@automagik/omni 2.260915.19 → 2.260915.21

package/dist/server/index.js

@@ -38197,7 +38197,8 @@ async function executeCallAgentAction(config2, context2, deps, trustedTenantId,
       result: {
         response: result.fullResponse,
         runId: result.metadata.runId,
-        sessionId: result.metadata.sessionId
+        sessionId: result.metadata.sessionId,
+        ...result.metadata.usage ? { usage: result.metadata.usage } : {}
       },
       error: result.metadata.status === "failed" ? "Agent call failed" : undefined
     };
@@ -38219,6 +38220,7 @@ function dispatchCallAgent(run, deps, provenance) {
     status: result.metadata.status,
     providerRunId: result.metadata.runId,
     response: result.fullResponse,
+    ...result.metadata.usage ? { usage: result.metadata.usage } : {},
     error: result.metadata.status === "failed" ? "Agent call failed" : undefined
   }), (error) => publish({ status: "failed", error: error instanceof Error ? error.message : "Unknown error" }));
   return { success: true, result: { runId, accepted: true } };
@@ -173910,6 +173912,7 @@ var init_schema2 = __esm(() => {
     durationMs: integer("duration_ms"),
     inputTokens: integer("input_tokens"),
     outputTokens: integer("output_tokens"),
+    costUsd: numeric("cost_usd", { precision: 15, scale: 6 }),
     error: text("error"),
     metadata: jsonb("metadata").$type(),
     createdAt: timestamp("created_at", { withTimezone: true }).notNull().defaultNow(),
@@ -251106,7 +251109,7 @@ var init_sentry_scrub = __esm(() => {
 var require_package7 = __commonJS((exports, module) => {
   module.exports = {
     name: "@omni/api",
-    version: "2.260915.19",
+    version: "2.260915.21",
     private: true,
     type: "module",
     exports: {
@@ -362163,6 +362166,31 @@ async function stampAgentUsage(db2, eventId, stamp) {
     log87.warn("Failed to stamp agent usage on journal row", { eventId, error: String(error3) });
   }
 }
+async function recordAutomationTriggerLog(db2, entry) {
+  try {
+    const { usage } = entry;
+    await scopedHandle(db2).insert(triggerLogs).values({
+      instanceId: entry.instanceId,
+      providerId: entry.providerId && isValidUuid(entry.providerId) ? entry.providerId : null,
+      eventType: entry.eventType ?? "unknown",
+      eventId: entry.eventId ?? "unknown",
+      triggerType: "automation",
+      channelType: entry.channelType,
+      chatId: entry.chatId,
+      senderId: entry.senderId,
+      mode: "round-trip",
+      respondedAt: entry.error ? null : new Date,
+      responded: !entry.error,
+      durationMs: entry.durationMs !== undefined ? Math.round(entry.durationMs) : null,
+      inputTokens: usage?.tokensIn ?? null,
+      outputTokens: usage?.tokensOut ?? null,
+      costUsd: usage?.costUsd !== undefined ? String(usage.costUsd) : null,
+      error: entry.error
+    });
+  } catch (error3) {
+    log87.warn("Failed to record automation trigger log", { instanceId: entry.instanceId, error: String(error3) });
+  }
+}
 var log87;
 var init_agent_usage2 = __esm(() => {
   init_src();
@@ -370379,6 +370407,8 @@ class EventService {
       totalCostUsd: sql`coalesce(sum((${omniEvents.metadata}->'agentUsage'->>'costUsd')::numeric), 0)::float`
     }).from(omniEvents).where(whereClause);
     const counts = countResults[0];
+    const costExpr = sql`sum((${omniEvents.metadata}->'agentUsage'->>'costUsd')::numeric)::float`;
+    const costByEventType = await this.db.select({ eventType: omniEvents.eventType, costUsd: costExpr }).from(omniEvents).where(and2(whereClause, sql`${omniEvents.metadata}->'agentUsage'->>'costUsd' is not null`)).groupBy(omniEvents.eventType);
     const contentTypeCounts = await this.db.select({
       contentType: omniEvents.contentType,
       count: sql`count(*)::int`
@@ -370421,6 +370451,7 @@ class EventService {
       avgProcessingTimeMs: counts?.avgProcessingTime ?? null,
       avgAgentTimeMs: counts?.avgAgentTime ?? null,
       totalCostUsd: counts?.totalCostUsd ?? 0,
+      costByEventType: Object.fromEntries(costByEventType.map((c) => [c.eventType, c.costUsd])),
       messageTypes: Object.fromEntries(contentTypeCounts.filter((c) => c.contentType != null).map((c) => [c.contentType, c.count])),
       errorStages: Object.fromEntries(errorStageCounts.filter((c) => c.errorStage != null).map((c) => [c.errorStage, c.count])),
       instances: Object.fromEntries(instanceCounts.filter((c) => c.instanceId != null).map((c) => [c.instanceId, c.count])),
@@ -380767,6 +380798,7 @@ var init_events3 = __esm(() => {
     avgProcessingTimeMs: exports_external.number().nullable().openapi({ description: "Average processing time (ms)" }),
     avgAgentTimeMs: exports_external.number().nullable().openapi({ description: "Average agent time (ms)" }),
     totalCostUsd: exports_external.number().openapi({ description: "Sum of agent run cost (USD) stamped on events in range" }),
+    costByEventType: exports_external.record(exports_external.string(), exports_external.number()).openapi({ description: "Agent run cost (USD) grouped by event type, for events with a stamped cost" }),
     messageTypes: exports_external.record(exports_external.string(), exports_external.number()).openapi({ description: "Count by content type" }),
     errorStages: exports_external.record(exports_external.string(), exports_external.number()).openapi({ description: "Count by error stage" }),
     instances: exports_external.record(exports_external.string(), exports_external.number()).openapi({ description: "Count by instance" }),
@@ -400890,7 +400922,7 @@ async function runChatlessCallAgent(services, db3, ctx, cfg, trustedTenantId) {
   });
   return toCallAgentResult(db3, ctx, result, trustedTenantId);
 }
-function toCallAgentResult(db3, ctx, result, trustedTenantId) {
+function toCallAgentResult(db3, ctx, result, trustedTenantId, instance4) {
   const usage = agentUsageFromResult({
     providerId: result.metadata.providerId,
     runId: result.metadata.runId,
@@ -400899,6 +400931,20 @@ function toCallAgentResult(db3, ctx, result, trustedTenantId) {
   if (usage) {
     runTenantWorkDb(db3, trustedTenantId, () => stampAgentUsage(db3, ctx.event?.id, { usage, latencyMs: result.metadata.metrics?.durationMs })).catch((error3) => log133.warn("call_agent: usage stamp scope failed", { error: String(error3) }));
   }
+  if (instance4) {
+    runTenantWorkDb(db3, trustedTenantId, () => recordAutomationTriggerLog(db3, {
+      instanceId: instance4.id,
+      providerId: result.metadata.providerId,
+      eventId: ctx.event?.id,
+      eventType: ctx.event?.type,
+      chatId: ctx.chatId,
+      senderId: ctx.senderId,
+      channelType: instance4.channel ?? undefined,
+      durationMs: result.metadata.metrics?.durationMs,
+      usage,
+      error: result.metadata.status === "failed" ? "Agent call failed" : undefined
+    })).catch((error3) => log133.warn("call_agent: trigger log scope failed", { error: String(error3) }));
+  }
   return {
     parts: result.parts,
     fullResponse: result.parts.join(`
@@ -401021,7 +401067,7 @@ function buildAutomationEngineDeps(services, db3, options = {}) {
         chatType: "dm",
         messages: ctx.messages
       });
-      return toCallAgentResult(db3, ctx, result, trustedTenantId);
+      return toCallAgentResult(db3, ctx, result, trustedTenantId, instance4);
     },
     staleIdleTimeoutGate: async (chatId, instanceId, eventSequenceIndex, trustedTenantId) => {
       return services.followUpLifecycle.evaluateIdleTimeoutFreshness(chatId, instanceId, eventSequenceIndex, trustedTenantId);

package/package.json

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