npm - @automagik/omni - Versions diffs - 2.260910.12 → 2.260910.14 - Mend

@automagik/omni 2.260910.12 → 2.260910.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/commands/events.d.ts +22 -0
package/dist/commands/events.d.ts.map +1 -1
package/dist/index.js +44 -8
package/dist/server/index.js +56 -3
package/package.json +1 -1

package/dist/commands/events.d.ts CHANGED Viewed

@@ -137,11 +137,28 @@ export interface FormatLineOptions {
     /** Print raw uuid8 ids even when a name is known (#1036 ask 2, `--ids`). */
     ids?: boolean;
     names?: StreamNames;
+    /** `--pretty` (#1079): compact colored `time type who: text` line. */
+    pretty?: boolean;
+    /** Force ANSI on/off (tests); defaults to `areColorsEnabled()`. */
+    color?: boolean;
 }
 /** Sender label: resolved person name, then channel push name, then raw `from`. */
 export declare function senderLabel(event: StreamEventRow, names?: StreamNames): string;
 /** Format an event as a single human-readable line. */
 export declare function formatEventLine(event: StreamEventRow, options?: FormatLineOptions): string;
+/**
+ * `--pretty` content column (#1079): message text first, then the webhook
+ * body fields humans grep for (github: action #number title; purchase: subject).
+ * ponytail: one generic key list instead of per-family formatters; add a
+ * per-family switch when a family needs a shape this cannot express.
+ */
+export declare function prettyContent(event: StreamEventRow): string;
+/**
+ * `--pretty` (#1079): one compact `time type who: text` line, colored when
+ * stdout is a TTY and NO_COLOR / --no-color are unset. Sender resolution is
+ * the `--verbose` one (`senderLabel`), not a second copy.
+ */
+export declare function formatPrettyLine(event: StreamEventRow, options?: FormatLineOptions): string;
 /**
  * The journal row as the API actually returns it: the generated SDK `Event`
  * type is a projection, but GET /events returns full omni_events rows —
@@ -213,6 +230,11 @@ export interface FollowParams {
     isStopped?: () => boolean;
     /** Line sink — defaults to output.raw (stdout). Injected by tests. */
     emit?: (line: string) => void;
+    /** `--pretty` (#1079): print formatPrettyLine instead of JSON lines; names resolved via `client`. */
+    pretty?: {
+        client: OmniClient;
+        format: FormatLineOptions;
+    };
     /** Consecutive transport failures tolerated before giving up (default 5). */
     maxRetries?: number;
     /** First backoff delay; doubles per retry up to 30s (default 1000). */

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

	@@ -1 +1 @@
