@automagik/omni 2.260911.3 → 2.260911.5

package/dist/server/index.js

@@ -38333,6 +38333,8 @@ class DebounceManager {
       this.windows.set(key, window2);
     }
     window2.messages.push(message2);
+    window2.from = from;
+    window2.instanceId = instanceId;
     window2.lastActivityAt = Date.now();
     this.resetTimer(key, window2);
   }
@@ -38667,6 +38669,23 @@ class AutomationEngine {
       throw err2;
     }
   }
+  resolveDebounceKey(automation, event, instanceId) {
+    const payload = event.payload;
+    const template = automation.debounce?.key;
+    if (!template) {
+      const from = payload.from;
+      return from?.id ? buildConversationKey(instanceId, from.id) : null;
+    }
+    const rendered = substituteTemplate(template, createTemplateContext(payload)).trim();
+    if (!rendered) {
+      logger4.debug("Debounce key template rendered empty \u2014 processing immediately", {
+        automationId: automation.id,
+        eventId: event.id
+      });
+      return null;
+    }
+    return `${instanceId}:${rendered}`;
+  }
   async handleDebounced(automation, event) {
     const manager = this.debounceManagers.get(automation.id);
     if (!manager) {
@@ -38676,11 +38695,11 @@ class AutomationEngine {
     const payload = event.payload;
     const instanceId = event.metadata.instanceId ?? "global";
     const from = payload.from;
-    if (!from?.id) {
+    const key = this.resolveDebounceKey(automation, event, instanceId);
+    if (!key) {
       await this.handleImmediate(automation, event);
       return;
     }
-    const key = buildConversationKey(instanceId, from.id);
     if (event.type.startsWith("presence.")) {
       manager.handlePresenceEvent(key, event.type);
       return;
@@ -251672,7 +251691,7 @@ var init_sentry_scrub = __esm(() => {
 var require_package7 = __commonJS((exports, module) => {
   module.exports = {
     name: "@omni/api",
-    version: "2.260911.3",
+    version: "2.260911.5",
     private: true,
     type: "module",
     exports: {
@@ -375856,6 +375875,9 @@ var init_ingress_idempotency = __esm(() => {
 
 // ../api/src/services/webhooks.ts
 import { createHmac as createHmac4, timingSafeEqual } from "crypto";
+function scopeTriggerKey(key, instanceId, tenantId) {
+  return `manual:${instanceId ?? tenantId ?? "global"}:${key}`;
+}
 function timingSafeEqualStrings(a, b3) {
   const bufA = Buffer.from(a);
   const bufB = Buffer.from(b3);
@@ -376026,7 +376048,7 @@ class WebhookService {
       payload,
       headers
     });
-    const claimed = await this.db.insert(omniEvents).values({
+    const claim = await this.claimJournalRow({
       id: eventId,
       channel: "internal",
       eventType,
@@ -376036,18 +376058,17 @@ class WebhookService {
       idempotencyKey,
       receivedAt: new Date,
       metadata: { correlationId: eventId, source: "webhook", fullEventType: eventType, webhookSource: sourceName }
-    }).onConflictDoNothing({ target: omniEvents.idempotencyKey }).returning({ id: omniEvents.id });
-    if (claimed.length === 0) {
+    });
+    if (claim.duplicate) {
       await this.db.update(webhookSources).set({
         totalDuplicates: sql`${webhookSources.totalDuplicates} + 1`,
         updatedAt: new Date
       }).where(eq(webhookSources.id, source.id));
-      const [original] = await this.db.select({ id: omniEvents.id }).from(omniEvents).where(eq(omniEvents.idempotencyKey, idempotencyKey)).limit(1);
       log114.info("Webhook redelivery acked without a second event", { sourceName, idempotencyKey });
       return {
         received: true,
         duplicate: true,
-        eventId: original?.id ?? eventId,
+        eventId: claim.eventId,
         source: sourceName,
         eventType
       };
@@ -376082,6 +376103,14 @@ class WebhookService {
       eventType
     };
   }
+  async claimJournalRow(row) {
+    const claimed = await this.db.insert(omniEvents).values(row).onConflictDoNothing({ target: omniEvents.idempotencyKey }).returning({ id: omniEvents.id });
+    if (claimed.length > 0) {
+      return { eventId: row.id, duplicate: false };
+    }
+    const [original] = await this.db.select({ id: omniEvents.id }).from(omniEvents).where(eq(omniEvents.idempotencyKey, row.idempotencyKey)).limit(1);
+    return { eventId: original?.id ?? row.id, duplicate: true };
+  }
   verifySignature(source, rawBody, headers) {
     const config4 = source.signatureConfig;
     if (!config4)
@@ -376145,16 +376174,66 @@ class WebhookService {
   async trigger(eventType, payload, metadata) {
     const provisionalId = metadata?.correlationId ?? generateId();
     await this.enforceRegisteredSchema(eventType, payload, provisionalId, "manual trigger");
-    if (this.eventBus) {
-      const result = await this.eventBus.publishGeneric(eventType, payload, {
-        correlationId: metadata?.correlationId,
-        causationId: metadata?.causationId,
-        instanceId: metadata?.instanceId,
+    const bus2 = this.eventBus;
+    if (!bus2) {
+      return { eventId: provisionalId, published: false };
+    }
+    const key = metadata?.idempotencyKey;
+    if (key) {
+      return this.triggerClaimed(bus2, eventType, payload, metadata ?? {}, key);
+    }
+    const result = await bus2.publishGeneric(eventType, payload, {
+      correlationId: metadata?.correlationId,
+      causationId: metadata?.causationId,
+      instanceId: metadata?.instanceId,
+      source: "manual-trigger"
+    });
+    return { eventId: result.id, published: true };
+  }
+  async triggerClaimed(bus2, eventType, payload, metadata, key) {
+    const idempotencyKey = scopeTriggerKey(key, metadata.instanceId, this.tenantId);
+    const eventId = generateId();
+    const claim = await this.claimJournalRow({
+      id: eventId,
+      channel: "internal",
+      eventType,
+      direction: "internal",
+      status: "completed",
+      rawPayload: payload,
+      idempotencyKey,
+      causationId: metadata.causationId ?? null,
+      receivedAt: new Date,
+      metadata: {
+        correlationId: metadata.correlationId ?? eventId,
+        source: "manual-trigger",
+        fullEventType: eventType,
+        idempotencyKey
+      }
+    });
+    if (claim.duplicate) {
+      log114.info("Manual trigger deduped: idempotency key already journaled", { eventType, idempotencyKey });
+      return { eventId: claim.eventId, published: false, duplicate: true };
+    }
+    try {
+      await bus2.publishGeneric(eventType, payload, {
+        correlationId: metadata.correlationId,
+        causationId: metadata.causationId,
+        instanceId: metadata.instanceId,
+        publishEventId: eventId,
         source: "manual-trigger"
       });
-      return { eventId: result.id, published: true };
+    } catch (error3) {
+      await this.db.delete(omniEvents).where(eq(omniEvents.id, eventId)).catch((releaseError) => {
+        log114.error("Failed to release trigger idempotency claim after publish failure", {
+          eventType,
+          eventId,
+          idempotencyKey,
+          error: String(releaseError)
+        });
+      });
+      throw error3;
     }
-    return { eventId: provisionalId, published: false };
+    return { eventId, published: true, duplicate: false };
   }
   async heartbeat(sourceName) {
     const source = await this.getByName(sourceName);
@@ -379381,7 +379460,8 @@ var init_automations3 = __esm(() => {
     maxMs: exports_external.number().int().optional(),
     baseDelayMs: exports_external.number().int().optional(),
     maxWaitMs: exports_external.number().int().optional(),
-    extendOnEvents: exports_external.array(exports_external.string()).optional()
+    extendOnEvents: exports_external.array(exports_external.string()).optional(),
+    key: exports_external.string().optional().describe('Template over the event payload naming the debounce window (#1110), e.g. "{{payload.pull_request.id}}"; ' + 'absent = grouped by conversation (instance + sender). Not allowed with mode "presence"')
   });
   AutomationSchema = exports_external.object({
     id: exports_external.string().uuid().openapi({ description: "Automation UUID" }),
@@ -383545,7 +383625,10 @@ var init_webhooks2 = __esm(() => {
     payload: exports_external.record(exports_external.string(), exports_external.unknown()).openapi({ description: "Event payload" }),
     correlationId: exports_external.string().optional().openapi({ description: "Correlation ID" }),
     causationId: exports_external.string().uuid().optional().openapi({ description: "Parent event ID; stamps causationId so the emission is parented in the causality tree" }),
-    instanceId: exports_external.string().uuid().optional().openapi({ description: "Instance ID for context" })
+    instanceId: exports_external.string().uuid().optional().openapi({ description: "Instance ID for context" }),
+    idempotencyKey: exports_external.string().min(1).max(255).optional().openapi({
+      description: "Producer-supplied ingress key (#1109). Unique per instance (else per tenant), not global. A key already journaled publishes nothing and returns the ORIGINAL event id with duplicate: true. Omit for undeduped publishing."
+    })
   });
   WebhookReceiveResponseSchema = exports_external.object({
     eventId: exports_external.string().uuid().openapi({ description: "Created event ID (the ORIGINAL event on a duplicate)" }),
@@ -385132,7 +385215,7 @@ async function resolveTestEvent(services, body) {
     timestamp: row.receivedAt.getTime()
   };
 }
-var automationsRoutes, conditionSchema, webhookActionSchema, sendMessageActionSchema, emitEventActionSchema, logActionSchema, callAgentActionSchema, actionSchema, debounceSchema, createAutomationSchema, updateAutomationSchema, listQuerySchema5, testAutomationSchema, logsQuerySchema;
+var automationsRoutes, conditionSchema, webhookActionSchema, sendMessageActionSchema, emitEventActionSchema, logActionSchema, callAgentActionSchema, actionSchema, debounceKeySchema, debounceSchema, createAutomationSchema, updateAutomationSchema, listQuerySchema5, testAutomationSchema, logsQuerySchema;
 var init_automations4 = __esm(() => {
   init_dist6();
   init_dist2();
@@ -385198,24 +385281,31 @@ var init_automations4 = __esm(() => {
     logActionSchema,
     callAgentActionSchema
   ]);
+  debounceKeySchema = exports_external.string().min(1).optional().describe('Template over the event payload naming the debounce window (#1110), e.g. "{{payload.pull_request.id}}"; ' + 'omit to group by conversation (instance + sender) as before. Not allowed with mode "presence"');
   debounceSchema = exports_external.discriminatedUnion("mode", [
-    exports_external.object({ mode: exports_external.literal("none") }),
+    exports_external.object({ mode: exports_external.literal("none"), key: debounceKeySchema }),
     exports_external.object({
       mode: exports_external.literal("fixed"),
-      delayMs: exports_external.number().int().min(100).max(300000).describe("Fixed delay in milliseconds")
+      delayMs: exports_external.number().int().min(100).max(300000).describe("Fixed delay in milliseconds"),
+      key: debounceKeySchema
     }),
     exports_external.object({
       mode: exports_external.literal("range"),
       minMs: exports_external.number().int().min(100).describe("Minimum delay"),
-      maxMs: exports_external.number().int().max(300000).describe("Maximum delay")
+      maxMs: exports_external.number().int().max(300000).describe("Maximum delay"),
+      key: debounceKeySchema
     }),
     exports_external.object({
       mode: exports_external.literal("presence"),
       baseDelayMs: exports_external.number().int().min(100).describe("Base delay"),
       maxWaitMs: exports_external.number().int().max(300000).optional().describe("Maximum total wait"),
-      extendOnEvents: exports_external.array(exports_external.string()).describe("Events that extend the timer")
+      extendOnEvents: exports_external.array(exports_external.string()).describe("Events that extend the timer"),
+      key: debounceKeySchema
     })
-  ]);
+  ]).refine((debounce3) => !(debounce3.mode === "presence" && debounce3.key), {
+    message: 'debounce.key cannot be combined with mode "presence": presence extension only applies to conversations',
+    path: ["key"]
+  });
   createAutomationSchema = exports_external.object({
     name: exports_external.string().min(1).max(255).describe("Automation name"),
     description: exports_external.string().optional().describe("Description"),
@@ -396356,10 +396446,11 @@ var init_webhooks3 = __esm(() => {
     payload: exports_external.record(exports_external.string(), exports_external.unknown()).describe("Event payload"),
     correlationId: exports_external.string().optional().describe("Optional correlation ID"),
     causationId: exports_external.string().uuid().optional().describe("Optional parent event ID (causality tree, #1072)"),
-    instanceId: exports_external.string().uuid().optional().describe("Optional instance ID for context")
+    instanceId: exports_external.string().uuid().optional().describe("Optional instance ID for context"),
+    idempotencyKey: exports_external.string().min(1).max(255).optional().describe("Optional producer-supplied ingress key; a key already journaled returns the original event (#1109)")
   });
   webhooksRoutes.post("/events/trigger", zValidator("json", triggerEventSchema), async (c) => {
-    const { eventType, payload, correlationId, causationId, instanceId } = c.req.valid("json");
+    const { eventType, payload, correlationId, causationId, instanceId, idempotencyKey } = c.req.valid("json");
     const services = c.get("services");
     const apiKey = c.get("apiKey");
     if (instanceId && apiKey && !ApiKeyService.instanceAllowed(apiKey.instanceIds, instanceId)) {
@@ -396368,7 +396459,8 @@ var init_webhooks3 = __esm(() => {
     const result = await services.webhooks.trigger(eventType, payload, {
       correlationId,
       causationId,
-      instanceId
+      instanceId,
+      idempotencyKey
     });
     return c.json(result, 201);
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automagik/omni",
-  "version": "2.260911.3",
+  "version": "2.260911.5",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/automagik-dev/omni.git",