clean up action fields before saving to db

apps/web/app/(app)/automation/RuleForm.tsx

@@ -39,7 +39,7 @@ import {
   type CreateRuleBody,
   createRuleBody,
 } from "@/utils/actions/validation";
-import { actionInputs } from "@/utils/actionType";
+import { actionInputs } from "@/utils/action-item";
 import { Select } from "@/components/Select";
 import { Toggle } from "@/components/Toggle";
 import type { GroupsResponse } from "@/app/api/user/group/route";

apps/web/components/email-list/PlanExplanation.tsx

@@ -3,7 +3,7 @@ import { Badge } from "@/components/Badge";
 import type { Thread } from "@/components/email-list/types";
 import { PlanActions } from "@/components/email-list/PlanActions";
 import { PlanBadge, getActionColor } from "@/components/PlanBadge";
-import { getActionFields } from "@/utils/actionType";
+import { getActionFields } from "@/utils/action-item";
 
 export function PlanExplanation(props: {
   thread: Thread;

apps/web/utils/actionType.ts → apps/web/utils/action-item.ts

@@ -1,4 +1,9 @@
-import { type Action, ActionType, type ExecutedAction } from "@prisma/client";
+import {
+  type Action,
+  ActionType,
+  type ExecutedAction,
+  type Prisma,
+} from "@prisma/client";
 
 export const actionInputs: Record<
   ActionType,
@@ -140,3 +145,82 @@ export function getActionFields(fields: Action | ExecutedAction | undefined) {
 
   return res;
 }
+
+type ActionFieldsSelection = Pick<
+  Prisma.ActionCreateInput,
+  "type" | "label" | "subject" | "content" | "to" | "cc" | "bcc" | "url"
+>;
+
+export function sanitizeActionFields(
+  action: Partial<ActionFieldsSelection> & { type: ActionType },
+): ActionFieldsSelection {
+  const base = {
+    type: action.type,
+    label: null,
+    subject: null,
+    content: null,
+    to: null,
+    cc: null,
+    bcc: null,
+    url: null,
+  };
+
+  switch (action.type) {
+    case ActionType.ARCHIVE:
+    case ActionType.MARK_SPAM:
+      return base;
+    case ActionType.LABEL: {
+      return {
+        ...base,
+        label: action.label ?? null,
+      };
+    }
+    case ActionType.REPLY: {
+      return {
+        ...base,
+        content: action.content ?? null,
+        cc: action.cc ?? null,
+        bcc: action.bcc ?? null,
+      };
+    }
+    case ActionType.SEND_EMAIL: {
+      return {
+        ...base,
+        subject: action.subject ?? null,
+        content: action.content ?? null,
+        to: action.to ?? null,
+        cc: action.cc ?? null,
+        bcc: action.bcc ?? null,
+      };
+    }
+    case ActionType.FORWARD: {
+      return {
+        ...base,
+        content: action.content ?? null,
+        to: action.to ?? null,
+        cc: action.cc ?? null,
+        bcc: action.bcc ?? null,
+      };
+    }
+    case ActionType.DRAFT_EMAIL: {
+      return {
+        ...base,
+        subject: action.subject ?? null,
+        content: action.content ?? null,
+        to: action.to ?? null,
+        cc: action.cc ?? null,
+        bcc: action.bcc ?? null,
+      };
+    }
+    case ActionType.CALL_WEBHOOK: {
+      return {
+        ...base,
+        url: action.url ?? null,
+      };
+    }
+    default:
+      // biome-ignore lint/correctness/noSwitchDeclarations: intentional exhaustive check
+      const exhaustiveCheck: never = action.type;
+      return exhaustiveCheck;
+  }
+}

apps/web/utils/actions/rule.ts

@@ -26,6 +26,7 @@ import {
   appendRulePrompt,
 } from "@/utils/rule/prompt-file";
 import { generatePromptOnDeleteRule } from "@/utils/ai/rule/generate-prompt-on-delete-rule";
+import { sanitizeActionFields } from "@/utils/action-item";
 
 export const createRuleAction = withActionInstrumentation(
   "createRule",
@@ -49,7 +50,7 @@ export const createRuleAction = withActionInstrumentation(
                 createMany: {
                   data: body.actions.map(
                     ({ type, label, subject, content, to, cc, bcc, url }) => {
-                      return {
+                      return sanitizeActionFields({
                         type,
                         label: label?.value,
                         subject: subject?.value,
@@ -58,7 +59,7 @@ export const createRuleAction = withActionInstrumentation(
                         cc: cc?.value,
                         bcc: bcc?.value,
                         url: url?.value,
-                      };
+                      });
                     },
                   ),
                 },
@@ -170,7 +171,7 @@ export const updateRuleAction = withActionInstrumentation(
         ...actionsToUpdate.map((a) => {
           return prisma.action.update({
             where: { id: a.id },
-            data: {
+            data: sanitizeActionFields({
               type: a.type,
               label: a.label?.value,
               subject: a.subject?.value,
@@ -179,24 +180,28 @@ export const updateRuleAction = withActionInstrumentation(
               cc: a.cc?.value,
               bcc: a.bcc?.value,
               url: a.url?.value,
-            },
+            }),
           });
         }),
         // create new actions
         ...(actionsToCreate.length
           ? [
               prisma.action.createMany({
-                data: actionsToCreate.map((a) => ({
-                  ruleId: body.id,
-                  type: a.type,
-                  label: a.label?.value,
-                  subject: a.subject?.value,
-                  content: a.content?.value,
-                  to: a.to?.value,
-                  cc: a.cc?.value,
-                  bcc: a.bcc?.value,
-                  url: a.url?.value,
-                })),
+                data: actionsToCreate.map((a) => {
+                  return {
+                    ...sanitizeActionFields({
+                      type: a.type,
+                      label: a.label?.value,
+                      subject: a.subject?.value,
+                      content: a.content?.value,
+                      to: a.to?.value,
+                      cc: a.cc?.value,
+                      bcc: a.bcc?.value,
+                      url: a.url?.value,
+                    }),
+                    ruleId: body.id,
+                  };
+                }),
               }),
             ]
           : []),

apps/web/utils/ai/choose-rule/run-rules.ts

@@ -18,6 +18,7 @@ import { getEmailFromMessage } from "@/utils/ai/choose-rule/get-email-from-messa
 import prisma from "@/utils/prisma";
 import { createScopedLogger } from "@/utils/logger";
 import type { MatchReason } from "@/utils/ai/choose-rule/types";
+import { sanitizeActionFields } from "@/utils/action-item";
 
 const logger = createScopedLogger("ai-run-rules");
 
@@ -169,17 +170,7 @@ async function saveExecutedRule(
   const data: Prisma.ExecutedRuleCreateInput = {
     actionItems: {
       createMany: {
-        data:
-          actionItems?.map((a) => ({
-            type: a.type,
-            label: a.label,
-            subject: a.subject,
-            content: a.content,
-            to: a.to,
-            cc: a.cc,
-            bcc: a.bcc,
-            url: a.url,
-          })) || [],
+        data: actionItems?.map(sanitizeActionFields) || [],
       },
     },
     messageId,