1	- {"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../src/commands/events.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,EAAE,KAAK,mBAAmB,EAAsB,MAAM,YAAY,CAAC;AAC1E,OAAO,KAAK,EAAE,KAAK,EAAE,qBAAqB,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;~~AAC1E~~,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;~~AAuJpC~~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~~CACrB~~;AAQD,mFAAmF;AACnF,wBAAgB,WAAW,CAAC,KAAK,EAAE,cAAc,EAAE,KAAK,CAAC,EAAE,WAAW,GAAG,MAAM,CAG9E;AAED,uDAAuD;AACvD,wBAAgB,eAAe,CAAC,KAAK,EAAE,cAAc,EAAE,OAAO,GAAE,iBAAsB,GAAG,MAAM,CAc9F;~~AAiLD~~;;;;;;GAMG;AACH,KAAK,YAAY,GAAG,KAAK,GAAG;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAA;CAAE,CAAC;AAc5E;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,mBAAmB,EAAE,CAYzE;AAED,UAAU,UAAU;IAClB,OAAO,EAAE,mBAAmB,CAAC;IAC7B,UAAU,EAAE,mBAAmB,EAAE,CAAC;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,gEAAgE;IAChE,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,gFAAgF;AAChF,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,mBAAmB,EAC5B,UAAU,EAAE,mBAAmB,EAAE,GAChC,OAAO,CAGT;AAED;;;;;GAKG;AACH,wBAAsB,YAAY,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CA4BvG;AAMD,0EAA0E;AAC1E,UAAU,YAAY;IACpB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAC/B,OAAO,EAAE,mBAAmB,EAAE,GAAG,IAAI,CAAC;IACtC,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB;AAWD;;;;GAIG;AACH,wBAAsB,mBAAmB,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,GAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAepH;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAY/E;AAED,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,sCAAsC;IACtC,KAAK,EAAE,MAAM,CAAC;IACd,sEAAsE;IACtE,MAAM,EAAE,MAAM,CAAC;IACf,sFAAsF;IACtF,GAAG,EAAE,OAAO,CAAC;IACb,8EAA8E;IAC9E,SAAS,EAAE,OAAO,CAAC;IACnB,qCAAqC;IACrC,SAAS,CAAC,EAAE,MAAM,OAAO,CAAC;IAC1B,sEAAsE;IACtE,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9B,6EAA6E;IAC7E,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,uEAAuE;IACvE,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;~~AA8BD~~;;;;;;;;GAQG;AACH,wBAAsB,cAAc,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,~~CA4CxE~~;AA8FD,wBAAgB,mBAAmB,IAAI,OAAO,~~CA0Y7C~~"}
1	+ {"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../src/commands/events.ts"],"names":[],"mappings":"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"}

package/dist/index.js CHANGED Viewed

