@automagik/omni 2.260910.11 → 2.260910.13

package/dist/server/index.js

@@ -174442,6 +174442,7 @@ var init_schema2 = __esm(() => {
     id: uuid("id").primaryKey().defaultRandom(),
     name: varchar("name", { length: 100 }).notNull(),
     eventType: varchar("event_type", { length: 255 }).notNull(),
+    excludeTypes: jsonb("exclude_types").$type(),
     filters: jsonb("filters").$type(),
     cursor: bigint2("cursor", { mode: "number" }).notNull().default(0),
     createdAt: timestamp("created_at", { withTimezone: true }).notNull().defaultNow(),
@@ -251644,7 +251645,7 @@ var init_sentry_scrub = __esm(() => {
 var require_package7 = __commonJS((exports, module) => {
   module.exports = {
     name: "@omni/api",
-    version: "2.260910.11",
+    version: "2.260910.13",
     private: true,
     type: "module",
     exports: {
@@ -363796,6 +363797,19 @@ async function postProcessChat(services, chat2, _chatCreated, chatExternalId, ch
 function resolveSenderDisplayName(senderName, rawPayload, participantResult) {
   return truncate4(senderName ?? rawPayload?.pushName, 255) || participantResult?.participant.displayName || undefined;
 }
+async function resolveQuotedSenderName(services, chatId, quotedMessage) {
+  const pushName = truncate4(quotedMessage?.pushName, 255);
+  if (pushName)
+    return pushName;
+  const participant = quotedMessage?.participant;
+  if (!participant)
+    return;
+  const platformUserId = participant.split("@")[0]?.split(":")[0];
+  if (!platformUserId)
+    return;
+  const existing = await services.chats.findParticipant(chatId, platformUserId);
+  return truncate4(existing?.displayName ?? undefined, 255);
+}
 async function maybeFindOrCreateParticipant(services, chatId, from, rawPayload, personId, platformIdentityId, senderName) {
   if (!from)
     return;
@@ -363955,7 +363969,7 @@ async function handleMessageReceived(services, payload, metadata, eventTimestamp
     mediaLocalPath: rawPayload?.mediaLocalPath,
     replyToExternalId: truncate4(payload.replyToId, 255),
     quotedText: quotedMessage?.conversation,
-    quotedSenderName: truncate4(quotedMessage?.pushName, 255),
+    quotedSenderName: await resolveQuotedSenderName(services, chat2.id, quotedMessage),
     threadExternalId: truncate4(payload.threadId, 255),
     isThreadBroadcast: rawPayload?.isThreadBroadcast === true,
     isForwarded: !!(rawPayload?.isForwarded || rawPayload?.forwardingScore),
@@ -370061,8 +370075,12 @@ class ChatService {
     }).where(eq(chatParticipants.id, existing.id)).returning();
     return updated ?? existing;
   }
-  async findOrCreateParticipant(chatId, platformUserId, defaults2 = {}) {
+  async findParticipant(chatId, platformUserId) {
     const [existing] = await this.db.select().from(chatParticipants).where(and2(eq(chatParticipants.chatId, chatId), eq(chatParticipants.platformUserId, platformUserId))).limit(1);
+    return existing;
+  }
+  async findOrCreateParticipant(chatId, platformUserId, defaults2 = {}) {
+    const existing = await this.findParticipant(chatId, platformUserId);
     if (existing) {
       const hasNewIdentity = defaults2.personId || defaults2.platformIdentityId;
       const missingIdentity = !existing.personId || !existing.platformIdentityId;
@@ -370514,6 +370532,20 @@ var init_dead_letters = __esm(() => {
 function escapeLikePattern(value) {
   return value.replace(/([\\%_])/g, "\\$1");
 }
+function eventTypeGlobClause(globs) {
+  const exact = globs.filter((t) => !t.endsWith("*"));
+  const prefixes = globs.filter((t) => t.endsWith("*")).map((t) => t.slice(0, -1));
+  const clauses = [
+    ...exact.length ? [inArray(omniEvents.eventType, exact)] : [],
+    ...prefixes.map((p2) => like(omniEvents.eventType, `${escapeLikePattern(p2)}%`))
+  ];
+  return clauses.length === 1 ? clauses[0] : or2(...clauses);
+}
+function eventTypeFilterClause(include, exclude) {
+  const inc = include?.length ? eventTypeGlobClause(include) : undefined;
+  const exc = exclude?.length ? eventTypeGlobClause(exclude) : undefined;
+  return and2(inc, exc ? not2(exc) : undefined);
+}
 function consumerTypeMatches(filter, eventType) {
   return filter.endsWith("*") ? eventType.startsWith(filter.slice(0, -1)) : filter === eventType;
 }
@@ -370533,6 +370565,7 @@ class EventService {
       personId,
       chatId,
       eventType,
+      excludeEventType,
       contentType,
       direction,
       since,
@@ -370556,17 +370589,9 @@ class EventService {
     if (chatId) {
       conditions3.push(eq(omniEvents.chatUuid, chatId));
     }
-    if (eventType?.length) {
-      const exact = eventType.filter((t) => !t.endsWith("*"));
-      const prefixes = eventType.filter((t) => t.endsWith("*")).map((t) => t.slice(0, -1));
-      const typeClauses = [
-        ...exact.length ? [inArray(omniEvents.eventType, exact)] : [],
-        ...prefixes.map((p2) => like(omniEvents.eventType, `${escapeLikePattern(p2)}%`))
-      ];
-      const combined = typeClauses.length === 1 ? typeClauses[0] : or2(...typeClauses);
-      if (combined)
-        conditions3.push(combined);
-    }
+    const typeClause = eventTypeFilterClause(eventType, excludeEventType);
+    if (typeClause)
+      conditions3.push(typeClause);
     if (contentType?.length) {
       conditions3.push(inArray(omniEvents.contentType, contentType));
     }
@@ -370830,7 +370855,13 @@ class EventConsumerService {
   async create(input) {
     const head = await this.head();
     const cursor = resolveInitialCursor(input.startFrom ?? "now", head);
-    const [created] = await this.db.insert(durableConsumers).values({ name: input.name, eventType: input.eventType, filters: input.filters ?? null, cursor }).onConflictDoNothing({ target: durableConsumers.name }).returning();
+    const [created] = await this.db.insert(durableConsumers).values({
+      name: input.name,
+      eventType: input.eventType,
+      excludeTypes: input.excludeTypes?.length ? input.excludeTypes : null,
+      filters: input.filters ?? null,
+      cursor
+    }).onConflictDoNothing({ target: durableConsumers.name }).returning();
     if (!created) {
       throw new ConflictError("DurableConsumer", `a consumer named '${input.name}' already exists`, {
         name: input.name
@@ -370890,7 +370921,7 @@ class EventConsumerService {
     return { ...updated, head, lag: computeLag(head, updated.cursor) };
   }
   async scanPage(consumer, limit2) {
-    const typeClause = consumer.eventType.endsWith("*") ? like(omniEvents.eventType, `${escapeLikePattern(consumer.eventType.slice(0, -1))}%`) : eq(omniEvents.eventType, consumer.eventType);
+    const typeClause = eventTypeFilterClause([consumer.eventType], consumer.excludeTypes ?? undefined);
     return this.db.select().from(omniEvents).where(and2(gt(omniEvents.journalSeq, consumer.cursor), typeClause)).orderBy(asc(omniEvents.journalSeq)).limit(limit2);
   }
 }
@@ -379973,6 +380004,7 @@ var init_event_consumers2 = __esm(() => {
     id: exports_external.string().uuid().openapi({ description: "Consumer UUID" }),
     name: exports_external.string().openapi({ description: "Unique consumer name (the follow/ack handle)" }),
     eventType: exports_external.string().openapi({ description: "Type filter: exact event type or trailing-* prefix glob" }),
+    excludeTypes: exports_external.array(exports_external.string()).nullable().openapi({ description: "Type globs dropped from the stream (exclusion wins over eventType), or null" }),
     filters: exports_external.array(ConsumerConditionSchema).nullable().openapi({ description: "Payload conditions (AND), or null" }),
     cursor: exports_external.number().int().openapi({ description: "Last acked journal_seq; delivery resumes strictly after it" }),
     head: exports_external.number().int().openapi({ description: "Highest journal_seq currently in the journal" }),
@@ -379983,6 +380015,7 @@ var init_event_consumers2 = __esm(() => {
   CreateConsumerSchema = exports_external.object({
     name: exports_external.string().min(1).max(100).regex(CONSUMER_NAME_PATTERN, "Consumer name must be lowercase tokens: a-z 0-9 . _ - (starting alphanumeric)").openapi({ description: "Unique consumer name (e.g. deploy-tracker)" }),
     eventType: exports_external.string().min(1).max(255).openapi({ description: "Type filter: exact event type, or trailing-* prefix glob (e.g. custom.github.*)" }),
+    excludeTypes: exports_external.array(exports_external.string().min(1).max(255)).max(20).optional().openapi({ description: "Type globs to drop (same syntax as eventType); exclusion wins over inclusion" }),
     filters: exports_external.array(ConsumerConditionSchema).max(20).optional().openapi({ description: "Payload conditions (AND) \u2014 same matcher as events wait --filter" }),
     startFrom: exports_external.enum(["now", "beginning"]).optional().openapi({ description: "Initial cursor: 'now' = journal head (default), 'beginning' = full replay" })
   });
@@ -380299,6 +380332,7 @@ function registerEventSchemas(registry4) {
         personId: exports_external.string().uuid().optional().openapi({ description: "Filter by person" }),
         chatId: exports_external.string().uuid().optional().openapi({ description: "Filter by chat UUID" }),
         eventType: exports_external.string().optional().openapi({ description: "Event types (comma-separated)" }),
+        excludeEventType: exports_external.string().optional().openapi({ description: "Event type globs to drop (comma-separated); exclusion wins over eventType" }),
         contentType: exports_external.string().optional().openapi({ description: "Content types (comma-separated)" }),
         direction: exports_external.enum(["inbound", "outbound"]).optional().openapi({ description: "Direction" }),
         since: exports_external.string().datetime().optional().openapi({ description: "Start date" }),
@@ -386871,6 +386905,7 @@ var init_events4 = __esm(() => {
     personId: exports_external.string().uuid().optional(),
     chatId: exports_external.string().uuid().optional(),
     eventType: exports_external.string().optional().transform((v2) => v2?.split(",")),
+    excludeEventType: exports_external.string().optional().transform((v2) => v2?.split(",")),
     contentType: exports_external.string().optional().transform((v2) => v2?.split(",")),
     direction: exports_external.enum(["inbound", "outbound"]).optional(),
     since: optionalDateParam("since"),
@@ -398025,6 +398060,16 @@ async function resolveChatLink(db2, instanceId, chatId) {
     return NO_CHAT_LINK;
   }
 }
+async function resolveReplyToEventId(db2, instanceId, replyToExternalId) {
+  if (!instanceId || !replyToExternalId)
+    return null;
+  try {
+    const [row] = await db2.select({ id: omniEvents.id }).from(omniEvents).where(and2(eq(omniEvents.instanceId, instanceId), eq(omniEvents.externalId, replyToExternalId))).orderBy(omniEvents.receivedAt).limit(1);
+    return row?.id ?? null;
+  } catch {
+    return null;
+  }
+}
 async function resolvePersonId2(db2, candidate) {
   if (typeof candidate !== "string" || !isValidUuid(candidate))
     return null;
@@ -398059,6 +398104,7 @@ async function setupEventPersistence(eventBus, db2) {
         await runConsumerInTenantContext(db2, event, async () => {
           const sdb = scopedHandle(db2);
           const chatLink = await resolveChatLink(sdb, metadata.instanceId, payload.chatId);
+          const replyToEventId = await resolveReplyToEventId(sdb, metadata.instanceId, payload.replyToId);
           const columns2 = {
             externalId: payload.externalId,
             channel: mapChannelType(metadata.channelType),
@@ -398073,6 +398119,7 @@ async function setupEventPersistence(eventBus, db2) {
             mediaMimeType: payload.content.mimeType,
             chatId: payload.chatId,
             replyToExternalId: payload.replyToId,
+            replyToEventId,
             status: "received",
             receivedAt: new Date(event.timestamp),
             rawPayload: payload.rawPayload ? deepSanitize(payload.rawPayload) : undefined,
@@ -398109,6 +398156,7 @@ async function setupEventPersistence(eventBus, db2) {
         await runConsumerInTenantContext(db2, event, async () => {
           const sdb = scopedHandle(db2);
           const chatLink = await resolveChatLink(sdb, metadata.instanceId, payload.chatId);
+          const replyToEventId = await resolveReplyToEventId(sdb, metadata.instanceId, payload.replyToId);
           const newEvent = {
             ...eventIdInsert(event.id),
             externalId: payload.externalId,
@@ -398124,6 +398172,7 @@ async function setupEventPersistence(eventBus, db2) {
             mediaMimeType: payload.content.mimeType,
             chatId: payload.chatId,
             replyToExternalId: payload.replyToId,
+            replyToEventId,
             status: "completed",
             receivedAt: new Date(event.timestamp),
             processedAt: new Date,
@@ -528573,6 +528622,19 @@ function getReplyToId2(msg) {
   const contextInfo = getMessageContextInfo(msg);
   return contextInfo?.stanzaId || undefined;
 }
+function extractQuotedContext(msg) {
+  const contextInfo = getMessageContextInfo(msg);
+  if (!contextInfo?.quotedMessage)
+    return;
+  const content = extractContent3({ key: msg.key, message: contextInfo.quotedMessage });
+  const type = content?.type ?? "unknown";
+  return {
+    stanzaId: contextInfo.stanzaId || undefined,
+    participant: contextInfo.participant || undefined,
+    type,
+    conversation: content?.text || content?.caption || `[${type}]`
+  };
+}
 function isFromMe(msg) {
   return msg.key.fromMe === true;
 }
@@ -531673,6 +531735,7 @@ class WhatsAppPlugin extends BaseChannelPlugin {
         }
       } catch {}
     }
+    await this.enrichPayloadWithQuotedMessage(extendedPayload, instanceId, chatId, rawMessage);
     if (content.poll)
       extendedPayload.poll = content.poll;
     if (content.pollVotes)
@@ -532205,6 +532268,7 @@ class WhatsAppPlugin extends BaseChannelPlugin {
       if (content.localPath)
         rawPayload.mediaLocalPath = content.localPath;
       this.enrichPayloadWithChatName(rawPayload, instanceId, chatId);
+      await this.enrichPayloadWithQuotedMessage(rawPayload, instanceId, chatId, msg);
       const historySenderName = msg.pushName ?? undefined;
       await this.emitMessageReceived({
         instanceId,
@@ -532224,6 +532288,13 @@ class WhatsAppPlugin extends BaseChannelPlugin {
       });
     }
   }
+  async enrichPayloadWithQuotedMessage(rawPayload, instanceId, chatId, msg) {
+    const quoted = extractQuotedContext(msg);
+    if (!quoted)
+      return;
+    const pushName = quoted.participant ? (await this.getContactInfo(instanceId, quoted.participant, chatId))?.name : undefined;
+    rawPayload.quotedMessage = { ...quoted, pushName };
+  }
   enrichPayloadWithChatName(payload, instanceId, chatId) {
     if (chatId.includes("@g.us")) {
       const group = this.groupsCache.get(instanceId)?.get(chatId);

package/package.json

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