@automagik/omni 2.260525.2 → 2.260528.1

package/dist/index.js

@@ -35744,6 +35744,100 @@ var init_types6 = __esm(() => {
   };
 });
 
+// ../core/src/providers/execution-context.ts
+function compactEnv(values) {
+  return Object.fromEntries(Object.entries(values).filter(([, value]) => value !== undefined));
+}
+function inferChatType(context) {
+  if (context.type === "dm")
+    return "dm";
+  if (context.source.chatId === context.sender.platformUserId)
+    return "dm";
+  if (context.source.threadId)
+    return "channel";
+  return "group";
+}
+function compactCustomer(customer) {
+  if (!customer)
+    return;
+  const compacted = Object.fromEntries(Object.entries(customer).filter(([, value]) => value !== undefined));
+  return Object.keys(compacted).length > 0 ? compacted : undefined;
+}
+function buildOmniExecutionContext(context) {
+  const userId = context.sender.personId ?? context.sender.platformUserId;
+  const sessionId = context.sessionId || context.source.threadId || context.source.chatId || userId;
+  const customer = compactCustomer(context.customer);
+  return {
+    identity: {
+      userId,
+      ...context.sender.personId ? { personId: context.sender.personId } : {},
+      platformUserId: context.sender.platformUserId,
+      ...context.sender.displayName ? { displayName: context.sender.displayName } : {}
+    },
+    source: {
+      channel: context.source.channelType,
+      instanceId: context.source.instanceId,
+      chatId: context.source.chatId,
+      ...context.source.threadId ? { threadId: context.source.threadId } : {},
+      messageId: context.source.messageId
+    },
+    session: {
+      id: sessionId,
+      ...context.sessionStrategy ? { strategy: context.sessionStrategy } : {}
+    },
+    trace: {
+      id: context.traceId
+    },
+    ...customer ? { customer } : {}
+  };
+}
+function buildOmniEnv(context, executionContext = buildOmniExecutionContext(context)) {
+  return compactEnv({
+    ...context.env ?? {},
+    OMNI_USER_ID: executionContext.identity.userId,
+    OMNI_PERSON_ID: executionContext.identity.personId,
+    OMNI_PLATFORM_USER_ID: executionContext.identity.platformUserId,
+    OMNI_SENDER: executionContext.identity.platformUserId,
+    OMNI_DISPLAY_NAME: executionContext.identity.displayName,
+    OMNI_INSTANCE: executionContext.source.instanceId,
+    OMNI_CHAT: executionContext.source.chatId,
+    OMNI_MESSAGE: executionContext.source.messageId,
+    OMNI_CHANNEL: executionContext.source.channel,
+    OMNI_SESSION: executionContext.session.id,
+    OMNI_TRACE_ID: executionContext.trace.id,
+    OMNI_THREAD: executionContext.source.threadId,
+    OMNI_EXTERNAL_USER_ID: executionContext.customer?.externalUserId,
+    OMNI_CUSTOMER_ID: executionContext.customer?.customerId,
+    OMNI_ORGANIZATION_ID: executionContext.customer?.organizationId,
+    OMNI_TENANT_ID: executionContext.customer?.tenantId
+  });
+}
+function buildProviderRequestContext(context) {
+  const executionContext = buildOmniExecutionContext(context);
+  return {
+    userId: executionContext.identity.userId,
+    sessionId: executionContext.session.id,
+    platform: {
+      id: executionContext.identity.platformUserId,
+      channel: executionContext.source.channel,
+      instanceId: executionContext.source.instanceId
+    },
+    sender: {
+      ...executionContext.identity.displayName ? { displayName: executionContext.identity.displayName } : {}
+    },
+    chat: {
+      type: inferChatType(context),
+      id: executionContext.source.chatId,
+      ...executionContext.source.threadId ? { threadId: executionContext.source.threadId } : {}
+    },
+    messageId: executionContext.source.messageId,
+    ...context.content.referencedMessageId ? { replyToMessageId: context.content.referencedMessageId } : {},
+    env: buildOmniEnv(context, executionContext),
+    executionContext
+  };
+}
+var OMNI_EXECUTION_CONTEXT_EXTENSION_URI = "https://omni.dev/extensions/execution-context/v1";
+
 // ../core/src/providers/agno-client.ts
 class AgnoClient {
   baseUrl;
@@ -60159,12 +60253,11 @@ class AgnoAgentProvider {
       message2 = `[${context.sender.displayName}]: ${message2}`;
     }
     const request = {
+      ...buildProviderRequestContext(context),
       message: message2,
       agentId: this.config.agentId,
       agentType: this.config.agentType,
       stream: false,
-      sessionId: context.sessionId,
-      userId: context.sender.platformUserId,
       timeoutMs: this.config.timeoutMs ?? 60000
     };
     log8.info("Triggering Agno agent", {
@@ -60220,20 +60313,6 @@ function boundContextMessages(contextMessages) {
   }
   return bounded;
 }
-function buildOmniEnv(context) {
-  return {
-    ...context.env ?? {},
-    OMNI_INSTANCE: context.source.instanceId,
-    OMNI_CHAT: context.source.chatId,
-    OMNI_MESSAGE: context.source.messageId,
-    OMNI_CHANNEL: context.source.channelType,
-    OMNI_SESSION: context.sessionId,
-    OMNI_TRACE_ID: context.traceId,
-    OMNI_SENDER: context.sender.platformUserId,
-    ...context.sender.personId ? { OMNI_PERSON_ID: context.sender.personId } : {},
-    ...context.source.threadId ? { OMNI_THREAD: context.source.threadId } : {}
-  };
-}
 
 class ClaudeCodeAgentProvider {
   id;
@@ -60357,13 +60436,12 @@ ${fileList}`;
     }
     const { message: message2, resolvedSessionId, internalSessionKey } = prepared;
     const request = {
+      ...buildProviderRequestContext(context),
       message: message2,
       agentId: "claude-code",
       stream: false,
       sessionId: resolvedSessionId,
-      userId: context.sender.personId ?? context.sender.platformUserId,
       timeoutMs: this.options.timeoutMs ?? 120000,
-      env: buildOmniEnv(context),
       ...context.source.chatId ? { mcpUrlParams: { chat_id: context.source.chatId } } : {}
     };
     log9.info("Triggering Claude Code agent", {
@@ -60400,13 +60478,12 @@ ${fileList}`;
     }
     const { message: message2, resolvedSessionId, internalSessionKey } = prepared;
     const request = {
+      ...buildProviderRequestContext(context),
       message: message2,
       agentId: "claude-code",
       stream: true,
       sessionId: resolvedSessionId,
-      userId: context.sender.personId ?? context.sender.platformUserId,
       timeoutMs: this.options.timeoutMs ?? 120000,
-      env: buildOmniEnv(context),
       ...context.source.chatId ? { mcpUrlParams: { chat_id: context.source.chatId } } : {}
     };
     log9.info("Triggering Claude Code agent (stream)", {
@@ -60502,6 +60579,7 @@ class WebhookAgentProvider {
         emoji: context.content.emoji
       },
       traceId: context.traceId,
+      executionContext: buildOmniExecutionContext(context),
       replyEndpoint: "POST /api/v2/messages/send"
     };
     log10.info("Sending webhook trigger", {
@@ -61917,10 +61995,9 @@ class AgUiAgentProvider {
       return { parts: [], metadata: { runId: "", providerId: this.id, durationMs: 0 } };
     }
     const request = {
+      ...buildProviderRequestContext(context),
       message: message2,
       agentId: this.config.agentId,
-      sessionId: context.sessionId,
-      userId: context.sender.platformUserId,
       timeoutMs: this.config.timeoutMs ?? 60000
     };
     log14.info("Triggering AG-UI agent", { agentId: this.config.agentId, traceId: context.traceId });
@@ -61947,10 +62024,9 @@ class AgUiAgentProvider {
       return;
     }
     const request = {
+      ...buildProviderRequestContext(context),
       message: message2,
       agentId: this.config.agentId,
-      sessionId: context.sessionId,
-      userId: context.sender.platformUserId,
       timeoutMs: this.config.timeoutMs ?? 60000
     };
     log14.info("Streaming AG-UI agent", { agentId: this.config.agentId, traceId: context.traceId });
@@ -62109,16 +62185,23 @@ class A2AClient {
     }
   }
   buildJsonRpcRequest(method, request) {
+    const message2 = {
+      role: "ROLE_USER",
+      parts: [{ text: request.message, mediaType: "text/plain" }],
+      messageId: `msg-${crypto.randomUUID()}`
+    };
+    if (request.executionContext) {
+      message2.extensions = [OMNI_EXECUTION_CONTEXT_EXTENSION_URI];
+      message2.metadata = {
+        omniExecutionContext: request.executionContext
+      };
+    }
     return {
       jsonrpc: "2.0",
       id: `omni-${crypto.randomUUID()}`,
       method,
       params: {
-        message: {
-          role: "ROLE_USER",
-          parts: [{ text: request.message, mediaType: "text/plain" }],
-          messageId: `msg-${crypto.randomUUID()}`
-        },
+        message: message2,
         configuration: {
           acceptedOutputModes: ["text/plain"],
           returnImmediately: true
@@ -62334,10 +62417,9 @@ class A2AAgentProvider {
       return { parts: [], metadata: { runId: "", providerId: this.id, durationMs: 0 } };
     }
     const request = {
+      ...buildProviderRequestContext(context),
       message: message2,
       agentId: this.config.agentId,
-      sessionId: context.sessionId,
-      userId: context.sender.platformUserId,
       timeoutMs: this.config.timeoutMs ?? 60000
     };
     log16.info("Triggering A2A agent", { agentId: this.config.agentId, traceId: context.traceId });
@@ -62367,10 +62449,9 @@ class A2AAgentProvider {
       return;
     }
     const request = {
+      ...buildProviderRequestContext(context),
       message: message2,
       agentId: this.config.agentId,
-      sessionId: context.sessionId,
-      userId: context.sender.platformUserId,
       timeoutMs: this.config.timeoutMs ?? 60000
     };
     log16.info("Streaming A2A agent", { agentId: this.config.agentId, traceId: context.traceId });
@@ -62466,7 +62547,8 @@ class NatsGenieProvider {
       traceId: context.traceId,
       messageId: context.source.messageId,
       files: context.content.files,
-      env: context.env
+      env: buildOmniEnv(context),
+      executionContext: buildOmniExecutionContext(context)
     };
     try {
       await this.ensureConnected();
@@ -63449,6 +63531,9 @@ __export(exports_src, {
   calculateBackoffDelay: () => calculateBackoffDelay,
   buildSubscribePattern: () => buildSubscribePattern,
   buildSubject: () => buildSubject,
+  buildProviderRequestContext: () => buildProviderRequestContext,
+  buildOmniExecutionContext: () => buildOmniExecutionContext,
+  buildOmniEnv: () => buildOmniEnv,
   buildConversationKey: () => buildConversationKey,
   buildConsumerConfig: () => buildConsumerConfig,
   armSequence: () => armSequence,
@@ -63493,6 +63578,7 @@ __export(exports_src, {
   OpenClawAgentProvider: () => OpenClawAgentProvider,
   OmniEventRecordSchema: () => OmniEventRecordSchema,
   OmniError: () => OmniError,
+  OMNI_EXECUTION_CONTEXT_EXTENSION_URI: () => OMNI_EXECUTION_CONTEXT_EXTENSION_URI,
   NotFoundError: () => NotFoundError,
   NonEmptyStringSchema: () => NonEmptyStringSchema,
   NatsGenieProvider: () => NatsGenieProvider,
@@ -124617,7 +124703,7 @@ import { fileURLToPath } from "url";
 // package.json
 var package_default = {
   name: "@automagik/omni",
-  version: "2.260525.2",
+  version: "2.260528.1",
   description: "LLM-optimized CLI for Omni",
   type: "module",
   bin: {

package/dist/server/index.js

@@ -29417,6 +29417,100 @@ var init_types7 = __esm(() => {
   };
 });
 
+// ../core/src/providers/execution-context.ts
+function compactEnv(values) {
+  return Object.fromEntries(Object.entries(values).filter(([, value]) => value !== undefined));
+}
+function inferChatType(context2) {
+  if (context2.type === "dm")
+    return "dm";
+  if (context2.source.chatId === context2.sender.platformUserId)
+    return "dm";
+  if (context2.source.threadId)
+    return "channel";
+  return "group";
+}
+function compactCustomer(customer) {
+  if (!customer)
+    return;
+  const compacted = Object.fromEntries(Object.entries(customer).filter(([, value]) => value !== undefined));
+  return Object.keys(compacted).length > 0 ? compacted : undefined;
+}
+function buildOmniExecutionContext(context2) {
+  const userId = context2.sender.personId ?? context2.sender.platformUserId;
+  const sessionId = context2.sessionId || context2.source.threadId || context2.source.chatId || userId;
+  const customer = compactCustomer(context2.customer);
+  return {
+    identity: {
+      userId,
+      ...context2.sender.personId ? { personId: context2.sender.personId } : {},
+      platformUserId: context2.sender.platformUserId,
+      ...context2.sender.displayName ? { displayName: context2.sender.displayName } : {}
+    },
+    source: {
+      channel: context2.source.channelType,
+      instanceId: context2.source.instanceId,
+      chatId: context2.source.chatId,
+      ...context2.source.threadId ? { threadId: context2.source.threadId } : {},
+      messageId: context2.source.messageId
+    },
+    session: {
+      id: sessionId,
+      ...context2.sessionStrategy ? { strategy: context2.sessionStrategy } : {}
+    },
+    trace: {
+      id: context2.traceId
+    },
+    ...customer ? { customer } : {}
+  };
+}
+function buildOmniEnv(context2, executionContext = buildOmniExecutionContext(context2)) {
+  return compactEnv({
+    ...context2.env ?? {},
+    OMNI_USER_ID: executionContext.identity.userId,
+    OMNI_PERSON_ID: executionContext.identity.personId,
+    OMNI_PLATFORM_USER_ID: executionContext.identity.platformUserId,
+    OMNI_SENDER: executionContext.identity.platformUserId,
+    OMNI_DISPLAY_NAME: executionContext.identity.displayName,
+    OMNI_INSTANCE: executionContext.source.instanceId,
+    OMNI_CHAT: executionContext.source.chatId,
+    OMNI_MESSAGE: executionContext.source.messageId,
+    OMNI_CHANNEL: executionContext.source.channel,
+    OMNI_SESSION: executionContext.session.id,
+    OMNI_TRACE_ID: executionContext.trace.id,
+    OMNI_THREAD: executionContext.source.threadId,
+    OMNI_EXTERNAL_USER_ID: executionContext.customer?.externalUserId,
+    OMNI_CUSTOMER_ID: executionContext.customer?.customerId,
+    OMNI_ORGANIZATION_ID: executionContext.customer?.organizationId,
+    OMNI_TENANT_ID: executionContext.customer?.tenantId
+  });
+}
+function buildProviderRequestContext(context2) {
+  const executionContext = buildOmniExecutionContext(context2);
+  return {
+    userId: executionContext.identity.userId,
+    sessionId: executionContext.session.id,
+    platform: {
+      id: executionContext.identity.platformUserId,
+      channel: executionContext.source.channel,
+      instanceId: executionContext.source.instanceId
+    },
+    sender: {
+      ...executionContext.identity.displayName ? { displayName: executionContext.identity.displayName } : {}
+    },
+    chat: {
+      type: inferChatType(context2),
+      id: executionContext.source.chatId,
+      ...executionContext.source.threadId ? { threadId: executionContext.source.threadId } : {}
+    },
+    messageId: executionContext.source.messageId,
+    ...context2.content.referencedMessageId ? { replyToMessageId: context2.content.referencedMessageId } : {},
+    env: buildOmniEnv(context2, executionContext),
+    executionContext
+  };
+}
+var OMNI_EXECUTION_CONTEXT_EXTENSION_URI = "https://omni.dev/extensions/execution-context/v1";
+
 // ../core/src/providers/agno-client.ts
 class AgnoClient {
   baseUrl;
@@ -30462,12 +30556,11 @@ class AgnoAgentProvider {
       message2 = `[${context2.sender.displayName}]: ${message2}`;
     }
     const request = {
+      ...buildProviderRequestContext(context2),
       message: message2,
       agentId: this.config.agentId,
       agentType: this.config.agentType,
       stream: false,
-      sessionId: context2.sessionId,
-      userId: context2.sender.platformUserId,
       timeoutMs: this.config.timeoutMs ?? 60000
     };
     log8.info("Triggering Agno agent", {
@@ -30523,20 +30616,6 @@ function boundContextMessages(contextMessages) {
   }
   return bounded;
 }
-function buildOmniEnv(context2) {
-  return {
-    ...context2.env ?? {},
-    OMNI_INSTANCE: context2.source.instanceId,
-    OMNI_CHAT: context2.source.chatId,
-    OMNI_MESSAGE: context2.source.messageId,
-    OMNI_CHANNEL: context2.source.channelType,
-    OMNI_SESSION: context2.sessionId,
-    OMNI_TRACE_ID: context2.traceId,
-    OMNI_SENDER: context2.sender.platformUserId,
-    ...context2.sender.personId ? { OMNI_PERSON_ID: context2.sender.personId } : {},
-    ...context2.source.threadId ? { OMNI_THREAD: context2.source.threadId } : {}
-  };
-}
 
 class ClaudeCodeAgentProvider {
   id;
@@ -30660,13 +30739,12 @@ ${fileList}`;
     }
     const { message: message2, resolvedSessionId, internalSessionKey } = prepared;
     const request = {
+      ...buildProviderRequestContext(context2),
       message: message2,
       agentId: "claude-code",
       stream: false,
       sessionId: resolvedSessionId,
-      userId: context2.sender.personId ?? context2.sender.platformUserId,
       timeoutMs: this.options.timeoutMs ?? 120000,
-      env: buildOmniEnv(context2),
       ...context2.source.chatId ? { mcpUrlParams: { chat_id: context2.source.chatId } } : {}
     };
     log9.info("Triggering Claude Code agent", {
@@ -30703,13 +30781,12 @@ ${fileList}`;
     }
     const { message: message2, resolvedSessionId, internalSessionKey } = prepared;
     const request = {
+      ...buildProviderRequestContext(context2),
       message: message2,
       agentId: "claude-code",
       stream: true,
       sessionId: resolvedSessionId,
-      userId: context2.sender.personId ?? context2.sender.platformUserId,
       timeoutMs: this.options.timeoutMs ?? 120000,
-      env: buildOmniEnv(context2),
       ...context2.source.chatId ? { mcpUrlParams: { chat_id: context2.source.chatId } } : {}
     };
     log9.info("Triggering Claude Code agent (stream)", {
@@ -30805,6 +30882,7 @@ class WebhookAgentProvider {
         emoji: context2.content.emoji
       },
       traceId: context2.traceId,
+      executionContext: buildOmniExecutionContext(context2),
       replyEndpoint: "POST /api/v2/messages/send"
     };
     log10.info("Sending webhook trigger", {
@@ -32201,10 +32279,9 @@ class AgUiAgentProvider {
       return { parts: [], metadata: { runId: "", providerId: this.id, durationMs: 0 } };
     }
     const request = {
+      ...buildProviderRequestContext(context2),
       message: message2,
       agentId: this.config.agentId,
-      sessionId: context2.sessionId,
-      userId: context2.sender.platformUserId,
       timeoutMs: this.config.timeoutMs ?? 60000
     };
     log14.info("Triggering AG-UI agent", { agentId: this.config.agentId, traceId: context2.traceId });
@@ -32231,10 +32308,9 @@ class AgUiAgentProvider {
       return;
     }
     const request = {
+      ...buildProviderRequestContext(context2),
       message: message2,
       agentId: this.config.agentId,
-      sessionId: context2.sessionId,
-      userId: context2.sender.platformUserId,
       timeoutMs: this.config.timeoutMs ?? 60000
     };
     log14.info("Streaming AG-UI agent", { agentId: this.config.agentId, traceId: context2.traceId });
@@ -32380,16 +32456,23 @@ class A2AClient {
     }
   }
   buildJsonRpcRequest(method, request) {
+    const message2 = {
+      role: "ROLE_USER",
+      parts: [{ text: request.message, mediaType: "text/plain" }],
+      messageId: `msg-${crypto.randomUUID()}`
+    };
+    if (request.executionContext) {
+      message2.extensions = [OMNI_EXECUTION_CONTEXT_EXTENSION_URI];
+      message2.metadata = {
+        omniExecutionContext: request.executionContext
+      };
+    }
     return {
       jsonrpc: "2.0",
       id: `omni-${crypto.randomUUID()}`,
       method,
       params: {
-        message: {
-          role: "ROLE_USER",
-          parts: [{ text: request.message, mediaType: "text/plain" }],
-          messageId: `msg-${crypto.randomUUID()}`
-        },
+        message: message2,
         configuration: {
           acceptedOutputModes: ["text/plain"],
           returnImmediately: true
@@ -32605,10 +32688,9 @@ class A2AAgentProvider {
       return { parts: [], metadata: { runId: "", providerId: this.id, durationMs: 0 } };
     }
     const request = {
+      ...buildProviderRequestContext(context2),
       message: message2,
       agentId: this.config.agentId,
-      sessionId: context2.sessionId,
-      userId: context2.sender.platformUserId,
       timeoutMs: this.config.timeoutMs ?? 60000
     };
     log16.info("Triggering A2A agent", { agentId: this.config.agentId, traceId: context2.traceId });
@@ -32638,10 +32720,9 @@ class A2AAgentProvider {
       return;
     }
     const request = {
+      ...buildProviderRequestContext(context2),
       message: message2,
       agentId: this.config.agentId,
-      sessionId: context2.sessionId,
-      userId: context2.sender.platformUserId,
       timeoutMs: this.config.timeoutMs ?? 60000
     };
     log16.info("Streaming A2A agent", { agentId: this.config.agentId, traceId: context2.traceId });
@@ -32724,7 +32805,8 @@ class NatsGenieProvider {
       traceId: context2.traceId,
       messageId: context2.source.messageId,
       files: context2.content.files,
-      env: context2.env
+      env: buildOmniEnv(context2),
+      executionContext: buildOmniExecutionContext(context2)
     };
     try {
       await this.ensureConnected();
@@ -230186,7 +230268,7 @@ var init_sentry_scrub = __esm(() => {
 var require_package8 = __commonJS((exports, module) => {
   module.exports = {
     name: "@omni/api",
-    version: "2.260525.2",
+    version: "2.260528.1",
     type: "module",
     exports: {
       ".": {
@@ -331775,7 +331857,7 @@ function resolveEffectiveChatName(params) {
 function mapContentType(contentType) {
   return CONTENT_TYPE_MAP[contentType ?? ""] ?? "text";
 }
-function inferChatType(chatId, isGroup) {
+function inferChatType2(chatId, isGroup) {
   if (chatId.includes("@g.us") || chatId.includes("@broadcast"))
     return "group";
   if (chatId.includes("@newsletter"))
@@ -332047,7 +332129,7 @@ async function handleMessageReceived(services, payload, metadata, eventTimestamp
   const chatExternalId = truncate3(payload.chatId, 255) ?? payload.chatId;
   const messageExternalId = truncate3(payload.externalId, 255) ?? payload.externalId;
   const rawPayload = payload.rawPayload ? deepSanitize(payload.rawPayload) : undefined;
-  const chatType = inferChatType(payload.chatId, rawPayload?.isGroup);
+  const chatType = inferChatType2(payload.chatId, rawPayload?.isGroup);
   const isFromMe2 = rawPayload?.isFromMe === true;
   const pushName = truncate3(payload.senderName ?? rawPayload?.pushName, 255);
   const chatName = truncate3(payload.chatName ?? rawPayload?.chatName, 255);
@@ -332149,7 +332231,7 @@ async function setupMessagePersistence(eventBus, services) {
         const chatExternalId = truncate3(payload.chatId, 255) ?? payload.chatId;
         const messageExternalId = truncate3(payload.externalId, 255) ?? payload.externalId;
         const { chat: chat2 } = await services.chats.findOrCreate(metadata.instanceId, chatExternalId, {
-          chatType: inferChatType(payload.chatId),
+          chatType: inferChatType2(payload.chatId),
           channel: metadata.channelType ?? "whatsapp"
         });
         const sentContent = buildSentMessageContentFields(payload);
@@ -333014,6 +333096,62 @@ async function resolvePersonId(services, channel5, instanceId, senderId, metadat
   }
   return;
 }
+function isRecord(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+function pickString(record, ...keys) {
+  for (const key of keys) {
+    const value = record[key];
+    if (typeof value === "string" && value.length > 0)
+      return value;
+  }
+  return;
+}
+function compactCustomerContext(context20) {
+  const compacted = Object.fromEntries(Object.entries(context20).filter(([, value]) => value !== undefined));
+  return Object.keys(compacted).length > 0 ? compacted : undefined;
+}
+function customerContextFromRecord(record) {
+  return compactCustomerContext({
+    externalUserId: pickString(record, "externalUserId", "external_user_id"),
+    customerId: pickString(record, "customerId", "customer_id"),
+    organizationId: pickString(record, "organizationId", "organization_id", "orgId", "org_id"),
+    tenantId: pickString(record, "tenantId", "tenant_id")
+  });
+}
+function extractA2ACustomerContext(messages4, channel5) {
+  if (channel5 !== "a2a")
+    return;
+  const rawPayload = messages4[0]?.payload.rawPayload;
+  if (!isRecord(rawPayload))
+    return;
+  const executionContext = rawPayload.omniExecutionContext;
+  if (!isRecord(executionContext))
+    return;
+  const customer = isRecord(executionContext.customer) ? executionContext.customer : {};
+  const identity = isRecord(executionContext.identity) ? executionContext.identity : {};
+  return compactCustomerContext({
+    ...customerContextFromRecord(customer),
+    externalUserId: pickString(customer, "externalUserId", "external_user_id") ?? pickString(identity, "platformUserId", "userId")
+  });
+}
+async function resolveCustomerContext(services, personId, externalContext) {
+  let storedContext;
+  if (personId) {
+    try {
+      const person2 = await services.persons.getById(personId);
+      if (person2 && isRecord(person2.metadata)) {
+        storedContext = customerContextFromRecord(person2.metadata);
+      }
+    } catch (error3) {
+      log94.debug("Failed to resolve customer context", { personId, error: String(error3) });
+    }
+  }
+  return compactCustomerContext({
+    ...externalContext ?? {},
+    ...storedContext ?? {}
+  });
+}
 async function fetchSenderMetadata(services, channel5, instanceId, senderId) {
   try {
     const identity = await services.persons.getIdentityByPlatformId(channel5, instanceId, senderId);
@@ -333168,7 +333306,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, allContextMessages) {
+function buildMessageTrigger(traceId, triggerType, rawEvent, channel5, instance4, chatId, senderId, personId, senderName, messages4, messageTexts, triggerFiles, sessionId, customerContext, allContextMessages) {
   const threadId2 = extractThreadId(messages4);
   const env2 = {};
   if (instance4.bridgeTmuxSession) {
@@ -333197,6 +333335,8 @@ function buildMessageTrigger(traceId, triggerType, rawEvent, channel5, instance4
       referencedMessageId: messages4[0]?.payload.replyToId || undefined
     },
     sessionId,
+    sessionStrategy: instance4.agentSessionStrategy ?? "per_chat",
+    customer: customerContext,
     contextMessages: allContextMessages.length > 0 ? allContextMessages : undefined,
     env: Object.keys(env2).length > 0 ? env2 : undefined
   };
@@ -333219,7 +333359,8 @@ async function dispatchViaStreamingProvider(services, instance4, messages4, trig
   const allContextMessages = mergeContextMessages(extraContextMessages, dbContextMessages);
   const triggerFiles = toTriggerFiles(mediaFiles);
   await executeBeforeAgentStartHooks(instance4, chatId, senderId, senderName, triggerType, traceId, messages4[0]?.metadata.correlationId, triggerFiles);
-  const trigger = buildMessageTrigger(traceId, triggerType, rawEvent, channel5, instance4, chatId, senderId, personId, senderName, messages4, messageTexts, triggerFiles, sessionId, allContextMessages);
+  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 chatType = determineChatType(chatId, channel5, rawPl);
   const formatMode = instance4.messageFormatMode ?? "convert";
   const sender = resolved.createSender(instance4.id, chatId, replyToId, chatType, { formatMode });
@@ -333438,7 +333579,8 @@ async function dispatchViaProvider(services, instance4, messages4, triggerType,
   const allContextMessages = mergeContextMessages(extraContextMessages, dbContextMessages);
   const triggerFiles = toTriggerFiles(mediaFiles);
   await executeBeforeAgentStartHooks(instance4, chatId, senderId, senderName, triggerType, traceId, messages4[0]?.metadata.correlationId, triggerFiles);
-  const trigger = buildMessageTrigger(traceId, triggerType, rawEvent, channel5, instance4, chatId, senderId, personId, senderName, messages4, messageTexts, triggerFiles, sessionId, allContextMessages);
+  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);
   if (provider.mode === "turn-based") {
     return dispatchViaTurnBasedProvider(services, instance4, provider, trigger, messages4, chatId, traceId, db2);
   }
@@ -334301,6 +334443,7 @@ async function processReactionTrigger(services, baseInstance, payload, metadata,
       const effectivePersonId = reactionPersonId ?? metadata.personId;
       const senderName2 = await services.agentRunner.getSenderName(effectivePersonId, undefined);
       const sessionId = computeSessionId(instance4.agentSessionStrategy ?? "per_chat", payload.from, externalChatId);
+      const customerContext = await resolveCustomerContext(services, effectivePersonId);
       const trigger = {
         traceId: metadata.traceId,
         type: "reaction",
@@ -334320,7 +334463,9 @@ async function processReactionTrigger(services, baseInstance, payload, metadata,
           emoji: payload.emoji,
           referencedMessageId: payload.messageId
         },
-        sessionId
+        sessionId,
+        sessionStrategy: instance4.agentSessionStrategy ?? "per_chat",
+        customer: customerContext
       };
       const result2 = await provider.trigger(trigger);
       if (result2 && result2.parts.length > 0) {
@@ -342675,7 +342820,7 @@ var init_dist6 = __esm(() => {
 });
 
 // ../api/src/services/a2a-discovery.ts
-function isRecord(value) {
+function isRecord2(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 function stringOverride(value) {
@@ -342722,7 +342867,7 @@ function buildDefaultSkills(capabilities3) {
 }
 function buildA2AAgentCard(params) {
   const { baseUrl, agent: agent3, instance: instance4 } = params;
-  const override = isRecord(agent3.agentCard) ? agent3.agentCard : {};
+  const override = isRecord2(agent3.agentCard) ? agent3.agentCard : {};
   const capabilities3 = agent3.capabilities ?? [];
   const endpointUrl = `${normalizeBaseUrl(baseUrl)}/a2a/${instance4.id}`;
   const card = {
@@ -342740,8 +342885,16 @@ function buildA2AAgentCard(params) {
       streaming: true,
       pushNotifications: false,
       extendedAgentCard: false,
-      ...isRecord(override.capabilities) ? override.capabilities : {}
+      ...isRecord2(override.capabilities) ? override.capabilities : {}
     },
+    extensions: Array.isArray(override.extensions) ? override.extensions : [
+      {
+        uri: OMNI_EXECUTION_CONTEXT_EXTENSION_URI,
+        description: "Omni execution context metadata for user, source, session, trace, and customer identity.",
+        version: "1.0",
+        required: false
+      }
+    ],
     defaultInputModes: stringArray(override.defaultInputModes) ?? ["text/plain"],
     defaultOutputModes: stringArray(override.defaultOutputModes) ?? ["text/plain"],
     skills: Array.isArray(override.skills) ? override.skills : buildDefaultSkills(capabilities3),
@@ -342760,14 +342913,14 @@ function buildA2AAgentCard(params) {
           description: "Legacy Omni API key header."
         }
       },
-      ...isRecord(override.securitySchemes) ? override.securitySchemes : {}
+      ...isRecord2(override.securitySchemes) ? override.securitySchemes : {}
     },
     securityRequirements: [{ schemes: { bearerAuth: { list: [] } } }, { schemes: { apiKeyHeader: { list: [] } } }]
   };
-  const providerOverride = isRecord(override.provider) ? override.provider : undefined;
+  const providerOverride = isRecord2(override.provider) ? override.provider : undefined;
   if (providerOverride)
     card.provider = providerOverride;
-  const metadataOverride = isRecord(override.metadata) ? override.metadata : undefined;
+  const metadataOverride = isRecord2(override.metadata) ? override.metadata : undefined;
   if (metadataOverride)
     card.metadata = metadataOverride;
   const iconUrl = stringOverride(override.iconUrl);
@@ -342854,6 +343007,9 @@ async function resolveA2AAgentCard(params) {
     provider
   };
 }
+var init_a2a_discovery = __esm(() => {
+  init_src();
+});
 
 // ../api/src/routes/v2/a2a.ts
 function baseUrlFromRequest(url) {
@@ -342864,6 +343020,7 @@ var init_a2a = __esm(() => {
   init_dist6();
   init_dist2();
   init_zod();
+  init_a2a_discovery();
   a2aRoutes = new Hono2;
   listQuerySchema = exports_external.object({
     includeUnconfigured: exports_external.coerce.boolean().optional().default(false)
@@ -352845,6 +353002,7 @@ var init_app = __esm(() => {
   init_health2();
   init_openapi2();
   init_v2();
+  init_a2a_discovery();
   httpLog = createLogger("http");
 });
 

package/package.json

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