@automagik/omni 2.260609.1 → 2.260609.2

package/dist/index.js

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

package/dist/server/index.js

@@ -225245,7 +225245,7 @@ var init_sentry_scrub = __esm(() => {
 var require_package7 = __commonJS((exports, module) => {
   module.exports = {
     name: "@omni/api",
-    version: "2.260609.1",
+    version: "2.260609.2",
     type: "module",
     exports: {
       ".": {
@@ -335731,6 +335731,23 @@ class MessageService {
     const [result] = await this.db.select().from(messages2).where(and2(eq(messages2.chatId, chatId), eq(messages2.externalId, externalId))).limit(1);
     return result ?? null;
   }
+  async findByProviderAlias(chatId, aliases) {
+    const candidates = [
+      ...new Set(aliases.filter((alias3) => typeof alias3 === "string" && alias3.length > 0).map((alias3) => alias3.slice(0, 255)))
+    ].slice(0, 8);
+    if (candidates.length === 0)
+      return null;
+    const aliasConditions = candidates.flatMap((alias3) => [
+      eq(messages2.externalId, alias3),
+      sql`${messages2.rawPayload}->'gupshupResponse'->>'messageId' = ${alias3}`,
+      sql`${messages2.rawPayload}->'gupshupResponse'->>'gsId' = ${alias3}`,
+      sql`${messages2.rawPayload}->'gupshupResponse'->>'id' = ${alias3}`,
+      sql`${messages2.rawPayload}->'gupshupResponse'->'messageIds' @> ${JSON.stringify([alias3])}::jsonb`,
+      sql`${messages2.rawPayload}->'gupshupProviderAliases' @> ${JSON.stringify([alias3])}::jsonb`
+    ]);
+    const [result] = await this.db.select().from(messages2).where(and2(eq(messages2.chatId, chatId), eq(messages2.isFromMe, true), or2(...aliasConditions))).orderBy(desc(messages2.platformTimestamp)).limit(1);
+    return result ?? null;
+  }
   async getByExternalIds(chatId, externalIds) {
     if (externalIds.length === 0)
       return [];
@@ -338434,12 +338451,35 @@ function getMessageContentText(msg) {
       return msg.textContent;
   }
 }
-async function resolveQuotedMessage(services, instanceId, chatId, replyToId) {
+function uniqueNonEmpty(values2) {
+  return [...new Set(values2.filter((value) => typeof value === "string" && value.length > 0))];
+}
+async function lookupQuotedMessage(messages4, chatDbId, replyToId, aliases) {
+  const quoted = await messages4.getByExternalId(chatDbId, replyToId);
+  if (quoted)
+    return quoted;
+  const candidates = uniqueNonEmpty([replyToId, ...aliases]);
+  const aliasLookup = messages4;
+  if (aliasLookup.findByProviderAlias && candidates.length > 0) {
+    const byAlias = await aliasLookup.findByProviderAlias(chatDbId, candidates);
+    if (byAlias)
+      return byAlias;
+  }
+  for (const candidate of candidates) {
+    if (candidate === replyToId)
+      continue;
+    const byExternalId = await messages4.getByExternalId(chatDbId, candidate);
+    if (byExternalId)
+      return byExternalId;
+  }
+  return null;
+}
+async function resolveQuotedMessage(services, instanceId, chatId, replyToId, providerAliases = []) {
   try {
     const chat2 = await services.chats.findByExternalIdSmart(instanceId, chatId);
     if (!chat2)
       return null;
-    const quoted = await services.messages.getByExternalId(chat2.id, replyToId);
+    const quoted = await lookupQuotedMessage(services.messages, chat2.id, replyToId, providerAliases);
     if (!quoted)
       return null;
     const sender = quoted.senderDisplayName ?? quoted.senderPlatformUserId ?? (quoted.isFromMe ? "You" : "unknown");
@@ -338504,12 +338544,29 @@ async function collectProcessedMedia(services, instance4, messages4) {
   }
   return results;
 }
+function extractQuotedProviderAliases(rawPayload) {
+  if (!rawPayload)
+    return [];
+  const messageObj = isRecord(rawPayload.messageobj) ? rawPayload.messageobj : undefined;
+  const replyContext = isRecord(messageObj?.replyContext) ? messageObj.replyContext : undefined;
+  const rawMessage = isRecord(messageObj?.raw) ? messageObj.raw : undefined;
+  const rawContext = isRecord(rawMessage?.context) ? rawMessage.context : undefined;
+  const topContext = isRecord(rawPayload.context) ? rawPayload.context : undefined;
+  return uniqueNonEmpty([
+    replyContext?.internalId,
+    rawContext?.gsId,
+    rawContext?.id,
+    topContext?.gsId,
+    topContext?.id
+  ]);
+}
 async function prependQuotedContext(services, instanceId, chatId, messages4, entries, messageKeyByIndex) {
   for (const [index2, m2] of messages4.entries()) {
     const replyToId = m2.payload.replyToId;
     if (!replyToId)
       continue;
-    const quotedText = await resolveQuotedMessage(services, instanceId, chatId, replyToId);
+    const providerAliases = extractQuotedProviderAliases(m2.payload.rawPayload);
+    const quotedText = await resolveQuotedMessage(services, instanceId, chatId, replyToId, providerAliases);
     if (!quotedText)
       continue;
     const messageKey = messageKeyByIndex.get(index2);
@@ -366770,6 +366827,34 @@ async function dispatchContent(client, dest, message2) {
   }
   return sendText(client, dest, content.text ?? "[Unsupported content]");
 }
+function extractResponseString(response, key) {
+  const value = response[key];
+  if (typeof value !== "string" || value.length === 0)
+    return;
+  return value.slice(0, 255);
+}
+function extractGupshupMessageIds(response) {
+  if (!Array.isArray(response.messageIds))
+    return [];
+  return response.messageIds.filter((value) => typeof value === "string" && value.length > 0).map((value) => value.slice(0, 255));
+}
+function extractGupshupProviderAliases(response) {
+  return [
+    extractResponseString(response, "messageId"),
+    extractResponseString(response, "gsId"),
+    extractResponseString(response, "id"),
+    ...extractGupshupMessageIds(response)
+  ].filter((value, index, values) => typeof value === "string" && values.indexOf(value) === index);
+}
+function buildGupshupResponseMetadata(response) {
+  return {
+    status: extractResponseString(response, "status"),
+    messageId: extractResponseString(response, "messageId"),
+    gsId: extractResponseString(response, "gsId"),
+    id: extractResponseString(response, "id"),
+    messageIds: extractGupshupMessageIds(response)
+  };
+}
 
 class GupshupPlugin extends BaseChannelPlugin {
   id = "gupshup";
@@ -366850,7 +366935,8 @@ class GupshupPlugin extends BaseChannelPlugin {
       this.captureT10(correlationId);
     try {
       const response = await dispatchContent(client, dest, message2);
-      const messageId = typeof response.messageId === "string" ? response.messageId : crypto.randomUUID();
+      const providerAliases = extractGupshupProviderAliases(response);
+      const messageId = extractResponseString(response, "messageId") ?? crypto.randomUUID();
       if (correlationId)
         this.captureT11(correlationId);
       await this.emitMessageSent({
@@ -366864,6 +366950,10 @@ class GupshupPlugin extends BaseChannelPlugin {
           mediaUrl: content.mediaUrl
         },
         replyToId: message2.replyTo,
+        rawPayload: {
+          gupshupResponse: buildGupshupResponseMetadata(response),
+          gupshupProviderAliases: providerAliases
+        },
         senderAgentId: message2.metadata?.senderAgentId
       });
       return { success: true, messageId, timestamp: Date.now() };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automagik/omni",
-  "version": "2.260609.1",
+  "version": "2.260609.2",
   "description": "LLM-optimized CLI for Omni",
   "type": "module",
   "bin": {