@automagik/omni 2.260520.20 → 2.260524.1

package/dist/server/index.js

@@ -18204,11 +18204,13 @@ function isStreamNotFoundError(error) {
   }
   return false;
 }
-var import_nats, log, STREAM_NAMES, daysToNs = (days) => days * 24 * 60 * 60 * 1e9, STREAM_CONFIGS;
+var nats, log, NATS_STORAGE_FILE, NATS_RETENTION_LIMITS, STREAM_NAMES, daysToNs = (days) => days * 24 * 60 * 60 * 1e9, STREAM_CONFIGS;
 var init_streams = __esm(() => {
   init_logger();
-  import_nats = __toESM(require_mod4(), 1);
+  nats = __toESM(require_mod4(), 1);
   log = createLogger("nats:streams");
+  NATS_STORAGE_FILE = nats.StorageType.File;
+  NATS_RETENTION_LIMITS = nats.RetentionPolicy.Limits;
   STREAM_NAMES = {
     MESSAGE: "MESSAGE",
     REACTION: "REACTION",
@@ -18226,80 +18228,80 @@ var init_streams = __esm(() => {
       name: STREAM_NAMES.MESSAGE,
       subjects: ["message.>"],
       max_age: daysToNs(30),
-      storage: import_nats.StorageType.File,
-      retention: import_nats.RetentionPolicy.Limits,
+      storage: NATS_STORAGE_FILE,
+      retention: NATS_RETENTION_LIMITS,
       description: "All message lifecycle events (received, sent, delivered, read, failed)"
     },
     [STREAM_NAMES.REACTION]: {
       name: STREAM_NAMES.REACTION,
       subjects: ["reaction.>"],
       max_age: daysToNs(7),
-      storage: import_nats.StorageType.File,
-      retention: import_nats.RetentionPolicy.Limits,
+      storage: NATS_STORAGE_FILE,
+      retention: NATS_RETENTION_LIMITS,
       description: "Reaction events (received, removed)"
     },
     [STREAM_NAMES.INSTANCE]: {
       name: STREAM_NAMES.INSTANCE,
       subjects: ["instance.>"],
       max_age: daysToNs(7),
-      storage: import_nats.StorageType.File,
-      retention: import_nats.RetentionPolicy.Limits,
+      storage: NATS_STORAGE_FILE,
+      retention: NATS_RETENTION_LIMITS,
       description: "Instance lifecycle events (connected, disconnected, qr_code)"
     },
     [STREAM_NAMES.IDENTITY]: {
       name: STREAM_NAMES.IDENTITY,
       subjects: ["identity.>"],
       max_age: daysToNs(90),
-      storage: import_nats.StorageType.File,
-      retention: import_nats.RetentionPolicy.Limits,
+      storage: NATS_STORAGE_FILE,
+      retention: NATS_RETENTION_LIMITS,
       description: "Identity management events (created, linked, merged, unlinked)"
     },
     [STREAM_NAMES.MEDIA]: {
       name: STREAM_NAMES.MEDIA,
       subjects: ["media.>"],
       max_age: daysToNs(7),
-      storage: import_nats.StorageType.File,
-      retention: import_nats.RetentionPolicy.Limits,
+      storage: NATS_STORAGE_FILE,
+      retention: NATS_RETENTION_LIMITS,
       description: "Media processing events (received, processed)"
     },
     [STREAM_NAMES.ACCESS]: {
       name: STREAM_NAMES.ACCESS,
       subjects: ["access.>"],
       max_age: daysToNs(30),
-      storage: import_nats.StorageType.File,
-      retention: import_nats.RetentionPolicy.Limits,
+      storage: NATS_STORAGE_FILE,
+      retention: NATS_RETENTION_LIMITS,
       description: "Access control events (allowed, denied)"
     },
     [STREAM_NAMES.SESSION]: {
       name: STREAM_NAMES.SESSION,
       subjects: ["session.>"],
       max_age: daysToNs(7),
-      storage: import_nats.StorageType.File,
-      retention: import_nats.RetentionPolicy.Limits,
+      storage: NATS_STORAGE_FILE,
+      retention: NATS_RETENTION_LIMITS,
       description: "Session lifecycle events (reset)"
     },
     [STREAM_NAMES.CUSTOM]: {
       name: STREAM_NAMES.CUSTOM,
       subjects: ["custom.>"],
       max_age: daysToNs(7),
-      storage: import_nats.StorageType.File,
-      retention: import_nats.RetentionPolicy.Limits,
+      storage: NATS_STORAGE_FILE,
+      retention: NATS_RETENTION_LIMITS,
       description: "User-defined custom events (webhooks, triggers, etc.)"
     },
     [STREAM_NAMES.SYSTEM]: {
       name: STREAM_NAMES.SYSTEM,
       subjects: ["system.>", "sync.>", "batch-job.>", "presence.>", "chat.>", "follow_up.>"],
       max_age: daysToNs(7),
-      storage: import_nats.StorageType.File,
-      retention: import_nats.RetentionPolicy.Limits,
+      storage: NATS_STORAGE_FILE,
+      retention: NATS_RETENTION_LIMITS,
       description: "Internal system events (dead_letter, replay, health, sync, batch-job, presence, chat, follow_up)"
     },
     [STREAM_NAMES.AGENT]: {
       name: STREAM_NAMES.AGENT,
       subjects: ["agent.>"],
       max_age: daysToNs(30),
-      storage: import_nats.StorageType.File,
-      retention: import_nats.RetentionPolicy.Limits,
+      storage: NATS_STORAGE_FILE,
+      retention: NATS_RETENTION_LIMITS,
       description: "Agent lifecycle events (state, tasks, A2A, internal routing)"
     }
   };
@@ -18316,7 +18318,7 @@ function buildConsumerConfig(pattern, options = {}) {
   } = options;
   const config2 = {
     filter_subject: pattern,
-    ack_policy: import_nats2.AckPolicy.Explicit,
+    ack_policy: nats2.AckPolicy.Explicit,
     ack_wait: ackWaitMs * 1e6,
     max_deliver: maxRetries + 1,
     max_ack_pending: DEFAULT_CONSUMER_CONFIG.maxAckPending,
@@ -18334,15 +18336,15 @@ function buildConsumerConfig(pattern, options = {}) {
 }
 function mapStartFrom(startFrom) {
   if (startFrom instanceof Date) {
-    return import_nats2.DeliverPolicy.StartTime;
+    return nats2.DeliverPolicy.StartTime;
   }
   switch (startFrom) {
     case "first":
-      return import_nats2.DeliverPolicy.All;
+      return nats2.DeliverPolicy.All;
     case "last":
-      return import_nats2.DeliverPolicy.Last;
+      return nats2.DeliverPolicy.Last;
     default:
-      return import_nats2.DeliverPolicy.New;
+      return nats2.DeliverPolicy.New;
   }
 }
 function generateConsumerName(pattern) {
@@ -18365,10 +18367,10 @@ function calculateBackoffDelay(retryCount, baseDelayMs = DEFAULT_CONSUMER_CONFIG
   const jitter = delay * 0.1 * (Math.random() * 2 - 1);
   return Math.floor(Math.min(delay + jitter, maxDelayMs));
 }
-var import_nats2, DEFAULT_CONSUMER_CONFIG;
+var nats2, DEFAULT_CONSUMER_CONFIG;
 var init_consumer = __esm(() => {
   init_streams();
-  import_nats2 = __toESM(require_mod4(), 1);
+  nats2 = __toESM(require_mod4(), 1);
   DEFAULT_CONSUMER_CONFIG = {
     maxRetries: 3,
     retryDelayMs: 1000,
@@ -22720,7 +22722,7 @@ function buildTraceHeaders() {
       return null;
     const flags = (ctx.traceFlags ?? 0).toString(16).padStart(2, "0");
     const traceparent = `00-${ctx.traceId}-${ctx.spanId}-${flags}`;
-    const h = import_nats3.headers();
+    const h = import_nats.headers();
     h.set("traceparent", traceparent);
     h.set("x-trace-id", ctx.traceId);
     h.set("x-span-id", ctx.spanId);
@@ -22735,7 +22737,7 @@ class NatsEventBus {
   js = null;
   jsm = null;
   config;
-  sc = import_nats3.StringCodec();
+  sc = import_nats.StringCodec();
   subscriptionManager = new SubscriptionManager;
   connectionAttempts = 0;
   isClosing = false;
@@ -22768,7 +22770,7 @@ class NatsEventBus {
     }
     try {
       this.connectionAttempts++;
-      this.nc = await import_nats3.connect(connectionOptions);
+      this.nc = await import_nats.connect(connectionOptions);
       this.setupConnectionHandlers();
       this.js = this.nc.jetstream();
       this.jsm = await this.nc.jetstreamManager();
@@ -23040,7 +23042,7 @@ async function connectEventBus(config2) {
   await bus.connect();
   return bus;
 }
-var import_api2, import_nats3, log4, DEFAULTS;
+var import_api2, import_nats, log4, DEFAULTS;
 var init_client = __esm(() => {
   init_logger();
   init_consumer();
@@ -23048,7 +23050,7 @@ var init_client = __esm(() => {
   init_streams();
   init_subscription();
   import_api2 = __toESM(require_src(), 1);
-  import_nats3 = __toESM(require_mod4(), 1);
+  import_nats = __toESM(require_mod4(), 1);
   log4 = createLogger("nats");
   DEFAULTS = {
     url: "nats://localhost:4222",
@@ -23271,8 +23273,10 @@ var init_common = __esm(() => {
     "discord",
     "slack",
     "telegram",
+    "a2a",
     "gupshup",
-    "twilio-whatsapp"
+    "twilio-whatsapp",
+    "internal"
   ]);
   ContentTypeSchema = exports_external.enum([
     "text",
@@ -23301,6 +23305,7 @@ var init_agent2 = __esm(() => {
   AgentCardSchema = exports_external.object({
     name: exports_external.string(),
     url: exports_external.string().optional(),
+    supportedInterfaces: exports_external.array(exports_external.unknown()).optional(),
     version: exports_external.string().optional(),
     skills: exports_external.array(exports_external.unknown()).optional()
   }).passthrough();
@@ -23334,7 +23339,8 @@ var init_agent2 = __esm(() => {
     configPath: exports_external.string().optional(),
     isInternal: exports_external.boolean().default(false),
     isActive: exports_external.boolean().default(true),
-    metadata: MetadataSchema.optional()
+    metadata: MetadataSchema.optional(),
+    agentCard: AgentCardSchema.optional()
   });
   UpdateAgentSchema = CreateAgentSchema.partial();
 });
@@ -32277,7 +32283,7 @@ class A2AClient {
   }
   async run(request) {
     const startMs = Date.now();
-    const body = this.buildJsonRpcRequest("message/send", request);
+    const body = this.buildJsonRpcRequest("SendMessage", request);
     const response = await this.post(body, request.timeoutMs ?? this.defaultTimeoutMs);
     if (!response.ok) {
       throw new ProviderError(`A2A request failed: ${response.status}`, "SERVER_ERROR", response.status);
@@ -32294,13 +32300,13 @@ class A2AClient {
       throw new ProviderError("A2A response missing task.id", "INVALID_RESPONSE");
     }
     const state = task?.status?.state;
-    if (state === "completed" || state === "failed") {
+    if (isTerminalState(state)) {
       return this.taskToProviderResponse(task, taskId, startMs);
     }
     return this.pollUntilComplete(taskId, startMs, request.timeoutMs ?? this.defaultTimeoutMs);
   }
   async* stream(request) {
-    const body = this.buildJsonRpcRequest("message/stream", request);
+    const body = this.buildJsonRpcRequest("SendStreamingMessage", request);
     const controller = new AbortController;
     const timeoutMs = request.timeoutMs ?? this.defaultTimeoutMs;
     const timer = setTimeout(() => controller.abort(), timeoutMs);
@@ -32337,16 +32343,18 @@ class A2AClient {
       const response = await fetch(this.baseUrl, {
         method: "POST",
         headers: this.headers({ "Content-Type": "application/json" }),
-        body: JSON.stringify({ jsonrpc: "2.0", id: "health", method: "tasks/get", params: { id: "ping" } }),
+        body: JSON.stringify({ jsonrpc: "2.0", id: "health", method: "GetTask", params: { id: "ping" } }),
         signal: AbortSignal.timeout(5000)
       });
-      return { healthy: response.ok, latencyMs: Date.now() - start };
+      const healthy = response.status < 500 && response.status !== 401 && response.status !== 403;
+      return { healthy, latencyMs: Date.now() - start, error: healthy ? undefined : `HTTP ${response.status}` };
     } catch (error) {
       return { healthy: false, latencyMs: Date.now() - start, error: String(error) };
     }
   }
   headers(extra) {
     return {
+      "A2A-Version": "1.0",
       ...this.apiKey ? { Authorization: `Bearer ${this.apiKey}` } : {},
       ...extra
     };
@@ -32378,12 +32386,13 @@ class A2AClient {
       method,
       params: {
         message: {
-          role: "user",
-          parts: [{ type: "text", text: request.message }],
+          role: "ROLE_USER",
+          parts: [{ text: request.message, mediaType: "text/plain" }],
           messageId: `msg-${crypto.randomUUID()}`
         },
         configuration: {
-          acceptedOutputModes: ["text"]
+          acceptedOutputModes: ["text/plain"],
+          returnImmediately: true
         },
         contextId: request.sessionId
       }
@@ -32426,13 +32435,49 @@ class A2AClient {
     }
   }
   parseSSEEvent(event) {
+    const result = event.result ?? event;
+    return this.parseArtifactUpdate(result) ?? this.parseStatusUpdate(result) ?? this.parseLegacySSEEvent(event);
+  }
+  parseArtifactUpdate(result) {
+    const artifactUpdate = result.taskArtifactUpdate ?? result.artifactUpdate ?? result.artifact_update;
+    if (artifactUpdate) {
+      const artifact = artifactUpdate.artifact;
+      if (!artifact)
+        return null;
+      const text = extractTextFromParts(artifact.parts ?? []);
+      if (!text)
+        return null;
+      return {
+        event: "artifact",
+        content: text,
+        isComplete: false,
+        runId: artifactUpdate.taskId
+      };
+    }
+    return null;
+  }
+  parseStatusUpdate(result) {
+    const statusUpdate = result.taskStatusUpdate ?? result.statusUpdate ?? result.status_update;
+    if (statusUpdate) {
+      const status = statusUpdate.status;
+      const state = status?.state;
+      if (isTerminalState(state)) {
+        return {
+          event: "final",
+          isComplete: true,
+          runId: statusUpdate.taskId
+        };
+      }
+    }
+    return null;
+  }
+  parseLegacySSEEvent(event) {
     const type = event.type;
     if (type === "taskArtifactUpdateEvent") {
       const artifact = event.artifact;
       if (!artifact)
         return null;
-      const parts = artifact.parts ?? [];
-      const textParts = parts.filter((p2) => p2.type === "text").map((p2) => p2.text).join("");
+      const textParts = extractTextFromParts(artifact.parts ?? []);
       if (!textParts)
         return null;
       return {
@@ -32445,7 +32490,7 @@ class A2AClient {
     if (type === "taskStatusUpdateEvent") {
       const status = event.status;
       const state = status?.state;
-      const isFinal = event.final === true || state === "completed" || state === "failed";
+      const isFinal = event.final === true || isTerminalState(state);
       if (isFinal) {
         return {
           event: "final",
@@ -32461,11 +32506,9 @@ class A2AClient {
     const textParts = [];
     for (const artifact of artifacts) {
       const parts = artifact.parts ?? [];
-      for (const part of parts) {
-        if (part.type === "text" && part.text) {
-          textParts.push(part.text);
-        }
-      }
+      const text = extractTextFromParts(parts);
+      if (text)
+        textParts.push(text);
     }
     const status = task?.status;
     const state = status?.state;
@@ -32474,7 +32517,7 @@ class A2AClient {
 `),
       runId: taskId,
       sessionId: task?.contextId ?? taskId,
-      status: state === "failed" ? "failed" : "completed",
+      status: state === "TASK_STATE_COMPLETED" || state === "completed" ? "completed" : "failed",
       metrics: {
         inputTokens: 0,
         outputTokens: 0,
@@ -32491,7 +32534,7 @@ class A2AClient {
       const body = {
         jsonrpc: "2.0",
         id: `poll-${attempt}`,
-        method: "tasks/get",
+        method: "GetTask",
         params: { id: taskId }
       };
       const response = await this.post(body, Math.min(1e4, Math.max(0, deadline - Date.now())));
@@ -32510,7 +32553,7 @@ class A2AClient {
       const task = taskResult?.task;
       const status = task?.status;
       const state = status?.state;
-      if (state === "completed" || state === "failed") {
+      if (isTerminalState(state)) {
         return this.taskToProviderResponse(task, taskId, startMs);
       }
       await sleep(POLL_INTERVAL_MS);
@@ -32521,6 +32564,12 @@ class A2AClient {
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
+function isTerminalState(state) {
+  return state === "TASK_STATE_COMPLETED" || state === "TASK_STATE_FAILED" || state === "TASK_STATE_CANCELED" || state === "TASK_STATE_REJECTED" || state === "TASK_STATE_INPUT_REQUIRED" || state === "TASK_STATE_AUTH_REQUIRED" || state === "completed" || state === "failed" || state === "canceled";
+}
+function extractTextFromParts(parts) {
+  return parts.filter((part) => typeof part.text === "string").map((part) => part.text).join("");
+}
 function createA2AClient(config2) {
   return new A2AClient(config2);
 }
@@ -32643,7 +32692,7 @@ class NatsGenieProvider {
   schema = "nats-genie";
   mode;
   nc = null;
-  sc = import_nats4.StringCodec();
+  sc = import_nats2.StringCodec();
   replySubscription = null;
   constructor(id, name, config2) {
     this.id = id;
@@ -32801,7 +32850,7 @@ class NatsGenieProvider {
   async ensureConnected() {
     if (this.nc)
       return;
-    this.nc = await import_nats4.connect({
+    this.nc = await import_nats2.connect({
       servers: this.config.natsUrl,
       name: `omni-nats-genie-${this.config.instanceId}`,
       reconnect: true,
@@ -32840,10 +32889,10 @@ class NatsGenieProvider {
     }
   }
 }
-var import_nats4, log17;
+var import_nats2, log17;
 var init_nats_genie_provider = __esm(() => {
   init_logger();
-  import_nats4 = __toESM(require_mod4(), 1);
+  import_nats2 = __toESM(require_mod4(), 1);
   log17 = createLogger("provider:nats-genie");
 });
 
@@ -230137,7 +230186,7 @@ var init_sentry_scrub = __esm(() => {
 var require_package8 = __commonJS((exports, module) => {
   module.exports = {
     name: "@omni/api",
-    version: "2.260520.20",
+    version: "2.260524.1",
     type: "module",
     exports: {
       ".": {
@@ -288940,6 +288989,24 @@ var init_api_keys = __esm(() => {
 });
 
 // ../api/src/middleware/auth.ts
+function requireAnyScope(requiredScopes) {
+  return createMiddleware(async (c, next) => {
+    const apiKey = c.get("apiKey");
+    if (!apiKey) {
+      return c.json({ error: { code: "UNAUTHORIZED", message: "Authentication required" } }, 401);
+    }
+    const allowed = requiredScopes.some((scope) => ApiKeyService.scopeAllows(apiKey.scopes, scope));
+    if (!allowed) {
+      return c.json({
+        error: {
+          code: "FORBIDDEN",
+          message: `Insufficient permissions. Required one of: ${requiredScopes.join(", ")}`
+        }
+      }, 403);
+    }
+    return next();
+  });
+}
 function requireInstanceAccess(instanceIdGetter) {
   return createMiddleware(async (c, next) => {
     const apiKey = c.get("apiKey");
@@ -288973,8 +289040,7 @@ var init_auth = __esm(() => {
   init_factory2();
   init_api_keys();
   authMiddleware = createMiddleware(async (c, next) => {
-    const bearer = c.req.header("authorization")?.replace(/^Bearer\s+/i, "");
-    const apiKey = c.req.header("x-api-key") ?? c.req.query("api_key") ?? bearer;
+    const apiKey = c.req.header("x-api-key") ?? c.req.query("api_key") ?? c.req.header("authorization")?.replace(/^Bearer\s+/i, "");
     if (!apiKey) {
       return c.json({
         error: {
@@ -289535,6 +289601,8 @@ var DEFAULT_TURN_SCOPES, SCOPE_MAP;
 var init_scopes = __esm(() => {
   DEFAULT_TURN_SCOPES = ["messages:send", "turns:close", "tts:synthesize", "context:read"];
   SCOPE_MAP = {
+    "GET /a2a/agents": "agents:read",
+    "GET /a2a/agents/:agentId/card": "agents:read",
     "GET /access/rules": "access:read",
     "GET /access/rules/:id": "access:read",
     "POST /access/rules": "access:write",
@@ -317223,12 +317291,12 @@ class AgentStateService {
     return parsed.success ? parsed.data : null;
   }
 }
-var import_nats6, log70, sc, KV_TTL_MS;
+var import_nats4, log70, sc, KV_TTL_MS;
 var init_agent_state2 = __esm(() => {
   init_src();
-  import_nats6 = __toESM(require_mod4(), 1);
+  import_nats4 = __toESM(require_mod4(), 1);
   log70 = createLogger("services:agent-state");
-  sc = import_nats6.StringCodec();
+  sc = import_nats4.StringCodec();
   KV_TTL_MS = 24 * 60 * 60 * 1000;
 });
 
@@ -331212,7 +331280,7 @@ async function initTurnEvents(natsUrl) {
   if (nc && !nc.isClosed())
     return;
   try {
-    nc = await import_nats7.connect({
+    nc = await import_nats5.connect({
       servers: natsUrl,
       name: "omni-turn-events",
       reconnect: true,
@@ -331262,12 +331330,12 @@ function publishTurnTimeout(instanceId, chatId, event) {
   publish(topic, event);
   log89.debug("Published turn.timeout", { turnId: event.turnId, instanceId });
 }
-var import_nats7, log89, sc2, nc = null;
+var import_nats5, log89, sc2, nc = null;
 var init_turn_events = __esm(() => {
   init_src();
-  import_nats7 = __toESM(require_mod4(), 1);
+  import_nats5 = __toESM(require_mod4(), 1);
   log89 = createLogger("turn-events");
-  sc2 = import_nats7.StringCodec();
+  sc2 = import_nats5.StringCodec();
 });
 
 // ../api/src/plugins/logger.ts
@@ -331756,6 +331824,40 @@ function buildChatPreview(payload, rawPayload) {
   }
   return preview.substring(0, 500);
 }
+function compactRecord(record) {
+  const compacted = Object.fromEntries(Object.entries(record).filter(([, value]) => value !== undefined));
+  return Object.keys(compacted).length > 0 ? compacted : undefined;
+}
+function isSentMediaContent(content) {
+  return OUTBOUND_MEDIA_TYPES.has(content.type) || !!content.mediaUrl || !!content.localPath || !!content.mimeType;
+}
+function buildSentMediaMetadata(content, rawPayload) {
+  if (!isSentMediaContent(content))
+    return;
+  const rawSource = typeof rawPayload?.mediaSource === "string" ? rawPayload.mediaSource : undefined;
+  return compactRecord({
+    caption: content.caption,
+    filename: content.filename,
+    voiceNote: content.isVoiceNote === true ? true : undefined,
+    source: rawSource ?? (content.mediaUrl ? "url" : content.localPath ? "localPath" : "inline")
+  });
+}
+function buildSentMessageContentFields(payload) {
+  return {
+    textContent: sanitizeText(payload.content.text ?? payload.content.caption),
+    hasMedia: isSentMediaContent(payload.content),
+    mediaMimeType: truncate3(payload.content.mimeType, 100),
+    mediaUrl: payload.content.mediaUrl,
+    mediaLocalPath: payload.content.localPath,
+    mediaMetadata: buildSentMediaMetadata(payload.content, payload.rawPayload),
+    rawPayload: payload.rawPayload ? deepSanitize(payload.rawPayload) : undefined
+  };
+}
+function buildSentChatPreview(payload) {
+  const text3 = payload.content.text ?? payload.content.caption ?? "";
+  const badge = payload.content.type !== "text" ? MEDIA_BADGES2[payload.content.type] ?? `[${payload.content.type}]` : "";
+  return badge ? text3 ? `${badge} ${text3}` : badge : text3;
+}
 function extractPhoneFromSender(senderId, channel5) {
   if (!channel5.startsWith("whatsapp"))
     return;
@@ -332047,17 +332149,22 @@ async function setupMessagePersistence(eventBus, services) {
           chatType: inferChatType(payload.chatId),
           channel: metadata.channelType ?? "whatsapp"
         });
+        const sentContent = buildSentMessageContentFields(payload);
         const { message: message2, created } = await services.messages.findOrCreate(chat2.id, messageExternalId, {
           source: "realtime",
           messageType: mapContentType(payload.content.type),
-          textContent: sanitizeText(payload.content.text),
+          textContent: sentContent.textContent,
           platformTimestamp: new Date(event.timestamp),
           senderPersonId: metadata.personId,
           senderPlatformIdentityId: metadata.platformIdentityId,
           isFromMe: true,
           senderAgentId: payload.senderAgentId ?? null,
-          hasMedia: !!payload.content.mediaUrl,
-          mediaUrl: payload.content.mediaUrl,
+          hasMedia: sentContent.hasMedia,
+          mediaMimeType: sentContent.mediaMimeType,
+          mediaUrl: sentContent.mediaUrl,
+          mediaLocalPath: sentContent.mediaLocalPath,
+          mediaMetadata: sentContent.mediaMetadata,
+          rawPayload: sentContent.rawPayload,
           replyToExternalId: truncate3(payload.replyToId, 255)
         });
         if (created) {
@@ -332067,7 +332174,7 @@ async function setupMessagePersistence(eventBus, services) {
             chatId: chat2.id
           });
         }
-        services.chats.updateLastMessage(chat2.id, sanitizeText(payload.content.text ?? "") ?? "", new Date(event.timestamp), true).catch((err) => log93.debug("Failed to update chat recency (sent)", { error: String(err) }));
+        services.chats.updateLastMessage(chat2.id, sanitizeText(buildSentChatPreview(payload)) ?? "", new Date(event.timestamp), true).catch((err) => log93.debug("Failed to update chat recency (sent)", { error: String(err) }));
         if (metadata.streamSequence) {
           await services.consumerOffsets.updateOffset("message-persistence-sent", "MESSAGE", metadata.streamSequence, event.id);
         }
@@ -332236,7 +332343,7 @@ async function detectStartupGaps(services) {
     }
   }
 }
-var log93, CONTENT_TYPE_MAP, INTERNAL_JID_SUFFIXES, MEDIA_BADGES2;
+var log93, CONTENT_TYPE_MAP, INTERNAL_JID_SUFFIXES, MEDIA_BADGES2, OUTBOUND_MEDIA_TYPES;
 var init_message_persistence = __esm(() => {
   init_src();
   init_esm5();
@@ -332266,6 +332373,7 @@ var init_message_persistence = __esm(() => {
     location: "[Location]",
     poll: "[Poll]"
   };
+  OUTBOUND_MEDIA_TYPES = new Set(["audio", "image", "video", "document", "sticker"]);
 });
 
 // ../api/src/plugins/session-storage.ts
@@ -333886,7 +333994,8 @@ function createClaudeCodeProviderInstance(provider, instance4, db2) {
     model: schemaConfig.model,
     systemPrompt: schemaConfig.systemPrompt,
     mcpServers: schemaConfig.mcpServers,
-    maxTurns: schemaConfig.maxTurns
+    maxTurns: schemaConfig.maxTurns,
+    pathToClaudeCodeExecutable: schemaConfig.pathToClaudeCodeExecutable
   }, createSessionStorage(db2, provider.id), {
     timeoutMs: (instance4.agentTimeout ?? provider.defaultTimeout ?? 120) * 1000,
     enableAutoSplit: instance4.enableAutoSplit ?? true,
@@ -338802,6 +338911,7 @@ var init_agents2 = __esm(() => {
     isInternal: exports_external.boolean().openapi({ description: "Whether this is an internal system agent" }),
     isActive: exports_external.boolean().openapi({ description: "Whether agent is active" }),
     metadata: exports_external.record(exports_external.string(), exports_external.unknown()).nullable().openapi({ description: "Arbitrary metadata" }),
+    agentCard: exports_external.record(exports_external.string(), exports_external.unknown()).nullable().openapi({ description: "A2A Agent Card overrides" }),
     createdAt: exports_external.string().datetime().openapi({ description: "Creation timestamp" }),
     updatedAt: exports_external.string().datetime().openapi({ description: "Last update timestamp" })
   });
@@ -338816,7 +338926,8 @@ var init_agents2 = __esm(() => {
     configPath: exports_external.string().optional().openapi({ description: "Path to agent config file" }),
     isInternal: exports_external.boolean().default(false).openapi({ description: "Whether this is an internal system agent" }),
     isActive: exports_external.boolean().default(true).openapi({ description: "Whether agent is active" }),
-    metadata: exports_external.record(exports_external.string(), exports_external.unknown()).optional().openapi({ description: "Arbitrary metadata" })
+    metadata: exports_external.record(exports_external.string(), exports_external.unknown()).optional().openapi({ description: "Arbitrary metadata" }),
+    agentCard: exports_external.record(exports_external.string(), exports_external.unknown()).optional().openapi({ description: "A2A Agent Card overrides" })
   });
 });
 
@@ -342560,6 +342671,228 @@ var init_dist6 = __esm(() => {
   init_zod();
 });
 
+// ../api/src/services/a2a-discovery.ts
+function isRecord(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+function stringOverride(value) {
+  return typeof value === "string" ? value : undefined;
+}
+function stringArray(value) {
+  return Array.isArray(value) && value.every((item) => typeof item === "string") ? value : undefined;
+}
+function normalizeBaseUrl(baseUrl) {
+  return baseUrl.replace(/\/+$/, "");
+}
+function buildDefaultSkills(capabilities3) {
+  const skills = [
+    {
+      id: "messaging",
+      name: "Messaging",
+      description: "Process and respond to text messages",
+      tags: ["messaging", "chat"],
+      inputModes: ["text/plain"],
+      outputModes: ["text/plain"]
+    }
+  ];
+  if (capabilities3.includes("image") || capabilities3.includes("vision")) {
+    skills.push({
+      id: "vision",
+      name: "Vision",
+      description: "Process and describe images",
+      tags: ["vision", "image"],
+      inputModes: ["text/plain", "image/png", "image/jpeg", "image/webp"],
+      outputModes: ["text/plain"]
+    });
+  }
+  if (capabilities3.includes("audio") || capabilities3.includes("transcription")) {
+    skills.push({
+      id: "audio",
+      name: "Audio",
+      description: "Transcribe and process audio",
+      tags: ["audio", "transcription"],
+      inputModes: ["audio/mpeg", "audio/ogg", "audio/wav"],
+      outputModes: ["text/plain"]
+    });
+  }
+  return skills;
+}
+function buildA2AAgentCard(params) {
+  const { baseUrl, agent: agent3, instance: instance4 } = params;
+  const override = isRecord(agent3.agentCard) ? agent3.agentCard : {};
+  const capabilities3 = agent3.capabilities ?? [];
+  const endpointUrl = `${normalizeBaseUrl(baseUrl)}/a2a/${instance4.id}`;
+  const card = {
+    name: stringOverride(override.name) ?? agent3.name,
+    description: stringOverride(override.description) ?? `Omni agent ${agent3.name}`,
+    version: stringOverride(override.version) ?? "1.0.0",
+    supportedInterfaces: Array.isArray(override.supportedInterfaces) ? override.supportedInterfaces : [
+      {
+        url: endpointUrl,
+        protocolBinding: "JSONRPC",
+        protocolVersion: "1.0"
+      }
+    ],
+    capabilities: {
+      streaming: true,
+      pushNotifications: false,
+      extendedAgentCard: false,
+      ...isRecord(override.capabilities) ? override.capabilities : {}
+    },
+    defaultInputModes: stringArray(override.defaultInputModes) ?? ["text/plain"],
+    defaultOutputModes: stringArray(override.defaultOutputModes) ?? ["text/plain"],
+    skills: Array.isArray(override.skills) ? override.skills : buildDefaultSkills(capabilities3),
+    securitySchemes: {
+      bearerAuth: {
+        httpAuthSecurityScheme: {
+          scheme: "Bearer",
+          bearerFormat: "Omni API key",
+          description: "Use an Omni API key as a bearer token."
+        }
+      },
+      apiKeyHeader: {
+        apiKeySecurityScheme: {
+          location: "header",
+          name: "x-api-key",
+          description: "Legacy Omni API key header."
+        }
+      },
+      ...isRecord(override.securitySchemes) ? override.securitySchemes : {}
+    },
+    securityRequirements: [{ schemes: { bearerAuth: { list: [] } } }, { schemes: { apiKeyHeader: { list: [] } } }]
+  };
+  const providerOverride = isRecord(override.provider) ? override.provider : undefined;
+  if (providerOverride)
+    card.provider = providerOverride;
+  const metadataOverride = isRecord(override.metadata) ? override.metadata : undefined;
+  if (metadataOverride)
+    card.metadata = metadataOverride;
+  const iconUrl = stringOverride(override.iconUrl);
+  if (iconUrl)
+    card.iconUrl = iconUrl;
+  const documentationUrl = stringOverride(override.documentationUrl);
+  if (documentationUrl)
+    card.documentationUrl = documentationUrl;
+  return card;
+}
+async function listA2ADiscoverableAgents(params) {
+  const { services, baseUrl, includeUnconfigured = false } = params;
+  const [agents2, instances2, providers2] = await Promise.all([
+    services.agents.list({ isActive: true, limit: 200 }),
+    services.instances.list({ channel: ["a2a"], status: ["active"], limit: 200 }),
+    services.providers.list({ active: true })
+  ]);
+  const instanceByAgent = new Map;
+  for (const instance4 of instances2.items) {
+    if (instance4.agentId && !instanceByAgent.has(instance4.agentId)) {
+      instanceByAgent.set(instance4.agentId, instance4);
+    }
+  }
+  const providerById = new Map(providers2.map((provider) => [provider.id, provider]));
+  const result = [];
+  for (const agent3 of agents2) {
+    const instance4 = instanceByAgent.get(agent3.id) ?? null;
+    const provider = agent3.agentProviderId ? providerById.get(agent3.agentProviderId) : null;
+    if (!instance4 && !includeUnconfigured)
+      continue;
+    result.push({
+      agentId: agent3.id,
+      name: agent3.name,
+      description: stringOverride(agent3.agentCard?.description) ?? null,
+      provider: agent3.provider,
+      providerSchema: provider?.schema ?? null,
+      model: agent3.model,
+      capabilities: agent3.capabilities,
+      configured: Boolean(instance4),
+      instanceId: instance4?.id ?? null,
+      endpointUrl: instance4 ? `${normalizeBaseUrl(baseUrl)}/a2a/${instance4.id}` : null,
+      parameters: {
+        agentType: agent3.agentType,
+        providerId: agent3.agentProviderId,
+        metadata: agent3.metadata ?? {},
+        agentCard: agent3.agentCard ?? {}
+      },
+      card: instance4 ? buildA2AAgentCard({ baseUrl, agent: agent3, instance: instance4 }) : null
+    });
+  }
+  return result;
+}
+async function resolveA2AAgentCard(params) {
+  const { services, baseUrl, agentId, instanceId } = params;
+  let instance4 = null;
+  let agent3 = null;
+  if (instanceId) {
+    instance4 = await services.instances.getById(instanceId);
+    if (!instance4 || instance4.channel !== "a2a" || !instance4.agentId)
+      return null;
+    agent3 = await services.agents.getById(instance4.agentId);
+  } else if (agentId) {
+    agent3 = await services.agents.getById(agentId);
+    const instances2 = await services.instances.list({ channel: ["a2a"], status: ["active"], limit: 200 });
+    instance4 = instances2.items.find((item) => item.agentId === agentId) ?? null;
+    if (!instance4)
+      return null;
+  } else {
+    const instances2 = await services.instances.list({ channel: ["a2a"], status: ["active"], limit: 2 });
+    if (instances2.items.length !== 1)
+      return null;
+    instance4 = instances2.items[0] ?? null;
+    if (!instance4?.agentId)
+      return null;
+    agent3 = await services.agents.getById(instance4.agentId);
+  }
+  if (!agent3 || !instance4 || !agent3.isActive || !instance4.isActive)
+    return null;
+  const provider = agent3.agentProviderId ? await services.providers.getById(agent3.agentProviderId).catch(() => null) : null;
+  return {
+    card: buildA2AAgentCard({ baseUrl, agent: agent3, instance: instance4 }),
+    agent: agent3,
+    instance: instance4,
+    provider
+  };
+}
+
+// ../api/src/routes/v2/a2a.ts
+function baseUrlFromRequest(url) {
+  return `${url.protocol}//${url.host}`;
+}
+var a2aRoutes, listQuerySchema, agentParamSchema;
+var init_a2a = __esm(() => {
+  init_dist6();
+  init_dist2();
+  init_zod();
+  a2aRoutes = new Hono2;
+  listQuerySchema = exports_external.object({
+    includeUnconfigured: exports_external.coerce.boolean().optional().default(false)
+  });
+  agentParamSchema = exports_external.object({
+    agentId: exports_external.string().uuid()
+  });
+  a2aRoutes.get("/agents", zValidator("query", listQuerySchema), async (c) => {
+    const query = c.req.valid("query");
+    const url = new URL(c.req.url);
+    const items = await listA2ADiscoverableAgents({
+      services: c.get("services"),
+      baseUrl: baseUrlFromRequest(url),
+      includeUnconfigured: query.includeUnconfigured
+    });
+    return c.json({ items });
+  });
+  a2aRoutes.get("/agents/:agentId/card", zValidator("param", agentParamSchema), async (c) => {
+    const { agentId } = c.req.valid("param");
+    const url = new URL(c.req.url);
+    const resolved = await resolveA2AAgentCard({
+      services: c.get("services"),
+      baseUrl: baseUrlFromRequest(url),
+      agentId
+    });
+    if (!resolved) {
+      return c.json({ error: { code: "A2A_AGENT_NOT_CONFIGURED", message: "Agent has no active A2A instance" } }, 404);
+    }
+    return c.json({ data: resolved.card });
+  });
+});
+
 // ../api/src/schemas/date-query.ts
 function parseDateOrIssue(paramName, v2, ctx) {
   const parsed = new Date(v2);
@@ -342594,7 +342927,7 @@ var init_date_query = __esm(() => {
 });
 
 // ../api/src/routes/v2/access.ts
-var accessRoutes, listQuerySchema, createRuleSchema, updateRuleSchema, checkAccessSchema;
+var accessRoutes, listQuerySchema2, createRuleSchema, updateRuleSchema, checkAccessSchema;
 var init_access3 = __esm(() => {
   init_dist6();
   init_src();
@@ -342602,7 +342935,7 @@ var init_access3 = __esm(() => {
   init_zod();
   init_date_query();
   accessRoutes = new Hono2;
-  listQuerySchema = exports_external.object({
+  listQuerySchema2 = exports_external.object({
     instanceId: exports_external.string().uuid().optional(),
     type: RuleTypeSchema.optional()
   });
@@ -342625,13 +342958,13 @@ var init_access3 = __esm(() => {
     platformUserId: exports_external.string().describe("Platform user ID to check"),
     channel: exports_external.string().describe("Channel type")
   });
-  accessRoutes.get("/", zValidator("query", listQuerySchema), async (c) => {
+  accessRoutes.get("/", zValidator("query", listQuerySchema2), async (c) => {
     const { instanceId, type } = c.req.valid("query");
     const services = c.get("services");
     const rules = await services.access.list({ instanceId, type });
     return c.json({ items: rules });
   });
-  accessRoutes.get("/rules", zValidator("query", listQuerySchema), async (c) => {
+  accessRoutes.get("/rules", zValidator("query", listQuerySchema2), async (c) => {
     const { instanceId, type } = c.req.valid("query");
     const services = c.get("services");
     const rules = await services.access.list({ instanceId, type });
@@ -343019,7 +343352,7 @@ var init_agent_state3 = __esm(() => {
 });
 
 // ../api/src/routes/v2/agent-tasks.ts
-var agentTasksRoutes, agentTaskStatusValues, idParamSchema, listQuerySchema2, createTaskSchema, updateTaskSchema;
+var agentTasksRoutes, agentTaskStatusValues, idParamSchema, listQuerySchema3, createTaskSchema, updateTaskSchema;
 var init_agent_tasks2 = __esm(() => {
   init_dist6();
   init_dist2();
@@ -343029,7 +343362,7 @@ var init_agent_tasks2 = __esm(() => {
   idParamSchema = exports_external.object({
     id: exports_external.string().uuid()
   });
-  listQuerySchema2 = exports_external.object({
+  listQuerySchema3 = exports_external.object({
     agentId: exports_external.string().uuid().optional(),
     chatId: exports_external.string().uuid().optional(),
     conversationId: exports_external.string().uuid().optional(),
@@ -343062,7 +343395,7 @@ var init_agent_tasks2 = __esm(() => {
     result: exports_external.record(exports_external.string(), exports_external.unknown()).nullable().optional(),
     error: exports_external.string().nullable().optional()
   });
-  agentTasksRoutes.get("/", zValidator("query", listQuerySchema2), async (c) => {
+  agentTasksRoutes.get("/", zValidator("query", listQuerySchema3), async (c) => {
     const query = c.req.valid("query");
     const services = c.get("services");
     const result = await services.agentTasks.list(query);
@@ -343112,7 +343445,7 @@ var init_agent_tasks2 = __esm(() => {
 });
 
 // ../api/src/routes/v2/agents.ts
-var agentsRoutes, idParamSchema2, listQuerySchema3, createAgentSchema, updateAgentSchema;
+var agentsRoutes, idParamSchema2, listQuerySchema4, createAgentSchema, updateAgentSchema;
 var init_agents3 = __esm(() => {
   init_dist6();
   init_src();
@@ -343122,7 +343455,7 @@ var init_agents3 = __esm(() => {
   idParamSchema2 = exports_external.object({
     id: exports_external.string().uuid()
   });
-  listQuerySchema3 = exports_external.object({
+  listQuerySchema4 = exports_external.object({
     ownerId: exports_external.string().uuid().optional(),
     provider: exports_external.string().optional(),
     isActive: exports_external.coerce.boolean().optional(),
@@ -343139,10 +343472,11 @@ var init_agents3 = __esm(() => {
     configPath: exports_external.string().optional(),
     isInternal: exports_external.boolean().default(false),
     isActive: exports_external.boolean().default(true),
-    metadata: exports_external.record(exports_external.string(), exports_external.unknown()).optional()
+    metadata: exports_external.record(exports_external.string(), exports_external.unknown()).optional(),
+    agentCard: exports_external.record(exports_external.string(), exports_external.unknown()).optional()
   });
   updateAgentSchema = createAgentSchema.partial();
-  agentsRoutes.get("/", zValidator("query", listQuerySchema3), async (c) => {
+  agentsRoutes.get("/", zValidator("query", listQuerySchema4), async (c) => {
     const { ownerId, provider, isActive, limit: limit2 } = c.req.valid("query");
     const services = c.get("services");
     const items = await services.agents.list({ ownerId, provider, isActive, limit: limit2 });
@@ -343228,7 +343562,7 @@ var init_auth3 = __esm(() => {
 });
 
 // ../api/src/routes/v2/automations.ts
-var automationsRoutes, conditionSchema, webhookActionSchema, sendMessageActionSchema, emitEventActionSchema, logActionSchema, callAgentActionSchema, actionSchema, debounceSchema, createAutomationSchema, updateAutomationSchema, listQuerySchema4, testAutomationSchema, logsQuerySchema;
+var automationsRoutes, conditionSchema, webhookActionSchema, sendMessageActionSchema, emitEventActionSchema, logActionSchema, callAgentActionSchema, actionSchema, debounceSchema, createAutomationSchema, updateAutomationSchema, listQuerySchema5, testAutomationSchema, logsQuerySchema;
 var init_automations4 = __esm(() => {
   init_dist6();
   init_dist2();
@@ -343323,7 +343657,7 @@ var init_automations4 = __esm(() => {
     priority: exports_external.number().int().default(0).describe("Priority (higher runs first)")
   });
   updateAutomationSchema = createAutomationSchema.partial();
-  listQuerySchema4 = exports_external.object({
+  listQuerySchema5 = exports_external.object({
     enabled: exports_external.coerce.boolean().optional()
   });
   testAutomationSchema = exports_external.object({
@@ -343339,7 +343673,7 @@ var init_automations4 = __esm(() => {
     eventType: exports_external.string().optional(),
     automationId: exports_external.string().uuid().optional()
   });
-  automationsRoutes.get("/", zValidator("query", listQuerySchema4), async (c) => {
+  automationsRoutes.get("/", zValidator("query", listQuerySchema5), async (c) => {
     const { enabled } = c.req.valid("query");
     const services = c.get("services");
     const items = await services.automations.list({ enabled });
@@ -343429,7 +343763,7 @@ var init_automations4 = __esm(() => {
 });
 
 // ../api/src/routes/v2/batch-jobs.ts
-var batchJobsRoutes, jobTypeSchema, contentTypeSchema, createBatchJobSchema, estimateSchema, listQuerySchema5, idParamSchema3;
+var batchJobsRoutes, jobTypeSchema, contentTypeSchema, createBatchJobSchema, estimateSchema, listQuerySchema6, idParamSchema3;
 var init_batch_jobs2 = __esm(() => {
   init_dist6();
   init_dist2();
@@ -343456,7 +343790,7 @@ var init_batch_jobs2 = __esm(() => {
     limit: exports_external.number().int().positive().optional(),
     contentTypes: exports_external.array(contentTypeSchema).optional()
   });
-  listQuerySchema5 = exports_external.object({
+  listQuerySchema6 = exports_external.object({
     instanceId: exports_external.string().uuid().optional(),
     status: exports_external.string().optional().transform((v2) => v2?.split(",")),
     jobType: exports_external.string().optional().transform((v2) => v2?.split(",")),
@@ -343488,7 +343822,7 @@ var init_batch_jobs2 = __esm(() => {
     });
     return c.json({ data: job }, 201);
   });
-  batchJobsRoutes.get("/", zValidator("query", listQuerySchema5), async (c) => {
+  batchJobsRoutes.get("/", zValidator("query", listQuerySchema6), async (c) => {
     const { instanceId, status, jobType, limit: limit2, cursor } = c.req.valid("query");
     const services = c.get("services");
     const result = await services.batchJobs.list({
@@ -343826,7 +344160,7 @@ function resolveContactName2(chat2, contactNames) {
   }
   return;
 }
-var chatsRoutes, UUID_REGEX, ChatTypeSchema, listQuerySchema6, createChatSchema, updateChatSchema, addParticipantSchema, updateParticipantRoleSchema, chatChannelActionSchema, muteActionSchema, labelBodySchema, listMessagesQuerySchema, markChatReadSchema, disappearingSchema, DISAPPEARING_DURATIONS, syncNamesSchema, clearSessionSchema;
+var chatsRoutes, UUID_REGEX, ChatTypeSchema, listQuerySchema7, createChatSchema, updateChatSchema, addParticipantSchema, updateParticipantRoleSchema, chatChannelActionSchema, muteActionSchema, labelBodySchema, listMessagesQuerySchema, markChatReadSchema, disappearingSchema, DISAPPEARING_DURATIONS, syncNamesSchema, clearSessionSchema;
 var init_chats2 = __esm(() => {
   init_dist6();
   init_src();
@@ -343851,7 +344185,7 @@ var init_chats2 = __esm(() => {
     "announcement",
     "stage"
   ]);
-  listQuerySchema6 = exports_external.object({
+  listQuerySchema7 = exports_external.object({
     instanceId: exports_external.string().uuid().optional(),
     channel: exports_external.string().optional().transform((v2) => v2?.split(",")),
     chatType: exports_external.string().optional().transform((v2) => v2?.split(",")),
@@ -343900,7 +344234,7 @@ var init_chats2 = __esm(() => {
   updateParticipantRoleSchema = exports_external.object({
     role: exports_external.string().min(1)
   });
-  chatsRoutes.get("/", zValidator("query", listQuerySchema6), async (c) => {
+  chatsRoutes.get("/", zValidator("query", listQuerySchema7), async (c) => {
     const query = c.req.valid("query");
     const services = c.get("services");
     const apiKey = c.get("apiKey");
@@ -344511,13 +344845,13 @@ var init_context5 = __esm(() => {
 });
 
 // ../api/src/routes/v2/conversations.ts
-var conversationsRoutes, listQuerySchema7, idParamSchema4, createConversationSchema, updateConversationSchema;
+var conversationsRoutes, listQuerySchema8, idParamSchema4, createConversationSchema, updateConversationSchema;
 var init_conversations3 = __esm(() => {
   init_dist6();
   init_dist2();
   init_zod();
   conversationsRoutes = new Hono2;
-  listQuerySchema7 = exports_external.object({
+  listQuerySchema8 = exports_external.object({
     limit: exports_external.coerce.number().int().positive().max(200).optional().default(50)
   });
   idParamSchema4 = exports_external.object({
@@ -344529,7 +344863,7 @@ var init_conversations3 = __esm(() => {
     state: exports_external.record(exports_external.string(), exports_external.unknown()).nullable().optional()
   });
   updateConversationSchema = createConversationSchema.partial();
-  conversationsRoutes.get("/", zValidator("query", listQuerySchema7), async (c) => {
+  conversationsRoutes.get("/", zValidator("query", listQuerySchema8), async (c) => {
     const { limit: limit2 } = c.req.valid("query");
     const services = c.get("services");
     const items = await services.conversations.list({ limit: limit2 });
@@ -344570,14 +344904,14 @@ var init_conversations3 = __esm(() => {
 });
 
 // ../api/src/routes/v2/dead-letters.ts
-var deadLettersRoutes, listQuerySchema8, resolveBodySchema;
+var deadLettersRoutes, listQuerySchema9, resolveBodySchema;
 var init_dead_letters3 = __esm(() => {
   init_dist6();
   init_dist2();
   init_zod();
   init_date_query();
   deadLettersRoutes = new Hono2;
-  listQuerySchema8 = exports_external.object({
+  listQuerySchema9 = exports_external.object({
     status: exports_external.string().optional().transform((v2) => v2?.split(",")),
     eventType: exports_external.string().optional().transform((v2) => v2?.split(",") ?? undefined),
     since: optionalDateParam("since"),
@@ -344588,7 +344922,7 @@ var init_dead_letters3 = __esm(() => {
   resolveBodySchema = exports_external.object({
     note: exports_external.string().min(1).max(500)
   });
-  deadLettersRoutes.get("/", zValidator("query", listQuerySchema8), async (c) => {
+  deadLettersRoutes.get("/", zValidator("query", listQuerySchema9), async (c) => {
     const query = c.req.valid("query");
     const services = c.get("services");
     const result = await services.deadLetters.list(query);
@@ -344731,7 +345065,7 @@ function applyInstanceAccess(query, apiKey) {
   }
   return { ...query, instanceIds: apiKey.instanceIds };
 }
-var eventsRoutes, listQuerySchema9, searchBodySchema, analyticsQuerySchema, timelineQuerySchema;
+var eventsRoutes, listQuerySchema10, searchBodySchema, analyticsQuerySchema, timelineQuerySchema;
 var init_events4 = __esm(() => {
   init_dist6();
   init_src();
@@ -344740,7 +345074,7 @@ var init_events4 = __esm(() => {
   init_date_query();
   init_api_keys();
   eventsRoutes = new Hono2;
-  listQuerySchema9 = exports_external.object({
+  listQuerySchema10 = exports_external.object({
     channel: exports_external.string().optional().transform((v2) => v2?.split(",")),
     instanceId: exports_external.string().uuid().optional(),
     personId: exports_external.string().uuid().optional(),
@@ -344782,7 +345116,7 @@ var init_events4 = __esm(() => {
     limit: exports_external.coerce.number().int().min(1).max(100).default(50),
     cursor: exports_external.string().optional()
   });
-  eventsRoutes.get("/", zValidator("query", listQuerySchema9), async (c) => {
+  eventsRoutes.get("/", zValidator("query", listQuerySchema10), async (c) => {
     const query = c.req.valid("query");
     const services = c.get("services");
     const apiKey = c.get("apiKey");
@@ -344998,7 +345332,7 @@ var init_follow_up3 = __esm(() => {
 });
 
 // ../api/src/routes/v2/handoffs.ts
-var handoffsRoutes, listQuerySchema10;
+var handoffsRoutes, listQuerySchema11;
 var init_handoffs = __esm(() => {
   init_dist6();
   init_src5();
@@ -345006,7 +345340,7 @@ var init_handoffs = __esm(() => {
   init_dist2();
   init_zod();
   handoffsRoutes = new Hono2;
-  listQuerySchema10 = exports_external.object({
+  listQuerySchema11 = exports_external.object({
     instanceId: exports_external.string().uuid().optional(),
     chatId: exports_external.string().optional(),
     since: exports_external.string().datetime().optional(),
@@ -345014,7 +345348,7 @@ var init_handoffs = __esm(() => {
     limit: exports_external.coerce.number().int().min(1).max(200).default(50),
     offset: exports_external.coerce.number().int().min(0).default(0)
   });
-  handoffsRoutes.get("/", zValidator("query", listQuerySchema10), async (c) => {
+  handoffsRoutes.get("/", zValidator("query", listQuerySchema11), async (c) => {
     const { instanceId, chatId, since, until, limit: limit2, offset } = c.req.valid("query");
     const db2 = c.get("db");
     const conditions3 = [];
@@ -346665,7 +346999,7 @@ function getCacheKey(instanceId, guildId) {
 function invalidateGuildCache(instanceId, guildId) {
   guildConfigCache.delete(getCacheKey(instanceId, guildId));
 }
-var log103, instancesRoutes, instanceAccess2, listQuerySchema11, agentReplyFilterSchema, createInstanceSchema, updateInstanceSchema, DEFAULT_AGENT_REPLY_FILTER, SENSITIVE_INSTANCE_FIELDS, pairingCodeSchema, connectInstanceSchema, syncRequestSchema, listContactsQuerySchema, listGroupsQuerySchema, checkNumberSchema, updateBioSchema, blockContactSchema, resyncSchema, replaySchema, pairingActionSchema, guildConfigOverrideSchema, guildConfigCache, GUILD_CONFIG_TTL, presenceSchema;
+var log103, instancesRoutes, instanceAccess2, listQuerySchema12, agentReplyFilterSchema, createInstanceSchema, updateInstanceSchema, DEFAULT_AGENT_REPLY_FILTER, SENSITIVE_INSTANCE_FIELDS, pairingCodeSchema, connectInstanceSchema, syncRequestSchema, listContactsQuerySchema, listGroupsQuerySchema, checkNumberSchema, updateBioSchema, blockContactSchema, resyncSchema, replaySchema, pairingActionSchema, guildConfigOverrideSchema, guildConfigCache, GUILD_CONFIG_TTL, presenceSchema;
 var init_instances3 = __esm(() => {
   init_dist6();
   init_src();
@@ -346680,7 +347014,7 @@ var init_instances3 = __esm(() => {
   log103 = createLogger("api:instances");
   instancesRoutes = new Hono2;
   instanceAccess2 = requireInstanceAccess((c) => c.req.param("id") ?? "");
-  listQuerySchema11 = exports_external.object({
+  listQuerySchema12 = exports_external.object({
     channel: exports_external.string().optional().transform((v2) => v2?.split(",")),
     status: exports_external.string().optional().transform((v2) => v2?.split(",")),
     limit: exports_external.coerce.number().int().min(1).max(100).default(50),
@@ -346799,7 +347133,7 @@ var init_instances3 = __esm(() => {
     "webhookVerifyToken",
     "twilioAuthToken"
   ];
-  instancesRoutes.get("/", zValidator("query", listQuerySchema11), async (c) => {
+  instancesRoutes.get("/", zValidator("query", listQuerySchema12), async (c) => {
     const { channel: channel5, status, limit: limit2, cursor } = c.req.valid("query");
     const services = c.get("services");
     const apiKey = c.get("apiKey");
@@ -346840,7 +347174,13 @@ var init_instances3 = __esm(() => {
       },
       { id: "discord", name: "Discord", description: "Discord bot integration", loaded: false },
       { id: "slack", name: "Slack", description: "Slack bot integration", loaded: false },
-      { id: "telegram", name: "Telegram", description: "Telegram bot integration", loaded: false }
+      { id: "telegram", name: "Telegram", description: "Telegram bot integration", loaded: false },
+      {
+        id: "a2a",
+        name: "A2A Protocol Server",
+        description: "Agent-to-Agent protocol endpoint",
+        loaded: false
+      }
     ];
     const unloadedChannels = staticChannels.filter((ch) => !loadedIds.has(ch.id));
     return c.json({
@@ -348579,7 +348919,7 @@ async function handleLegacyCreate(c, data, services) {
   });
   return c.json({ data: { ...result.key, plainTextKey: result.plainTextKey } }, 201);
 }
-var keysRoutes, NON_ADMIN_PROFILES, profileOverridesSchema, createKeySchema, updateKeySchema, revokeKeySchema, listQuerySchema12, auditQuerySchema;
+var keysRoutes, NON_ADMIN_PROFILES, profileOverridesSchema, createKeySchema, updateKeySchema, revokeKeySchema, listQuerySchema13, auditQuerySchema;
 var init_keys = __esm(() => {
   init_dist6();
   init_dist2();
@@ -348621,7 +348961,7 @@ var init_keys = __esm(() => {
     reason: exports_external.string().optional().describe("Reason for revocation"),
     revokedBy: exports_external.string().optional().describe("Who revoked the key")
   });
-  listQuerySchema12 = exports_external.object({
+  listQuerySchema13 = exports_external.object({
     status: exports_external.enum(["active", "revoked", "expired"]).optional().describe("Filter by status"),
     limit: exports_external.coerce.number().int().min(1).max(100).default(50).describe("Max results")
   });
@@ -348652,7 +348992,7 @@ var init_keys = __esm(() => {
     }
     return handleLegacyCreate(c, data, services);
   });
-  keysRoutes.get("/", zValidator("query", listQuerySchema12), async (c) => {
+  keysRoutes.get("/", zValidator("query", listQuerySchema13), async (c) => {
     const { status, limit: limit2 } = c.req.valid("query");
     const services = c.get("services");
     let items = await services.apiKeys.list();
@@ -349294,7 +349634,15 @@ var init__close_contact_config = __esm(() => {
 
 // ../api/src/routes/v2/messages.ts
 import { existsSync as existsSync7 } from "fs";
-import { join as join22 } from "path";
+import { extname as extname3, join as join22 } from "path";
+function inferMediaMimeType(type, filename) {
+  if (filename) {
+    const fromExtension = MIME_BY_EXTENSION[extname3(filename).toLowerCase()];
+    if (fromExtension)
+      return fromExtension;
+  }
+  return DEFAULT_MIME_BY_MEDIA_TYPE[type];
+}
 function isUUID(value) {
   return UUID_REGEX2.test(value);
 }
@@ -349452,7 +349800,7 @@ async function verifyMessageInstanceOwnership(services, message2, instanceId) {
     });
   }
 }
-var log105, mediaDownloadLog, messagesRoutes, UUID_REGEX2, MessageSourceSchema, MessageTypeSchema, MessageStatusSchema, DeliveryStatusSchema, listQuerySchema13, createMessageSchema, updateMessageSchema, recordEditSchema, addReactionSchema, removeReactionSchema, updateDeliveryStatusSchema, MentionSchema, sendTextSchema, sendMediaSchema, sendReactionSchema, sendStickerSchema, sendContactSchema, sendLocationSchema, sendHandoffSchema, sendCloseContactSchema, messageRefSchema, _mediaStorageForDownload = null, sendTtsSchema, forwardMessageSchema, sendPresenceSchema, markMessageReadSchema, markBatchReadSchema, sendPollSchema, sendEmbedSchema, editMessageChannelSchema, deleteMessageChannelSchema, starMessageSchema;
+var log105, mediaDownloadLog, messagesRoutes, MIME_BY_EXTENSION, DEFAULT_MIME_BY_MEDIA_TYPE, UUID_REGEX2, MessageSourceSchema, MessageTypeSchema, MessageStatusSchema, DeliveryStatusSchema, listQuerySchema14, createMessageSchema, updateMessageSchema, recordEditSchema, addReactionSchema, removeReactionSchema, updateDeliveryStatusSchema, MentionSchema, sendTextSchema, sendMediaSchema, sendReactionSchema, sendStickerSchema, sendContactSchema, sendLocationSchema, sendHandoffSchema, sendCloseContactSchema, messageRefSchema, _mediaStorageForDownload = null, sendTtsSchema, forwardMessageSchema, sendPresenceSchema, markMessageReadSchema, markBatchReadSchema, sendPollSchema, sendEmbedSchema, editMessageChannelSchema, deleteMessageChannelSchema, starMessageSchema;
 var init_messages5 = __esm(() => {
   init_dist6();
   init_src2();
@@ -349470,6 +349818,29 @@ var init_messages5 = __esm(() => {
   log105 = createLogger("routes:messages");
   mediaDownloadLog = createLogger("routes:messages:media-download");
   messagesRoutes = new Hono2;
+  MIME_BY_EXTENSION = {
+    ".jpg": "image/jpeg",
+    ".jpeg": "image/jpeg",
+    ".png": "image/png",
+    ".gif": "image/gif",
+    ".webp": "image/webp",
+    ".mp3": "audio/mpeg",
+    ".ogg": "audio/ogg",
+    ".opus": "audio/opus",
+    ".wav": "audio/wav",
+    ".m4a": "audio/mp4",
+    ".mp4": "video/mp4",
+    ".webm": "video/webm",
+    ".mov": "video/quicktime",
+    ".avi": "video/x-msvideo",
+    ".pdf": "application/pdf"
+  };
+  DEFAULT_MIME_BY_MEDIA_TYPE = {
+    image: "image/jpeg",
+    audio: "audio/ogg",
+    video: "video/mp4",
+    document: "application/octet-stream"
+  };
   UUID_REGEX2 = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
   MessageSourceSchema = exports_external.enum(["realtime", "sync", "api", "import"]);
   MessageTypeSchema = exports_external.enum([
@@ -349486,7 +349857,7 @@ var init_messages5 = __esm(() => {
   ]);
   MessageStatusSchema = exports_external.enum(["active", "edited", "deleted", "expired"]);
   DeliveryStatusSchema = exports_external.enum(["pending", "sent", "delivered", "read", "failed"]);
-  listQuerySchema13 = exports_external.object({
+  listQuerySchema14 = exports_external.object({
     chatId: exports_external.string().uuid().optional(),
     source: exports_external.string().optional().transform((v2) => v2?.split(",")),
     messageType: exports_external.string().optional().transform((v2) => v2?.split(",")),
@@ -349637,7 +350008,7 @@ var init_messages5 = __esm(() => {
     reason: exports_external.string().optional().describe("Free-text rationale persisted in close_contact_logs"),
     closeFields: exports_external.record(exports_external.unknown()).optional().describe("Structured BI/CRM payload \u2014 forwarded to Gupshup native send when supported")
   });
-  messagesRoutes.get("/", zValidator("query", listQuerySchema13), async (c) => {
+  messagesRoutes.get("/", zValidator("query", listQuerySchema14), async (c) => {
     const query = c.req.valid("query");
     const services = c.get("services");
     const apiKey = c.get("apiKey");
@@ -349944,6 +350315,7 @@ var init_messages5 = __esm(() => {
       });
     }
     const resolvedTo = await resolveRecipient(data.to, instance4.channel, services);
+    const mediaMimeType = data.mimeType ?? inferMediaMimeType(data.type, data.filename);
     const outgoingMessage = {
       to: resolvedTo,
       threadId: data.threadId,
@@ -349952,7 +350324,7 @@ var init_messages5 = __esm(() => {
         mediaUrl: data.url,
         caption: data.caption,
         filename: data.filename,
-        mimeType: data.mimeType
+        mimeType: mediaMimeType
       },
       metadata: {
         base64: data.base64,
@@ -351229,14 +351601,14 @@ var init_payloads2 = __esm(() => {
 });
 
 // ../api/src/routes/v2/persons.ts
-var personsRoutes, listQuerySchema14, timelineQuerySchema2, updatePersonSchema, linkIdentitiesSchema, unlinkIdentitySchema, mergePersonsSchema;
+var personsRoutes, listQuerySchema15, timelineQuerySchema2, updatePersonSchema, linkIdentitiesSchema, unlinkIdentitySchema, mergePersonsSchema;
 var init_persons3 = __esm(() => {
   init_dist6();
   init_dist2();
   init_zod();
   init_date_query();
   personsRoutes = new Hono2;
-  listQuerySchema14 = exports_external.object({
+  listQuerySchema15 = exports_external.object({
     search: exports_external.string().min(1).optional().describe("Search term (name, email, or phone)"),
     limit: exports_external.coerce.number().int().min(1).max(100).default(20),
     cursor: exports_external.string().optional().describe("Cursor for pagination")
@@ -351268,7 +351640,7 @@ var init_persons3 = __esm(() => {
     targetPersonId: exports_external.string().uuid().describe("Person to merge into (will be kept)"),
     reason: exports_external.string().optional().describe("Reason for merge")
   });
-  personsRoutes.get("/", zValidator("query", listQuerySchema14), async (c) => {
+  personsRoutes.get("/", zValidator("query", listQuerySchema15), async (c) => {
     const { search, limit: limit2, cursor } = c.req.valid("query");
     const services = c.get("services");
     if (search) {
@@ -351410,7 +351782,7 @@ function applySchemaDefaults(data) {
     supportsImages: data.supportsImages ?? data.schema === "claude-code"
   };
 }
-var providersRoutes, SENSITIVE_KEY_PATTERN, listQuerySchema15, providerBaseSchema, createProviderSchema, updateProviderSchema;
+var providersRoutes, SENSITIVE_KEY_PATTERN, listQuerySchema16, providerBaseSchema, createProviderSchema, updateProviderSchema;
 var init_providers4 = __esm(() => {
   init_dist6();
   init_src();
@@ -351419,7 +351791,7 @@ var init_providers4 = __esm(() => {
   init_agent_dispatcher();
   providersRoutes = new Hono2;
   SENSITIVE_KEY_PATTERN = /private|secret|password|token|apikey|api_key/i;
-  listQuerySchema15 = exports_external.object({
+  listQuerySchema16 = exports_external.object({
     active: exports_external.coerce.boolean().optional()
   });
   providerBaseSchema = exports_external.object({
@@ -351439,7 +351811,7 @@ var init_providers4 = __esm(() => {
   });
   createProviderSchema = providerBaseSchema.transform(applySchemaDefaults);
   updateProviderSchema = providerBaseSchema.partial().transform(applySchemaDefaults);
-  providersRoutes.get("/", zValidator("query", listQuerySchema15), async (c) => {
+  providersRoutes.get("/", zValidator("query", listQuerySchema16), async (c) => {
     const { active } = c.req.valid("query");
     const services = c.get("services");
     const providers2 = await services.providers.list({ active });
@@ -351569,14 +351941,14 @@ var init_providers4 = __esm(() => {
 });
 
 // ../api/src/routes/v2/settings.ts
-var settingsRoutes, listQuerySchema16, setSettingSchema, bulkUpdateSchema, historyQuerySchema;
+var settingsRoutes, listQuerySchema17, setSettingSchema, bulkUpdateSchema, historyQuerySchema;
 var init_settings3 = __esm(() => {
   init_dist6();
   init_dist2();
   init_zod();
   init_date_query();
   settingsRoutes = new Hono2;
-  listQuerySchema16 = exports_external.object({
+  listQuerySchema17 = exports_external.object({
     category: exports_external.string().optional()
   });
   setSettingSchema = exports_external.object({
@@ -351591,7 +351963,7 @@ var init_settings3 = __esm(() => {
     limit: exports_external.coerce.number().int().min(1).max(100).default(50),
     since: optionalDateParam("since")
   });
-  settingsRoutes.get("/", zValidator("query", listQuerySchema16), async (c) => {
+  settingsRoutes.get("/", zValidator("query", listQuerySchema17), async (c) => {
     const { category } = c.req.valid("query");
     const services = c.get("services");
     const settings = await services.settings.list(category);
@@ -351762,7 +352134,7 @@ async function resolveOpenTurn(services, keyId, turnId, headerInstanceId, header
   }
   return null;
 }
-var turnsRoutes, closeTurnSchema, listQuerySchema17, adminForceCloseSchema, bulkCloseSchema;
+var turnsRoutes, closeTurnSchema, listQuerySchema18, adminForceCloseSchema, bulkCloseSchema;
 var init_turns2 = __esm(() => {
   init_dist6();
   init_dist2();
@@ -351825,7 +352197,7 @@ var init_turns2 = __esm(() => {
       }
     });
   });
-  listQuerySchema17 = exports_external.object({
+  listQuerySchema18 = exports_external.object({
     status: exports_external.enum(["open", "done", "timeout"]).optional(),
     instanceId: exports_external.string().uuid().optional(),
     chatId: exports_external.string().optional(),
@@ -351840,7 +352212,7 @@ var init_turns2 = __esm(() => {
     confirm: exports_external.boolean(),
     reason: exports_external.string().optional()
   });
-  turnsRoutes.get("/", zValidator("query", listQuerySchema17), async (c) => {
+  turnsRoutes.get("/", zValidator("query", listQuerySchema18), async (c) => {
     const denied = requireAdmin(c);
     if (denied)
       return denied;
@@ -352071,7 +352443,7 @@ var init_voice2 = __esm(() => {
 });
 
 // ../api/src/routes/v2/webhooks.ts
-var webhooksRoutes, createWebhookSourceSchema, updateWebhookSourceSchema, listQuerySchema18, triggerEventSchema;
+var webhooksRoutes, createWebhookSourceSchema, updateWebhookSourceSchema, listQuerySchema19, triggerEventSchema;
 var init_webhooks3 = __esm(() => {
   init_dist6();
   init_dist2();
@@ -352085,10 +352457,10 @@ var init_webhooks3 = __esm(() => {
     enabled: exports_external.boolean().default(true).describe("Whether source is enabled")
   });
   updateWebhookSourceSchema = createWebhookSourceSchema.partial();
-  listQuerySchema18 = exports_external.object({
+  listQuerySchema19 = exports_external.object({
     enabled: exports_external.coerce.boolean().optional()
   });
-  webhooksRoutes.get("/webhook-sources", zValidator("query", listQuerySchema18), async (c) => {
+  webhooksRoutes.get("/webhook-sources", zValidator("query", listQuerySchema19), async (c) => {
     const { enabled } = c.req.valid("query");
     const services = c.get("services");
     const sources = await services.webhooks.list({ enabled });
@@ -352162,6 +352534,7 @@ var init_webhooks3 = __esm(() => {
 var v2Routes;
 var init_v2 = __esm(() => {
   init_dist2();
+  init_a2a();
   init_access3();
   init_agent_routes2();
   init_agent_state3();
@@ -352195,6 +352568,7 @@ var init_v2 = __esm(() => {
   init_voice2();
   init_webhooks3();
   v2Routes = new Hono2;
+  v2Routes.route("/a2a", a2aRoutes);
   v2Routes.route("/agents", agentsRoutes);
   v2Routes.route("/agent-state", agentStateRoutes);
   v2Routes.route("/agent-tasks", agentTasksRoutes);
@@ -352247,6 +352621,21 @@ function getAllowedOrigins() {
   }
   return envOrigins.split(",").map((origin) => origin.trim());
 }
+function validateA2AInstance(instance4) {
+  if (!instance4) {
+    return { body: { error: "Instance not found" }, status: 404 };
+  }
+  if (instance4.channel !== "a2a") {
+    return { body: { error: "Instance is not an A2A channel instance" }, status: 400 };
+  }
+  if (!instance4.isActive) {
+    return { body: { error: "A2A instance is inactive" }, status: 403 };
+  }
+  if (!instance4.agentId) {
+    return { body: { error: "A2A instance has no linked agent" }, status: 409 };
+  }
+  return null;
+}
 function createApp(db2, eventBus = null, channelRegistry2 = null) {
   const app = new Hono2;
   const { middleware: contextMiddleware, services } = createContextMiddleware(db2, eventBus, channelRegistry2);
@@ -352266,7 +352655,7 @@ function createApp(db2, eventBus = null, channelRegistry2 = null) {
   const allowedOrigins = getAllowedOrigins();
   app.use("*", cors({
     origin: allowedOrigins === "*" ? "*" : allowedOrigins,
-    allowHeaders: ["Content-Type", "x-api-key", "x-request-id"],
+    allowHeaders: ["Authorization", "Content-Type", "x-api-key", "x-request-id", "A2A-Version", "A2A-Extensions"],
     allowMethods: ["GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"],
     exposeHeaders: ["x-request-id", "X-RateLimit-Limit", "X-RateLimit-Remaining", "X-RateLimit-Reset"],
     maxAge: 86400
@@ -352279,29 +352668,54 @@ function createApp(db2, eventBus = null, channelRegistry2 = null) {
   app.route("/api/v2", healthRoutes);
   app.route("/api/v2", openapiRoutes);
   if (process.env.A2A_ENABLED === "true") {
-    app.get("/.well-known/agent.json", async (c) => {
-      const channelRegistry3 = c.get("channelRegistry");
-      const plugin7 = channelRegistry3?.get("a2a");
-      if (!plugin7?.handleWebhook) {
-        return c.json({ error: "A2A channel not available" }, 503);
+    const handleWellKnownAgentCard = async (c) => {
+      const url = new URL(c.req.url);
+      const baseUrl = `${url.protocol}//${url.host}`;
+      const resolved = await resolveA2AAgentCard({
+        services: c.get("services"),
+        baseUrl,
+        instanceId: url.searchParams.get("instanceId"),
+        agentId: url.searchParams.get("agentId")
+      });
+      if (!resolved) {
+        return c.json({
+          error: {
+            code: "A2A_AGENT_CARD_NOT_FOUND",
+            message: "No active A2A agent card matched the request. Pass instanceId or agentId when multiple agents exist."
+          }
+        }, 404);
       }
-      return plugin7.handleWebhook(c.req.raw);
-    });
+      return c.json(resolved.card);
+    };
+    app.get("/.well-known/agent-card.json", handleWellKnownAgentCard);
+    app.get("/.well-known/agent.json", handleWellKnownAgentCard);
     const UUID_REGEX3 = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
-    app.post("/a2a/:instanceId", authMiddleware, requireInstanceAccess((c) => c.req.param("instanceId") ?? ""), rateLimitMiddleware, async (c) => {
+    app.post("/a2a/:instanceId", authMiddleware, requireInstanceAccess((c) => c.req.param("instanceId") ?? ""), requireAnyScope(["a2a:invoke", "messages:send"]), rateLimitMiddleware, async (c) => {
       const instanceId = c.req.param("instanceId") ?? "";
       if (!UUID_REGEX3.test(instanceId)) {
         return c.json({ error: "Invalid instance ID format" }, 400);
       }
+      const services2 = c.get("services");
+      const instance4 = await services2.instances.getById(instanceId);
+      const validationError = validateA2AInstance(instance4);
+      if (validationError) {
+        return c.json(validationError.body, validationError.status);
+      }
       const channelRegistry3 = c.get("channelRegistry");
       const plugin7 = channelRegistry3?.get("a2a");
       if (!plugin7?.handleWebhook) {
         return c.json({ error: "A2A channel not available" }, 503);
       }
-      return plugin7.handleWebhook(c.req.raw);
+      const headers = new Headers(c.req.raw.headers);
+      const apiKey = c.get("apiKey");
+      if (apiKey?.id) {
+        headers.set("x-omni-api-key-id", apiKey.id);
+      }
+      return plugin7.handleWebhook(new Request(c.req.raw, { headers }));
     });
   } else {
     app.all("/a2a/*", (c) => c.json({ error: "A2A channel not enabled. Set A2A_ENABLED=true." }, 503));
+    app.get("/.well-known/agent-card.json", (c) => c.json({ error: "A2A not enabled" }, 503));
     app.get("/.well-known/agent.json", (c) => c.json({ error: "A2A not enabled" }, 503));
   }
   app.post("/api/v2/instances/:id/telegram/webhook", async (c) => {
@@ -352721,16 +353135,20 @@ async function setupEventPersistence(eventBus, db2) {
           eventType: "message.sent",
           direction: "outbound",
           contentType: mapContentType2(payload.content.type),
-          textContent: sanitizeText(payload.content.text),
+          textContent: sanitizeText(payload.content.text ?? payload.content.caption),
           mediaUrl: payload.content.mediaUrl,
+          mediaMimeType: payload.content.mimeType,
           chatId: payload.chatId,
           replyToExternalId: payload.replyToId,
           status: "completed",
           receivedAt: new Date(event.timestamp),
           processedAt: new Date,
+          rawPayload: payload.rawPayload ? deepSanitize(payload.rawPayload) : undefined,
           metadata: {
             correlationId: metadata.correlationId,
-            to: payload.to
+            to: payload.to,
+            filename: payload.content.filename,
+            voiceNote: payload.content.isVoiceNote
           },
           agentId: metadata.agentId ?? null,
           conversationId: null,
@@ -354793,12 +355211,12 @@ async function closeAgentHeartbeat() {
   await consumer.stop();
   consumer = null;
 }
-var import_nats8, log111, sc3, HEARTBEAT_SUBJECT = "omni.agent.heartbeat.>", consumer = null;
+var import_nats6, log111, sc3, HEARTBEAT_SUBJECT = "omni.agent.heartbeat.>", consumer = null;
 var init_agent_heartbeat = __esm(() => {
   init_src();
-  import_nats8 = __toESM(require_mod4(), 1);
+  import_nats6 = __toESM(require_mod4(), 1);
   log111 = createLogger("agent-heartbeat");
-  sc3 = import_nats8.StringCodec();
+  sc3 = import_nats6.StringCodec();
 });
 
 // ../api/src/services/turn-monitor.ts
@@ -478760,6 +479178,49 @@ class WhatsAppPlugin extends BaseChannelPlugin {
     }
     return phoneJid;
   }
+  getSentMediaSource(message2) {
+    if (message2.content.mediaUrl)
+      return "url";
+    if (message2.content.localPath)
+      return "localPath";
+    if (message2.metadata?.base64)
+      return "base64";
+    return;
+  }
+  buildSentRawPayload(externalId, originalMessage, processedMessage) {
+    const mediaSource = this.getSentMediaSource(processedMessage);
+    return {
+      externalId,
+      isFromMe: true,
+      to: originalMessage.to,
+      ...processedMessage.content.caption ? { caption: processedMessage.content.caption } : {},
+      ...processedMessage.content.filename ? { filename: processedMessage.content.filename } : {},
+      ...processedMessage.content.mimeType ? { mimeType: processedMessage.content.mimeType } : {},
+      ...processedMessage.metadata?.ptt === true ? { voiceNote: true } : {},
+      ...mediaSource ? { mediaSource } : {}
+    };
+  }
+  buildSentEventPayload(instanceId, externalId, chatId, originalMessage, processedMessage) {
+    return {
+      instanceId,
+      externalId,
+      chatId,
+      to: originalMessage.to,
+      content: {
+        type: processedMessage.content.type,
+        text: processedMessage.content.text ?? processedMessage.content.caption,
+        caption: processedMessage.content.caption,
+        mediaUrl: processedMessage.content.mediaUrl,
+        localPath: processedMessage.content.localPath,
+        mimeType: processedMessage.content.mimeType,
+        filename: processedMessage.content.filename,
+        isVoiceNote: processedMessage.metadata?.ptt === true
+      },
+      replyToId: originalMessage.replyTo,
+      rawPayload: this.buildSentRawPayload(externalId, originalMessage, processedMessage),
+      senderAgentId: originalMessage.metadata?.senderAgentId
+    };
+  }
   async sendMessage(instanceId, message2) {
     const sock = this.getSocket(instanceId);
     const jid = await this.resolveSendTarget(sock, instanceId, message2.to);
@@ -478786,18 +479247,7 @@ class WhatsAppPlugin extends BaseChannelPlugin {
           this.trackRecentSentMessage(instanceId, externalId, result.message);
         }
       }
-      await this.emitMessageSent({
-        instanceId,
-        externalId,
-        chatId: jid,
-        to: message2.to,
-        content: {
-          type: message2.content.type,
-          text: message2.content.text
-        },
-        replyToId: message2.replyTo,
-        senderAgentId: message2.metadata?.senderAgentId
-      });
+      await this.emitMessageSent(this.buildSentEventPayload(instanceId, externalId, jid, message2, processedMessage));
       rateLimiter.reset();
       return {
         success: true,