@automagik/omni 2.260531.5 → 2.260601.1

package/dist/index.js

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

package/dist/server/index.js

@@ -225241,7 +225241,7 @@ var init_sentry_scrub = __esm(() => {
 var require_package7 = __commonJS((exports, module) => {
   module.exports = {
     name: "@omni/api",
-    version: "2.260531.5",
+    version: "2.260601.1",
     type: "module",
     exports: {
       ".": {
@@ -337846,6 +337846,18 @@ function emitLifecycleSpan(name, attributes) {
     return;
   }).catch(() => {});
 }
+function activeProviderTraceContext() {
+  const activeSpan = import_api32.trace.getActiveSpan();
+  const spanContext = activeSpan?.spanContext();
+  if (!spanContext?.traceId || !spanContext?.spanId)
+    return;
+  return {
+    traceId: spanContext.traceId,
+    spanId: spanContext.spanId,
+    traceFlags: spanContext.traceFlags,
+    traceState: spanContext.traceState?.serialize()
+  };
+}
 function createPluginAckProvider(plugin7) {
   if (!plugin7?.react || !plugin7?.unreact)
     return null;
@@ -338982,63 +338994,76 @@ async function dispatchViaProvider(services, instance4, messages4, triggerType,
     inputText: messageTexts.join(`
 `)
   };
-  emitLifecycleSpan("omni.provider_inbound", buildLifecycleSpanAttributes({
+  return withLifecycleSpan("omni.turn", buildLifecycleSpanAttributes({
     ...lifecycleBase,
-    stage: "provider_inbound",
-    extra: { trigger_type: triggerType, message_count: messages4.length }
-  }));
-  if (provider.mode === "turn-based") {
-    return dispatchViaTurnBasedProvider(services, instance4, provider, trigger, messages4, chatId, traceId, db2);
-  }
-  const correlationId = messages4[0]?.metadata.correlationId;
-  const dispatchStart = Date.now();
-  const result = await withLifecycleSpan("omni.dispatch_to_agno", buildLifecycleSpanAttributes({
-    ...lifecycleBase,
-    stage: "dispatch_to_agno",
-    extra: { trigger_type: triggerType, provider_id: provider.id, provider_schema: provider.schema }
-  }), () => provider.trigger(trigger));
-  const dispatchDurationMs = Date.now() - dispatchStart;
-  if (sentryEnabled()) {
-    exports_public_api2.count("agent.dispatch", 1, { attributes: { provider_type: provider.schema } });
-    exports_public_api2.distribution("agent.dispatch.latency", dispatchDurationMs, {
-      unit: "millisecond",
-      attributes: { provider_type: provider.schema }
-    });
-  }
-  const chatAfterRun = await services.chats.findByExternalIdSmart(instance4.id, chatId);
-  const handoffTriggered = chatAfterRun?.settings?.agentPaused === true;
-  if (result && result.parts.length > 0 && !handoffTriggered) {
-    const selfChat = isSelfChat(chatId, instance4.ownerIdentifier);
-    const rawParts = selfChat ? result.parts.map((p2) => `${BOT_PREFIX}${p2}`) : result.parts;
-    const parts = await Promise.all(rawParts.map((part) => executeBeforeMessageWriteHooks(instance4.id, chatId, part)));
-    const _fmtMode = instance4.messageFormatMode ?? "convert";
-    const replyTo = messages4[0]?.payload.replyToId ?? messages4[0]?.payload.externalId;
-    recordJourneyCheckpoint(correlationId, "T8", JOURNEY_STAGES.T8);
-    await withLifecycleSpan("omni.provider_outbound", buildLifecycleSpanAttributes({
+    stage: "turn",
+    extra: {
+      trigger_type: triggerType,
+      message_count: messages4.length,
+      provider_id: provider.id,
+      provider_schema: provider.schema
+    }
+  }), async () => {
+    await withLifecycleSpan("omni.provider_inbound", buildLifecycleSpanAttributes({
+      ...lifecycleBase,
+      stage: "provider_inbound",
+      extra: { trigger_type: triggerType, message_count: messages4.length }
+    }), async () => {
+      return;
+    });
+    if (provider.mode === "turn-based") {
+      return dispatchViaTurnBasedProvider(services, instance4, provider, trigger, messages4, chatId, traceId, db2);
+    }
+    const correlationId = messages4[0]?.metadata.correlationId;
+    const dispatchStart = Date.now();
+    const result = await withLifecycleSpan("omni.dispatch_to_agno", buildLifecycleSpanAttributes({
       ...lifecycleBase,
-      stage: "provider_outbound",
-      outputText: parts.join(`
+      stage: "dispatch_to_agno",
+      extra: { trigger_type: triggerType, provider_id: provider.id, provider_schema: provider.schema }
+    }), () => provider.trigger({ ...trigger, traceContext: activeProviderTraceContext() ?? trigger.traceContext }));
+    const dispatchDurationMs = Date.now() - dispatchStart;
+    if (sentryEnabled()) {
+      exports_public_api2.count("agent.dispatch", 1, { attributes: { provider_type: provider.schema } });
+      exports_public_api2.distribution("agent.dispatch.latency", dispatchDurationMs, {
+        unit: "millisecond",
+        attributes: { provider_type: provider.schema }
+      });
+    }
+    const chatAfterRun = await services.chats.findByExternalIdSmart(instance4.id, chatId);
+    const handoffTriggered = chatAfterRun?.settings?.agentPaused === true;
+    if (result && result.parts.length > 0 && !handoffTriggered) {
+      const selfChat = isSelfChat(chatId, instance4.ownerIdentifier);
+      const rawParts = selfChat ? result.parts.map((p2) => `${BOT_PREFIX}${p2}`) : result.parts;
+      const parts = await Promise.all(rawParts.map((part) => executeBeforeMessageWriteHooks(instance4.id, chatId, part)));
+      const _fmtMode = instance4.messageFormatMode ?? "convert";
+      const replyTo = messages4[0]?.payload.replyToId ?? messages4[0]?.payload.externalId;
+      recordJourneyCheckpoint(correlationId, "T8", JOURNEY_STAGES.T8);
+      await withLifecycleSpan("omni.provider_outbound", buildLifecycleSpanAttributes({
+        ...lifecycleBase,
+        stage: "provider_outbound",
+        outputText: parts.join(`
 `),
-      extra: { parts_count: parts.length, provider_id: provider.id, provider_schema: provider.schema }
-    }), () => sendResponseParts(channel5, instance4.id, chatId, parts, getSplitDelayConfig(instance4), _fmtMode, replyTo, correlationId, senderAgentId));
-    recordJourneyCheckpoint(correlationId, "T9", JOURNEY_STAGES.T9);
-    await forwardToChainedInstance(instance4, parts, correlationId, messages4);
-  } else if (handoffTriggered) {
-    log99.info("Agent response suppressed \u2014 handoff triggered during run", {
+        extra: { parts_count: parts.length, provider_id: provider.id, provider_schema: provider.schema }
+      }), () => sendResponseParts(channel5, instance4.id, chatId, parts, getSplitDelayConfig(instance4), _fmtMode, replyTo, correlationId, senderAgentId));
+      recordJourneyCheckpoint(correlationId, "T9", JOURNEY_STAGES.T9);
+      await forwardToChainedInstance(instance4, parts, correlationId, messages4);
+    } else if (handoffTriggered) {
+      log99.info("Agent response suppressed \u2014 handoff triggered during run", {
+        instanceId: instance4.id,
+        chatId
+      });
+    }
+    log99.info("Agent response via IAgentProvider", {
       instanceId: instance4.id,
-      chatId
+      chatId,
+      parts: result?.parts.length ?? 0,
+      providerId: result?.metadata.providerId,
+      durationMs: result?.metadata.durationMs,
+      triggerType,
+      traceId
     });
-  }
-  log99.info("Agent response via IAgentProvider", {
-    instanceId: instance4.id,
-    chatId,
-    parts: result?.parts.length ?? 0,
-    providerId: result?.metadata.providerId,
-    durationMs: result?.metadata.durationMs,
-    triggerType,
-    traceId
+    return true;
   });
-  return true;
 }
 async function dispatchViaLegacy(services, instance4, messages4, triggerType, channel5, chatId, senderId, personId, senderName, traceId, perThreadExtraContext, senderAgentId) {
   const { messageTexts, mediaFiles } = await prepareAgentContent(services, instance4, messages4);
@@ -355645,6 +355670,67 @@ function extractReactionTargetParticipant(rawPayload) {
   const participant = key?.participant;
   return typeof participant === "string" && participant.length > 0 ? participant : undefined;
 }
+async function resolveReactionTarget(services, instanceId, resolvedTo, messageId) {
+  const metadata = {};
+  const chat2 = await services.chats.findByExternalIdSmart(instanceId, resolvedTo);
+  if (!chat2) {
+    if (isUUID(messageId)) {
+      throw new OmniError({
+        code: ERROR_CODES.NOT_FOUND,
+        message: `Reaction target message not found: ${messageId}`,
+        context: { instanceId, resolvedTo, messageId },
+        recoverable: false
+      });
+    }
+    log110.warn("Reaction target chat not found in DB; deferring fromMe to channel plugin fallback (#386)", {
+      instanceId,
+      resolvedTo,
+      messageId,
+      fallback: "plugin-heuristic"
+    });
+    return { targetMessageId: messageId, metadata };
+  }
+  const target = isUUID(messageId) ? await getReactionTargetByOmniId(services, instanceId, chat2.id, messageId) : await services.messages.getByExternalId(chat2.id, messageId);
+  if (!target) {
+    log110.warn("Reaction target message not found in DB; deferring fromMe to channel plugin fallback (#386)", {
+      instanceId,
+      chatId: chat2.id,
+      messageId,
+      fallback: "plugin-heuristic"
+    });
+    return { targetMessageId: messageId, metadata };
+  }
+  metadata.fromMe = target.isFromMe === true;
+  if (target.isFromMe !== true) {
+    const participant = extractReactionTargetParticipant(target.rawPayload);
+    if (participant)
+      metadata.targetParticipant = participant;
+  }
+  return { targetMessageId: target.externalId, metadata };
+}
+async function getReactionTargetByOmniId(services, instanceId, chatId, messageId) {
+  let target;
+  try {
+    target = await services.messages.getById(messageId);
+  } catch (error3) {
+    if (error3 instanceof NotFoundError) {
+      throw reactionTargetNotFound(instanceId, chatId, messageId);
+    }
+    throw error3;
+  }
+  if (target.chatId !== chatId) {
+    throw reactionTargetNotFound(instanceId, chatId, messageId);
+  }
+  return target;
+}
+function reactionTargetNotFound(instanceId, chatId, messageId) {
+  return new OmniError({
+    code: ERROR_CODES.NOT_FOUND,
+    message: `Reaction target message not found: ${messageId}`,
+    context: { instanceId, chatId, messageId },
+    recoverable: false
+  });
+}
 async function resolveRecipient(to, channelType, services) {
   if (!isUUID(to))
     return to;
@@ -356401,39 +356487,13 @@ var init_messages5 = __esm(() => {
       });
     }
     const resolvedTo = await resolveRecipient(to, instance4.channel, services);
-    const reactionMetadata = {};
-    const chat2 = await services.chats.findByExternalIdSmart(instanceId, resolvedTo);
-    if (chat2) {
-      const target = await services.messages.getByExternalId(chat2.id, messageId);
-      if (target) {
-        reactionMetadata.fromMe = target.isFromMe === true;
-        if (target.isFromMe !== true) {
-          const participant = extractReactionTargetParticipant(target.rawPayload);
-          if (participant)
-            reactionMetadata.targetParticipant = participant;
-        }
-      } else {
-        log110.warn("Reaction target message not found in DB; deferring fromMe to channel plugin fallback (#386)", {
-          instanceId,
-          chatId: chat2.id,
-          messageId,
-          fallback: "plugin-heuristic"
-        });
-      }
-    } else {
-      log110.warn("Reaction target chat not found in DB; deferring fromMe to channel plugin fallback (#386)", {
-        instanceId,
-        resolvedTo,
-        messageId,
-        fallback: "plugin-heuristic"
-      });
-    }
+    const { targetMessageId, metadata: reactionMetadata } = await resolveReactionTarget(services, instanceId, resolvedTo, messageId);
     const outgoingMessage = {
       to: resolvedTo,
       content: {
         type: "reaction",
         emoji,
-        targetMessageId: messageId
+        targetMessageId
       },
       metadata: reactionMetadata
     };

package/package.json

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