@automagik/omni 2.260530.5 → 2.260531.2

package/dist/index.js

@@ -60766,6 +60766,7 @@ class WebhookAgentProvider {
         emoji: context.content.emoji
       },
       traceId: context.traceId,
+      headers: context.headers,
       executionContext: buildOmniExecutionContext(context),
       replyEndpoint: "POST /api/v2/messages/send"
     };
@@ -60827,10 +60828,11 @@ class WebhookAgentProvider {
       };
     }
   }
-  buildHeaders() {
+  buildHeaders(extraHeaders) {
     const headers = {
       "Content-Type": "application/json",
-      "X-Omni-Provider": "webhook"
+      "X-Omni-Provider": "webhook",
+      ...extraHeaders
     };
     if (this.config.apiKey) {
       headers.Authorization = `Bearer ${this.config.apiKey}`;
@@ -60841,7 +60843,7 @@ class WebhookAgentProvider {
     const timeoutMs = this.config.timeoutMs ?? DEFAULT_TIMEOUT_MS2;
     const response = await fetch(this.config.webhookUrl, {
       method: "POST",
-      headers: this.buildHeaders(),
+      headers: this.buildHeaders(payload.headers),
       body: JSON.stringify(payload),
       signal: AbortSignal.timeout(timeoutMs)
     });
@@ -124965,7 +124967,7 @@ import { fileURLToPath } from "url";
 // package.json
 var package_default = {
   name: "@automagik/omni",
-  version: "2.260530.5",
+  version: "2.260531.2",
   description: "LLM-optimized CLI for Omni",
   type: "module",
   bin: {

package/dist/server/index.js

@@ -31074,6 +31074,7 @@ class WebhookAgentProvider {
         emoji: context2.content.emoji
       },
       traceId: context2.traceId,
+      headers: context2.headers,
       executionContext: buildOmniExecutionContext(context2),
       replyEndpoint: "POST /api/v2/messages/send"
     };
@@ -31135,10 +31136,11 @@ class WebhookAgentProvider {
       };
     }
   }
-  buildHeaders() {
+  buildHeaders(extraHeaders) {
     const headers = {
       "Content-Type": "application/json",
-      "X-Omni-Provider": "webhook"
+      "X-Omni-Provider": "webhook",
+      ...extraHeaders
     };
     if (this.config.apiKey) {
       headers.Authorization = `Bearer ${this.config.apiKey}`;
@@ -31149,7 +31151,7 @@ class WebhookAgentProvider {
     const timeoutMs = this.config.timeoutMs ?? DEFAULT_TIMEOUT_MS2;
     const response = await fetch(this.config.webhookUrl, {
       method: "POST",
-      headers: this.buildHeaders(),
+      headers: this.buildHeaders(payload.headers),
       body: JSON.stringify(payload),
       signal: AbortSignal.timeout(timeoutMs)
     });
@@ -225239,7 +225241,7 @@ var init_sentry_scrub = __esm(() => {
 var require_package7 = __commonJS((exports, module) => {
   module.exports = {
     name: "@omni/api",
-    version: "2.260530.5",
+    version: "2.260531.2",
     type: "module",
     exports: {
       ".": {
@@ -338506,6 +338508,25 @@ async function consumeStream(generator, sender, instanceId, chatId, traceId) {
 function extractThreadId(messages4) {
   return (messages4[0]?.payload.rawPayload ?? {}).threadId;
 }
+function extractKhalSessionId(messages4) {
+  for (const message2 of messages4) {
+    const rawPayload = message2.payload.rawPayload ?? {};
+    const direct = rawPayload.khalSessionId;
+    if (typeof direct === "string" && direct.trim())
+      return direct.trim();
+    const headers = rawPayload.headers;
+    if (headers && typeof headers === "object") {
+      const headerMap = headers;
+      const value = headerMap["x-khal-session-id"] ?? headerMap["X-Khal-Session-Id"] ?? headerMap["X-KHAL-SESSION-ID"];
+      if (typeof value === "string" && value.trim())
+        return value.trim();
+    }
+  }
+  return;
+}
+function buildTriggerHeaders(khalSessionId) {
+  return khalSessionId ? { "x-khal-session-id": khalSessionId } : undefined;
+}
 function mergeContextMessages(extra, db2) {
   return extra?.length ? [...extra, ...db2] : db2;
 }
@@ -338553,7 +338574,7 @@ async function executeBeforeMessageWriteHooks(instanceId, chatId, content) {
   });
   return result.context.content;
 }
-function buildMessageTrigger(traceId, triggerType, rawEvent, channel5, instance4, chatId, senderId, personId, senderName, messages4, messageTexts, triggerFiles, sessionId, customerContext, allContextMessages) {
+function buildMessageTrigger(traceId, triggerType, rawEvent, channel5, instance4, chatId, senderId, personId, senderName, messages4, messageTexts, triggerFiles, sessionId, customerContext, allContextMessages, khalSessionId) {
   const threadId2 = extractThreadId(messages4);
   const env2 = {};
   if (instance4.bridgeTmuxSession) {
@@ -338582,6 +338603,7 @@ function buildMessageTrigger(traceId, triggerType, rawEvent, channel5, instance4
       referencedMessageId: messages4[0]?.payload.replyToId || undefined
     },
     sessionId,
+    headers: buildTriggerHeaders(khalSessionId),
     sessionStrategy: instance4.agentSessionStrategy ?? "per_chat",
     customer: customerContext,
     contextMessages: allContextMessages.length > 0 ? allContextMessages : undefined,
@@ -338598,7 +338620,8 @@ async function dispatchViaStreamingProvider(services, instance4, messages4, trig
   if (!messageTexts.length && mediaFiles.length)
     messageTexts.push("[Media message]");
   const rawThreadId = extractThreadId(messages4);
-  const sessionId = computeSessionId(instance4.agentSessionStrategy ?? "per_chat", senderId, chatId, rawThreadId);
+  const explicitKhalSessionId = extractKhalSessionId(messages4);
+  const sessionId = explicitKhalSessionId ?? computeSessionId(instance4.agentSessionStrategy ?? "per_chat", senderId, chatId, rawThreadId);
   const rawPl = messages4[0]?.payload.rawPayload ?? {};
   const replyToId = messages4[0]?.payload.replyToId ?? messages4[0]?.payload.externalId;
   const currentMessageIds = messages4.map((msg) => msg.payload.externalId).filter((id) => !!id);
@@ -338607,7 +338630,7 @@ async function dispatchViaStreamingProvider(services, instance4, messages4, trig
   const triggerFiles = toTriggerFiles(mediaFiles);
   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);
+  const trigger = buildMessageTrigger(traceId, triggerType, rawEvent, channel5, instance4, chatId, senderId, personId, senderName, messages4, messageTexts, triggerFiles, sessionId, customerContext, allContextMessages, explicitKhalSessionId);
   const chatType = determineChatType(chatId, channel5, rawPl);
   const formatMode = instance4.messageFormatMode ?? "convert";
   const sender = resolved.createSender(instance4.id, chatId, replyToId, chatType, { formatMode });
@@ -338820,14 +338843,15 @@ async function dispatchViaProvider(services, instance4, messages4, triggerType,
     messageTexts.push("[Media message]");
   }
   const rawThreadId = extractThreadId(messages4);
-  const sessionId = computeSessionId(instance4.agentSessionStrategy ?? "per_chat", senderId, chatId, rawThreadId);
+  const explicitKhalSessionId = extractKhalSessionId(messages4);
+  const sessionId = explicitKhalSessionId ?? computeSessionId(instance4.agentSessionStrategy ?? "per_chat", senderId, chatId, rawThreadId);
   const currentMessageIds = messages4.map((msg) => msg.payload.externalId).filter((id) => !!id);
   const dbContextMessages = await buildContextMessages(services, instance4, chatId, currentMessageIds);
   const allContextMessages = mergeContextMessages(extraContextMessages, dbContextMessages);
   const triggerFiles = toTriggerFiles(mediaFiles);
   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);
+  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);
   }
@@ -338958,7 +338982,7 @@ async function handleSessionReset(firstMessage, instance4, channel5, senderId, c
   const hasThread = !!(firstMessage.payload.threadId || msgRawPayload.isThread || msgRawPayload.threadId);
   const resetChatType = hasThread ? "thread" : resolvedChatType === "channel" ? "group" : resolvedChatType;
   const rawThreadIdForReset = msgRawPayload.threadId;
-  const sessionId = computeSessionId(instance4.agentSessionStrategy ?? "per_chat", senderId, chatId, rawThreadIdForReset);
+  const sessionId = extractKhalSessionId([firstMessage]) ?? computeSessionId(instance4.agentSessionStrategy ?? "per_chat", senderId, chatId, rawThreadIdForReset);
   const sessionResetConfig = inst.sessionReset;
   const activity = sessionActivityStore.getActivity(instance4.id, sessionId);
   const resetResult = checkSessionReset(sessionResetConfig, resetChatType, activity);
@@ -365775,7 +365799,9 @@ async function handleGupshupWebhook(request, plugin3, instanceId, webhookVerifyT
       sender: webhook.sender
     });
   }
-  const processed = await processInboundMessage(plugin3, instanceId, webhook, dedupeCache);
+  const processed = await processInboundMessage(plugin3, instanceId, webhook, dedupeCache, {
+    khalSessionId: request.headers.get("x-khal-session-id")?.trim() || undefined
+  });
   let handled;
   if (!knownMessageEvent) {
     handled = "dropped_unknown_fail_open";
@@ -365791,7 +365817,7 @@ async function handleGupshupWebhook(request, plugin3, instanceId, webhookVerifyT
   });
   return new Response("OK", { status: 200 });
 }
-async function processInboundMessage(plugin3, instanceId, webhook, dedupeCache) {
+async function processInboundMessage(plugin3, instanceId, webhook, dedupeCache, options = {}) {
   const msg = webhook.messageobj;
   const from = webhook.sender;
   const dedupeKey = `${from.trim()}:${msg.id}`;
@@ -365813,13 +365839,21 @@ async function processInboundMessage(plugin3, instanceId, webhook, dedupeCache)
   const platformTimestamp = msg.timestamp * 1000;
   const replyTo = msg.replyContext?.id;
   const senderName = webhook.senderobj?.display ?? webhook.contextobj?.senderName ?? webhook.messageobj?.raw?.sender?.name;
+  const threadId = webhook.contextobj?.contextid;
+  const khalSessionHeaders = options.khalSessionId ? { "x-khal-session-id": options.khalSessionId } : undefined;
   await plugin3.handleMessageReceived({
     instanceId,
     externalId: msg.id,
     chatId: from,
     from,
     content,
-    rawPayload: { ...webhook, pushName: senderName },
+    rawPayload: {
+      ...webhook,
+      pushName: senderName,
+      ...threadId ? { threadId } : {},
+      ...options.khalSessionId ? { khalSessionId: options.khalSessionId } : {},
+      ...khalSessionHeaders ? { headers: khalSessionHeaders } : {}
+    },
     platformTimestamp,
     replyTo
   });

package/package.json

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