@automagik/omni 2.260911.2 → 2.260911.4

package/dist/server/index.js

@@ -38426,7 +38426,7 @@ var init_debounce = __esm(() => {
 class AutomationEngine {
   config;
   subscriptions = new Map;
-  instanceQueues = new Map;
+  queues = new Map;
   debounceManagers = new Map;
   automations = [];
   eventBus = null;
@@ -38751,29 +38751,38 @@ class AutomationEngine {
     const manager = new DebounceManager(automation.debounce, callback);
     this.debounceManagers.set(automation.id, manager);
   }
+  resolveQueueKey(automation, context2, instanceId) {
+    if (automation.maxConcurrency == null && automation.concurrencyKey == null)
+      return instanceId;
+    const base = `${instanceId}:${automation.id}`;
+    if (!automation.concurrencyKey)
+      return base;
+    const partition = substituteTemplate(automation.concurrencyKey, context2).trim();
+    return partition ? `${base}:${partition}` : base;
+  }
   async queueExecution(automation, event, context2, instanceId) {
-    let queue = this.instanceQueues.get(instanceId);
-    if (!queue) {
-      const maxConcurrency = this.config.instanceConcurrencyOverrides?.[instanceId] ?? this.config.defaultConcurrency;
-      queue = {
-        instanceId,
-        activeCount: 0,
-        maxConcurrency,
-        pending: []
-      };
-      this.instanceQueues.set(instanceId, queue);
-    }
+    const key = this.resolveQueueKey(automation, context2, instanceId);
+    const maxConcurrency = automation.maxConcurrency ?? this.config.instanceConcurrencyOverrides?.[instanceId] ?? this.config.defaultConcurrency;
+    const queue = this.queues.get(key) ?? {
+      key,
+      evictWhenIdle: key !== instanceId,
+      activeCount: 0,
+      maxConcurrency,
+      pending: []
+    };
+    queue.maxConcurrency = maxConcurrency;
+    this.queues.set(key, queue);
     if (queue.activeCount < queue.maxConcurrency) {
       return this.executeAutomation(automation, event, context2, queue);
     }
     const maxQueueDepth = this.config.maxQueueDepth ?? 100;
     if (queue.pending.length >= maxQueueDepth) {
       logger4.warn("Queue full, applying backpressure", {
-        instanceId,
+        queueKey: key,
         queueDepth: queue.pending.length,
         maxDepth: maxQueueDepth
       });
-      throw new QueueFullError(instanceId, queue.pending.length, maxQueueDepth);
+      throw new QueueFullError(key, queue.pending.length, maxQueueDepth);
     }
     const queueRef = queue;
     return new Promise((resolve) => {
@@ -38785,7 +38794,7 @@ class AutomationEngine {
       });
       logger4.debug("Execution queued", {
         automationId: automation.id,
-        instanceId,
+        queueKey: key,
         queueLength: queueRef.pending.length
       });
     });
@@ -38892,6 +38901,10 @@ class AutomationEngine {
           next.resolve(result);
         }
       }
+      if (queue.evictWhenIdle && queue.activeCount === 0 && queue.pending.length === 0) {
+        if (this.queues.get(queue.key) === queue)
+          this.queues.delete(queue.key);
+      }
     }
   }
   async logExecution(result, trustedTenantId = null) {
@@ -38917,8 +38930,8 @@ class AutomationEngine {
     });
   }
   getMetrics() {
-    const instanceQueues = Array.from(this.instanceQueues.values()).map((q) => ({
-      instanceId: q.instanceId,
+    const instanceQueues = Array.from(this.queues.values()).map((q) => ({
+      instanceId: q.key,
       activeCount: q.activeCount,
       pendingCount: q.pending.length
     }));
@@ -38961,12 +38974,12 @@ var init_engine = __esm(() => {
   init_templates();
   logger4 = createLogger("automations:engine");
   QueueFullError = class QueueFullError extends Error {
-    instanceId;
+    queueKey;
     queueDepth;
     maxDepth;
-    constructor(instanceId, queueDepth, maxDepth) {
-      super(`Queue full for instance ${instanceId}: ${queueDepth}/${maxDepth} pending`);
-      this.instanceId = instanceId;
+    constructor(queueKey, queueDepth, maxDepth) {
+      super(`Queue full for ${queueKey}: ${queueDepth}/${maxDepth} pending`);
+      this.queueKey = queueKey;
       this.queueDepth = queueDepth;
       this.maxDepth = maxDepth;
       this.name = "QueueFullError";
@@ -76985,7 +76998,7 @@ var require_ClientVoiceManager = __commonJS((exports, module) => {
 
 // ../../node_modules/.bun/@discordjs+ws@1.2.3/node_modules/@discordjs/ws/dist/index.js
 var require_dist9 = __commonJS((exports, module) => {
-  var __dirname = "/home/runner/work/omni/omni/.stable-source/node_modules/.bun/@discordjs+ws@1.2.3/node_modules/@discordjs/ws/dist";
+  var __dirname = "/home/runner/work/omni/omni/node_modules/.bun/@discordjs+ws@1.2.3/node_modules/@discordjs/ws/dist";
   var __create2 = Object.create;
   var __defProp2 = Object.defineProperty;
   var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -162265,7 +162278,7 @@ var require_indexes = __commonJS((exports, module) => {
 
 // ../../node_modules/.bun/thread-stream@3.1.0/node_modules/thread-stream/index.js
 var require_thread_stream = __commonJS((exports, module) => {
-  var __dirname = "/home/runner/work/omni/omni/.stable-source/node_modules/.bun/thread-stream@3.1.0/node_modules/thread-stream";
+  var __dirname = "/home/runner/work/omni/omni/node_modules/.bun/thread-stream@3.1.0/node_modules/thread-stream";
   var { version } = require_package5();
   var { EventEmitter: EventEmitter3 } = __require("events");
   var { Worker } = __require("worker_threads");
@@ -162686,7 +162699,7 @@ var require_thread_stream = __commonJS((exports, module) => {
 
 // ../../node_modules/.bun/pino@9.14.0/node_modules/pino/lib/transport.js
 var require_transport2 = __commonJS((exports, module) => {
-  var __dirname = "/home/runner/work/omni/omni/.stable-source/node_modules/.bun/pino@9.14.0/node_modules/pino/lib";
+  var __dirname = "/home/runner/work/omni/omni/node_modules/.bun/pino@9.14.0/node_modules/pino/lib";
   var { createRequire: createRequire2 } = __require("module");
   var getCallers = require_caller();
   var { join: join8, isAbsolute, sep: sep2 } = __require("path");
@@ -174411,6 +174424,8 @@ var init_schema2 = __esm(() => {
     enabled: boolean2("enabled").notNull().default(true),
     priority: integer("priority").notNull().default(0),
     transactionalEmissions: boolean2("transactional_emissions").notNull().default(false),
+    maxConcurrency: integer("max_concurrency"),
+    concurrencyKey: text("concurrency_key"),
     managedByAgentId: uuid("managed_by_agent_id").references(() => agents.id, { onDelete: "cascade" }),
     createdAt: timestamp("created_at", { withTimezone: true }).notNull().defaultNow(),
     updatedAt: timestamp("updated_at", { withTimezone: true }).notNull().defaultNow(),
@@ -244431,7 +244446,7 @@ var require_client3 = __commonJS((exports) => {
 
 // ../../node_modules/.bun/@sentry+node-core@10.52.0+2c50d7e904f6cfd7/node_modules/@sentry/node-core/build/cjs/sdk/esmLoader.js
 var require_esmLoader = __commonJS((exports) => {
-  var __filename = "/home/runner/work/omni/omni/.stable-source/node_modules/.bun/@sentry+node-core@10.52.0+2c50d7e904f6cfd7/node_modules/@sentry/node-core/build/cjs/sdk/esmLoader.js";
+  var __filename = "/home/runner/work/omni/omni/node_modules/.bun/@sentry+node-core@10.52.0+2c50d7e904f6cfd7/node_modules/@sentry/node-core/build/cjs/sdk/esmLoader.js";
   Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
   var core3 = require_cjs6();
   var importInTheMiddle = require_import_in_the_middle();
@@ -251657,7 +251672,7 @@ var init_sentry_scrub = __esm(() => {
 var require_package7 = __commonJS((exports, module) => {
   module.exports = {
     name: "@omni/api",
-    version: "2.260911.2",
+    version: "2.260911.4",
     private: true,
     type: "module",
     exports: {
@@ -278759,7 +278774,7 @@ var require_src45 = __commonJS((exports) => {
 
 // ../../node_modules/.bun/@grpc+grpc-js@1.14.3/node_modules/@grpc/grpc-js/build/src/channelz.js
 var require_channelz = __commonJS((exports) => {
-  var __dirname = "/home/runner/work/omni/omni/.stable-source/node_modules/.bun/@grpc+grpc-js@1.14.3/node_modules/@grpc/grpc-js/build/src";
+  var __dirname = "/home/runner/work/omni/omni/node_modules/.bun/@grpc+grpc-js@1.14.3/node_modules/@grpc/grpc-js/build/src";
   Object.defineProperty(exports, "__esModule", { value: true });
   exports.registerChannelzSocket = exports.registerChannelzServer = exports.registerChannelzSubchannel = exports.registerChannelzChannel = exports.ChannelzCallTrackerStub = exports.ChannelzCallTracker = exports.ChannelzChildrenTrackerStub = exports.ChannelzChildrenTracker = exports.ChannelzTrace = exports.ChannelzTraceStub = undefined;
   exports.unregisterChannelzRef = unregisterChannelzRef;
@@ -284162,7 +284177,7 @@ var require_duration = __commonJS((exports) => {
 
 // ../../node_modules/.bun/@grpc+grpc-js@1.14.3/node_modules/@grpc/grpc-js/build/src/orca.js
 var require_orca = __commonJS((exports) => {
-  var __dirname = "/home/runner/work/omni/omni/.stable-source/node_modules/.bun/@grpc+grpc-js@1.14.3/node_modules/@grpc/grpc-js/build/src";
+  var __dirname = "/home/runner/work/omni/omni/node_modules/.bun/@grpc+grpc-js@1.14.3/node_modules/@grpc/grpc-js/build/src";
   Object.defineProperty(exports, "__esModule", { value: true });
   exports.OrcaOobMetricsSubchannelWrapper = exports.GRPC_METRICS_HEADER = exports.ServerMetricRecorder = exports.PerRequestMetricRecorder = undefined;
   exports.createOrcaClient = createOrcaClient;
@@ -375841,6 +375856,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);
@@ -376011,7 +376029,7 @@ class WebhookService {
       payload,
       headers
     });
-    const claimed = await this.db.insert(omniEvents).values({
+    const claim = await this.claimJournalRow({
       id: eventId,
       channel: "internal",
       eventType,
@@ -376021,18 +376039,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
       };
@@ -376067,6 +376084,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)
@@ -376130,16 +376155,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);
@@ -379382,6 +379457,12 @@ var init_automations3 = __esm(() => {
     transactionalEmissions: exports_external.boolean().openapi({
       description: "Transactional publication (G5, #988): buffer the run's emit_event publishes and flush them in order " + "only when every action succeeded; a failed run publishes zero"
     }),
+    maxConcurrency: exports_external.number().int().nullable().openapi({
+      description: "Per-automation concurrency limit (#1108). null = queued per instance with the engine default; " + "set = a queue private to this automation, 1 being strict single-flight"
+    }),
+    concurrencyKey: exports_external.string().nullable().openapi({
+      description: "Template over the event payload partitioning this automation\u2019s queue (#1108), e.g. " + '"{{payload.from.id}}" to serialize per chat; null = one queue for the whole automation'
+    }),
     managedByAgentId: exports_external.string().uuid().nullable().openapi({
       description: "Set when this automation was compiled from an agent event manifest (RFC #925 G4b, #986); " + "null = hand-made. Managed automations reject manual mutation \u2014 edit the owning agent\u2019s manifest instead"
     }),
@@ -379400,6 +379481,12 @@ var init_automations3 = __esm(() => {
     priority: exports_external.number().int().default(0).openapi({ description: "Priority" }),
     transactionalEmissions: exports_external.boolean().default(false).openapi({
       description: "Transactional publication (G5, #988): buffer the run's emit_event publishes and flush them in order " + "only when every action succeeded; a failed run publishes zero. Default false = immediate publishing"
+    }),
+    maxConcurrency: exports_external.number().int().min(1).nullable().optional().openapi({
+      description: "Per-automation concurrency limit (#1108). Omit/null = today\u2019s per-instance queueing with the engine " + "default; 1 = strict single-flight, which is what a read-before-write action needs"
+    }),
+    concurrencyKey: exports_external.string().min(1).nullable().optional().openapi({
+      description: "Template over the event payload partitioning this automation\u2019s queue (#1108), e.g. " + '"{{payload.from.id}}" to serialize per chat; omit/null = one queue for the whole automation'
     })
   });
   AutomationLogSchema = exports_external.object({
@@ -379445,7 +379532,9 @@ var init_automations3 = __esm(() => {
   AutomationMetricsSchema = exports_external.object({
     running: exports_external.boolean().openapi({ description: "Engine running" }),
     instanceQueues: exports_external.array(exports_external.object({
-      instanceId: exports_external.string().openapi({ description: "Instance ID" }),
+      instanceId: exports_external.string().openapi({
+        description: 'Queue key: the instance ID, or "<instanceId>:<automationId>[:<partition>]" for an automation ' + "running on its own queue (#1108)"
+      }),
       activeCount: exports_external.number().int().openapi({ description: "Active jobs" }),
       pendingCount: exports_external.number().int().openapi({ description: "Pending jobs" })
     })).optional().openapi({ description: "Instance queue stats" }),
@@ -383516,7 +383605,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)" }),
@@ -385197,7 +385289,9 @@ var init_automations4 = __esm(() => {
     debounce: debounceSchema.optional().describe("Message debounce configuration"),
     enabled: exports_external.boolean().default(true).describe("Whether automation is enabled"),
     priority: exports_external.number().int().default(0).describe("Priority (higher runs first)"),
-    transactionalEmissions: exports_external.boolean().default(false).describe("Transactional publication (G5, #988): buffer the run's emit_event publishes and flush them in order " + "only when every action succeeded; a failed run publishes zero. Default false = immediate publishing")
+    transactionalEmissions: exports_external.boolean().default(false).describe("Transactional publication (G5, #988): buffer the run's emit_event publishes and flush them in order " + "only when every action succeeded; a failed run publishes zero. Default false = immediate publishing"),
+    maxConcurrency: exports_external.number().int().min(1).nullable().optional().describe("Per-automation concurrency limit (#1108). Omit/null = today\u2019s per-instance queueing with the engine " + "default; 1 = strict single-flight, which is what a read-before-write action needs"),
+    concurrencyKey: exports_external.string().min(1).nullable().optional().describe("Template over the event payload partitioning this automation\u2019s queue (#1108), e.g. " + '"{{payload.from.id}}" to serialize per chat; omit/null = one queue for the whole automation')
   });
   updateAutomationSchema = createAutomationSchema.partial();
   listQuerySchema5 = exports_external.object({
@@ -396325,10 +396419,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)) {
@@ -396337,7 +396432,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.2",
+  "version": "2.260911.4",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/automagik-dev/omni.git",