@automagik/omni 2.260930.1 → 2.260930.3

package/dist/index.js

@@ -137462,7 +137462,7 @@ import { fileURLToPath } from "url";
 // package.json
 var package_default = {
   name: "@automagik/omni",
-  version: "2.260930.1",
+  version: "2.260930.3",
   repository: {
     type: "git",
     url: "git+https://github.com/automagik-dev/omni.git",

package/dist/server/index.js

@@ -266444,7 +266444,7 @@ var init_sentry_scrub = __esm(() => {
 var require_package7 = __commonJS((exports, module) => {
   module.exports = {
     name: "@omni/api",
-    version: "2.260930.1",
+    version: "2.260930.3",
     private: true,
     type: "module",
     exports: {
@@ -381951,11 +381951,7 @@ async function dispatchToAgent(services, instance4, msgs, triggerType, channel5,
 }
 async function applyCloseContactGate(services, chatRecordId, instanceId, chatId, chatSettings, trustedTenantId) {
   if (chatSettings?.closed === true) {
-    log94.debug("Chat closed (terminal), skipping dispatch", {
-      instanceId,
-      chatId,
-      outcome: chatSettings.closeOutcome ?? null
-    });
+    logDrop("chat closed (terminal)", { chatId }, instanceId, { outcome: chatSettings.closeOutcome ?? null });
     return "skip";
   }
   if (!chatSettings?.closeUntil)
@@ -382013,7 +382009,7 @@ async function processAgentResponse(services, instance4, messages4, triggerType,
   const dispatchTenantId = firstMessage.metadata.trustedTenantId;
   const personId = await resolvePersonId(services, channel5, instance4.id, senderId, firstMessage.metadata.personId, dispatchTenantId);
   if (!personId) {
-    log94.warn("Could not resolve person ID, skipping agent", { instanceId: instance4.id, chatId, senderId });
+    logDrop("could not resolve person ID", firstMessage.payload, instance4.id);
     ackHandle.remove();
     return;
   }
@@ -382026,7 +382022,7 @@ async function processAgentResponse(services, instance4, messages4, triggerType,
   }
   const isAgentPaused = chatSettings?.agentPaused === true && gateResult !== "reopened";
   if (isAgentPaused) {
-    log94.debug("Agent paused (handoff active), skipping dispatch", { instanceId: instance4.id, chatId });
+    logDrop("agent paused (handoff active)", firstMessage.payload, instance4.id);
     ackHandle.remove();
     return;
   }
@@ -382034,9 +382030,7 @@ async function processAgentResponse(services, instance4, messages4, triggerType,
     const resumedAt = new Date(chatSettings.agentResumedAt).getTime();
     const msgTimestamp = (extractPlatformTimestamp(firstMessage.payload.rawPayload, Date.now()) ?? new Date).getTime();
     if (msgTimestamp < resumedAt) {
-      log94.debug("Dropping pre-resume message (arrived during handoff window)", {
-        instanceId: instance4.id,
-        chatId,
+      logDrop("pre-resume message (arrived during handoff window)", firstMessage.payload, instance4.id, {
         msgTimestamp: new Date(msgTimestamp).toISOString(),
         resumedAt: chatSettings.agentResumedAt
       });
@@ -382724,28 +382718,29 @@ function isFirstPartyInstanceSender(sender, currentOwnerIdentifier, activeOwnerI
   }
   return false;
 }
-async function listActiveOwnerIdentifiers(db2, trustedTenantId) {
+async function listActiveOwnerIdentifiers(db2, instance4, trustedTenantId) {
   const now = Date.now();
-  if (trustedTenantId !== undefined) {
-    const cached = tenantCachedActiveOwnerIdentifiers.get(trustedTenantId);
-    if (cached && now - cached.at < ACTIVE_OWNER_IDENTIFIER_CACHE_TTL_MS)
-      return cached.ids;
-    const rows2 = await runInWorkerTenantScope(db2, trustedTenantId, () => scopedHandle(db2).select({ ownerIdentifier: instances.ownerIdentifier }).from(instances).where(eq(instances.isActive, true)));
-    if (!Array.isArray(rows2))
-      return [];
-    const ids2 = rows2.map((row) => row.ownerIdentifier);
-    tenantCachedActiveOwnerIdentifiers.set(trustedTenantId, { ids: ids2, at: now });
-    return ids2;
-  }
-  if (cachedActiveOwnerIdentifiers && now - cachedActiveOwnerIdentifiersAt < ACTIVE_OWNER_IDENTIFIER_CACHE_TTL_MS) {
-    return cachedActiveOwnerIdentifiers;
-  }
-  const rows = await db2.select({ ownerIdentifier: instances.ownerIdentifier }).from(instances).where(eq(instances.isActive, true));
+  const cacheKey = `${trustedTenantId ?? ""}:${instance4.id}:${instance4.channel}:${instance4.slackTeamId ?? ""}`;
+  const cached = cachedActiveOwnerIdentifiers.get(cacheKey);
+  if (cached && now - cached.at < ACTIVE_OWNER_IDENTIFIER_CACHE_TTL_MS)
+    return cached.ids;
+  const where = and2(eq(instances.isActive, true), eq(instances.channel, instance4.channel), ne(instances.id, instance4.id), instance4.slackTeamId ? eq(instances.slackTeamId, instance4.slackTeamId) : undefined);
+  const rows = trustedTenantId !== undefined ? await runInWorkerTenantScope(db2, trustedTenantId, () => scopedHandle(db2).select({ ownerIdentifier: instances.ownerIdentifier }).from(instances).where(where)) : await db2.select({ ownerIdentifier: instances.ownerIdentifier }).from(instances).where(where);
   if (!Array.isArray(rows))
     return [];
-  cachedActiveOwnerIdentifiers = rows.map((row) => row.ownerIdentifier);
-  cachedActiveOwnerIdentifiersAt = now;
-  return cachedActiveOwnerIdentifiers;
+  const ids2 = rows.map((row) => row.ownerIdentifier);
+  cachedActiveOwnerIdentifiers.set(cacheKey, { ids: ids2, at: now });
+  return ids2;
+}
+function logDrop(reason, payload, instanceId, extra = {}) {
+  log94.warn(`Dropping inbound: ${reason}`, {
+    instanceId,
+    chatId: payload.chatId,
+    sender: payload.from,
+    externalId: payload.externalId,
+    reason,
+    ...extra
+  });
 }
 async function isAgentOutboundEcho(chatsService, messagesService, db2, payload, instanceId, trustedTenantId) {
   if (payload.rawPayload?.isFromMe !== true)
@@ -382758,44 +382753,34 @@ async function isAgentOutboundEcho(chatsService, messagesService, db2, payload,
   });
   if (!priorMessage?.senderAgentId)
     return false;
-  log94.info("Skipping own outbound echo (agent-authored message received back)", {
-    instanceId,
-    chatId: payload.chatId,
-    externalId: payload.externalId,
+  logDrop("own outbound echo (agent-authored message received back)", payload, instanceId, {
     senderAgentId: priorMessage.senderAgentId
   });
   return true;
 }
 async function shouldProcessMessage3(agentRunner, accessService, chatsService, messagesService, routeResolver, db2, payload, metadata, trustedTenantId) {
   if (!metadata.instanceId) {
-    log94.debug("No instanceId in metadata", { from: payload.from, chatId: payload.chatId });
+    logDrop("no instanceId in metadata", payload, undefined);
     return null;
   }
   if (payload.from === metadata.platformIdentityId) {
-    log94.debug("Message from self, skipping", { instanceId: metadata.instanceId, from: payload.from });
+    logDrop("message from self", payload, metadata.instanceId);
     return null;
   }
   if (await isAgentOutboundEcho(chatsService, messagesService, db2, payload, metadata.instanceId, trustedTenantId)) {
     return null;
   }
   if (payload.content?.type && NON_DISPATCHABLE_CONTENT_TYPES.has(payload.content.type)) {
-    log94.debug("Skipping non-conversational content type on message path", {
-      instanceId: metadata.instanceId,
-      chatId: payload.chatId,
-      contentType: payload.content.type
-    });
+    logDrop("non-conversational content type", payload, metadata.instanceId, { contentType: payload.content.type });
     return null;
   }
   if (isTrashEmojiOnly(payload.content?.text)) {
-    log94.debug("Skipping trash emoji message (session-cleaner handles this)", {
-      instanceId: metadata.instanceId,
-      chatId: payload.chatId
-    });
+    logDrop("trash emoji message (session-cleaner handles this)", payload, metadata.instanceId);
     return null;
   }
   const chatId = payload.chatId ?? "";
   if (isBroadcastOrNewsletter(chatId)) {
-    log94.debug("Skipping newsletter/broadcast message", { instanceId: metadata.instanceId, chatId });
+    logDrop("newsletter/broadcast chat", payload, metadata.instanceId);
     return null;
   }
   const instance4 = await runDispatchDb(db2, trustedTenantId, () => agentRunner.getInstanceWithProvider(metadata.instanceId));
@@ -382803,19 +382788,16 @@ async function shouldProcessMessage3(agentRunner, accessService, chatsService, m
     log94.debug("Instance has no agentId", { instanceId: metadata.instanceId });
     return null;
   }
-  const activeOwnerIdentifiers = await listActiveOwnerIdentifiers(db2, trustedTenantId);
+  const activeOwnerIdentifiers = await listActiveOwnerIdentifiers(db2, instance4, trustedTenantId);
   if (!instance4.allowFirstParty && isFirstPartyInstanceSender(payload, instance4.ownerIdentifier, activeOwnerIdentifiers)) {
-    log94.info("Skipping first-party cross-instance message", {
-      instanceId: instance4.id
+    logDrop("first-party cross-instance sender (set allowFirstParty to opt out)", payload, instance4.id, {
+      channel: instance4.channel
     });
     return null;
   }
   const staleness = isInboundTooStale(payload.rawPayload, instance4.inboundMaxAgeMinutes);
   if (staleness.stale) {
-    log94.warn("Dropping stale inbound message", {
-      instanceId: instance4.id,
-      chatId: payload.chatId,
-      externalId: payload.externalId,
+    logDrop("stale inbound message", payload, instance4.id, {
       ageMs: staleness.ageMs,
       maxAgeMs: staleness.maxAgeMs,
       maxAgeMinutes: instance4.inboundMaxAgeMinutes
@@ -382849,12 +382831,7 @@ async function shouldProcessMessage3(agentRunner, accessService, chatsService, m
     });
   }
   if (!shouldAgentReply(effectiveReplyFilter, messageContext)) {
-    log94.info("Message did not pass reply filter", {
-      instanceId: instance4.id,
-      chatId: payload.chatId,
-      messageContext,
-      filter: effectiveReplyFilter
-    });
+    logDrop("did not pass reply filter", payload, instance4.id, { messageContext, filter: effectiveReplyFilter });
     return null;
   }
   const channel5 = metadata.channelType ?? instance4.channel;
@@ -382892,13 +382869,7 @@ async function checkAccessWithFallback(accessService, instance4, payload, channe
   }
   if (accessResult.allowed)
     return false;
-  log94.info("Access denied", {
-    instanceId: instance4.id,
-    chatId: payload.chatId,
-    from: payload.from,
-    participantAlt,
-    reason: accessResult.reason
-  });
+  logDrop(`access denied: ${accessResult.reason}`, payload, instance4.id, { participantAlt });
   if (accessResult.mode === "allowlist" && !accessResult.rule && primaryId) {
     accessService.requestPairing(instance4.id, primaryId, { channelType: instance4.channel }, trustedTenantId).catch((err2) => {
       log94.warn("Failed to create pairing request", { instanceId: instance4.id, from: primaryId, error: String(err2) });
@@ -382918,7 +382889,7 @@ async function shouldProcessReaction(agentRunner, accessService, reactionDedup,
   if (!instanceTriggersOnEvent(instance4, eventType))
     return null;
   if (!isReactionTrigger(instance4, payload.emoji)) {
-    log94.debug("Reaction emoji not in trigger list", { instanceId: instance4.id, emoji: payload.emoji });
+    logDrop("reaction emoji not in trigger list", payload, instance4.id, { emoji: payload.emoji });
     return null;
   }
   const channel5 = metadata.channelType ?? instance4.channel;
@@ -382926,11 +382897,7 @@ async function shouldProcessReaction(agentRunner, accessService, reactionDedup,
   if (accessDenied)
     return null;
   if (reactionDedup.isDuplicate(payload.messageId, payload.emoji, payload.from)) {
-    log94.debug("Duplicate reaction, skipping", {
-      instanceId: instance4.id,
-      messageId: payload.messageId,
-      emoji: payload.emoji
-    });
+    logDrop("duplicate reaction", payload, instance4.id, { messageId: payload.messageId, emoji: payload.emoji });
     return null;
   }
   return instance4;
@@ -383295,7 +383262,7 @@ async function setupAgentDispatcher(eventBus, services, db2) {
     log94.info("Agent dispatcher shutdown complete");
   };
 }
-var import_api31, log94, 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, setupAgentResponder;
+var import_api31, log94, 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, setupAgentResponder;
 var init_agent_dispatcher = __esm(() => {
   init_src2();
   init_src();
@@ -383364,7 +383331,7 @@ var init_agent_dispatcher = __esm(() => {
   openclawClientPool = new Map;
   _openClawClientCtor = OpenClawClient;
   nullFilterWarnedInstances = new Set;
-  tenantCachedActiveOwnerIdentifiers = new Map;
+  cachedActiveOwnerIdentifiers = new Map;
   setupAgentResponder = setupAgentDispatcher;
 });
 

package/package.json

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