@automagik/omni 2.260911.4 → 2.260911.6

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;
@@ -76998,7 +77017,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/node_modules/.bun/@discordjs+ws@1.2.3/node_modules/@discordjs/ws/dist";
+  var __dirname = "/home/runner/work/omni/omni/.stable-source/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;
@@ -162278,7 +162297,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/node_modules/.bun/thread-stream@3.1.0/node_modules/thread-stream";
+  var __dirname = "/home/runner/work/omni/omni/.stable-source/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");
@@ -162699,7 +162718,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/node_modules/.bun/pino@9.14.0/node_modules/pino/lib";
+  var __dirname = "/home/runner/work/omni/omni/.stable-source/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");
@@ -244446,7 +244465,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/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/.stable-source/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();
@@ -251672,7 +251691,7 @@ var init_sentry_scrub = __esm(() => {
 var require_package7 = __commonJS((exports, module) => {
   module.exports = {
     name: "@omni/api",
-    version: "2.260911.4",
+    version: "2.260911.6",
     private: true,
     type: "module",
     exports: {
@@ -278774,7 +278793,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/node_modules/.bun/@grpc+grpc-js@1.14.3/node_modules/@grpc/grpc-js/build/src";
+  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";
   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;
@@ -284177,7 +284196,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/node_modules/.bun/@grpc+grpc-js@1.14.3/node_modules/@grpc/grpc-js/build/src";
+  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";
   Object.defineProperty(exports, "__esModule", { value: true });
   exports.OrcaOobMetricsSubchannelWrapper = exports.GRPC_METRICS_HEADER = exports.ServerMetricRecorder = exports.PerRequestMetricRecorder = undefined;
   exports.createOrcaClient = createOrcaClient;
@@ -379441,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" }),
@@ -385195,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();
@@ -385261,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"),

package/package.json

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