@@ -137198,7 +137198,7 @@ import { fileURLToPath } from "url";
 // package.json
 var package_default = {
   name: "@automagik/omni",
-  version: "2.260910.12",
+  version: "2.260910.14",
   repository: {
     type: "git",
     url: "git+https://github.com/automagik-dev/omni.git",
@@ -143917,10 +143917,12 @@ function createDoneCommand() {
 // src/commands/events.ts
 init_src();
+init_source();
 import { readFileSync as readFileSync11 } from "fs";
 init_zod();
 init_config();
 init_output();
+init_output();
 function parseSinceTime(since) {
   const match = since.match(/^(\d+)([hdwm]|min)$/);
   if (!match) {
@@ -144270,6 +144272,29 @@ function formatEventLine(event, options = {}) {
   }
   return `${cols.join("  ")}  ${trimmed}`.trimEnd();
 }
+function prettyContent(event) {
+  const text = event.textContent ?? event.transcription ?? event.imageDescription;
+  if (text)
+    return text;
+  const p11 = event.rawPayload ?? {};
+  const nested = p11.pull_request ?? p11.issue ?? {};
+  const str = (v4) => typeof v4 === "string" && v4 ? v4 : undefined;
+  const number2 = p11.number ?? nested.number;
+  const title = ["title", "subject", "text", "message", "body"].map((k4) => str(p11[k4]) ?? str(nested[k4])).find(Boolean);
+  return [str(p11.action), number2 === undefined ? undefined : `#${String(number2)}`, title].filter(Boolean).join(" ");
+}
+var chalk2 = new Chalk({ level: 1 });
+var paint = (on, fn, s2) => on && s2 ? fn(s2) : s2;
+function formatPrettyLine(event, options = {}) {
+  const color = options.color ?? (areColorsEnabled() && !process.env.NO_COLOR);
+  const time = new Date(event.receivedAt).toISOString().slice(11, 19);
+  const typeColor = isErrorEvent(event.eventType) ? chalk2.red : event.direction === "outbound" ? chalk2.magenta : chalk2.cyan;
+  const who = event.direction === "outbound" && !event.rawPayload?.pushName ? "me" : senderLabel(event, options.names);
+  const content = prettyContent(event);
+  const head = `${paint(color, chalk2.dim, time)} ${paint(color, typeColor, event.eventType)}`;
+  const tail = [paint(color, chalk2.bold, who), content].filter(Boolean).join(": ");
+  return `${head}  ${tail}`.trimEnd();
+}
 async function warmStreamNames(client, names, events2) {
   const lookup2 = async (map2, id, fetch2) => {
     if (map2.has(id))
@@ -144294,7 +144319,7 @@ function emitStreamEvent(event, ndjson, format) {
   if (ndjson) {
     raw(JSON.stringify(event));
   } else {
-    raw(formatEventLine(event, format));
+    raw(format.pretty ? formatPrettyLine(event, format) : formatEventLine(event, format));
   }
 }
 async function fetchStreamBatch(client, filters, channel2, type, sinceIso) {
@@ -144356,6 +144381,7 @@ async function streamEvents(client, options) {
   const format = {
     verbose: options.verbose,
     ids: options.ids,
+    pretty: options.pretty,
     names: { instances: new Map, chats: new Map, persons: new Map }
   };
   let stopped = false;
@@ -144472,6 +144498,14 @@ async function pullWithRetry(params) {
     }
   }
 }
+async function emitFollowPage(params, items, emit) {
+  const pretty = params.pretty;
+  if (pretty?.format.names && !pretty.format.ids)
+    await warmStreamNames(pretty.client, pretty.format.names, items);
+  for (const item of items) {
+    emit(pretty ? formatPrettyLine(item, pretty.format) : JSON.stringify(item));
+  }
+}
 async function followConsumer(params) {
   const emit = params.emit ?? raw;
   let acked = -1;
@@ -144479,9 +144513,7 @@ async function followConsumer(params) {
     if (params.isStopped?.())
       return;
     const page = await pullWithRetry(params);
-    for (const item of page.items) {
-      emit(JSON.stringify(item));
-    }
+    await emitFollowPage(params, page.items, emit);
     if (!params.ack) {
       await flushStdout();
       return;
@@ -144583,7 +144615,7 @@ function createEventsCommand() {
       error(`Failed to list events: ${message2}`);
     }
   });
-  events2.command("stream").description("Stream events in real-time (tail -f style). Ctrl+C to stop.").option("--instance <id>", "Filter by instance ID").option("--channel <type>", "Filter by channel type").option("--type <type>", "Filter by event type (trailing * = prefix glob, e.g. custom.*)").option("--exclude <glob>", "Drop event types matching this glob, repeatable; wins over --type (e.g. --exclude custom.chat.*)", (value, previous) => [...previous, value], []).option("--chat-id <id>", "Filter by chat ID").option("--person-id <id>", "Filter by person ID").option("--since <time>", "Start cursor (e.g., 5min, 24h, 7d, or ISO timestamp)").option("--errors-only", "Show only error/failure events").option("--all", "Include noisy event types (presence, delivered, read, progress)").option("--ndjson", "Emit JSON Lines (one event per line) \u2014 same as global --json in stream mode").option("-v, --verbose", "Add sender, fromMe marker and contentType columns").option("--ids", "Print raw ids instead of resolved instance/chat names").option("--poll-ms <n>", "Polling interval in milliseconds", (v4) => Number.parseInt(v4, 10), 2000).action(async (options) => {
+  events2.command("stream").description("Stream events in real-time (tail -f style). Ctrl+C to stop.").option("--instance <id>", "Filter by instance ID").option("--channel <type>", "Filter by channel type").option("--type <type>", "Filter by event type (trailing * = prefix glob, e.g. custom.*)").option("--exclude <glob>", "Drop event types matching this glob, repeatable; wins over --type (e.g. --exclude custom.chat.*)", (value, previous) => [...previous, value], []).option("--chat-id <id>", "Filter by chat ID").option("--person-id <id>", "Filter by person ID").option("--since <time>", "Start cursor (e.g., 5min, 24h, 7d, or ISO timestamp)").option("--errors-only", "Show only error/failure events").option("--all", "Include noisy event types (presence, delivered, read, progress)").option("--ndjson", "Emit JSON Lines (one event per line) \u2014 same as global --json in stream mode").option("-v, --verbose", "Add sender, fromMe marker and contentType columns").option("--ids", "Print raw ids instead of resolved instance/chat names").option("--pretty", "One colored `time type who: text` line per event (no ANSI when piped or NO_COLOR)").option("--poll-ms <n>", "Polling interval in milliseconds", (v4) => Number.parseInt(v4, 10), 2000).action(async (options) => {
     const client = getClient();
     try {
       await streamEvents(client, options);
@@ -144628,7 +144660,7 @@ function createEventsCommand() {
       error(`Failed to wait for event: ${message2}`);
     }
   });
-  events2.command("follow").description("Tail the journal through a durable consumer: resumes from its stored cursor, prints JSON lines, acks as it goes.").requiredOption("--consumer <name>", "Durable consumer to follow (create with: omni events consumers create)").option("--limit <n>", "Max journal rows scanned per pull", (v4) => Number.parseInt(v4, 10), 100).option("--wait-ms <n>", "Server-side long-poll window per pull when idle (max 30000)", (v4) => Number.parseInt(v4, 10), 1e4).option("--no-ack", "Peek: print one page without advancing the cursor, then exit").option("--until-idle", "Exit 0 once caught up with the journal instead of tailing forever").option("--ndjson", "Accepted for symmetry with `events stream` \u2014 follow always emits JSON Lines").action(async (options) => {
+  events2.command("follow").description("Tail the journal through a durable consumer: resumes from its stored cursor, prints JSON lines, acks as it goes.").requiredOption("--consumer <name>", "Durable consumer to follow (create with: omni events consumers create)").option("--limit <n>", "Max journal rows scanned per pull", (v4) => Number.parseInt(v4, 10), 100).option("--wait-ms <n>", "Server-side long-poll window per pull when idle (max 30000)", (v4) => Number.parseInt(v4, 10), 1e4).option("--no-ack", "Peek: print one page without advancing the cursor, then exit").option("--until-idle", "Exit 0 once caught up with the journal instead of tailing forever").option("--ndjson", "Accepted for symmetry with `events stream` \u2014 follow emits JSON Lines unless --pretty").option("--pretty", "One colored `time type who: text` line per event (no ANSI when piped or NO_COLOR)").option("--ids", "With --pretty: print raw ids instead of resolved names").action(async (options) => {
     let stopped = false;
     const shutdown = () => {
       stopped = true;
@@ -144643,7 +144675,11 @@ function createEventsCommand() {
         waitMs: Math.min(Math.max(options.waitMs, 0), 30000),
         ack: options.ack,
         untilIdle: options.untilIdle === true,
-        isStopped: () => stopped
+        isStopped: () => stopped,
+        pretty: options.pretty && !options.ndjson && getOutputFormat() !== "json" ? {
+          client: getClient(),
+          format: { ids: options.ids, names: { instances: new Map, chats: new Map, persons: new Map } }
+        } : undefined
       });
     } catch (err2) {
       error(`Failed to follow consumer: ${errorMessage(err2)}`);

package/dist/server/index.js CHANGED Viewed

@@ -251645,7 +251645,7 @@ var init_sentry_scrub = __esm(() => {
 var require_package7 = __commonJS((exports, module) => {
   module.exports = {
     name: "@omni/api",
-    version: "2.260910.12",
+    version: "2.260910.14",
     private: true,
     type: "module",
     exports: {
@@ -363797,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;
@@ -363956,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),
@@ -370062,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;
@@ -398043,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;
@@ -398077,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),
@@ -398091,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,
@@ -398127,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,
@@ -398142,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,
@@ -528591,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;
 }
@@ -531691,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)
@@ -532223,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,
@@ -532242,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 CHANGED Viewed

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