fix(workflows): remove duplicate run email metadata

Author: TheodoreSpeaks

apps/sim/blocks/blocks/start_trigger.ts

@@ -32,7 +32,7 @@ export const StartTriggerBlock: BlockConfig = {
       mode: 'advanced',
       defaultValue: false,
       description:
-        'Expose trusted, server-injected run metadata under <start.metadata>: subject, userEmail, workspaceId, workflowId, executionId, executionType, executionMode, startTime. The subject identifies the authenticated Sim user, chat email, or external provider user without exposing credentials.',
+        'Expose trusted, server-injected run metadata under <start.metadata>: subject, workspaceId, workflowId, executionId, executionType, executionMode, startTime. The subject identifies the authenticated Sim user, chat email, or external provider user without exposing credentials.',
     },
   ],
   tools: {

apps/sim/executor/handlers/workflow/workflow-handler.test.ts

@@ -879,7 +879,6 @@ describe('WorkflowBlockHandler', () => {
           userId: 'consumer-1',
           email: 'a@corp.com',
         },
-        userEmail: 'a@corp.com',
         workspaceId: 'workspace-consumer',
         workflowId: 'parent-workflow-id',
         executionId: 'exec-1',
@@ -902,7 +901,6 @@ describe('WorkflowBlockHandler', () => {
           userId: 'original-user',
           email: 'original@corp.com',
         },
-        userEmail: 'original@corp.com',
         workspaceId: 'workspace-original',
         workflowId: 'workflow-original',
         executionId: 'exec-1',
@@ -987,7 +985,6 @@ describe('WorkflowBlockHandler', () => {
           userId: 'original-user',
           email: 'original@corp.com',
         },
-        userEmail: 'original@corp.com',
         workspaceId: 'workspace-original',
         workflowId: 'workflow-original',
         executionMode: 'async',
@@ -1002,7 +999,6 @@ describe('WorkflowBlockHandler', () => {
         workspaceId: 'workspace-parent',
         startRunMetadata: {
           subject: null,
-          userEmail: null,
           workspaceId: 'workspace-original',
           workflowId: 'workflow-original',
         },
@@ -1043,7 +1039,6 @@ describe('WorkflowBlockHandler', () => {
 
       expect(executorOptions).toHaveLength(1)
       expect(executorOptions[0].contextExtensions.startRunMetadata.subject).toBeNull()
-      expect(executorOptions[0].contextExtensions.startRunMetadata.userEmail).toBeNull()
       expect(mockGetUserEmailById).not.toHaveBeenCalled()
     })
 
@@ -1053,7 +1048,6 @@ describe('WorkflowBlockHandler', () => {
           kind: 'authenticated_email' as const,
           email: 'original@corp.com',
         },
-        userEmail: 'original@corp.com',
         workspaceId: 'workspace-original',
         workflowId: 'workflow-original',
         executionMode: 'sync',
@@ -1119,7 +1113,6 @@ describe('WorkflowBlockHandler', () => {
           kind: 'authenticated_email',
           email: 'original@corp.com',
         },
-        userEmail: 'original@corp.com',
         workspaceId: 'workspace-original',
         workflowId: 'workflow-original',
       })
@@ -1132,7 +1125,6 @@ describe('WorkflowBlockHandler', () => {
           kind: 'authenticated_email' as const,
           email: 'original@corp.com',
         },
-        userEmail: 'original@corp.com',
         workspaceId: 'workspace-original',
         workflowId: 'workflow-original',
       }

apps/sim/executor/handlers/workflow/workflow-handler.ts

@@ -725,7 +725,6 @@ export class WorkflowBlockHandler implements BlockHandler {
         if (inherited && Object.hasOwn(inherited, 'subject')) {
           invokingIdentity = {
             subject: inherited.subject ?? null,
-            userEmail: inherited.userEmail ?? null,
           }
         } else {
           if (!ctx.principal) {

apps/sim/executor/types.ts

@@ -263,7 +263,6 @@ export type StartBlockRunSubject =
  */
 export interface StartBlockRunMetadata {
   subject?: StartBlockRunSubject | null
-  userEmail?: string | null
   workspaceId?: string | null
   workflowId?: string | null
   executionId?: string

apps/sim/executor/utils/start-block.test.ts

@@ -853,7 +853,6 @@ describe('start-block utilities', () => {
         userId: 'user-1',
         email: 'real@sim.ai',
       },
-      userEmail: 'real@sim.ai',
       workspaceId: 'ws-1',
       workflowId: 'wf-1',
       executionId: 'exec-1',
@@ -877,7 +876,9 @@ describe('start-block utilities', () => {
       const output = buildStartBlockOutput({
         resolution,
         workflowInput: {
-          metadata: { userEmail: 'attacker@x.com' },
+          metadata: {
+            subject: { kind: 'authenticated_email', email: 'attacker@x.com' },
+          },
           simUserEmail: 'attacker@x.com',
           payload: 'value',
         },
@@ -894,7 +895,11 @@ describe('start-block utilities', () => {
 
       const output = buildStartBlockOutput({
         resolution,
-        workflowInput: { metadata: { userEmail: 'attacker@x.com' } },
+        workflowInput: {
+          metadata: {
+            subject: { kind: 'authenticated_email', email: 'attacker@x.com' },
+          },
+        },
       })
 
       expect(output).not.toHaveProperty('metadata')

apps/sim/lib/workflows/blocks/block-outputs.test.ts

@@ -85,12 +85,9 @@ describe('block outputs parity', () => {
     expect(paths).toContain('metadata.subject.provider')
     expect(paths).toContain('metadata.subject.tenantId')
     expect(paths).toContain('metadata.subject.subjectId')
-    expect(paths).toContain('metadata.userEmail')
+    expect(paths).not.toContain('metadata.userEmail')
     expect(paths).toContain('metadata.executionType')
     expect(paths).toContain('metadata.workflowId')
-    expect(
-      getEffectiveBlockOutputType('start_trigger', 'metadata.userEmail', subBlocks, options)
-    ).toBe('string')
     expect(
       getEffectiveBlockOutputType('start_trigger', 'metadata.subject.kind', subBlocks, options)
     ).toBe('string')

apps/sim/lib/workflows/blocks/block-outputs.ts

@@ -171,10 +171,6 @@ const START_RUN_METADATA_OUTPUT = {
         subjectId: { type: 'string', description: 'Provider user ID for an external_user subject' },
       },
     },
-    userEmail: {
-      type: 'string',
-      description: 'Email of the authenticated subject, or null when the subject has no email',
-    },
     workspaceId: {
       type: 'string',
       description: 'Workspace ID of the invoking run (for custom blocks, the invoking workspace)',

apps/sim/lib/workflows/executor/start-run-identity.test.ts

@@ -33,7 +33,6 @@ describe('resolveStartBlockRunIdentity', () => {
         userId: 'user-1',
         email: 'owner@example.com',
       },
-      userEmail: 'owner@example.com',
     })
     expect(mockGetUserEmailById).toHaveBeenCalledWith('user-1')
   })
@@ -49,7 +48,6 @@ describe('resolveStartBlockRunIdentity', () => {
       })
     ).resolves.toEqual({
       subject: { kind: 'authenticated_email', email: 'person@example.com' },
-      userEmail: 'person@example.com',
     })
     expect(mockGetUserEmailById).not.toHaveBeenCalled()
   })
@@ -77,7 +75,6 @@ describe('resolveStartBlockRunIdentity', () => {
         tenantId: 'team-1',
         subjectId: 'slack-user-1',
       },
-      userEmail: null,
     })
     expect(mockGetUserEmailById).not.toHaveBeenCalled()
   })
@@ -89,7 +86,7 @@ describe('resolveStartBlockRunIdentity', () => {
         workspaceId: 'workspace-1',
         keyId: 'key-1',
       })
-    ).resolves.toEqual({ subject: null, userEmail: null })
+    ).resolves.toEqual({ subject: null })
     expect(mockGetUserEmailById).not.toHaveBeenCalled()
   })
 

apps/sim/lib/workflows/executor/start-run-identity.ts

@@ -4,27 +4,23 @@ import type { StartBlockRunSubject } from '@/executor/types'
 
 export interface StartBlockRunIdentity {
   subject: StartBlockRunSubject | null
-  userEmail: string | null
 }
 
 /** Projects the authenticated execution principal into workflow-visible identity metadata. */
 export async function resolveStartBlockRunIdentity(
   principal: WorkflowExecutionPrincipal
 ): Promise<StartBlockRunIdentity> {
   const subject = resolvePrincipalSubject(principal)
-  if (!subject) return { subject: null, userEmail: null }
+  if (!subject) return { subject: null }
 
   switch (subject.kind) {
     case 'sim_user': {
       const email = await getUserEmailById(subject.userId)
-      return {
-        subject: { ...subject, email },
-        userEmail: email,
-      }
+      return { subject: { ...subject, email } }
     }
     case 'authenticated_email':
-      return { subject: { ...subject }, userEmail: subject.email }
+      return { subject: { ...subject } }
     case 'external_user':
-      return { subject: { ...subject }, userEmail: null }
+      return { subject: { ...subject } }
   }
 }