@automagik/omni 2.260901.3 → 2.260902.1

package/dist/server/index.js

@@ -242901,7 +242901,7 @@ var init_sentry_scrub = __esm(() => {
 var require_package7 = __commonJS((exports, module) => {
   module.exports = {
     name: "@omni/api",
-    version: "2.260901.3",
+    version: "2.260902.1",
     type: "module",
     exports: {
       ".": {
@@ -345619,6 +345619,10 @@ async function consumeStream(generator, sender, instanceId, chatId, traceId) {
 function extractThreadId(messages4) {
   return (messages4[0]?.payload.rawPayload ?? {}).threadId;
 }
+function extractCancelThreadId(messages4) {
+  const parsed = CancelThreadPayloadSchema.safeParse(messages4[0]?.payload.rawPayload ?? {});
+  return (parsed.success ? parsed.data.cancelThreadId : undefined) ?? extractThreadId(messages4);
+}
 function extractKhalSessionId(messages4) {
   for (const message2 of messages4) {
     const rawPayload = message2.payload.rawPayload ?? {};
@@ -345759,8 +345763,9 @@ async function dispatchViaStreamingProvider(services, instance4, messages4, trig
   const streamKey = `${instance4.id}:${chatId}`;
   activeStreams.set(streamKey, sender);
   const cancelController = new AbortController;
-  const runKey = runAbortKey(instance4.id, chatId, rawThreadId);
-  activeRunAborts.set(runKey, { controller: cancelController, startedAt: Date.now(), sender });
+  const runKey = runAbortKey(instance4.id, chatId, extractCancelThreadId(messages4));
+  const runEntry = { controller: cancelController, startedAt: Date.now(), sender };
+  activeRunAborts.set(runKey, runEntry);
   trigger.abortSignal = cancelController.signal;
   const streamDispatchStart = Date.now();
   try {
@@ -345794,7 +345799,8 @@ async function dispatchViaStreamingProvider(services, instance4, messages4, trig
     return false;
   } finally {
     activeStreams.delete(streamKey);
-    activeRunAborts.delete(runKey);
+    if (activeRunAborts.get(runKey) === runEntry)
+      activeRunAborts.delete(runKey);
   }
 }
 function formatMediaContent(msg) {
@@ -346004,10 +346010,11 @@ function resolveReplySuppression(flags) {
     return "run_cancelled_by_user";
   return null;
 }
-async function triggerProviderWithCancellation(provider, trigger, spanAttributes, instanceId, chatId, traceId) {
+async function triggerProviderWithCancellation(provider, trigger, spanAttributes, instanceId, chatId, traceId, cancelThreadId = trigger.source.threadId) {
   const cancelController = new AbortController;
-  const runKey = runAbortKey(instanceId, chatId, trigger.source.threadId);
-  activeRunAborts.set(runKey, { controller: cancelController, startedAt: Date.now() });
+  const runKey = runAbortKey(instanceId, chatId, cancelThreadId);
+  const runEntry = { controller: cancelController, startedAt: Date.now() };
+  activeRunAborts.set(runKey, runEntry);
   try {
     const result = await withLifecycleSpan("omni.dispatch_to_agno", spanAttributes, () => provider.trigger({
       ...trigger,
@@ -346022,7 +346029,8 @@ async function triggerProviderWithCancellation(provider, trigger, spanAttributes
     }
     throw err2;
   } finally {
-    activeRunAborts.delete(runKey);
+    if (activeRunAborts.get(runKey) === runEntry)
+      activeRunAborts.delete(runKey);
   }
 }
 async function dispatchViaProvider(services, instance4, messages4, triggerType, channel5, chatId, senderId, personId, senderName, traceId, rawEvent, db2, extraContextMessages, senderAgentId) {
@@ -346098,7 +346106,7 @@ async function dispatchViaProvider(services, instance4, messages4, triggerType,
       ...lifecycleBase,
       stage: "dispatch_to_agno",
       extra: { trigger_type: triggerType, provider_id: provider.id, provider_schema: provider.schema }
-    }), instance4.id, chatId, traceId);
+    }), instance4.id, chatId, traceId, extractCancelThreadId(messages4));
     if (!triggerOutcome)
       return true;
     const { result, cancelled: runCancelled } = triggerOutcome;
@@ -346488,6 +346496,7 @@ function takeQueuedAck(chatKey) {
 }
 async function ackQueuedMessage(info2) {
   const chatKey = `${info2.instanceId}:${info2.chatId}`;
+  let entry;
   try {
     const existing = queuedMessageAcks.get(chatKey);
     if (existing && Date.now() - existing.at < QUEUED_ACK_TIMEOUT_MS)
@@ -346496,16 +346505,22 @@ async function ackQueuedMessage(info2) {
     const messageId = info2.message.payload.externalId;
     if (!instance4 || !messageId)
       return;
-    const entry = { at: Date.now() };
+    entry = { at: Date.now() };
     queuedMessageAcks.set(chatKey, entry);
     const channel5 = info2.message.metadata.channelType ?? instance4.channel;
     const plugin10 = await getPlugin(channel5) ?? null;
-    entry.handle = startAck(plugin10, createPluginAckProvider(plugin10), instance4.id, info2.chatId, messageId, channel5, {
+    const handle = startAck(plugin10, createPluginAckProvider(plugin10), instance4.id, info2.chatId, messageId, channel5, {
       ...buildAckConfig(instance4),
       ackTimeoutMs: QUEUED_ACK_TIMEOUT_MS
     });
+    if (queuedMessageAcks.get(chatKey) !== entry) {
+      handle.release();
+      return;
+    }
+    entry.handle = handle;
   } catch (error3) {
-    queuedMessageAcks.delete(chatKey);
+    if (entry && queuedMessageAcks.get(chatKey) === entry)
+      queuedMessageAcks.delete(chatKey);
     log91.debug("Failed to ack queued message", { chatId: info2.chatId, error: String(error3) });
   }
 }
@@ -347876,7 +347891,7 @@ async function setupAgentDispatcher(eventBus, services, db2) {
     log91.info("Agent dispatcher shutdown complete");
   };
 }
-var import_api32, log91, agentDispatchLimiter, _natsGenieProviderCtor, QUOTED_MESSAGE_MAX_CHARS = 4000, DM_HISTORY_LIMIT = 20, LIFECYCLE_PREVIEW_MAX_CHARS = 160, LIFECYCLE_SENSITIVE_KEY_PARTS, PRESENCE_DEFAULT_MIN_MS = 5000, PRESENCE_DEFAULT_MAX_WAIT_MS = 30000, activeMessageDebouncer = null, DEFAULT_DISPATCH_ERROR_MESSAGE = "Opa, tive um probleminha aqui \uD83D\uDE05 Pode mandar de novo?", DEFAULT_ERROR_HANDOFF_MESSAGE = "T\xF4 com um probleminha t\xE9cnico aqui agora. Logo algu\xE9m do time vai entrar em contato com voc\xEA.", TRANSIENT_DISPATCH_ERROR_PATTERNS, TRANSIENT_DISPATCH_RETRY_DELAYS_MS, CHANNEL_MESSAGE_LIMITS, DEFAULT_MESSAGE_LIMIT = 4000, MEDIA_BASE_PATH3, MEDIA_ICONS, MEDIA_WAIT_NULL, mediaCompletions, mediaResultCache, MEDIA_WAIT_TIMEOUT_MS = 30000, DEFAULT_SEND_MEDIA_PATH_TYPES, BOT_PREFIX = "\uD83E\uDD16 ", activeStreams, activeRunAborts, sessionActivityStore, PROC_REACT_START, PROC_REACT_DONE = "\u2705", queuedMessageAcks, QUEUED_ACK_TIMEOUT_MS = 120000, providerCache, openclawClientPool, _openClawClientCtor, nullFilterWarnedInstances, ACTIVE_OWNER_IDENTIFIER_CACHE_TTL_MS = 1e4, cachedActiveOwnerIdentifiers = null, cachedActiveOwnerIdentifiersAt = 0, tenantCachedActiveOwnerIdentifiers, DEFAULT_GATE_MODEL = "gemini-3-flash-preview", GATE_TIMEOUT_MS = 3000, setupAgentResponder;
+var import_api32, log91, agentDispatchLimiter, _natsGenieProviderCtor, QUOTED_MESSAGE_MAX_CHARS = 4000, DM_HISTORY_LIMIT = 20, LIFECYCLE_PREVIEW_MAX_CHARS = 160, LIFECYCLE_SENSITIVE_KEY_PARTS, PRESENCE_DEFAULT_MIN_MS = 5000, PRESENCE_DEFAULT_MAX_WAIT_MS = 30000, activeMessageDebouncer = null, DEFAULT_DISPATCH_ERROR_MESSAGE = "Opa, tive um probleminha aqui \uD83D\uDE05 Pode mandar de novo?", DEFAULT_ERROR_HANDOFF_MESSAGE = "T\xF4 com um probleminha t\xE9cnico aqui agora. Logo algu\xE9m do time vai entrar em contato com voc\xEA.", TRANSIENT_DISPATCH_ERROR_PATTERNS, TRANSIENT_DISPATCH_RETRY_DELAYS_MS, CHANNEL_MESSAGE_LIMITS, DEFAULT_MESSAGE_LIMIT = 4000, MEDIA_BASE_PATH3, MEDIA_ICONS, MEDIA_WAIT_NULL, mediaCompletions, mediaResultCache, MEDIA_WAIT_TIMEOUT_MS = 30000, DEFAULT_SEND_MEDIA_PATH_TYPES, BOT_PREFIX = "\uD83E\uDD16 ", activeStreams, activeRunAborts, CancelThreadPayloadSchema, sessionActivityStore, PROC_REACT_START, PROC_REACT_DONE = "\u2705", queuedMessageAcks, QUEUED_ACK_TIMEOUT_MS = 120000, providerCache, openclawClientPool, _openClawClientCtor, nullFilterWarnedInstances, ACTIVE_OWNER_IDENTIFIER_CACHE_TTL_MS = 1e4, cachedActiveOwnerIdentifiers = null, cachedActiveOwnerIdentifiersAt = 0, tenantCachedActiveOwnerIdentifiers, DEFAULT_GATE_MODEL = "gemini-3-flash-preview", GATE_TIMEOUT_MS = 3000, setupAgentResponder;
 var init_agent_dispatcher = __esm(() => {
   init_src2();
   init_src();
@@ -347884,6 +347899,7 @@ var init_agent_dispatcher = __esm(() => {
   init_src8();
   init_esm5();
   init_drizzle_orm();
+  init_zod();
   init_idempotency();
   init_sentry_scrub();
   init_agent_runner();
@@ -347934,6 +347950,7 @@ var init_agent_dispatcher = __esm(() => {
   DEFAULT_SEND_MEDIA_PATH_TYPES = ["image", "video", "document"];
   activeStreams = new Map;
   activeRunAborts = new Map;
+  CancelThreadPayloadSchema = exports_external.object({ cancelThreadId: exports_external.string().min(1).optional() });
   sessionActivityStore = new InMemorySessionActivityStore;
   PROC_REACT_START = { audio: "\uD83C\uDFA7", image: "\uD83D\uDC40", video: "\uD83D\uDC40", document: "\uD83D\uDC40" };
   queuedMessageAcks = new Map;
@@ -352912,9 +352929,23 @@ function openProviderSecrets(tenantId, row) {
 
 class ProviderService {
   db;
+  clientCacheInvalidators = [];
   constructor(db2) {
     this.db = db2;
   }
+  onProviderChanged(invalidate) {
+    this.clientCacheInvalidators.push(invalidate);
+  }
+  invalidateCaches(providerId) {
+    runAfterTenantCommit(() => {
+      invalidateProviderCache(providerId);
+      for (const invalidate of this.clientCacheInvalidators) {
+        try {
+          invalidate(providerId);
+        } catch {}
+      }
+    });
+  }
   get tenantId() {
     return currentTenantScope()?.tenantId ?? null;
   }
@@ -352955,7 +352986,7 @@ class ProviderService {
     if (!updated) {
       throw new NotFoundError("AgentProvider", id);
     }
-    invalidateProviderCache(id);
+    this.invalidateCaches(id);
     return openProviderSecrets(tenantId, updated);
   }
   async delete(id) {
@@ -352963,7 +352994,7 @@ class ProviderService {
     if (!result.length) {
       throw new NotFoundError("AgentProvider", id);
     }
-    invalidateProviderCache(id);
+    this.invalidateCaches(id);
   }
   async checkHealth(id) {
     const provider = await this.getById(id);
@@ -355406,6 +355437,9 @@ function createServices(db2, eventBus) {
   batchJobs2.setAuthPlane(authPlane.db);
   const mediaStorage = new MediaStorageService(db2);
   mediaStorage.setTenantAdmissibilityCheck((tenantId) => isTenantWorkAdmissible(authPlane.db, tenantId));
+  const providers2 = new ProviderService(db2);
+  const agentRunner = new AgentRunnerService(db2);
+  providers2.onProviderChanged((providerId) => agentRunner.clearCache(providerId));
   return {
     agents: new AgentService(db2, eventBus),
     agentState: new AgentStateService(eventBus),
@@ -355418,7 +355452,7 @@ function createServices(db2, eventBus) {
     events: new EventService(db2),
     settings,
     access: new AccessService(db2, eventBus, accessCache),
-    providers: new ProviderService(db2),
+    providers: providers2,
     routes: new RouteService(db2, routeResolver),
     routeResolver,
     deadLetters,
@@ -355430,7 +355464,7 @@ function createServices(db2, eventBus) {
     messages: new MessageService(db2, eventBus),
     syncJobs: new SyncJobService(db2, eventBus),
     batchJobs: batchJobs2,
-    agentRunner: new AgentRunnerService(db2),
+    agentRunner,
     tts,
     turns: new TurnService(db2),
     consumerOffsets: new ConsumerOffsetService(db2),
@@ -355833,6 +355867,13 @@ var init_error3 = __esm(() => {
 });
 
 // ../api/src/middleware/rate-limit.ts
+function resolveClientIp(trustedProxyHeaderValue, remoteAddr) {
+  const raw2 = trustedProxyHeaderValue ?? remoteAddr;
+  if (!raw2)
+    return;
+  const hops = raw2.split(",").map((hop) => hop.trim()).filter(Boolean);
+  return hops.at(-1);
+}
 function createRateLimiter2(config4 = RATE_LIMITS.general, keyPrefix = "ratelimit") {
   return createMiddleware(async (c, next) => {
     const apiKey = c.get("apiKey");
@@ -355840,8 +355881,7 @@ function createRateLimiter2(config4 = RATE_LIMITS.general, keyPrefix = "ratelimi
     const trustedProxyIp = trustedProxyHeader ? c.req.header(trustedProxyHeader) : undefined;
     const server = c.env;
     const remoteAddr = server?.remoteAddr ?? server?.requestIP?.(c.req.raw)?.address;
-    const rawIp = trustedProxyIp ?? remoteAddr;
-    const normalizedIp = rawIp?.split(",")[0]?.trim() || undefined;
+    const normalizedIp = resolveClientIp(trustedProxyIp, remoteAddr);
     const identifier = apiKey?.id ? `api:${apiKey.id}` : normalizedIp ? `ip:${normalizedIp}` : "anon";
     const key = `${keyPrefix}:${identifier}`;
     const now = Date.now();
@@ -360507,7 +360547,10 @@ var init_messages4 = __esm(() => {
     instanceId: exports_external.string().uuid().openapi({ description: "Instance UUID" }),
     to: exports_external.string().openapi({ description: "Recipient" }),
     audioSizeKb: exports_external.number().openapi({ description: "Audio size in KB" }),
-    durationMs: exports_external.number().openapi({ description: "Audio duration in ms" })
+    durationMs: exports_external.number().openapi({ description: "Audio duration in ms" }),
+    senderAgentId: exports_external.string().uuid().nullable().optional().openapi({
+      description: "Present when the request set sentBy: 'agent' \u2014 the agent the send was attributed to, or null when the instance has no configured agent (attribution did not happen)"
+    })
   });
 });
 
@@ -361627,6 +361670,7 @@ var init_voice = __esm(() => {
 
 // ../api/src/schemas/openapi/webhooks.ts
 function registerWebhookSchemas(registry4) {
+  registry4.register("WebhookSignatureConfig", WebhookSignatureConfigSchema);
   registry4.register("WebhookSource", WebhookSourceSchema);
   registry4.register("CreateWebhookSourceRequest", CreateWebhookSourceSchema);
   registry4.register("TriggerEventRequest", TriggerEventSchema);
@@ -361767,16 +361811,22 @@ function registerWebhookSchemas(registry4) {
 }
 var WebhookSignatureConfigSchema, WebhookSourceSchema, CreateWebhookSourceSchema, TriggerEventSchema, WebhookReceiveResponseSchema;
 var init_webhooks2 = __esm(() => {
+  init_src5();
   init_zod_openapi();
   init_common4();
   WebhookSignatureConfigSchema = exports_external.object({
-    algorithm: exports_external.enum(["hmac-sha256", "hmac-sha1", "token-match"]).openapi({
+    algorithm: exports_external.enum(webhookSignatureAlgorithms).openapi({
       description: "How to verify: HMAC over the raw request body, or direct token match"
     }),
-    header: exports_external.string().openapi({ description: "Header carrying the signature/token (e.g. X-Hub-Signature-256)" }),
-    prefix: exports_external.string().optional().openapi({
-      description: 'Prefix before the hex digest (e.g. "sha256="). HMAC algorithms only \u2014 rejected with token-match'
+    header: exports_external.string().min(1).max(200).openapi({
+      description: "Header carrying the signature/token (e.g. X-Hub-Signature-256). 1-200 characters"
+    }),
+    prefix: exports_external.string().max(50).optional().openapi({
+      description: 'Prefix before the hex digest (e.g. "sha256="), at most 50 characters. HMAC algorithms only \u2014 rejected with token-match'
     })
+  }).refine((config4) => config4.algorithm !== "token-match" || config4.prefix === undefined, {
+    message: "prefix is not applicable to algorithm 'token-match'",
+    path: ["prefix"]
   });
   WebhookSourceSchema = exports_external.object({
     id: exports_external.string().uuid().openapi({ description: "Source UUID" }),
@@ -361790,14 +361840,14 @@ var init_webhooks2 = __esm(() => {
     updatedAt: exports_external.string().datetime().openapi({ description: "Last update timestamp" })
   });
   CreateWebhookSourceSchema = exports_external.object({
-    name: exports_external.string().min(1).max(100).openapi({ description: "Unique source name" }),
+    name: exports_external.string().min(1).max(100).openapi({ description: "Unique source name (e.g., github, stripe, agno)" }),
     description: exports_external.string().optional().openapi({ description: "Description" }),
     expectedHeaders: exports_external.record(exports_external.string(), exports_external.boolean()).optional().openapi({ description: "Headers to validate" }),
     signatureConfig: WebhookSignatureConfigSchema.nullable().optional().openapi({
-      description: "Signature verification config; required for the source to be reachable on the public ingress"
+      description: "Signature verification config; required for the source to be reachable on the public ingress. " + "Always paired with signatureSecret: a config without a stored secret is rejected (400), and clearing " + "the config (null) also clears the stored secret."
     }),
     signatureSecret: exports_external.string().min(8).max(512).nullable().optional().openapi({
-      description: "Shared secret used by signatureConfig (write-only, never returned)"
+      description: "Shared secret used by signatureConfig (write-only, never returned; 8-512 characters). Cannot be set " + "without a signatureConfig (given in the same request, or already stored on update); null clears it."
     }),
     enabled: exports_external.boolean().default(true).openapi({ description: "Whether enabled" })
   });
@@ -366451,7 +366501,7 @@ class AgentReplayService {
               SELECT 1 FROM ${messages2} AS reply
               WHERE reply.chat_id = ${messages2.chatId}
                 AND reply.is_from_me = true
-                AND COALESCE((reply.raw_payload ->> 'omniSystemNotice')::boolean, false) = false
+                AND (reply.raw_payload -> 'omniSystemNotice') IS DISTINCT FROM 'true'::jsonb
                 AND reply.platform_timestamp > ${messages2.platformTimestamp}
                 AND reply.deleted_at IS NULL
             )`, cursorId ? or2(gt(messages2.platformTimestamp, cursorTimestamp), and2(eq(messages2.platformTimestamp, cursorTimestamp), gt(messages2.id, cursorId))) : gt(messages2.platformTimestamp, cursorTimestamp), lte(messages2.platformTimestamp, now))).orderBy(asc(messages2.platformTimestamp), asc(messages2.id)).limit(PAGE_SIZE));
@@ -374151,35 +374201,41 @@ var init_voice2 = __esm(() => {
   });
 });
 
+// ../api/src/utils/json-body.ts
+function parseJsonObjectBody(rawBody) {
+  if (!rawBody)
+    return {};
+  let parsed;
+  try {
+    parsed = JSON.parse(rawBody);
+  } catch {
+    throw new ValidationError2(NOT_AN_OBJECT);
+  }
+  if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
+    throw new ValidationError2(NOT_AN_OBJECT);
+  }
+  return parsed;
+}
+var NOT_AN_OBJECT = "Request body must be a JSON object";
+var init_json_body = __esm(() => {
+  init_src();
+});
+
 // ../api/src/routes/v2/webhooks.ts
 function sanitizeSource(source) {
   const { signatureSecret, ...rest } = source;
   return { ...rest, hasSignatureSecret: Boolean(signatureSecret) };
 }
-var webhooksRoutes, signatureConfigSchema, createWebhookSourceSchema, updateWebhookSourceSchema, listQuerySchema21, triggerEventSchema;
+var webhooksRoutes, createWebhookSourceSchema, updateWebhookSourceSchema, listQuerySchema21, triggerEventSchema;
 var init_webhooks3 = __esm(() => {
   init_dist6();
-  init_src5();
   init_dist2();
   init_zod();
+  init_webhooks2();
   init_api_keys();
+  init_json_body();
   webhooksRoutes = new Hono2;
-  signatureConfigSchema = exports_external.object({
-    algorithm: exports_external.enum(webhookSignatureAlgorithms).describe("How to verify: HMAC over the raw body, or token match"),
-    header: exports_external.string().min(1).max(200).describe("Header carrying the signature/token (e.g. X-Hub-Signature-256)"),
-    prefix: exports_external.string().max(50).optional().describe("Prefix before the hex digest (HMAC algorithms only)")
-  }).refine((config4) => config4.algorithm !== "token-match" || config4.prefix === undefined, {
-    message: "prefix is not applicable to algorithm 'token-match'",
-    path: ["prefix"]
-  });
-  createWebhookSourceSchema = exports_external.object({
-    name: exports_external.string().min(1).max(100).describe("Unique source name (e.g., github, stripe, agno)"),
-    description: exports_external.string().optional().describe("Description of the webhook source"),
-    expectedHeaders: exports_external.record(exports_external.string(), exports_external.boolean()).optional().describe("Headers to validate"),
-    signatureConfig: signatureConfigSchema.nullable().optional().describe("Signature verification config"),
-    signatureSecret: exports_external.string().min(8).max(512).nullable().optional().describe("Shared secret (write-only)"),
-    enabled: exports_external.boolean().default(true).describe("Whether source is enabled")
-  });
+  createWebhookSourceSchema = CreateWebhookSourceSchema;
   updateWebhookSourceSchema = createWebhookSourceSchema.partial();
   listQuerySchema21 = exports_external.object({
     enabled: exports_external.coerce.boolean().optional()
@@ -374219,12 +374275,7 @@ var init_webhooks3 = __esm(() => {
     const sourceName = c.req.param("source");
     const services = c.get("services");
     const rawBody = await c.req.text();
-    let payload;
-    try {
-      payload = rawBody ? JSON.parse(rawBody) : {};
-    } catch {
-      payload = {};
-    }
+    const payload = parseJsonObjectBody(rawBody);
     const headers = {};
     for (const [key, value] of Object.entries(c.req.header())) {
       headers[key.toLowerCase()] = value ?? "";
@@ -375524,18 +375575,14 @@ function createApp(db2, eventBus = null, channelRegistry2 = null) {
     const sourceName = c.req.param("source");
     const services2 = c.get("services");
     const rawBody = await c.req.text();
-    let payload = {};
-    if (rawBody) {
-      let parsed;
-      try {
-        parsed = JSON.parse(rawBody);
-      } catch {
-        parsed = undefined;
-      }
-      if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
-        return c.json({ error: { code: "VALIDATION", message: "Request body must be a JSON object" } }, 400);
+    let payload;
+    try {
+      payload = parseJsonObjectBody(rawBody);
+    } catch (error3) {
+      if (error3 instanceof ValidationError2) {
+        return c.json({ error: { code: "VALIDATION", message: error3.message } }, 400);
       }
-      payload = parsed;
+      throw error3;
     }
     const headers = {};
     for (const [key, value] of Object.entries(c.req.header())) {
@@ -375638,6 +375685,7 @@ var init_app = __esm(() => {
   init_v2();
   init_platform_tenants2();
   init_a2a_discovery();
+  init_json_body();
   httpLog = createLogger("http");
 });
 
@@ -385399,16 +385447,33 @@ async function checkBoltHealth(connection) {
 }
 
 // ../channel-slack/src/handlers/agent-sessions.ts
+init_zod();
+var AgentSessionStoppedEventSchema = exports_external.object({
+  channel: exports_external.string().min(1),
+  thread_ts: exports_external.string().optional(),
+  user: exports_external.string().optional(),
+  event_ts: exports_external.string().optional(),
+  streaming_message_ts: exports_external.array(exports_external.string()).optional()
+}).passthrough();
 function setupAgentSessionHandlers(app, instanceId, callbacks, logger5) {
   app.event("agent_session_stopped", async ({ event }) => {
-    const evt = event;
-    const channelId = evt.channel;
-    if (!channelId)
+    const channelHint = event?.channel;
+    if (typeof channelHint !== "string" || channelHint.length === 0)
       return;
-    const threadTs = evt.thread_ts;
-    const userId = evt.user;
-    const eventTs = evt.event_ts;
-    const streamingMessageTs = Array.isArray(evt.streaming_message_ts) ? evt.streaming_message_ts : [];
+    const parsed = AgentSessionStoppedEventSchema.safeParse(event);
+    if (!parsed.success) {
+      logger5.warn("Ignoring malformed agent_session_stopped event", {
+        instanceId,
+        channelId: channelHint,
+        issues: parsed.error.issues.map((issue) => `${issue.path.join(".")}: ${issue.message}`)
+      });
+      return;
+    }
+    const channelId = parsed.data.channel;
+    const threadTs = parsed.data.thread_ts;
+    const userId = parsed.data.user;
+    const eventTs = parsed.data.event_ts;
+    const streamingMessageTs = parsed.data.streaming_message_ts ?? [];
     logger5.info("Agent session stopped by user", { instanceId, channelId, threadTs, userId, streamingMessageTs });
     await callbacks.onSessionStopped(instanceId, { channelId, threadTs, userId, streamingMessageTs, eventTs });
   });
@@ -385739,6 +385804,7 @@ function buildRawPayload(meta, msg, extra) {
     ts: meta.ts,
     threadTs: meta.threadTs,
     threadId: !meta.isDm && meta.threadTs ? meta.threadTs : undefined,
+    cancelThreadId: meta.threadTs,
     channelType: meta.channelType,
     teamId: meta.teamId,
     isDm: meta.isDm,
@@ -386354,6 +386420,7 @@ function createNativeStreamSender(options) {
   } = options;
   let streamer;
   let lastSentContent = "";
+  let streamTs;
   let stopped = false;
   let fallback;
   function buildFallback() {
@@ -386384,7 +386451,7 @@ function createNativeStreamSender(options) {
         channel: channelId,
         ...threadTs ? { thread_ts: threadTs } : {}
       });
-      await streamer.append({ markdown_text: firstChunk });
+      noteStreamTs(await streamer.append({ markdown_text: firstChunk }));
       lastSentContent = firstChunk;
     } catch (err2) {
       logger5.warn("native-stream: chat.startStream failed, falling back to replace mode", {
@@ -386394,12 +386461,27 @@ function createNativeStreamSender(options) {
       fallback = buildFallback();
     }
   }
+  function noteStreamTs(response) {
+    if (streamTs || typeof response !== "object" || response === null)
+      return;
+    const ts = response.ts;
+    if (typeof ts === "string" && ts.length > 0)
+      streamTs = ts;
+  }
+  function resolveStreamTs() {
+    if (streamTs)
+      return streamTs;
+    const fromStreamer = streamer?.streamTs;
+    if (typeof fromStreamer === "string" && fromStreamer.length > 0)
+      streamTs = fromStreamer;
+    return streamTs;
+  }
   async function appendDelta(newContent) {
     const delta = newContent.slice(lastSentContent.length);
     if (!delta)
       return;
     try {
-      await streamer?.append({ markdown_text: delta });
+      noteStreamTs(await streamer?.append({ markdown_text: delta }));
       lastSentContent = newContent;
     } catch (err2) {
       logger5.warn("native-stream: append failed", { error: String(err2) });
@@ -386459,6 +386541,16 @@ function createNativeStreamSender(options) {
       if (fallback)
         return fallback.cancel ? fallback.cancel() : fallback.abort();
       await stopStream();
+    },
+    markStoppedByPlatform(stoppedTs) {
+      if (fallback || stopped || !streamer)
+        return false;
+      const ts = resolveStreamTs();
+      if (!ts || !stoppedTs.includes(ts))
+        return false;
+      stopped = true;
+      logger5.debug("native-stream: stream already halted by Slack, skipping chat.stopStream", { channelId, ts });
+      return true;
     }
   };
 }
@@ -386620,6 +386712,7 @@ class SlackPlugin extends BaseChannelPlugin {
   activeThreads = new Map;
   presenceStatusTimers = new Map;
   pendingAckReactions = new Map;
+  activeNativeStreams = new Map;
   async onInitialize(_context) {}
   async onDestroy() {
     for (const [instanceId, connection] of this.connections) {
@@ -386647,6 +386740,7 @@ class SlackPlugin extends BaseChannelPlugin {
     this.presenceStatusTimers.clear();
     this.activeThreads.clear();
     this.pendingAckReactions.clear();
+    this.activeNativeStreams.clear();
   }
   async connect(instanceId, config2) {
     const existing = this.connections.get(instanceId);
@@ -386751,6 +386845,10 @@ class SlackPlugin extends BaseChannelPlugin {
       clearTimeout(timer);
       this.presenceStatusTimers.delete(key);
     }
+    for (const key of this.activeNativeStreams.keys()) {
+      if (key.startsWith(`${instanceId}:`))
+        this.activeNativeStreams.delete(key);
+    }
     for (const key of this.pendingAckReactions.keys()) {
       if (key.startsWith(`${instanceId}:`))
         this.pendingAckReactions.delete(key);
@@ -386812,29 +386910,40 @@ class SlackPlugin extends BaseChannelPlugin {
     const threadTs = this.resolveThreadTs(replyToMode, replyToMessageId, undefined);
     const streamMode = resolveStreamMode(slackConfig.streamMode);
     const throttleMs = resolveStreamThrottle(slackConfig.streamThrottleMs);
-    const base2 = streamMode === "native" ? createNativeStreamSender({
-      client: connection.actingClient,
-      channelId: chatId,
-      threadTs,
-      throttleMs,
-      username: slackConfig.defaultUsername,
-      iconUrl: slackConfig.defaultIconUrl,
-      iconEmoji: slackConfig.defaultIconEmoji,
-      formatMode: options?.formatMode ?? "convert",
-      logger: this.logger
-    }) : createSlackStreamSender({
-      client: connection.actingClient,
-      channelId: chatId,
-      threadTs,
-      streamMode,
-      throttleMs,
-      username: slackConfig.defaultUsername,
-      iconUrl: slackConfig.defaultIconUrl,
-      iconEmoji: slackConfig.defaultIconEmoji,
-      formatMode: options?.formatMode ?? "convert",
-      logger: this.logger
-    });
+    const streamKey = `${instanceId}:${chatId}`;
+    let native;
+    let base2;
+    if (streamMode === "native") {
+      native = createNativeStreamSender({
+        client: connection.actingClient,
+        channelId: chatId,
+        threadTs,
+        throttleMs,
+        username: slackConfig.defaultUsername,
+        iconUrl: slackConfig.defaultIconUrl,
+        iconEmoji: slackConfig.defaultIconEmoji,
+        formatMode: options?.formatMode ?? "convert",
+        logger: this.logger
+      });
+      base2 = native;
+      this.trackNativeStream(streamKey, native);
+    } else {
+      base2 = createSlackStreamSender({
+        client: connection.actingClient,
+        channelId: chatId,
+        threadTs,
+        streamMode,
+        throttleMs,
+        username: slackConfig.defaultUsername,
+        iconUrl: slackConfig.defaultIconUrl,
+        iconEmoji: slackConfig.defaultIconEmoji,
+        formatMode: options?.formatMode ?? "convert",
+        logger: this.logger
+      });
+    }
     const cleanup = () => {
+      if (native)
+        this.untrackNativeStream(streamKey, native);
       this.removeAckReaction(instanceId, chatId, connection, replyToMessageId, threadTs);
       this.clearActiveTyping(instanceId, chatId, connection, threadTs).catch(() => {});
     };
@@ -386859,6 +386968,32 @@ class SlackPlugin extends BaseChannelPlugin {
       }
     };
   }
+  trackNativeStream(streamKey, sender) {
+    let set = this.activeNativeStreams.get(streamKey);
+    if (!set) {
+      set = new Set;
+      this.activeNativeStreams.set(streamKey, set);
+    }
+    set.add(sender);
+  }
+  untrackNativeStream(streamKey, sender) {
+    const set = this.activeNativeStreams.get(streamKey);
+    if (!set)
+      return;
+    set.delete(sender);
+    if (set.size === 0)
+      this.activeNativeStreams.delete(streamKey);
+  }
+  markStreamsStoppedByPlatform(instanceId, channelId, stoppedTs) {
+    if (stoppedTs.length === 0)
+      return;
+    const senders2 = this.activeNativeStreams.get(`${instanceId}:${channelId}`);
+    if (!senders2)
+      return;
+    for (const sender of senders2) {
+      sender.markStoppedByPlatform(stoppedTs);
+    }
+  }
   async sendTyping(instanceId, chatId, duration) {
     await this.sendPresenceStatus(instanceId, chatId, duration === 0 ? "paused" : "typing", duration);
   }
@@ -387260,6 +387395,7 @@ class SlackPlugin extends BaseChannelPlugin {
   async handleAgentSessionStopped(instanceId, connection, args) {
     const parsedEventTs = args.eventTs ? Number.parseFloat(args.eventTs) : Number.NaN;
     const requestedAt = Number.isFinite(parsedEventTs) ? Math.round(parsedEventTs * 1000) : Date.now();
+    this.markStreamsStoppedByPlatform(instanceId, args.channelId, args.streamingMessageTs ?? []);
     try {
       await this.eventBus.publish("agent.run.cancel_requested", {
         instanceId,

package/package.json

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