@nativesquare/soma 0.13.0 → 0.14.0

package/src/component/garmin/public.ts

@@ -57,6 +57,7 @@ import { transformPulseOx } from "./transform/pulseOx.js";
 import { transformRespiration } from "./transform/respiration.js";
 import { transformPlannedWorkoutToGarmin } from "./transform/plannedWorkout.js";
 import { api, internal } from "../_generated/api";
+import type { SomaError } from "../validators/shared.js";
 
 // ─── OAuth ──────────────────────────────────────────────────────────────────
 
@@ -78,7 +79,7 @@ export const getGarminAuthUrl = action({
       state,
     });
 
-    await ctx.runMutation(internal.garmin.private.storePendingOAuth, {
+    await ctx.runMutation(internal.private.storePendingOAuth, {
       provider: "GARMIN",
       state,
       codeVerifier,
@@ -101,7 +102,7 @@ export const completeGarminOAuth = action({
     connectionId: Id<"connections">;
     userId: string;
   }> => {
-    const pending: Doc<"pendingOAuth"> | null = await ctx.runQuery(internal.garmin.private.getPendingOAuth, {
+    const pending: Doc<"pendingOAuth"> | null = await ctx.runQuery(internal.private.getPendingOAuth, {
       state: args.state,
     });
     if (!pending) {
@@ -126,7 +127,7 @@ export const completeGarminOAuth = action({
       redirectUri: args.redirectUri,
     });
 
-    const _deleted: null = await ctx.runMutation(internal.garmin.private.deletePendingOAuth, {
+    const _deleted: null = await ctx.runMutation(internal.private.deletePendingOAuth, {
       state: args.state,
     });
 
@@ -136,7 +137,7 @@ export const completeGarminOAuth = action({
     });
 
     const expiresAt = Math.floor(Date.now() / 1000) + tokenResult.expires_in;
-    const _stored: null = await ctx.runMutation(internal.garmin.private.storeTokens, {
+    const _stored: null = await ctx.runMutation(internal.private.storeTokens, {
       connectionId,
       accessToken: tokenResult.access_token,
       refreshToken: tokenResult.refresh_token,
@@ -179,7 +180,7 @@ export const disconnectGarmin = action({
     const connectionId = connection._id;
 
     // Best-effort: deregister user at Garmin
-    const tokenDoc: Doc<"providerTokens"> | null = await ctx.runQuery(internal.garmin.private.getTokens, {
+    const tokenDoc: Doc<"providerTokens"> | null = await ctx.runQuery(internal.private.getTokens, {
       connectionId,
     });
     if (tokenDoc) {
@@ -191,7 +192,7 @@ export const disconnectGarmin = action({
       }
     }
 
-    const _deleted: null = await ctx.runMutation(internal.garmin.private.deleteTokens, { connectionId });
+    const _deleted: null = await ctx.runMutation(internal.private.deleteTokens, { connectionId });
 
     const _disconnected: null = await ctx.runMutation(api.public.disconnect, {
       userId: args.userId,
@@ -215,9 +216,10 @@ export const pullActivities = action({
   handler: async (ctx, args) => {
 
     const { connectionId, accessToken } = await ctx.runAction(
-      internal.garmin.private.resolveConnectionAndAccessToken,
+      internal.private.resolveConnectionAndAccessToken,
       {
         userId: args.userId,
+        provider: "GARMIN",
         clientId: args.clientId,
         clientSecret: args.clientSecret,
       },
@@ -227,7 +229,7 @@ export const pullActivities = action({
 
     const wellnessClient = createWellnessClient(accessToken);
     const synced = { activities: 0 };
-    const errors: Array<{ type: string; id: string; message: string }> = [];
+    const errors: SomaError[] = [];
 
     try {
       const { data: activities, error } = await getActivities({
@@ -283,14 +285,14 @@ export const pullDailies = action({
   },
   handler: async (ctx, args) => {
     const { connectionId, accessToken } = await ctx.runAction(
-      internal.garmin.private.resolveConnectionAndAccessToken,
-      { userId: args.userId, clientId: args.clientId, clientSecret: args.clientSecret },
+      internal.private.resolveConnectionAndAccessToken,
+      { userId: args.userId, provider: "GARMIN", clientId: args.clientId, clientSecret: args.clientSecret },
     );
 
     const query = buildTimeRangeQuery(args, accessToken);
     const wellnessClient = createWellnessClient(accessToken);
     const synced = { dailies: 0 };
-    const errors: Array<{ type: string; id: string; message: string }> = [];
+    const errors: SomaError[] = [];
 
     try {
       const { data: dailies, error } = await getDailies({ client: wellnessClient, query });
@@ -324,14 +326,14 @@ export const pullSleep = action({
   },
   handler: async (ctx, args) => {
     const { connectionId, accessToken } = await ctx.runAction(
-      internal.garmin.private.resolveConnectionAndAccessToken,
-      { userId: args.userId, clientId: args.clientId, clientSecret: args.clientSecret },
+      internal.private.resolveConnectionAndAccessToken,
+      { userId: args.userId, provider: "GARMIN", clientId: args.clientId, clientSecret: args.clientSecret },
     );
 
     const query = buildTimeRangeQuery(args, accessToken);
     const wellnessClient = createWellnessClient(accessToken);
     const synced = { sleep: 0 };
-    const errors: Array<{ type: string; id: string; message: string }> = [];
+    const errors: SomaError[] = [];
 
     try {
       const { data: sleeps, error } = await getSleeps({ client: wellnessClient, query });
@@ -364,14 +366,14 @@ export const pullBody = action({
   },
   handler: async (ctx, args) => {
     const { connectionId, accessToken } = await ctx.runAction(
-      internal.garmin.private.resolveConnectionAndAccessToken,
-      { userId: args.userId, clientId: args.clientId, clientSecret: args.clientSecret },
+      internal.private.resolveConnectionAndAccessToken,
+      { userId: args.userId, provider: "GARMIN", clientId: args.clientId, clientSecret: args.clientSecret },
     );
 
     const query = buildTimeRangeQuery(args, accessToken);
     const wellnessClient = createWellnessClient(accessToken);
     const synced = { body: 0 };
-    const errors: Array<{ type: string; id: string; message: string }> = [];
+    const errors: SomaError[] = [];
 
     try {
       const { data: bodyComps, error } = await getBodyComps({ client: wellnessClient, query });
@@ -405,14 +407,14 @@ export const pullMenstruation = action({
   },
   handler: async (ctx, args) => {
     const { connectionId, accessToken } = await ctx.runAction(
-      internal.garmin.private.resolveConnectionAndAccessToken,
-      { userId: args.userId, clientId: args.clientId, clientSecret: args.clientSecret },
+      internal.private.resolveConnectionAndAccessToken,
+      { userId: args.userId, provider: "GARMIN", clientId: args.clientId, clientSecret: args.clientSecret },
     );
 
     const query = buildTimeRangeQuery(args, accessToken);
     const wellnessClient = createWellnessClient(accessToken);
     const synced = { menstruation: 0 };
-    const errors: Array<{ type: string; id: string; message: string }> = [];
+    const errors: SomaError[] = [];
 
     try {
       const { data: records, error } = await getMct({ client: wellnessClient, query });
@@ -445,14 +447,14 @@ export const pullBloodPressures = action({
   },
   handler: async (ctx, args) => {
     const { connectionId, accessToken } = await ctx.runAction(
-      internal.garmin.private.resolveConnectionAndAccessToken,
-      { userId: args.userId, clientId: args.clientId, clientSecret: args.clientSecret },
+      internal.private.resolveConnectionAndAccessToken,
+      { userId: args.userId, provider: "GARMIN", clientId: args.clientId, clientSecret: args.clientSecret },
     );
 
     const query = buildTimeRangeQuery(args, accessToken);
     const wellnessClient = createWellnessClient(accessToken);
     const synced = { bloodPressures: 0 };
-    const errors: Array<{ type: string; id: string; message: string }> = [];
+    const errors: SomaError[] = [];
 
     try {
       const { data: bpRecords, error } = await getBloodPressures({ client: wellnessClient, query });
@@ -486,14 +488,14 @@ export const pullSkinTemperature = action({
   },
   handler: async (ctx, args) => {
     const { connectionId, accessToken } = await ctx.runAction(
-      internal.garmin.private.resolveConnectionAndAccessToken,
-      { userId: args.userId, clientId: args.clientId, clientSecret: args.clientSecret },
+      internal.private.resolveConnectionAndAccessToken,
+      { userId: args.userId, provider: "GARMIN", clientId: args.clientId, clientSecret: args.clientSecret },
     );
 
     const query = buildTimeRangeQuery(args, accessToken);
     const wellnessClient = createWellnessClient(accessToken);
     const synced = { skinTemp: 0 };
-    const errors: Array<{ type: string; id: string; message: string }> = [];
+    const errors: SomaError[] = [];
 
     try {
       const { data: skinRecords, error } = await getSkinTemp({ client: wellnessClient, query });
@@ -527,14 +529,14 @@ export const pullUserMetrics = action({
   },
   handler: async (ctx, args) => {
     const { connectionId, accessToken } = await ctx.runAction(
-      internal.garmin.private.resolveConnectionAndAccessToken,
-      { userId: args.userId, clientId: args.clientId, clientSecret: args.clientSecret },
+      internal.private.resolveConnectionAndAccessToken,
+      { userId: args.userId, provider: "GARMIN", clientId: args.clientId, clientSecret: args.clientSecret },
     );
 
     const query = buildTimeRangeQuery(args, accessToken);
     const wellnessClient = createWellnessClient(accessToken);
     const synced = { userMetrics: 0 };
-    const errors: Array<{ type: string; id: string; message: string }> = [];
+    const errors: SomaError[] = [];
 
     try {
       const { data: metricsRecords, error } = await getUserMetrics({ client: wellnessClient, query });
@@ -568,14 +570,14 @@ export const pullHRV = action({
   },
   handler: async (ctx, args) => {
     const { connectionId, accessToken } = await ctx.runAction(
-      internal.garmin.private.resolveConnectionAndAccessToken,
-      { userId: args.userId, clientId: args.clientId, clientSecret: args.clientSecret },
+      internal.private.resolveConnectionAndAccessToken,
+      { userId: args.userId, provider: "GARMIN", clientId: args.clientId, clientSecret: args.clientSecret },
     );
 
     const query = buildTimeRangeQuery(args, accessToken);
     const wellnessClient = createWellnessClient(accessToken);
     const synced = { hrv: 0 };
-    const errors: Array<{ type: string; id: string; message: string }> = [];
+    const errors: SomaError[] = [];
 
     try {
       const { data: hrvRecords, error } = await getHrv({ client: wellnessClient, query });
@@ -609,14 +611,14 @@ export const pullStressDetails = action({
   },
   handler: async (ctx, args) => {
     const { connectionId, accessToken } = await ctx.runAction(
-      internal.garmin.private.resolveConnectionAndAccessToken,
-      { userId: args.userId, clientId: args.clientId, clientSecret: args.clientSecret },
+      internal.private.resolveConnectionAndAccessToken,
+      { userId: args.userId, provider: "GARMIN", clientId: args.clientId, clientSecret: args.clientSecret },
     );
 
     const query = buildTimeRangeQuery(args, accessToken);
     const wellnessClient = createWellnessClient(accessToken);
     const synced = { stressDetails: 0 };
-    const errors: Array<{ type: string; id: string; message: string }> = [];
+    const errors: SomaError[] = [];
 
     try {
       const { data: stressRecords, error } = await getStressDetails({ client: wellnessClient, query });
@@ -650,14 +652,14 @@ export const pullPulseOx = action({
   },
   handler: async (ctx, args) => {
     const { connectionId, accessToken } = await ctx.runAction(
-      internal.garmin.private.resolveConnectionAndAccessToken,
-      { userId: args.userId, clientId: args.clientId, clientSecret: args.clientSecret },
+      internal.private.resolveConnectionAndAccessToken,
+      { userId: args.userId, provider: "GARMIN", clientId: args.clientId, clientSecret: args.clientSecret },
     );
 
     const query = buildTimeRangeQuery(args, accessToken);
     const wellnessClient = createWellnessClient(accessToken);
     const synced = { pulseOx: 0 };
-    const errors: Array<{ type: string; id: string; message: string }> = [];
+    const errors: SomaError[] = [];
 
     try {
       const { data: pulseOxRecords, error } = await getPulseox({ client: wellnessClient, query });
@@ -691,14 +693,14 @@ export const pullRespiration = action({
   },
   handler: async (ctx, args) => {
     const { connectionId, accessToken } = await ctx.runAction(
-      internal.garmin.private.resolveConnectionAndAccessToken,
-      { userId: args.userId, clientId: args.clientId, clientSecret: args.clientSecret },
+      internal.private.resolveConnectionAndAccessToken,
+      { userId: args.userId, provider: "GARMIN", clientId: args.clientId, clientSecret: args.clientSecret },
     );
 
     const query = buildTimeRangeQuery(args, accessToken);
     const wellnessClient = createWellnessClient(accessToken);
     const synced = { respiration: 0 };
-    const errors: Array<{ type: string; id: string; message: string }> = [];
+    const errors: SomaError[] = [];
 
     try {
       const { data: respRecords, error } = await getRespiration({ client: wellnessClient, query });
@@ -753,7 +755,7 @@ export const pullAll = action({
       { ref: api.garmin.public.pullRespiration, name: "respiration" },
     ];
     const synced: Record<string, number> = {};
-    const errors: Array<{ type: string; id: string; message: string }> = [];
+    const errors: SomaError[] = [];
     for (const { ref, name } of pullFns) {
       try {
         const result = await ctx.runAction(ref, sharedArgs);
@@ -784,11 +786,11 @@ export const pushWorkout = action({
   },
   handler: async (ctx, args): Promise<{
     data: { garminWorkoutId: number } | null;
-    errors: Array<{ type: string; id: string; message: string }>;
+    errors: SomaError[];
   }> => {
     const { connectionId, accessToken } = await ctx.runAction(
-      internal.garmin.private.resolveConnectionAndAccessToken,
-      { userId: args.userId, clientId: args.clientId, clientSecret: args.clientSecret },
+      internal.private.resolveConnectionAndAccessToken,
+      { userId: args.userId, provider: "GARMIN", clientId: args.clientId, clientSecret: args.clientSecret },
     );
 
     const plannedWorkout: Doc<"plannedWorkouts"> | null = await ctx.runQuery(
@@ -869,11 +871,11 @@ export const pushSchedule = action({
   },
   handler: async (ctx, args): Promise<{
     data: { garminScheduleId: number } | null;
-    errors: Array<{ type: string; id: string; message: string }>;
+    errors: SomaError[];
   }> => {
     const { connectionId, accessToken } = await ctx.runAction(
-      internal.garmin.private.resolveConnectionAndAccessToken,
-      { userId: args.userId, clientId: args.clientId, clientSecret: args.clientSecret },
+      internal.private.resolveConnectionAndAccessToken,
+      { userId: args.userId, provider: "GARMIN", clientId: args.clientId, clientSecret: args.clientSecret },
     );
 
     const plannedWorkout: Doc<"plannedWorkouts"> | null = await ctx.runQuery(
@@ -965,11 +967,11 @@ export const deleteWorkout = action({
   },
   handler: async (ctx, args): Promise<{
     data: null;
-    errors: Array<{ type: string; id: string; message: string }>;
+    errors: SomaError[];
   }> => {
     const { connectionId, accessToken } = await ctx.runAction(
-      internal.garmin.private.resolveConnectionAndAccessToken,
-      { userId: args.userId, clientId: args.clientId, clientSecret: args.clientSecret },
+      internal.private.resolveConnectionAndAccessToken,
+      { userId: args.userId, provider: "GARMIN", clientId: args.clientId, clientSecret: args.clientSecret },
     );
 
     const plannedWorkout: Doc<"plannedWorkouts"> | null = await ctx.runQuery(
@@ -1023,11 +1025,11 @@ export const deleteSchedule = action({
   },
   handler: async (ctx, args): Promise<{
     data: null;
-    errors: Array<{ type: string; id: string; message: string }>;
+    errors: SomaError[];
   }> => {
     const { connectionId, accessToken } = await ctx.runAction(
-      internal.garmin.private.resolveConnectionAndAccessToken,
-      { userId: args.userId, clientId: args.clientId, clientSecret: args.clientSecret },
+      internal.private.resolveConnectionAndAccessToken,
+      { userId: args.userId, provider: "GARMIN", clientId: args.clientId, clientSecret: args.clientSecret },
     );
 
     const plannedWorkout: Doc<"plannedWorkouts"> | null = await ctx.runQuery(

package/src/component/garmin/webhooks.ts

@@ -6,6 +6,7 @@
 import { v } from "convex/values";
 import { action, type ActionCtx } from "../_generated/server";
 import { api, internal } from "../_generated/api";
+import type { SomaError } from "../validators/shared.js";
 import {
   garminSkinTemperaturePingPayloadSchema,
   garminSkinTemperaturePushPayloadSchema,
@@ -103,37 +104,19 @@ function isWebhookPushMode(payload: unknown): boolean {
   return !("callbackURL" in firstItem);
 }
 
-/** Shape returned by every public webhook handler action to the HTTP layer. */
+/** Shape returned by webhook handler actions (both internal processors and public handlers). */
 type WebhookResult = {
-  errors: Array<{ type: string; id: string; message: string }>;
+  errors: SomaError[];
   items: Array<{ connectionId: string; userId: string; data: Record<string, unknown> }>;
 };
 
-/** Shape returned by internal push-processing actions (transform only, no DB writes). */
-type ProcessResult = {
-  items: Array<{ connectionId: string; userId: string; data: Record<string, unknown> }>;
-  errors: Array<{ type: string; id: string; message: string }>;
-};
-
-/**
- * Build a WebhookResult from a ProcessResult without writing to the database.
- * Used when `autoIngest` is disabled — the host app still gets the full set of
- * transformed items in its callbacks, but no data is persisted.
- */
-function toWebhookResult(result: ProcessResult): WebhookResult {
-  return {
-    errors: result.errors,
-    items: result.items,
-  };
-}
-
 /**
  * Ingest transformed items from a private handler and update connections.
  * Shared orchestration logic for all push-mode webhook handlers.
  */
 async function ingestAndUpdate(
   ctx: ActionCtx,
-  result: ProcessResult,
+  result: WebhookResult,
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   ingestMutation: any,
 ): Promise<WebhookResult> {
@@ -179,13 +162,13 @@ export const handleGarminWebhookActivities = action({
     if (isWebhookPushMode(args.payload)) {
       const pushResult = garminActivityPushPayloadSchema.safeParse(args.payload);
       if (pushResult.success && pushResult.data.activities.length > 0) {
-        const result: ProcessResult = await ctx.runAction(
+        const result: WebhookResult = await ctx.runAction(
           internal.garmin.private.processActivityPushPayload,
           { payload: args.payload },
         );
         return shouldIngest
           ? await ingestAndUpdate(ctx, result, api.public.ingestActivity)
-          : toWebhookResult(result);
+          : result;
       }
     } else {
       const pingResult = garminActivityPingPayloadSchema.safeParse(args.payload);
@@ -218,13 +201,13 @@ export const handleGarminWebhookActivityDetails = action({
         pushResult.success &&
         pushResult.data.activityDetails.length > 0
       ) {
-        const result: ProcessResult = await ctx.runAction(
+        const result: WebhookResult = await ctx.runAction(
           internal.garmin.private.processActivityDetailsPushPayload,
           { payload: args.payload },
         );
         return shouldIngest
           ? await ingestAndUpdate(ctx, result, api.public.ingestActivity)
-          : toWebhookResult(result);
+          : result;
       }
     } else {
       const pingResult =
@@ -263,14 +246,14 @@ export const handleGarminWebhookManuallyUpdatedActivities = action({
         pushResult.success &&
         pushResult.data.manuallyUpdatedActivities.length > 0
       ) {
-        const result: ProcessResult = await ctx.runAction(
+        const result: WebhookResult = await ctx.runAction(
           internal.garmin.private
             .processManuallyUpdatedActivitiesPushPayload,
           { payload: args.payload },
         );
         return shouldIngest
           ? await ingestAndUpdate(ctx, result, api.public.ingestActivity)
-          : toWebhookResult(result);
+          : result;
       }
     } else {
       const pingResult =
@@ -310,13 +293,13 @@ export const handleGarminWebhookMoveIQ = action({
         pushResult.success &&
         pushResult.data.moveIQActivities.length > 0
       ) {
-        const result: ProcessResult = await ctx.runAction(
+        const result: WebhookResult = await ctx.runAction(
           internal.garmin.private.processMoveIQPushPayload,
           { payload: args.payload },
         );
         return shouldIngest
           ? await ingestAndUpdate(ctx, result, api.public.ingestActivity)
-          : toWebhookResult(result);
+          : result;
       }
     } else {
       const pingResult =
@@ -353,13 +336,13 @@ export const handleGarminWebhookBloodPressures = action({
         pushResult.success &&
         pushResult.data.bloodPressures.length > 0
       ) {
-        const result: ProcessResult = await ctx.runAction(
+        const result: WebhookResult = await ctx.runAction(
           internal.garmin.private.processBloodPressurePushPayload,
           { payload: args.payload },
         );
         return shouldIngest
           ? await ingestAndUpdate(ctx, result, api.public.ingestBody)
-          : toWebhookResult(result);
+          : result;
       }
     } else {
       const pingResult =
@@ -396,13 +379,13 @@ export const handleGarminWebhookBodyCompositions = action({
         pushResult.success &&
         pushResult.data.bodyComps.length > 0
       ) {
-        const result: ProcessResult = await ctx.runAction(
+        const result: WebhookResult = await ctx.runAction(
           internal.garmin.private.processBodyCompositionsPushPayload,
           { payload: args.payload },
         );
         return shouldIngest
           ? await ingestAndUpdate(ctx, result, api.public.ingestBody)
-          : toWebhookResult(result);
+          : result;
       }
     } else {
       const pingResult =
@@ -439,13 +422,13 @@ export const handleGarminWebhookDailies = action({
         pushResult.success &&
         pushResult.data.dailies.length > 0
       ) {
-        const result: ProcessResult = await ctx.runAction(
+        const result: WebhookResult = await ctx.runAction(
           internal.garmin.private.processDailiesPushPayload,
           { payload: args.payload },
         );
         return shouldIngest
           ? await ingestAndUpdate(ctx, result, api.public.ingestDaily)
-          : toWebhookResult(result);
+          : result;
       }
     } else {
       const pingResult =
@@ -482,13 +465,13 @@ export const handleGarminWebhookEpochs = action({
         pushResult.success &&
         pushResult.data.epochs.length > 0
       ) {
-        const result: ProcessResult = await ctx.runAction(
+        const result: WebhookResult = await ctx.runAction(
           internal.garmin.private.processEpochPushPayload,
           { payload: args.payload },
         );
         return shouldIngest
           ? await ingestAndUpdate(ctx, result, api.public.ingestDaily)
-          : toWebhookResult(result);
+          : result;
       }
     } else {
       const pingResult =
@@ -525,13 +508,13 @@ export const handleGarminWebhookHealthSnapshot = action({
         pushResult.success &&
         pushResult.data.healthSnapshot.length > 0
       ) {
-        const result: ProcessResult = await ctx.runAction(
+        const result: WebhookResult = await ctx.runAction(
           internal.garmin.private.processHealthSnapshotPushPayload,
           { payload: args.payload },
         );
         return shouldIngest
           ? await ingestAndUpdate(ctx, result, api.public.ingestDaily)
-          : toWebhookResult(result);
+          : result;
       }
     } else {
       const pingResult =
@@ -568,13 +551,13 @@ export const handleGarminWebhookSleeps = action({
         pushResult.success &&
         pushResult.data.sleeps.length > 0
       ) {
-        const result: ProcessResult = await ctx.runAction(
+        const result: WebhookResult = await ctx.runAction(
           internal.garmin.private.processSleepsPushPayload,
           { payload: args.payload },
         );
         return shouldIngest
           ? await ingestAndUpdate(ctx, result, api.public.ingestSleep)
-          : toWebhookResult(result);
+          : result;
       }
     } else {
       const pingResult =
@@ -611,13 +594,13 @@ export const handleGarminWebhookSkinTemp = action({
         pushResult.success &&
         pushResult.data.skinTemp.length > 0
       ) {
-        const result: ProcessResult = await ctx.runAction(
+        const result: WebhookResult = await ctx.runAction(
           internal.garmin.private.processSkinTemperaturePushPayload,
           { payload: args.payload },
         );
         return shouldIngest
           ? await ingestAndUpdate(ctx, result, api.public.ingestBody)
-          : toWebhookResult(result);
+          : result;
       }
     } else {
       const pingResult =
@@ -654,13 +637,13 @@ export const handleGarminWebhookUserMetrics = action({
         pushResult.success &&
         pushResult.data.userMetrics.length > 0
       ) {
-        const result: ProcessResult = await ctx.runAction(
+        const result: WebhookResult = await ctx.runAction(
           internal.garmin.private.processUserMetricsPushPayload,
           { payload: args.payload },
         );
         return shouldIngest
           ? await ingestAndUpdate(ctx, result, api.public.ingestBody)
-          : toWebhookResult(result);
+          : result;
       }
     } else {
       const pingResult =
@@ -697,13 +680,13 @@ export const handleGarminWebhookMenstrualCycleTracking = action({
         pushResult.success &&
         pushResult.data.mct.length > 0
       ) {
-        const result: ProcessResult = await ctx.runAction(
+        const result: WebhookResult = await ctx.runAction(
           internal.garmin.private.processMenstrualCycleTrackingPushPayload,
           { payload: args.payload },
         );
         return shouldIngest
           ? await ingestAndUpdate(ctx, result, api.public.ingestMenstruation)
-          : toWebhookResult(result);
+          : result;
       }
     } else {
       const pingResult =
@@ -740,13 +723,13 @@ export const handleGarminWebhookHRVSummary = action({
         pushResult.success &&
         pushResult.data.hrv.length > 0
       ) {
-        const result: ProcessResult = await ctx.runAction(
+        const result: WebhookResult = await ctx.runAction(
           internal.garmin.private.processHRVSummaryPushPayload,
           { payload: args.payload },
         );
         return shouldIngest
           ? await ingestAndUpdate(ctx, result, api.public.ingestDaily)
-          : toWebhookResult(result);
+          : result;
       }
     } else {
       const pingResult =
@@ -783,13 +766,13 @@ export const handleGarminWebhookStress = action({
         pushResult.success &&
         pushResult.data.stressDetails.length > 0
       ) {
-        const result: ProcessResult = await ctx.runAction(
+        const result: WebhookResult = await ctx.runAction(
           internal.garmin.private.processStressPushPayload,
           { payload: args.payload },
         );
         return shouldIngest
           ? await ingestAndUpdate(ctx, result, api.public.ingestDaily)
-          : toWebhookResult(result);
+          : result;
       }
     } else {
       const pingResult =
@@ -826,13 +809,13 @@ export const handleGarminWebhookPulseOx = action({
         pushResult.success &&
         pushResult.data.pulseox.length > 0
       ) {
-        const result: ProcessResult = await ctx.runAction(
+        const result: WebhookResult = await ctx.runAction(
           internal.garmin.private.processPulseOxPushPayload,
           { payload: args.payload },
         );
         return shouldIngest
           ? await ingestAndUpdate(ctx, result, api.public.ingestDaily)
-          : toWebhookResult(result);
+          : result;
       }
     } else {
       const pingResult =
@@ -869,13 +852,13 @@ export const handleGarminWebhookRespiration = action({
         pushResult.success &&
         pushResult.data.allDayRespiration.length > 0
       ) {
-        const result: ProcessResult = await ctx.runAction(
+        const result: WebhookResult = await ctx.runAction(
           internal.garmin.private.processRespirationPushPayload,
           { payload: args.payload },
         );
         return shouldIngest
           ? await ingestAndUpdate(ctx, result, api.public.ingestDaily)
-          : toWebhookResult(result);
+          : result;
       }
     } else {
       const pingResult =