@automagik/omni 2.260531.4 → 2.260531.6

package/dist/index.js

@@ -124967,7 +124967,7 @@ import { fileURLToPath } from "url";
 // package.json
 var package_default = {
   name: "@automagik/omni",
-  version: "2.260531.4",
+  version: "2.260531.6",
   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.4",
+    version: "2.260531.6",
     type: "module",
     exports: {
       ".": {
@@ -337739,9 +337739,125 @@ var init_session_storage = __esm(() => {
 });
 
 // ../api/src/plugins/agent-dispatcher.ts
+import { createHash as createHash10 } from "crypto";
 import { unlink, writeFile as writeFile5 } from "fs/promises";
 import { tmpdir as tmpdir11 } from "os";
 import { join as join24, resolve as resolve2 } from "path";
+function sha256Digest(value) {
+  return `sha256:${createHash10("sha256").update(value).digest("hex")}`;
+}
+function redactLifecycleText(value) {
+  return value.replace(/[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}/gi, "[EMAIL]").replace(/\b\+?\d[\d\s().-]{5,}\d\b/g, "[PHONE]").replace(/\b\d{6,}\b/g, "[NUMBER]").replace(/\b[^\s@]+@(s\.whatsapp\.net|g\.us|lid|newsletter)\b/gi, "[JID]");
+}
+function previewLifecycleText(value) {
+  const redacted = redactLifecycleText(value).replace(/\s+/g, " ").trim();
+  if (redacted.length <= LIFECYCLE_PREVIEW_MAX_CHARS)
+    return redacted;
+  return `${redacted.slice(0, LIFECYCLE_PREVIEW_MAX_CHARS - 1)}\u2026`;
+}
+function isLifecycleSafeExtraKey(key) {
+  const lowered = key.toLowerCase();
+  return !LIFECYCLE_SENSITIVE_KEY_PARTS.some((part) => lowered.includes(part));
+}
+function setTextLifecycleAttributes(attributes, prefix, value) {
+  if (value === undefined)
+    return;
+  attributes[`khal.${prefix}_chars`] = value.length;
+  attributes[`khal.${prefix}_sha256`] = sha256Digest(value);
+  attributes[`khal.${prefix}_preview_redacted`] = previewLifecycleText(value);
+}
+function setOptionalLifecycleAttributes(attributes, pairs) {
+  for (const [key, value] of pairs) {
+    if (value)
+      attributes[key] = value;
+  }
+}
+function setChatLifecycleAttributes(attributes, chatId) {
+  if (!chatId)
+    return;
+  attributes["omni.chat_id_sha256"] = sha256Digest(chatId);
+  attributes["omni.chat_id_preview_redacted"] = previewLifecycleText(chatId);
+}
+function setSessionLifecycleAttributes(attributes, sessionId) {
+  if (!sessionId)
+    return;
+  attributes["khal.session_id"] = sessionId;
+  attributes["langfuse.session.id"] = sessionId;
+  attributes["session.id"] = sessionId;
+}
+function setExtraLifecycleAttributes(attributes, extra) {
+  if (!extra)
+    return;
+  for (const [key, value] of Object.entries(extra)) {
+    if (!isLifecycleSafeExtraKey(key) || value === undefined || value === null)
+      continue;
+    if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
+      attributes[`khal.${key}`] = typeof value === "string" ? previewLifecycleText(value) : value;
+    }
+  }
+}
+function buildLifecycleSpanAttributes(input) {
+  const attributes = {
+    "khal.lifecycle.stage": input.stage,
+    "khal.event_type": input.eventType,
+    "khal.channel": input.channel
+  };
+  setOptionalLifecycleAttributes(attributes, [
+    ["khal.provider", input.provider],
+    ["omni.instance_id", input.instanceId],
+    ["khal.trace_id", input.traceId],
+    ["khal.turn.message_id", input.messageId],
+    ["khal.agent_id", input.agentId]
+  ]);
+  setChatLifecycleAttributes(attributes, input.chatId);
+  setSessionLifecycleAttributes(attributes, input.sessionId);
+  setTextLifecycleAttributes(attributes, "input", input.inputText);
+  setTextLifecycleAttributes(attributes, "output", input.outputText);
+  setExtraLifecycleAttributes(attributes, input.extra);
+  return attributes;
+}
+async function withLifecycleSpan(name, attributes, fn) {
+  let callbackStarted = false;
+  try {
+    const tracer2 = import_api32.trace.getTracer("omni.agent-dispatcher");
+    return await tracer2.startActiveSpan(name, { attributes }, async (span) => {
+      callbackStarted = true;
+      try {
+        const result = await fn();
+        span.setStatus({ code: import_api32.SpanStatusCode.OK });
+        return result;
+      } catch (error3) {
+        span.recordException(error3 instanceof Error ? error3 : new Error(String(error3)));
+        span.setStatus({ code: import_api32.SpanStatusCode.ERROR, message: error3 instanceof Error ? error3.message : String(error3) });
+        throw error3;
+      } finally {
+        span.end();
+      }
+    });
+  } catch (error3) {
+    if (callbackStarted)
+      throw error3;
+    log99.warn("Lifecycle span wrapper failed before dispatch; continuing without span", { spanName: name });
+    return fn();
+  }
+}
+function emitLifecycleSpan(name, attributes) {
+  withLifecycleSpan(name, attributes, async () => {
+    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;
@@ -338811,7 +338927,20 @@ async function dispatchViaTurnBasedProvider(services, instance4, provider, trigg
     OMNI_TURN_ID: turn.id
   };
   const dispatchStart = Date.now();
-  await provider.trigger(trigger);
+  await withLifecycleSpan("omni.dispatch_to_agno", buildLifecycleSpanAttributes({
+    stage: "dispatch_to_agno",
+    eventType: "user_message_turn",
+    channel: instance4.channel,
+    provider: provider.schema,
+    instanceId: instance4.id,
+    chatId,
+    sessionId: trigger.sessionId,
+    traceId,
+    messageId,
+    agentId: agentRecord.id,
+    inputText: trigger.content.text,
+    extra: { mode: "turn-based", 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, mode: "turn-based" } });
@@ -338852,48 +338981,89 @@ async function dispatchViaProvider(services, instance4, messages4, triggerType,
   await executeBeforeAgentStartHooks(instance4, chatId, senderId, senderName, triggerType, traceId, messages4[0]?.metadata.correlationId, triggerFiles);
   const customerContext = await resolveCustomerContext(services, personId, extractA2ACustomerContext(messages4, channel5));
   const trigger = buildMessageTrigger(traceId, triggerType, rawEvent, channel5, instance4, chatId, senderId, personId, senderName, messages4, messageTexts, triggerFiles, sessionId, customerContext, allContextMessages, explicitKhalSessionId);
-  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 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 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", {
+  const lifecycleBase = {
+    eventType: "user_message_turn",
+    channel: channel5,
+    provider: provider.schema,
     instanceId: instance4.id,
     chatId,
-    parts: result?.parts.length ?? 0,
-    providerId: result?.metadata.providerId,
-    durationMs: result?.metadata.durationMs,
-    triggerType,
-    traceId
+    sessionId,
+    traceId,
+    messageId: messages4[0]?.payload.externalId,
+    agentId: instance4.agentInternalId ?? instance4.agentId ?? undefined,
+    inputText: messageTexts.join(`
+`)
+  };
+  return withLifecycleSpan("omni.turn", buildLifecycleSpanAttributes({
+    ...lifecycleBase,
+    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: "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", {
+        instanceId: instance4.id,
+        chatId
+      });
+    }
+    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);
@@ -338916,7 +339086,30 @@ async function dispatchViaLegacy(services, instance4, messages4, triggerType, ch
   const { avatarUrl: senderAvatarUrl, platformUsername: senderPlatformUsername } = await fetchSenderMetadata(services, channel5, instance4.id, senderId);
   const { chatName, participantCount } = await fetchChatMetadata(services, instance4.id, chatId, chatType);
   await executeBeforeAgentStartHooks(instance4, chatId, senderId, senderName, triggerType, traceId, messages4[0]?.metadata.correlationId, mediaFiles.length > 0 ? mediaFiles : undefined);
-  const result = await services.agentRunner.run({
+  const lifecycleSessionId = computeSessionId(instance4.agentSessionStrategy ?? "per_chat", senderId, chatId, rawPl.threadId);
+  const lifecycleBase = {
+    eventType: "user_message_turn",
+    channel: channel5,
+    provider: "legacy-agent-runner",
+    instanceId: instance4.id,
+    chatId,
+    sessionId: lifecycleSessionId,
+    traceId,
+    messageId: messages4[0]?.payload.externalId,
+    agentId: instance4.agentInternalId ?? instance4.agentId ?? undefined,
+    inputText: messageTexts.join(`
+`)
+  };
+  emitLifecycleSpan("omni.provider_inbound", buildLifecycleSpanAttributes({
+    ...lifecycleBase,
+    stage: "provider_inbound",
+    extra: { trigger_type: triggerType, message_count: messages4.length }
+  }));
+  const result = await withLifecycleSpan("omni.dispatch_to_agno", buildLifecycleSpanAttributes({
+    ...lifecycleBase,
+    stage: "dispatch_to_agno",
+    extra: { trigger_type: triggerType, provider_schema: "legacy-agent-runner" }
+  }), () => services.agentRunner.run({
     instance: instance4,
     chatId,
     personId,
@@ -338929,7 +339122,7 @@ async function dispatchViaLegacy(services, instance4, messages4, triggerType, ch
     participantCount,
     messages: messageTexts,
     files: mediaFiles.length > 0 ? mediaFiles : undefined
-  });
+  }));
   const correlationId = messages4[0]?.metadata.correlationId;
   const selfChat = isSelfChat(chatId, instance4.ownerIdentifier);
   const rawParts = selfChat ? result.parts.map((p2) => `${BOT_PREFIX}${p2}`) : result.parts;
@@ -338937,7 +339130,13 @@ async function dispatchViaLegacy(services, instance4, messages4, triggerType, ch
   const _fmtMode = instance4.messageFormatMode ?? "convert";
   const replyTo = messages4[0]?.payload.replyToId ?? messages4[0]?.payload.externalId;
   recordJourneyCheckpoint(correlationId, "T8", JOURNEY_STAGES.T8);
-  await sendResponseParts(channel5, instance4.id, chatId, parts, getSplitDelayConfig(instance4), _fmtMode, replyTo, correlationId, senderAgentId);
+  await withLifecycleSpan("omni.provider_outbound", buildLifecycleSpanAttributes({
+    ...lifecycleBase,
+    stage: "provider_outbound",
+    outputText: parts.join(`
+`),
+    extra: { parts_count: parts.length, provider_schema: "legacy-agent-runner" }
+  }), () => sendResponseParts(channel5, instance4.id, chatId, parts, getSplitDelayConfig(instance4), _fmtMode, replyTo, correlationId, senderAgentId));
   recordJourneyCheckpoint(correlationId, "T9", JOURNEY_STAGES.T9);
   log99.info("Agent response via legacy runner", {
     instanceId: instance4.id,
@@ -340449,7 +340648,7 @@ async function setupAgentDispatcher(eventBus, services, db2) {
     log99.info("Agent dispatcher shutdown complete");
   };
 }
-var log99, _natsGenieProviderCtor, QUOTED_MESSAGE_MAX_CHARS = 4000, DM_HISTORY_LIMIT = 20, TRANSIENT_DISPATCH_ERROR_PATTERNS, TRANSIENT_DISPATCH_RETRY_DELAYS_MS, CHANNEL_MESSAGE_LIMITS, DEFAULT_MESSAGE_LIMIT = 4000, MEDIA_BASE_PATH3, MEDIA_ICONS, MEDIA_WAIT_NULL, mediaCompletions, mediaResultCache, MEDIA_WAIT_TIMEOUT_MS = 30000, DEFAULT_SEND_MEDIA_PATH_TYPES, BOT_PREFIX = "\uD83E\uDD16 ", activeStreams, sessionActivityStore, PROC_REACT_START, PROC_REACT_DONE = "\u2705", providerCache, openclawClientPool, nullFilterWarnedInstances, ACTIVE_OWNER_IDENTIFIER_CACHE_TTL_MS = 1e4, cachedActiveOwnerIdentifiers = null, cachedActiveOwnerIdentifiersAt = 0, DEFAULT_GATE_MODEL = "gemini-3-flash-preview", GATE_TIMEOUT_MS = 3000, setupAgentResponder;
+var import_api32, log99, _natsGenieProviderCtor, QUOTED_MESSAGE_MAX_CHARS = 4000, DM_HISTORY_LIMIT = 20, LIFECYCLE_PREVIEW_MAX_CHARS = 160, LIFECYCLE_SENSITIVE_KEY_PARTS, TRANSIENT_DISPATCH_ERROR_PATTERNS, TRANSIENT_DISPATCH_RETRY_DELAYS_MS, CHANNEL_MESSAGE_LIMITS, DEFAULT_MESSAGE_LIMIT = 4000, MEDIA_BASE_PATH3, MEDIA_ICONS, MEDIA_WAIT_NULL, mediaCompletions, mediaResultCache, MEDIA_WAIT_TIMEOUT_MS = 30000, DEFAULT_SEND_MEDIA_PATH_TYPES, BOT_PREFIX = "\uD83E\uDD16 ", activeStreams, sessionActivityStore, PROC_REACT_START, PROC_REACT_DONE = "\u2705", providerCache, openclawClientPool, nullFilterWarnedInstances, ACTIVE_OWNER_IDENTIFIER_CACHE_TTL_MS = 1e4, cachedActiveOwnerIdentifiers = null, cachedActiveOwnerIdentifiersAt = 0, DEFAULT_GATE_MODEL = "gemini-3-flash-preview", GATE_TIMEOUT_MS = 3000, setupAgentResponder;
 var init_agent_dispatcher = __esm(() => {
   init_src2();
   init_src();
@@ -340466,8 +340665,10 @@ var init_agent_dispatcher = __esm(() => {
   init_message_persistence();
   init_session_storage();
   init_src6();
+  import_api32 = __toESM(require_src(), 1);
   log99 = createLogger("agent-dispatcher");
   _natsGenieProviderCtor = NatsGenieProvider;
+  LIFECYCLE_SENSITIVE_KEY_PARTS = ["authorization", "bearer", "password", "secret", "token", "api_key", "apikey"];
   TRANSIENT_DISPATCH_ERROR_PATTERNS = [
     /ECONNREFUSED/i,
     /ECONNRESET/i,

package/package.json

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