@automagik/omni 2.260910.10 → 2.260910.11

package/dist/server/index.js

@@ -76973,7 +76973,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;
@@ -162253,7 +162253,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");
@@ -162674,7 +162674,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");
@@ -244418,7 +244418,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();
@@ -251644,7 +251644,7 @@ var init_sentry_scrub = __esm(() => {
 var require_package7 = __commonJS((exports, module) => {
   module.exports = {
     name: "@omni/api",
-    version: "2.260910.10",
+    version: "2.260910.11",
     private: true,
     type: "module",
     exports: {
@@ -278746,7 +278746,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;
@@ -284149,7 +284149,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;
@@ -313279,6 +313279,7 @@ var init_scopes = __esm(() => {
     "POST /events/consumers/:name/ack": "events:write",
     "GET /events": "events:read",
     "GET /events/analytics": "events:read",
+    "GET /events/types": "events:read",
     "GET /events/timeline/:personId": "events:read",
     "POST /events/search": "events:read",
     "GET /events/:id": "events:read",
@@ -314144,6 +314145,7 @@ var init_route_ownership = __esm(() => {
     "GET /api/v2/events/schemas",
     "GET /api/v2/events/schemas/:eventType",
     "GET /api/v2/events/timeline/:personId",
+    "GET /api/v2/events/types",
     "GET /api/v2/follow-up/agents/:id",
     "GET /api/v2/follow-up/chats/:id",
     "GET /api/v2/follow-up/instances/:id",
@@ -368514,17 +368516,38 @@ class AutomationService {
   }
   async test(id, event) {
     const automation = await this.getById(id);
-    if (this.engine) {
-      return this.engine.testAutomation(automation, event);
-    }
-    const matched = automation.triggerEventType === event.type;
+    const triggerMatched = automation.triggerEventType === event.type;
+    const conditionLogic = automation.conditionLogic ?? "and";
+    const conditionResult = evaluateConditionsWithDetails(automation.triggerConditions, { ...event.metadata ?? {}, ...event.payload }, conditionLogic);
+    const matched = triggerMatched && conditionResult.matched;
+    const context20 = createTemplateContext(event.payload, {
+      event: event.id ? {
+        id: event.id,
+        type: event.type,
+        timestamp: event.timestamp ?? Date.now(),
+        metadata: event.metadata ?? {}
+      } : undefined,
+      automation: { id: automation.id, managedByAgentId: automation.managedByAgentId }
+    });
     return {
       matched,
-      conditions: [],
+      triggerMatched,
+      conditionsMatched: conditionResult.matched,
+      conditionLogic,
+      conditions: conditionResult.conditions.map((c) => ({
+        field: c.field,
+        operator: c.operator,
+        expected: c.expectedValue,
+        actual: c.actualValue,
+        resolved: c.actualValue !== undefined,
+        matched: c.matched
+      })),
       actions: automation.actions.map((a) => ({
         type: a.type,
-        wouldExecute: matched
+        wouldExecute: matched,
+        config: substituteTemplateObject(a.config ?? {}, context20)
       })),
+      eventId: event.id ?? null,
       dryRun: true
     };
   }
@@ -368537,7 +368560,7 @@ class AutomationService {
         results: []
       };
     }
-    const correlationId = crypto.randomUUID();
+    const correlationId = event.id ?? crypto.randomUUID();
     const context20 = createTemplateContext(event.payload);
     const actionDeps = {
       eventBus: this.eventBus,
@@ -370491,6 +370514,9 @@ var init_dead_letters = __esm(() => {
 function escapeLikePattern(value) {
   return value.replace(/([\\%_])/g, "\\$1");
 }
+function consumerTypeMatches(filter, eventType) {
+  return filter.endsWith("*") ? eventType.startsWith(filter.slice(0, -1)) : filter === eventType;
+}
 
 class EventService {
   pool;
@@ -370722,6 +370748,31 @@ class EventService {
       timeline
     };
   }
+  async getTypes(options = {}) {
+    const autos = options.automations ?? [];
+    const [observed, schemas2, consumers] = await Promise.all([
+      this.db.select({
+        eventType: omniEvents.eventType,
+        count: sql`count(*)::int`,
+        lastSeen: sql`max(${omniEvents.receivedAt})::text`
+      }).from(omniEvents).where(options.since ? gte(omniEvents.receivedAt, options.since) : undefined).groupBy(omniEvents.eventType).orderBy(desc(sql`count(*)`)),
+      this.db.select({ eventType: eventSchemas.eventType, version: eventSchemas.version, enabled: eventSchemas.enabled }).from(eventSchemas),
+      this.db.select({ name: durableConsumers.name, eventType: durableConsumers.eventType }).from(durableConsumers)
+    ]);
+    const schemaByType = new Map(schemas2.map((s) => [s.eventType, s]));
+    return observed.map((row) => {
+      const schema3 = schemaByType.get(row.eventType);
+      return {
+        eventType: row.eventType,
+        count: row.count,
+        lastSeen: new Date(row.lastSeen).toISOString(),
+        schemaVersion: schema3?.version ?? null,
+        schemaEnabled: schema3?.enabled ?? null,
+        consumers: consumers.filter((c) => consumerTypeMatches(c.eventType, row.eventType)).map((c) => c.name),
+        automations: autos.filter((a) => a.triggerEventType === row.eventType).map((a) => a.name)
+      };
+    });
+  }
 }
 var TRACE_MAX_ANCESTORS = 50, TRACE_MAX_DEPTH = 10, TRACE_MAX_NODES = 200;
 var init_events2 = __esm(() => {
@@ -378977,6 +379028,7 @@ function registerAutomationSchemas(registry4) {
   registry4.register("CreateAutomationRequest", CreateAutomationSchema);
   registry4.register("AutomationLog", AutomationLogSchema);
   registry4.register("TestAutomationRequest", TestAutomationSchema);
+  registry4.register("AutomationTestResult", AutomationTestResultSchema);
   registry4.register("AutomationMetrics", AutomationMetricsSchema);
   registry4.registerPath({
     method: "get",
@@ -379094,24 +379146,16 @@ function registerAutomationSchemas(registry4) {
     path: "/automations/{id}/test",
     operationId: "testAutomation",
     tags: ["Automations"],
-    summary: "Test automation",
-    description: "Test automation against a sample event (dry run).",
+    summary: "Test automation (dry run)",
+    description: "Dry-run an automation against a hand-written event or a REAL journaled event (`eventId`, #1073): " + "trigger match, per-condition verdicts and rendered action templates. Executes nothing, writes no execution log.",
     request: {
       params: exports_external.object({ id: exports_external.string().uuid().openapi({ description: "Automation UUID" }) }),
       body: { content: { "application/json": { schema: TestAutomationSchema } } }
     },
     responses: {
       200: {
-        description: "Test result",
-        content: {
-          "application/json": {
-            schema: exports_external.object({
-              matched: exports_external.boolean(),
-              conditionResults: exports_external.array(exports_external.object({ condition: ConditionSchema, passed: exports_external.boolean() })).optional(),
-              wouldExecute: exports_external.array(ActionSchema).optional()
-            })
-          }
-        }
+        description: "Dry-run result",
+        content: { "application/json": { schema: AutomationTestResultSchema } }
       },
       404: { description: "Not found", content: { "application/json": { schema: ErrorSchema } } }
     }
@@ -379122,7 +379166,7 @@ function registerAutomationSchemas(registry4) {
     operationId: "executeAutomation",
     tags: ["Automations"],
     summary: "Execute automation",
-    description: "Execute automation with a provided event payload. Actually runs the actions (not a dry run).",
+    description: "Execute automation with a provided event payload or a journaled event (`eventId`). Actually runs the actions (not a dry run).",
     request: {
       params: exports_external.object({ id: exports_external.string().uuid().openapi({ description: "Automation UUID" }) }),
       body: { content: { "application/json": { schema: TestAutomationSchema } } }
@@ -379209,7 +379253,7 @@ function registerAutomationSchemas(registry4) {
     }
   });
 }
-var ConditionSchema, WebhookActionSchema, SendMessageActionSchema, EmitEventActionSchema, LogActionSchema, CallAgentActionSchema, ActionSchema, DebounceSchema, AutomationSchema, CreateAutomationSchema, AutomationLogSchema, TestAutomationSchema, AutomationMetricsSchema;
+var ConditionSchema, WebhookActionSchema, SendMessageActionSchema, EmitEventActionSchema, LogActionSchema, CallAgentActionSchema, ActionSchema, DebounceSchema, AutomationSchema, CreateAutomationSchema, AutomationLogSchema, TestAutomationSchema, AutomationTestResultSchema, AutomationMetricsSchema;
 var init_automations3 = __esm(() => {
   init_zod_openapi();
   init_common4();
@@ -379329,8 +379373,32 @@ var init_automations3 = __esm(() => {
     event: exports_external.object({
       type: exports_external.string().min(1).openapi({ description: "Event type" }),
       payload: exports_external.record(exports_external.string(), exports_external.unknown()).openapi({ description: "Event payload" })
+    }).optional().openapi({ description: "Hand-written event. Exactly one of event / eventId is required" }),
+    eventId: exports_external.string().uuid().optional().openapi({
+      description: "Id of a REAL journaled event (omni_events) to run against (#1073): its rawPayload is the payload, " + "its envelope metadata is merged for conditions. Exactly one of event / eventId is required"
     })
   });
+  AutomationTestResultSchema = exports_external.object({
+    matched: exports_external.boolean().openapi({ description: "triggerMatched AND conditionsMatched" }),
+    triggerMatched: exports_external.boolean().openapi({ description: "Event type equals the automation trigger" }),
+    conditionsMatched: exports_external.boolean().openapi({ description: "Condition set verdict under conditionLogic" }),
+    conditionLogic: exports_external.enum(["and", "or"]),
+    conditions: exports_external.array(exports_external.object({
+      field: exports_external.string(),
+      operator: exports_external.string(),
+      expected: exports_external.unknown().optional(),
+      actual: exports_external.unknown().optional(),
+      resolved: exports_external.boolean().openapi({ description: "false = the dot path resolved to nothing in the payload" }),
+      matched: exports_external.boolean()
+    })).openapi({ description: "Per-condition verdicts" }),
+    actions: exports_external.array(exports_external.object({
+      type: exports_external.string(),
+      wouldExecute: exports_external.boolean(),
+      config: exports_external.record(exports_external.string(), exports_external.unknown()).openapi({ description: "Action config with templates rendered" })
+    })).openapi({ description: "Rendered actions \u2014 never executed" }),
+    eventId: exports_external.string().uuid().nullable(),
+    dryRun: exports_external.literal(true)
+  });
   AutomationMetricsSchema = exports_external.object({
     running: exports_external.boolean().openapi({ description: "Engine running" }),
     instanceQueues: exports_external.array(exports_external.object({
@@ -380274,6 +380342,32 @@ function registerEventSchemas(registry4) {
       200: { description: "Analytics data", content: { "application/json": { schema: EventAnalyticsSchema } } }
     }
   });
+  registry4.registerPath({
+    method: "get",
+    path: "/events/types",
+    operationId: "listEventTypes",
+    tags: ["Events"],
+    summary: "List observed event types",
+    description: "Inventory of event types observed in the journal: volume and last seen in the window, registered schema version, and subscribed durable consumers / enabled automations.",
+    request: {
+      query: exports_external.object({
+        since: exports_external.string().datetime().optional().openapi({ description: "Only count events received at/after this time" })
+      })
+    },
+    responses: {
+      200: {
+        description: "Event type inventory",
+        content: {
+          "application/json": {
+            schema: exports_external.object({
+              items: exports_external.array(EventTypeInventoryRowSchema),
+              meta: exports_external.object({ since: exports_external.string().datetime().nullable() })
+            })
+          }
+        }
+      }
+    }
+  });
   registry4.registerPath({
     method: "get",
     path: "/events/timeline/{personId}",
@@ -380387,7 +380481,7 @@ function registerEventSchemas(registry4) {
     }
   });
 }
-var EventSchema, EventSummarySchema, EventAnalyticsSchema, EventTraceSchema, EventSearchSchema;
+var EventSchema, EventTypeInventoryRowSchema, EventSummarySchema, EventAnalyticsSchema, EventTraceSchema, EventSearchSchema;
 var init_events3 = __esm(() => {
   init_zod_openapi();
   init_common4();
@@ -380408,6 +380502,15 @@ var init_events3 = __esm(() => {
     processedAt: exports_external.string().datetime().nullable().openapi({ description: "When event was processed" }),
     causationId: exports_external.string().uuid().nullable().openapi({ description: "Id of the immediate parent event (null for roots and pre-#957 rows)" })
   });
+  EventTypeInventoryRowSchema = exports_external.object({
+    eventType: exports_external.string().openapi({ description: "Event type" }),
+    count: exports_external.number().int().openapi({ description: "Events observed in the window" }),
+    lastSeen: exports_external.string().datetime().openapi({ description: "Most recent receivedAt in the window" }),
+    schemaVersion: exports_external.number().int().nullable().openapi({ description: "Registered schema version (null = unregistered)" }),
+    schemaEnabled: exports_external.boolean().nullable().openapi({ description: "Whether the registered schema gate is enabled" }),
+    consumers: exports_external.array(exports_external.string()).openapi({ description: "Durable consumer names subscribed to this type" }),
+    automations: exports_external.array(exports_external.string()).openapi({ description: "Enabled automations triggered by this type" })
+  }).openapi("EventTypeInventoryRow");
   EventSummarySchema = exports_external.object({
     id: exports_external.string().uuid().openapi({ description: "Event UUID" }),
     eventType: exports_external.string().openapi({ description: "Event type" }),
@@ -384942,6 +385045,18 @@ var init_auth3 = __esm(() => {
 });
 
 // ../api/src/routes/v2/automations.ts
+async function resolveTestEvent(services, body) {
+  if (body.event)
+    return body.event;
+  const row = await services.events.getById(body.eventId);
+  return {
+    id: row.id,
+    type: row.eventType,
+    payload: row.rawPayload ?? {},
+    metadata: row.metadata ?? undefined,
+    timestamp: row.receivedAt.getTime()
+  };
+}
 var automationsRoutes, conditionSchema, webhookActionSchema, sendMessageActionSchema, emitEventActionSchema, logActionSchema, callAgentActionSchema, actionSchema, debounceSchema, createAutomationSchema, updateAutomationSchema, listQuerySchema5, testAutomationSchema, logsQuerySchema;
 var init_automations4 = __esm(() => {
   init_dist6();
@@ -385046,7 +385161,10 @@ var init_automations4 = __esm(() => {
     event: exports_external.object({
       type: exports_external.string().min(1).describe("Event type"),
       payload: exports_external.record(exports_external.string(), exports_external.unknown()).describe("Event payload")
-    })
+    }).optional(),
+    eventId: exports_external.string().uuid().optional().describe("Id of a journaled omni_events row to run against")
+  }).refine((b3) => (b3.event ? 1 : 0) + (b3.eventId ? 1 : 0) === 1, {
+    message: 'Provide exactly one of "event" or "eventId"'
   });
   logsQuerySchema = exports_external.object({
     limit: exports_external.coerce.number().int().min(1).max(100).default(50),
@@ -385120,15 +385238,15 @@ var init_automations4 = __esm(() => {
   });
   automationsRoutes.post("/:id/test", zValidator("json", testAutomationSchema), async (c) => {
     const id = c.req.param("id");
-    const { event } = c.req.valid("json");
     const services = c.get("services");
+    const event = await resolveTestEvent(services, c.req.valid("json"));
     const result = await services.automations.test(id, event);
     return c.json(result);
   });
   automationsRoutes.post("/:id/execute", zValidator("json", testAutomationSchema), async (c) => {
     const id = c.req.param("id");
-    const { event } = c.req.valid("json");
     const services = c.get("services");
+    const event = await resolveTestEvent(services, c.req.valid("json"));
     const result = await services.automations.execute(id, event);
     return c.json(result);
   });
@@ -386823,6 +386941,13 @@ var init_events4 = __esm(() => {
     });
     return c.json(analytics);
   });
+  eventsRoutes.get("/types", zValidator("query", exports_external.object({ since: optionalDateParam("since") })), async (c) => {
+    const { since } = c.req.valid("query");
+    const services = c.get("services");
+    const automations3 = await services.automations.list({ enabled: true });
+    const items = await services.events.getTypes({ since, automations: automations3 });
+    return c.json({ items, meta: { since: since?.toISOString() ?? null } });
+  });
   eventsRoutes.get("/timeline/:personId", zValidator("query", timelineQuerySchema), async (c) => {
     const personId = c.req.param("personId");
     const query = c.req.valid("query");

package/package.json

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