@automagik/omni 2.260529.2 → 2.260529.3

package/dist/index.js

@@ -35857,6 +35857,82 @@ function buildProviderRequestContext(context) {
 }
 var OMNI_EXECUTION_CONTEXT_EXTENSION_URI = "https://omni.dev/extensions/execution-context/v1";
 
+// ../core/src/providers/trace-context.ts
+import { createHash as createHash3 } from "crypto";
+function isNonZeroHex(value) {
+  return value.length > 0 && !/^0+$/.test(value);
+}
+function hashHex(value, length) {
+  return createHash3("sha256").update(value).digest("hex").slice(0, length);
+}
+function normalizeTraceId(value) {
+  const lower = value.toLowerCase();
+  if (W3C_TRACE_ID.test(lower) && isNonZeroHex(lower)) {
+    return lower;
+  }
+  return hashHex(lower, 32);
+}
+function normalizeSpanId(value) {
+  const lower = value.toLowerCase();
+  if (W3C_SPAN_ID.test(lower) && isNonZeroHex(lower)) {
+    return lower;
+  }
+  return hashHex(lower, 16);
+}
+function createTraceContextFromTraceId(traceId, spanSeed = "provider") {
+  if (!traceId)
+    return;
+  return {
+    traceId: normalizeTraceId(traceId),
+    spanId: normalizeSpanId(`${traceId}:${spanSeed}`),
+    traceFlags: 1
+  };
+}
+function formatTraceparent(ctx) {
+  const traceFlags = (ctx.traceFlags ?? 1) & 255;
+  const paddedFlagsHex = traceFlags.toString(16).padStart(2, "0");
+  return `00-${normalizeTraceId(ctx.traceId)}-${normalizeSpanId(ctx.spanId)}-${paddedFlagsHex}`;
+}
+function buildTraceHeaders2(ctx, khal) {
+  const traceHeaders = {};
+  if (ctx) {
+    traceHeaders.traceparent = formatTraceparent(ctx);
+    traceHeaders["x-trace-id"] = normalizeTraceId(ctx.traceId);
+    traceHeaders["x-span-id"] = normalizeSpanId(ctx.spanId);
+    const tracestate = ctx.tracestate ?? ctx.traceState;
+    if (tracestate) {
+      traceHeaders.tracestate = tracestate;
+    }
+    if (ctx.parentSpanId) {
+      traceHeaders["x-parent-span-id"] = normalizeSpanId(ctx.parentSpanId);
+    }
+  }
+  if (khal?.khalSessionId) {
+    traceHeaders["x-khal-session-id"] = khal.khalSessionId;
+  }
+  if (khal?.userId) {
+    traceHeaders["x-khal-user-id"] = khal.userId;
+  }
+  if (khal?.messageId) {
+    traceHeaders["x-khal-message-id"] = khal.messageId;
+  }
+  if (khal?.omni?.instanceId) {
+    traceHeaders["x-omni-instance-id"] = khal.omni.instanceId;
+  }
+  if (khal?.omni?.chatId) {
+    traceHeaders["x-omni-chat-id"] = khal.omni.chatId;
+  }
+  if (khal?.omni?.channel) {
+    traceHeaders["x-omni-channel"] = khal.omni.channel;
+  }
+  return traceHeaders;
+}
+var W3C_TRACE_ID, W3C_SPAN_ID;
+var init_trace_context = __esm(() => {
+  W3C_TRACE_ID = /^[0-9a-f]{32}$/i;
+  W3C_SPAN_ID = /^[0-9a-f]{16}$/i;
+});
+
 // ../core/src/providers/agno-client.ts
 class AgnoClient {
   baseUrl;
@@ -35985,12 +36061,14 @@ class AgnoClient {
     const formData = new FormData;
     formData.append("message", request.message);
     formData.append("stream", String(stream));
-    if (request.sessionId) {
-      formData.append("session_id", request.sessionId);
+    const sessionId = request.khalSessionId ?? request.sessionId;
+    if (sessionId) {
+      formData.append("session_id", sessionId);
     }
     if (request.userId) {
       formData.append("user_id", request.userId);
     }
+    this.appendStructuredMetadata(formData, request);
     if (request.files?.length) {
       for (const file of request.files) {
         try {
@@ -36008,6 +36086,28 @@ class AgnoClient {
     }
     return formData;
   }
+  appendStructuredMetadata(formData, request) {
+    const appendJson = (key, value) => {
+      if (value !== undefined) {
+        formData.append(key, JSON.stringify(value));
+      }
+    };
+    if (request.khalSessionId) {
+      formData.append("khal_session_id", request.khalSessionId);
+    }
+    if (request.messageId) {
+      formData.append("message_id", request.messageId);
+    }
+    if (request.replyToMessageId) {
+      formData.append("reply_to_message_id", request.replyToMessageId);
+    }
+    appendJson("platform", request.platform);
+    appendJson("sender", request.sender);
+    appendJson("chat", request.chat);
+    appendJson("mcp_url_params", request.mcpUrlParams);
+    appendJson("env", request.env);
+    appendJson("omni", request.omni);
+  }
   async runAgent(agentId, request) {
     return this.runEndpoint("agents", agentId, request);
   }
@@ -36023,7 +36123,15 @@ class AgnoClient {
     const timeoutMs = request.timeoutMs ?? this.defaultTimeoutMs;
     const response = await this.fetchWithTimeout(url, {
       method: "POST",
-      headers: this.getHeaders(),
+      headers: {
+        ...this.getHeaders(),
+        ...buildTraceHeaders2(request.traceContext, {
+          khalSessionId: request.khalSessionId ?? request.sessionId,
+          userId: request.userId,
+          messageId: request.omni?.messageId,
+          omni: request.omni
+        })
+      },
       body: formData
     }, timeoutMs);
     if (!response.ok) {
@@ -36057,7 +36165,15 @@ class AgnoClient {
     const timeoutMs = request.timeoutMs ?? this.defaultTimeoutMs;
     const response = await this.fetchWithTimeout(url, {
       method: "POST",
-      headers: this.getHeaders(),
+      headers: {
+        ...this.getHeaders(),
+        ...buildTraceHeaders2(request.traceContext, {
+          khalSessionId: request.khalSessionId ?? request.sessionId,
+          userId: request.userId,
+          messageId: request.omni?.messageId,
+          omni: request.omni
+        })
+      },
       body: formData
     }, timeoutMs);
     if (!response.ok) {
@@ -36197,6 +36313,7 @@ function createAgnoClient(config2) {
 }
 var DEFAULT_TIMEOUT_MS = 60000;
 var init_agno_client = __esm(() => {
+  init_trace_context();
   init_types6();
 });
 
@@ -60251,12 +60368,7 @@ class AgnoAgentProvider {
   }
   async trigger(context) {
     const startTime = Date.now();
-    let message2 = "";
-    if (context.content.text) {
-      message2 = context.content.text;
-    } else if (context.content.emoji) {
-      message2 = `[Reaction: ${context.content.emoji} on message ${context.content.referencedMessageId ?? context.source.messageId}]`;
-    }
+    const message2 = this.buildMessage(context);
     if (!message2) {
       log8.debug("No content to send to agent", { traceId: context.traceId });
       return {
@@ -60268,17 +60380,7 @@ class AgnoAgentProvider {
         }
       };
     }
-    if (this.config.prefixSenderName !== false && context.sender.displayName) {
-      message2 = `[${context.sender.displayName}]: ${message2}`;
-    }
-    const request = {
-      ...buildProviderRequestContext(context),
-      message: message2,
-      agentId: this.config.agentId,
-      agentType: this.config.agentType,
-      stream: false,
-      timeoutMs: this.config.timeoutMs ?? 60000
-    };
+    const request = this.buildRequest(context, message2, false);
     log8.info("Triggering Agno agent", {
       agentId: this.config.agentId,
       agentType: this.config.agentType,
@@ -60310,13 +60412,79 @@ class AgnoAgentProvider {
       }
     };
   }
+  async* triggerStream(context) {
+    const message2 = this.buildMessage(context);
+    if (!message2) {
+      log8.debug("No content to send to Agno agent (stream)", { traceId: context.traceId });
+      return;
+    }
+    const request = this.buildRequest(context, message2, true);
+    log8.info("Streaming Agno agent", {
+      agentId: this.config.agentId,
+      agentType: this.config.agentType,
+      triggerType: context.type,
+      traceId: context.traceId
+    });
+    try {
+      for await (const chunk of this.client.stream(request)) {
+        if (chunk.content) {
+          yield { phase: "content", content: chunk.content };
+        }
+        if (chunk.isComplete) {
+          yield { phase: "final", content: chunk.fullContent ?? chunk.content ?? "" };
+        }
+      }
+    } catch (error2) {
+      const message3 = error2 instanceof Error ? error2.message : String(error2);
+      log8.error("Error in Agno agent stream", {
+        agentId: this.config.agentId,
+        traceId: context.traceId,
+        error: message3
+      });
+      yield { phase: "error", error: message3 };
+    }
+  }
   async checkHealth() {
     return this.client.checkHealth();
   }
+  buildMessage(context) {
+    let message2 = "";
+    if (context.content.text) {
+      message2 = context.content.text;
+    } else if (context.content.emoji) {
+      message2 = `[Reaction: ${context.content.emoji} on message ${context.content.referencedMessageId ?? context.source.messageId}]`;
+    }
+    if (message2 && this.config.prefixSenderName !== false && context.sender.displayName) {
+      message2 = `[${context.sender.displayName}]: ${message2}`;
+    }
+    return message2;
+  }
+  buildRequest(context, message2, stream) {
+    const traceContext = context.traceContext ?? createTraceContextFromTraceId(context.traceId, `${context.source.instanceId}:${context.source.chatId}:${context.source.messageId}:agno`);
+    return {
+      ...buildProviderRequestContext(context),
+      message: message2,
+      agentId: this.config.agentId,
+      agentType: this.config.agentType,
+      stream,
+      timeoutMs: this.config.timeoutMs ?? 60000,
+      files: context.content.files,
+      traceContext,
+      khalSessionId: context.sessionId,
+      omni: {
+        instanceId: context.source.instanceId,
+        chatId: context.source.chatId,
+        messageId: context.source.messageId,
+        channel: context.source.channelType
+      },
+      ...context.source.chatId ? { mcpUrlParams: { chat_id: context.source.chatId } } : {}
+    };
+  }
 }
 var log8;
 var init_agno_provider = __esm(() => {
   init_logger();
+  init_trace_context();
   log8 = createLogger("provider:agno");
 });
 
@@ -62523,6 +62691,7 @@ var init_a2a_provider = __esm(() => {
 });
 
 // ../core/src/providers/nats-genie-provider.ts
+import { createHash as createHash5 } from "crypto";
 import { mkdir, writeFile } from "fs/promises";
 import { homedir as homedir10 } from "os";
 import { join as join16 } from "path";
@@ -62556,6 +62725,8 @@ class NatsGenieProvider {
       };
     }
     const topic = `omni.message.${this.config.instanceId}.${context.source.chatId}`;
+    const traceContext = this.resolveTraceContext(context);
+    const propagationHeaders = this.buildPropagationHeaders(context, traceContext);
     const payload = {
       content: message2,
       sender: context.sender.displayName ?? context.sender.platformUserId,
@@ -62565,22 +62736,28 @@ class NatsGenieProvider {
       timestamp: new Date().toISOString(),
       traceId: context.traceId,
       messageId: context.source.messageId,
+      contextMessages: context.contextMessages,
       files: context.content.files,
+      traceContext,
+      metadata: this.buildSafePayloadMetadata(propagationHeaders),
       env: buildOmniEnv(context),
       executionContext: buildOmniExecutionContext(context)
     };
     try {
       await this.ensureConnected();
-      this.nc?.publish(topic, this.sc.encode(JSON.stringify(payload)));
+      this.nc?.publish(topic, this.sc.encode(JSON.stringify(payload)), this.buildPublishOptions(propagationHeaders));
       log17.info("Published to NATS", {
-        topic,
+        subject: "omni.message.<instance>.<chat_hash>",
         agent: this.config.agentName,
-        chatId: context.source.chatId,
+        instanceId: this.config.instanceId,
+        chatHash: this.safeHash(context.source.chatId),
         traceId: context.traceId
       });
     } catch (error2) {
       log17.error("Failed to publish to NATS, writing to dead-letter queue", {
-        topic,
+        subject: "omni.message.<instance>.<chat_hash>",
+        instanceId: this.config.instanceId,
+        chatHash: this.safeHash(context.source.chatId),
         error: error2 instanceof Error ? error2.message : String(error2),
         traceId: context.traceId
       });
@@ -62623,7 +62800,8 @@ class NatsGenieProvider {
           }
         } catch (error2) {
           log17.error("Error processing reply", {
-            subject: msg.subject,
+            subject: "omni.reply.<instance>.<chat_hash>",
+            subjectHash: this.safeHash(msg.subject),
             error: error2 instanceof Error ? error2.message : String(error2)
           });
         }
@@ -62648,7 +62826,7 @@ class NatsGenieProvider {
     if (!chatId) {
       log17.warn("NATS session reset skipped: missing chatId", {
         providerId: this.id,
-        sessionKey
+        sessionKeyHash: this.safeHash(sessionKey)
       });
       throw new Error("chatId is required to reset NATS Genie session");
     }
@@ -62665,14 +62843,17 @@ class NatsGenieProvider {
       await this.ensureConnected();
       this.nc?.publish(topic, this.sc.encode(JSON.stringify(payload)));
       log17.info("Published session reset to NATS", {
-        topic,
+        subject: "omni.session.reset.<instance>.<chat_hash>",
         providerId: this.id,
-        sessionKey,
-        chatId
+        instanceId: resolvedInstanceId,
+        sessionKeyHash: this.safeHash(sessionKey),
+        chatHash: this.safeHash(chatId)
       });
     } catch (error2) {
       log17.error("Failed to publish NATS session reset", {
-        topic,
+        subject: "omni.session.reset.<instance>.<chat_hash>",
+        instanceId: resolvedInstanceId,
+        chatHash: this.safeHash(chatId),
         error: error2 instanceof Error ? error2.message : String(error2)
       });
       throw error2;
@@ -62702,6 +62883,48 @@ class NatsGenieProvider {
     });
     log17.info("Connected to NATS", { url: this.config.natsUrl });
   }
+  resolveTraceContext(context) {
+    return context.traceContext ?? createTraceContextFromTraceId(context.traceId, `${context.source.instanceId}:${context.source.chatId}:${context.source.messageId}:nats-genie`);
+  }
+  buildPropagationHeaders(context, traceContext) {
+    return buildTraceHeaders2(traceContext, {
+      khalSessionId: context.sessionId,
+      userId: context.sender.personId ?? context.sender.platformUserId,
+      messageId: context.source.messageId,
+      omni: {
+        instanceId: context.source.instanceId,
+        chatId: context.source.chatId,
+        channel: context.source.channelType
+      }
+    });
+  }
+  buildPublishOptions(traceHeaders) {
+    if (Object.keys(traceHeaders).length === 0)
+      return;
+    const natsHeaders2 = import_nats2.headers();
+    for (const [key, value] of Object.entries(traceHeaders)) {
+      natsHeaders2.set(key, value);
+    }
+    return { headers: natsHeaders2 };
+  }
+  buildSafePayloadMetadata(traceHeaders) {
+    const metadata = {};
+    for (const [key, value] of Object.entries(traceHeaders)) {
+      if (key === "x-khal-user-id") {
+        metadata["x-khal-user-hash"] = this.safeHash(value);
+        continue;
+      }
+      if (key === "x-omni-chat-id") {
+        metadata["x-omni-chat-hash"] = this.safeHash(value);
+        continue;
+      }
+      metadata[key] = value;
+    }
+    return metadata;
+  }
+  safeHash(value) {
+    return createHash5("sha256").update(value).digest("hex").slice(0, 12);
+  }
   buildMessage(context) {
     let message2 = "";
     if (context.content.text) {
@@ -62735,6 +62958,7 @@ class NatsGenieProvider {
 var import_nats2, log17;
 var init_nats_genie_provider = __esm(() => {
   init_logger();
+  init_trace_context();
   import_nats2 = __toESM(require_mod4(), 1);
   log17 = createLogger("provider:nats-genie");
 });
@@ -124723,7 +124947,7 @@ import { fileURLToPath } from "url";
 // package.json
 var package_default = {
   name: "@automagik/omni",
-  version: "2.260529.2",
+  version: "2.260529.3",
   description: "LLM-optimized CLI for Omni",
   type: "module",
   bin: {

package/dist/server/index.js

@@ -29535,6 +29535,82 @@ function buildProviderRequestContext(context2) {
 }
 var OMNI_EXECUTION_CONTEXT_EXTENSION_URI = "https://omni.dev/extensions/execution-context/v1";
 
+// ../core/src/providers/trace-context.ts
+import { createHash } from "crypto";
+function isNonZeroHex(value) {
+  return value.length > 0 && !/^0+$/.test(value);
+}
+function hashHex(value, length) {
+  return createHash("sha256").update(value).digest("hex").slice(0, length);
+}
+function normalizeTraceId(value) {
+  const lower = value.toLowerCase();
+  if (W3C_TRACE_ID.test(lower) && isNonZeroHex(lower)) {
+    return lower;
+  }
+  return hashHex(lower, 32);
+}
+function normalizeSpanId(value) {
+  const lower = value.toLowerCase();
+  if (W3C_SPAN_ID.test(lower) && isNonZeroHex(lower)) {
+    return lower;
+  }
+  return hashHex(lower, 16);
+}
+function createTraceContextFromTraceId(traceId, spanSeed = "provider") {
+  if (!traceId)
+    return;
+  return {
+    traceId: normalizeTraceId(traceId),
+    spanId: normalizeSpanId(`${traceId}:${spanSeed}`),
+    traceFlags: 1
+  };
+}
+function formatTraceparent(ctx) {
+  const traceFlags = (ctx.traceFlags ?? 1) & 255;
+  const paddedFlagsHex = traceFlags.toString(16).padStart(2, "0");
+  return `00-${normalizeTraceId(ctx.traceId)}-${normalizeSpanId(ctx.spanId)}-${paddedFlagsHex}`;
+}
+function buildTraceHeaders2(ctx, khal) {
+  const traceHeaders = {};
+  if (ctx) {
+    traceHeaders.traceparent = formatTraceparent(ctx);
+    traceHeaders["x-trace-id"] = normalizeTraceId(ctx.traceId);
+    traceHeaders["x-span-id"] = normalizeSpanId(ctx.spanId);
+    const tracestate = ctx.tracestate ?? ctx.traceState;
+    if (tracestate) {
+      traceHeaders.tracestate = tracestate;
+    }
+    if (ctx.parentSpanId) {
+      traceHeaders["x-parent-span-id"] = normalizeSpanId(ctx.parentSpanId);
+    }
+  }
+  if (khal?.khalSessionId) {
+    traceHeaders["x-khal-session-id"] = khal.khalSessionId;
+  }
+  if (khal?.userId) {
+    traceHeaders["x-khal-user-id"] = khal.userId;
+  }
+  if (khal?.messageId) {
+    traceHeaders["x-khal-message-id"] = khal.messageId;
+  }
+  if (khal?.omni?.instanceId) {
+    traceHeaders["x-omni-instance-id"] = khal.omni.instanceId;
+  }
+  if (khal?.omni?.chatId) {
+    traceHeaders["x-omni-chat-id"] = khal.omni.chatId;
+  }
+  if (khal?.omni?.channel) {
+    traceHeaders["x-omni-channel"] = khal.omni.channel;
+  }
+  return traceHeaders;
+}
+var W3C_TRACE_ID, W3C_SPAN_ID;
+var init_trace_context = __esm(() => {
+  W3C_TRACE_ID = /^[0-9a-f]{32}$/i;
+  W3C_SPAN_ID = /^[0-9a-f]{16}$/i;
+});
+
 // ../core/src/providers/agno-client.ts
 class AgnoClient {
   baseUrl;
@@ -29663,12 +29739,14 @@ class AgnoClient {
     const formData = new FormData;
     formData.append("message", request.message);
     formData.append("stream", String(stream));
-    if (request.sessionId) {
-      formData.append("session_id", request.sessionId);
+    const sessionId = request.khalSessionId ?? request.sessionId;
+    if (sessionId) {
+      formData.append("session_id", sessionId);
     }
     if (request.userId) {
       formData.append("user_id", request.userId);
     }
+    this.appendStructuredMetadata(formData, request);
     if (request.files?.length) {
       for (const file of request.files) {
         try {
@@ -29686,6 +29764,28 @@ class AgnoClient {
     }
     return formData;
   }
+  appendStructuredMetadata(formData, request) {
+    const appendJson = (key, value) => {
+      if (value !== undefined) {
+        formData.append(key, JSON.stringify(value));
+      }
+    };
+    if (request.khalSessionId) {
+      formData.append("khal_session_id", request.khalSessionId);
+    }
+    if (request.messageId) {
+      formData.append("message_id", request.messageId);
+    }
+    if (request.replyToMessageId) {
+      formData.append("reply_to_message_id", request.replyToMessageId);
+    }
+    appendJson("platform", request.platform);
+    appendJson("sender", request.sender);
+    appendJson("chat", request.chat);
+    appendJson("mcp_url_params", request.mcpUrlParams);
+    appendJson("env", request.env);
+    appendJson("omni", request.omni);
+  }
   async runAgent(agentId, request) {
     return this.runEndpoint("agents", agentId, request);
   }
@@ -29701,7 +29801,15 @@ class AgnoClient {
     const timeoutMs = request.timeoutMs ?? this.defaultTimeoutMs;
     const response = await this.fetchWithTimeout(url, {
       method: "POST",
-      headers: this.getHeaders(),
+      headers: {
+        ...this.getHeaders(),
+        ...buildTraceHeaders2(request.traceContext, {
+          khalSessionId: request.khalSessionId ?? request.sessionId,
+          userId: request.userId,
+          messageId: request.omni?.messageId,
+          omni: request.omni
+        })
+      },
       body: formData
     }, timeoutMs);
     if (!response.ok) {
@@ -29735,7 +29843,15 @@ class AgnoClient {
     const timeoutMs = request.timeoutMs ?? this.defaultTimeoutMs;
     const response = await this.fetchWithTimeout(url, {
       method: "POST",
-      headers: this.getHeaders(),
+      headers: {
+        ...this.getHeaders(),
+        ...buildTraceHeaders2(request.traceContext, {
+          khalSessionId: request.khalSessionId ?? request.sessionId,
+          userId: request.userId,
+          messageId: request.omni?.messageId,
+          omni: request.omni
+        })
+      },
       body: formData
     }, timeoutMs);
     if (!response.ok) {
@@ -29875,6 +29991,7 @@ function createAgnoClient(config2) {
 }
 var DEFAULT_TIMEOUT_MS = 60000;
 var init_agno_client = __esm(() => {
+  init_trace_context();
   init_types7();
 });
 
@@ -30559,12 +30676,7 @@ class AgnoAgentProvider {
   }
   async trigger(context2) {
     const startTime = Date.now();
-    let message2 = "";
-    if (context2.content.text) {
-      message2 = context2.content.text;
-    } else if (context2.content.emoji) {
-      message2 = `[Reaction: ${context2.content.emoji} on message ${context2.content.referencedMessageId ?? context2.source.messageId}]`;
-    }
+    const message2 = this.buildMessage(context2);
     if (!message2) {
       log8.debug("No content to send to agent", { traceId: context2.traceId });
       return {
@@ -30576,17 +30688,7 @@ class AgnoAgentProvider {
         }
       };
     }
-    if (this.config.prefixSenderName !== false && context2.sender.displayName) {
-      message2 = `[${context2.sender.displayName}]: ${message2}`;
-    }
-    const request = {
-      ...buildProviderRequestContext(context2),
-      message: message2,
-      agentId: this.config.agentId,
-      agentType: this.config.agentType,
-      stream: false,
-      timeoutMs: this.config.timeoutMs ?? 60000
-    };
+    const request = this.buildRequest(context2, message2, false);
     log8.info("Triggering Agno agent", {
       agentId: this.config.agentId,
       agentType: this.config.agentType,
@@ -30618,13 +30720,79 @@ class AgnoAgentProvider {
       }
     };
   }
+  async* triggerStream(context2) {
+    const message2 = this.buildMessage(context2);
+    if (!message2) {
+      log8.debug("No content to send to Agno agent (stream)", { traceId: context2.traceId });
+      return;
+    }
+    const request = this.buildRequest(context2, message2, true);
+    log8.info("Streaming Agno agent", {
+      agentId: this.config.agentId,
+      agentType: this.config.agentType,
+      triggerType: context2.type,
+      traceId: context2.traceId
+    });
+    try {
+      for await (const chunk of this.client.stream(request)) {
+        if (chunk.content) {
+          yield { phase: "content", content: chunk.content };
+        }
+        if (chunk.isComplete) {
+          yield { phase: "final", content: chunk.fullContent ?? chunk.content ?? "" };
+        }
+      }
+    } catch (error) {
+      const message3 = error instanceof Error ? error.message : String(error);
+      log8.error("Error in Agno agent stream", {
+        agentId: this.config.agentId,
+        traceId: context2.traceId,
+        error: message3
+      });
+      yield { phase: "error", error: message3 };
+    }
+  }
   async checkHealth() {
     return this.client.checkHealth();
   }
+  buildMessage(context2) {
+    let message2 = "";
+    if (context2.content.text) {
+      message2 = context2.content.text;
+    } else if (context2.content.emoji) {
+      message2 = `[Reaction: ${context2.content.emoji} on message ${context2.content.referencedMessageId ?? context2.source.messageId}]`;
+    }
+    if (message2 && this.config.prefixSenderName !== false && context2.sender.displayName) {
+      message2 = `[${context2.sender.displayName}]: ${message2}`;
+    }
+    return message2;
+  }
+  buildRequest(context2, message2, stream) {
+    const traceContext = context2.traceContext ?? createTraceContextFromTraceId(context2.traceId, `${context2.source.instanceId}:${context2.source.chatId}:${context2.source.messageId}:agno`);
+    return {
+      ...buildProviderRequestContext(context2),
+      message: message2,
+      agentId: this.config.agentId,
+      agentType: this.config.agentType,
+      stream,
+      timeoutMs: this.config.timeoutMs ?? 60000,
+      files: context2.content.files,
+      traceContext,
+      khalSessionId: context2.sessionId,
+      omni: {
+        instanceId: context2.source.instanceId,
+        chatId: context2.source.chatId,
+        messageId: context2.source.messageId,
+        channel: context2.source.channelType
+      },
+      ...context2.source.chatId ? { mcpUrlParams: { chat_id: context2.source.chatId } } : {}
+    };
+  }
 }
 var log8;
 var init_agno_provider = __esm(() => {
   init_logger();
+  init_trace_context();
   log8 = createLogger("provider:agno");
 });
 
@@ -32786,6 +32954,7 @@ var init_a2a_provider = __esm(() => {
 });
 
 // ../core/src/providers/nats-genie-provider.ts
+import { createHash as createHash2 } from "crypto";
 import { mkdir, writeFile } from "fs/promises";
 import { homedir } from "os";
 import { join } from "path";
@@ -32819,6 +32988,8 @@ class NatsGenieProvider {
       };
     }
     const topic = `omni.message.${this.config.instanceId}.${context2.source.chatId}`;
+    const traceContext = this.resolveTraceContext(context2);
+    const propagationHeaders = this.buildPropagationHeaders(context2, traceContext);
     const payload = {
       content: message2,
       sender: context2.sender.displayName ?? context2.sender.platformUserId,
@@ -32828,22 +32999,28 @@ class NatsGenieProvider {
       timestamp: new Date().toISOString(),
       traceId: context2.traceId,
       messageId: context2.source.messageId,
+      contextMessages: context2.contextMessages,
       files: context2.content.files,
+      traceContext,
+      metadata: this.buildSafePayloadMetadata(propagationHeaders),
       env: buildOmniEnv(context2),
       executionContext: buildOmniExecutionContext(context2)
     };
     try {
       await this.ensureConnected();
-      this.nc?.publish(topic, this.sc.encode(JSON.stringify(payload)));
+      this.nc?.publish(topic, this.sc.encode(JSON.stringify(payload)), this.buildPublishOptions(propagationHeaders));
       log17.info("Published to NATS", {
-        topic,
+        subject: "omni.message.<instance>.<chat_hash>",
         agent: this.config.agentName,
-        chatId: context2.source.chatId,
+        instanceId: this.config.instanceId,
+        chatHash: this.safeHash(context2.source.chatId),
         traceId: context2.traceId
       });
     } catch (error) {
       log17.error("Failed to publish to NATS, writing to dead-letter queue", {
-        topic,
+        subject: "omni.message.<instance>.<chat_hash>",
+        instanceId: this.config.instanceId,
+        chatHash: this.safeHash(context2.source.chatId),
         error: error instanceof Error ? error.message : String(error),
         traceId: context2.traceId
       });
@@ -32886,7 +33063,8 @@ class NatsGenieProvider {
           }
         } catch (error) {
           log17.error("Error processing reply", {
-            subject: msg.subject,
+            subject: "omni.reply.<instance>.<chat_hash>",
+            subjectHash: this.safeHash(msg.subject),
             error: error instanceof Error ? error.message : String(error)
           });
         }
@@ -32911,7 +33089,7 @@ class NatsGenieProvider {
     if (!chatId) {
       log17.warn("NATS session reset skipped: missing chatId", {
         providerId: this.id,
-        sessionKey
+        sessionKeyHash: this.safeHash(sessionKey)
       });
       throw new Error("chatId is required to reset NATS Genie session");
     }
@@ -32928,14 +33106,17 @@ class NatsGenieProvider {
       await this.ensureConnected();
       this.nc?.publish(topic, this.sc.encode(JSON.stringify(payload)));
       log17.info("Published session reset to NATS", {
-        topic,
+        subject: "omni.session.reset.<instance>.<chat_hash>",
         providerId: this.id,
-        sessionKey,
-        chatId
+        instanceId: resolvedInstanceId,
+        sessionKeyHash: this.safeHash(sessionKey),
+        chatHash: this.safeHash(chatId)
       });
     } catch (error) {
       log17.error("Failed to publish NATS session reset", {
-        topic,
+        subject: "omni.session.reset.<instance>.<chat_hash>",
+        instanceId: resolvedInstanceId,
+        chatHash: this.safeHash(chatId),
         error: error instanceof Error ? error.message : String(error)
       });
       throw error;
@@ -32965,6 +33146,48 @@ class NatsGenieProvider {
     });
     log17.info("Connected to NATS", { url: this.config.natsUrl });
   }
+  resolveTraceContext(context2) {
+    return context2.traceContext ?? createTraceContextFromTraceId(context2.traceId, `${context2.source.instanceId}:${context2.source.chatId}:${context2.source.messageId}:nats-genie`);
+  }
+  buildPropagationHeaders(context2, traceContext) {
+    return buildTraceHeaders2(traceContext, {
+      khalSessionId: context2.sessionId,
+      userId: context2.sender.personId ?? context2.sender.platformUserId,
+      messageId: context2.source.messageId,
+      omni: {
+        instanceId: context2.source.instanceId,
+        chatId: context2.source.chatId,
+        channel: context2.source.channelType
+      }
+    });
+  }
+  buildPublishOptions(traceHeaders) {
+    if (Object.keys(traceHeaders).length === 0)
+      return;
+    const natsHeaders2 = import_nats2.headers();
+    for (const [key, value] of Object.entries(traceHeaders)) {
+      natsHeaders2.set(key, value);
+    }
+    return { headers: natsHeaders2 };
+  }
+  buildSafePayloadMetadata(traceHeaders) {
+    const metadata = {};
+    for (const [key, value] of Object.entries(traceHeaders)) {
+      if (key === "x-khal-user-id") {
+        metadata["x-khal-user-hash"] = this.safeHash(value);
+        continue;
+      }
+      if (key === "x-omni-chat-id") {
+        metadata["x-omni-chat-hash"] = this.safeHash(value);
+        continue;
+      }
+      metadata[key] = value;
+    }
+    return metadata;
+  }
+  safeHash(value) {
+    return createHash2("sha256").update(value).digest("hex").slice(0, 12);
+  }
   buildMessage(context2) {
     let message2 = "";
     if (context2.content.text) {
@@ -32998,6 +33221,7 @@ class NatsGenieProvider {
 var import_nats2, log17;
 var init_nats_genie_provider = __esm(() => {
   init_logger();
+  init_trace_context();
   import_nats2 = __toESM(require_mod4(), 1);
   log17 = createLogger("provider:nats-genie");
 });
@@ -136608,7 +136832,7 @@ var require_libvips = __commonJS((exports, module) => {
     SPDX-License-Identifier: Apache-2.0
   */
   var { spawnSync } = __require("child_process");
-  var { createHash: createHash4 } = __require("crypto");
+  var { createHash: createHash6 } = __require("crypto");
   var semverCoerce = require_coerce();
   var semverGreaterThanOrEqualTo = require_gte();
   var semverSatisfies = require_satisfies();
@@ -136696,7 +136920,7 @@ var require_libvips = __commonJS((exports, module) => {
     }
     return false;
   };
-  var sha512 = (s) => createHash4("sha512").update(s).digest("hex");
+  var sha512 = (s) => createHash6("sha512").update(s).digest("hex");
   var yarnLocator = () => {
     try {
       const identHash = sha512(`imgsharp-libvips-${buildPlatformArch()}`);
@@ -230292,7 +230516,7 @@ var init_sentry_scrub = __esm(() => {
 var require_package8 = __commonJS((exports, module) => {
   module.exports = {
     name: "@omni/api",
-    version: "2.260529.2",
+    version: "2.260529.3",
     type: "module",
     exports: {
       ".": {
@@ -289287,9 +289511,9 @@ var init_body_limit2 = __esm(() => {
 });
 
 // ../api/src/middleware/genie-signature.ts
-import { createHash as createHash7, createPublicKey, verify } from "crypto";
+import { createHash as createHash9, createPublicKey, verify } from "crypto";
 function canonicalSigningInput(timestamp3, method, path2, body) {
-  const bodyHash = createHash7("sha256").update(body, "utf-8").digest("hex");
+  const bodyHash = createHash9("sha256").update(body, "utf-8").digest("hex");
   return `${timestamp3}
 ${method.toUpperCase()}
 ${path2}
@@ -357678,7 +357902,7 @@ async function sendMediaBuffer(client, channelId, buffer2, options) {
 
 // ../channel-discord/src/senders/media-dedup.ts
 init_src();
-import { createHash } from "crypto";
+import { createHash as createHash3 } from "crypto";
 var log28 = createLogger("discord:media-dedup");
 
 class MediaDedup {
@@ -357691,7 +357915,7 @@ class MediaDedup {
   }
   computeHash(data, scope = "") {
     const prefix = data.subarray(0, 4096);
-    const hash = createHash("sha256");
+    const hash = createHash3("sha256");
     hash.update(prefix);
     hash.update(Buffer.from(String(data.length)));
     if (scope)
@@ -452892,7 +453116,7 @@ var import_protobufs = __toESM(require_protobufs(), 1);
 
 // ../../node_modules/.bun/baileys@vendor+baileys-v7.0.0-rc10.tgz+89588f7e3fe8b2e6/node_modules/baileys/lib/Utils/generics.js
 var import_boom3 = __toESM(require_lib7(), 1);
-import { createHash as createHash3, randomBytes as randomBytes3 } from "crypto";
+import { createHash as createHash5, randomBytes as randomBytes3 } from "crypto";
 // ../../node_modules/.bun/baileys@vendor+baileys-v7.0.0-rc10.tgz+89588f7e3fe8b2e6/node_modules/baileys/lib/Types/Chat.js
 var ALL_WA_PATCH_NAMES = [
   "critical_block",
@@ -454951,7 +455175,7 @@ ${tabs(i)}</${node.tag}>` : "/>";
 }
 // ../../node_modules/.bun/baileys@vendor+baileys-v7.0.0-rc10.tgz+89588f7e3fe8b2e6/node_modules/baileys/lib/Utils/crypto.js
 var curve = __toESM(require_curve2(), 1);
-import { createCipheriv, createDecipheriv, createHash as createHash2, createHmac, randomBytes as randomBytes2 } from "crypto";
+import { createCipheriv, createDecipheriv, createHash as createHash4, createHmac, randomBytes as randomBytes2 } from "crypto";
 
 // ../../node_modules/.bun/whatsapp-rust-bridge@0.5.3/node_modules/whatsapp-rust-bridge/dist/index.js
 class ExpandedAppStateKeys {
@@ -456661,7 +456885,7 @@ function hmacSign(buffer2, key, variant = "sha256") {
   return createHmac(variant, key).update(buffer2).digest();
 }
 function sha256(buffer2) {
-  return createHash2("sha256").update(buffer2).digest();
+  return createHash4("sha256").update(buffer2).digest();
 }
 async function derivePairingCodeKey(pairingCode, salt) {
   const encoder = new TextEncoder;
@@ -456791,7 +457015,7 @@ var generateMessageIDV2 = (userId) => {
   }
   const random = randomBytes3(16);
   random.copy(data, 28);
-  const hash = createHash3("sha256").update(data).digest();
+  const hash = createHash5("sha256").update(data).digest();
   return "3EB0" + hash.toString("hex").toUpperCase().substring(0, 18);
 };
 var generateMessageID = () => "3EB0" + randomBytes3(18).toString("hex").toUpperCase();
@@ -458811,7 +459035,7 @@ var assertMediaContent = (content) => {
 };
 // ../../node_modules/.bun/baileys@vendor+baileys-v7.0.0-rc10.tgz+89588f7e3fe8b2e6/node_modules/baileys/lib/Utils/validate-connection.js
 var import_boom7 = __toESM(require_lib7(), 1);
-import { createHash as createHash5 } from "crypto";
+import { createHash as createHash7 } from "crypto";
 
 // ../../node_modules/.bun/baileys@vendor+baileys-v7.0.0-rc10.tgz+89588f7e3fe8b2e6/node_modules/baileys/lib/Utils/signal.js
 function chunk(array, size) {
@@ -459056,7 +459280,7 @@ var getPlatformType = (platform) => {
   return proto.DeviceProps.PlatformType[platformType] || proto.DeviceProps.PlatformType.CHROME;
 };
 var generateRegistrationNode = ({ registrationId, signedPreKey, signedIdentityKey }, config2) => {
-  const appVersionBuf = createHash5("md5").update(config2.version.join(".")).digest();
+  const appVersionBuf = createHash7("md5").update(config2.version.join(".")).digest();
   const companion = {
     os: config2.browser[0],
     platformType: getPlatformType(config2.browser[1]),
@@ -460800,8 +461024,8 @@ var CRC = class {
       }
     }
     crc = (crc ^ 4294967295) >>> 0;
-    const hashHex = crc.toString(16).padStart(8, "0");
-    return hashHex;
+    const hashHex2 = crc.toString(16).padStart(8, "0");
+    return hashHex2;
   }
   async toHash(data) {
     return this.toHashSync(data);
@@ -460820,8 +461044,8 @@ var WebCrypto = class {
   async toHash(data) {
     const hashBuffer = await crypto.subtle.digest(this._algorithm, data);
     const hashArray = Array.from(new Uint8Array(hashBuffer));
-    const hashHex = hashArray.map((byte) => byte.toString(16).padStart(2, "0")).join("");
-    return hashHex;
+    const hashHex2 = hashArray.map((byte) => byte.toString(16).padStart(2, "0")).join("");
+    return hashHex2;
   }
 };
 var DJB2 = class {
@@ -460845,8 +461069,8 @@ var DJB2 = class {
       hash = (hash << 5) + hash + bytes2[i];
       hash = hash >>> 0;
     }
-    const hashHex = hash.toString(16).padStart(8, "0");
-    return hashHex;
+    const hashHex2 = hash.toString(16).padStart(8, "0");
+    return hashHex2;
   }
   async toHash(data) {
     return this.toHashSync(data);
@@ -460876,8 +461100,8 @@ var FNV1 = class {
       hash = hash ^ bytes2[i];
       hash = hash >>> 0;
     }
-    const hashHex = hash.toString(16).padStart(8, "0");
-    return hashHex;
+    const hashHex2 = hash.toString(16).padStart(8, "0");
+    return hashHex2;
   }
   async toHash(data) {
     return this.toHashSync(data);
@@ -460942,8 +461166,8 @@ var Murmur = class {
     h1 = this._imul(h1, 3266489909);
     h1 ^= h1 >>> 16;
     h1 = h1 >>> 0;
-    const hashHex = h1.toString(16).padStart(8, "0");
-    return hashHex;
+    const hashHex2 = h1.toString(16).padStart(8, "0");
+    return hashHex2;
   }
   async toHash(data) {
     return this.toHashSync(data);
@@ -468812,7 +469036,7 @@ var TimeMs = {
 
 // ../../node_modules/.bun/baileys@vendor+baileys-v7.0.0-rc10.tgz+89588f7e3fe8b2e6/node_modules/baileys/lib/Utils/business.js
 var import_boom12 = __toESM(require_lib7(), 1);
-import { createHash as createHash6 } from "crypto";
+import { createHash as createHash8 } from "crypto";
 import { createWriteStream as createWriteStream2, promises as fs4 } from "fs";
 import { tmpdir as tmpdir4 } from "os";
 import { join as join7 } from "path";
@@ -468997,7 +469221,7 @@ var uploadingNecessaryImages = async (images, waUploadToServer, timeoutMs = 3000
       }
     }
     const { stream } = await getStream(img);
-    const hasher = createHash6("sha256");
+    const hasher = createHash8("sha256");
     const filePath = join7(tmpdir4(), "img" + generateMessageIDV2());
     const encFileWriteStream = createWriteStream2(filePath);
     for await (const block of stream) {

package/package.json

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