fix(workflows): align advertised file validation and reserve unsafe names

Author: icecrasher321

apps/sim/lib/workflows/input-format.ts

@@ -84,7 +84,7 @@ export type InputFormatFile = Pick<UserFile, 'id' | 'name' | 'url' | 'size' | 't
  * mirrors `normalizeStartFile` exactly (including the parse, so a malformed
  * internal URL is rejected rather than accepted on the prefix alone).
  */
-export function hasRecoverableFileKey(file: InputFormatFile): boolean {
+function hasRecoverableFileKey(file: InputFormatFile): boolean {
   if (typeof file.key === 'string' && file.key.length > 0) return true
   if (typeof file.url !== 'string' || !isInternalFileUrl(file.url)) return false
   try {

apps/sim/lib/workflows/input-schema.test.ts

@@ -1,5 +1,6 @@
 import { describe, expect, it } from 'vitest'
 import { z } from 'zod'
+import { compileMcpToolSchema } from '@/lib/mcp/tool-schema'
 import { generateToolInputSchema } from '@/lib/mcp/workflow-tool-schema'
 import { generateWorkflowInputShape } from '@/lib/workflows/input-schema'
 import type { InputFormatField } from '@/lib/workflows/types'
@@ -29,7 +30,7 @@ describe('workflow input schemas', () => {
       type: 'array',
       items: {
         type: 'object',
-        required: ['id', 'name', 'url', 'size', 'type'],
+        required: ['id', 'name', 'url', 'size', 'type', 'key'],
         properties: {
           key: { type: 'string' },
           type: { type: 'string' },
@@ -62,12 +63,34 @@ describe('workflow input schemas', () => {
     expect(schema.safeParse({ files: [invalidFile] }).success).toBe(false)
   })
 
-  it('accepts an internal file URL whose storage key can be recovered', () => {
-    const { key, ...internalFile } = file
-    internalFile.url = `/api/files/serve/s3/${encodeURIComponent(key)}?context=workspace`
-    expect(schema.parse({ files: [internalFile] })).toEqual({ files: [internalFile] })
+  it.each([
+    { value: file, valid: true },
+    { value: { ...file, key: '' }, valid: false },
+    { value: { ...file, key: undefined }, valid: false },
+    {
+      value: {
+        ...file,
+        key: undefined,
+        url: `/api/files/serve/s3/${encodeURIComponent(file.key)}?context=workspace`,
+      },
+      valid: false,
+    },
+  ])('advertises the same storage-key requirement it validates: $valid', ({ value, valid }) => {
+    const validate = compileMcpToolSchema(generateToolInputSchema(inputFormat))
+    const input = { files: [value] }
+    expect(validate(input)).toBe(valid)
+    expect(schema.safeParse(input).success).toBe(valid)
   })
 
+  it.each(['__proto__', 'constructor', 'prototype'])(
+    'rejects reserved input name %s before schema construction',
+    (name) => {
+      const fields: InputFormatField[] = [{ name, type: 'string' }]
+      expect(() => generateWorkflowInputShape(fields)).toThrow('is reserved')
+      expect(() => generateToolInputSchema(fields)).toThrow('is reserved')
+    }
+  )
+
   it('shares required fields, descriptions, and arbitrary array items across schemas', () => {
     const fields: InputFormatField[] = [
       { name: ' message ', type: 'string', description: ' User message ' },

apps/sim/lib/workflows/input-schema.ts

@@ -1,9 +1,10 @@
 import { z } from 'zod'
-import { hasRecoverableFileKey, type InputFormatFile } from '@/lib/workflows/input-format'
 import type { InputFormatField } from '@/lib/workflows/types'
+import type { UserFile } from '@/executor/types'
+import { isSafeKey } from '@/tools/safe-assign'
 
 /**
- * Uploaded file references accepted by Start inputs. File ownership is checked
+ * Canonical uploaded file references for workflow inputs. File ownership is checked
  * by the executor against the run's workspace, after input-shape validation.
  */
 const workflowInputFileSchema = z
@@ -13,13 +14,11 @@ const workflowInputFileSchema = z
     url: z.string().min(1, 'File url cannot be empty'),
     size: z.number().nonnegative(),
     type: z.string().min(1, 'File MIME type cannot be empty'),
-    key: z.string().optional(),
+    key: z.string().min(1, 'File storage key cannot be empty'),
   })
-  .passthrough()
-  .refine(hasRecoverableFileKey, {
-    message: 'File must include a storage key or an internal file URL with a recoverable key',
-    path: ['key'],
-  }) satisfies z.ZodType<InputFormatFile>
+  .passthrough() satisfies z.ZodType<
+  Pick<UserFile, 'id' | 'name' | 'url' | 'size' | 'type' | 'key'>
+>
 
 function fieldTypeToSchema(type: string | undefined): z.ZodType {
   switch (type) {
@@ -51,6 +50,9 @@ export function generateWorkflowInputShape(inputFormat: InputFormatField[]): z.Z
   for (const field of inputFormat) {
     const name = field.name?.trim()
     if (!name) continue
+    if (!isSafeKey(name)) {
+      throw new Error(`Workflow input name "${name}" is reserved. Rename this input field.`)
+    }
 
     const schema = fieldTypeToSchema(field.type).describe(
       field.description?.trim() ||

apps/sim/lib/workflows/triggers/run-options.test.ts

@@ -102,6 +102,23 @@ describe('file inputs through workflow run options', () => {
     expect(option.mockPayload).toEqual({ files: [file] })
     expect(validateTriggerInput(option, option.mockPayload)).toEqual({ ok: true })
   })
+
+  it('normalizes an editor file URL to canonical metadata in the sample payload', () => {
+    const { key, ...editorFile } = file
+    editorFile.url = `/api/files/serve/s3/${encodeURIComponent(key)}?context=workspace`
+    const [option] = resolveTriggerRunOptions({
+      start: {
+        ...block,
+        subBlocks: {
+          inputFormat: {
+            value: [{ name: 'files', type: 'file[]', value: JSON.stringify([editorFile]) }],
+          },
+        },
+      },
+    })
+    expect(option.mockPayload).toEqual({ files: [{ ...editorFile, key }] })
+    expect(validateTriggerInput(option, option.mockPayload)).toEqual({ ok: true })
+  })
 })
 
 describe('validateTriggerInput', () => {

apps/sim/lib/workflows/triggers/run-options.ts

@@ -1,6 +1,7 @@
 import { isRecordLike } from '@sim/utils/object'
 import { z } from 'zod'
 import { generateToolInputSchema } from '@/lib/mcp/workflow-tool-schema'
+import { parseInternalFileUrl } from '@/lib/uploads/utils/file-utils'
 import { normalizeInputFormatValue, parseInputFormatFiles } from '@/lib/workflows/input-format'
 import { generateWorkflowInputShape } from '@/lib/workflows/input-schema'
 import {
@@ -146,7 +147,10 @@ function buildFieldsSample(inputFormat: InputFormatField[]): Record<string, unkn
     const name = field.name?.trim()
     if (!name) continue
     if (field.type === 'file[]') {
-      sample[name] = parseInputFormatFiles(field.value)
+      sample[name] = parseInputFormatFiles(field.value).map((file) => ({
+        ...file,
+        key: file.key || parseInternalFileUrl(file.url).key,
+      }))
       continue
     }
     sample[name] =