@payloadcms/plugin-mcp 3.78.0-internal-debug.f663370 → 3.78.0-internal.ab11ffa

package/src/mcp/tools/job/update.ts

@@ -6,6 +6,7 @@ import { join } from 'path'
 
 import type { JobConfigUpdate, SchemaField, TaskSequenceItem } from '../../../types.js'
 
+import { toCamelCase } from '../../../utils/camelCase.js'
 import { validatePayloadFile } from '../../helpers/fileValidation.js'
 import { toolSchemas } from '../schemas.js'
 
@@ -199,40 +200,33 @@ export const updateJob = async (
   }
 }
 
-// Helper function to convert to camel case
-function toCamelCase(str: string): string {
-  return str
-    .replace(/[-_\s]+(.)?/g, (_, chr) => (chr ? chr.toUpperCase() : ''))
-    .replace(/^(.)/, (_, chr) => chr.toLowerCase())
-}
-
 // Helper functions for different update types
 function updateSchema(
   content: string,
-  camelCaseJobSlug: string,
-  inputSchema?: SchemaField[],
-  outputSchema?: SchemaField[],
+  _camelCaseJobSlug: string,
+  _inputSchema?: SchemaField[],
+  _outputSchema?: SchemaField[],
 ): string {
   // TODO: Implementation for schema updates
-  // This would modify the inputSchema and outputSchema in the job file
   return content
 }
 
-function updateWorkflowTasks(content: string, taskSequence: TaskSequenceItem[]): string {
+function updateWorkflowTasks(content: string, _taskSequence: TaskSequenceItem[]): string {
   // TODO: Implementation for updating workflow tasks
-  // This would modify the steps array in the workflow
   return content
 }
 
-function updateConfig(content: string, jobSlug: string, configUpdate: JobConfigUpdate): string {
+function updateConfig(content: string, _jobSlug: string, _configUpdate: JobConfigUpdate): string {
   // TODO: Implementation for updating job configuration
-  // This would modify various config properties
   return content
 }
 
-function updateHandler(content: string, handlerCode: string, jobType: 'task' | 'workflow'): string {
+function updateHandler(
+  content: string,
+  _handlerCode: string,
+  _jobType: 'task' | 'workflow',
+): string {
   // TODO: Implementation for replacing handler code
-  // This would replace the handler function in the job file
   return content
 }
 
@@ -242,55 +236,6 @@ export const updateJobTool = (
   verboseLogs: boolean,
   jobsDir: string,
 ) => {
-  const tool = async (
-    jobSlug: string,
-    updateType: string,
-    inputSchema?: SchemaField[],
-    outputSchema?: SchemaField[],
-    taskSequence?: TaskSequenceItem[],
-    configUpdate?: JobConfigUpdate,
-    handlerCode?: string,
-  ) => {
-    if (verboseLogs) {
-      req.payload.logger.info(
-        `[payload-mcp] Update Job Tool called with: ${jobSlug}, ${updateType}`,
-      )
-    }
-
-    try {
-      const result = await updateJob(
-        req,
-        verboseLogs,
-        jobsDir,
-        jobSlug,
-        updateType,
-        inputSchema,
-        outputSchema,
-        taskSequence,
-        configUpdate,
-        handlerCode,
-      )
-
-      if (verboseLogs) {
-        req.payload.logger.info(`[payload-mcp] Update Job Tool completed successfully`)
-      }
-
-      return result
-    } catch (error) {
-      const errorMessage = error instanceof Error ? error.message : 'Unknown error'
-      req.payload.logger.error(`[payload-mcp] Error in Update Job Tool: ${errorMessage}`)
-
-      return {
-        content: [
-          {
-            type: 'text' as const,
-            text: `❌ **Error in Update Job Tool**: ${errorMessage}`,
-          },
-        ],
-      }
-    }
-  }
-
   server.registerTool(
     'updateJob',
     {
@@ -298,17 +243,24 @@ export const updateJobTool = (
         'Updates an existing Payload job with new configuration, schema, or handler code',
       inputSchema: toolSchemas.updateJob.parameters.shape,
     },
-    async (args) => {
-      const {
-        configUpdate,
-        handlerCode,
-        inputSchema,
-        jobSlug,
-        outputSchema,
-        taskSequence,
-        updateType,
-      } = args
-      return await tool(
+    async ({
+      configUpdate,
+      handlerCode,
+      inputSchema,
+      jobSlug,
+      outputSchema,
+      taskSequence,
+      updateType,
+    }) => {
+      if (verboseLogs) {
+        req.payload.logger.info(
+          `[payload-mcp] Update Job Tool called with: ${jobSlug}, ${updateType}`,
+        )
+      }
+      return updateJob(
+        req,
+        verboseLogs,
+        jobsDir,
         jobSlug,
         updateType,
         inputSchema as unknown as SchemaField[],

package/src/mcp/tools/resource/create.ts

@@ -7,6 +7,10 @@ import { z } from 'zod'
 import type { PluginMCPServerConfig } from '../../../types.js'
 
 import { toCamelCase } from '../../../utils/camelCase.js'
+import {
+  getCollectionVirtualFieldNames,
+  stripVirtualFields,
+} from '../../../utils/getVirtualFieldNames.js'
 import { convertCollectionSchemaToZod } from '../../../utils/schemaConversion/convertCollectionSchemaToZod.js'
 import { transformPointDataToPayload } from '../../../utils/transformPointDataToPayload.js'
 import { toolSchemas } from '../schemas.js'
@@ -49,6 +53,9 @@ export const createResourceTool = (
         // Transform point fields from object format to tuple array
         parsedData = transformPointDataToPayload(parsedData)
 
+        const virtualFieldNames = getCollectionVirtualFieldNames(payload.config, collectionSlug)
+        parsedData = stripVirtualFields(parsedData, virtualFieldNames)
+
         if (verboseLogs) {
           payload.logger.info(
             `[payload-mcp] Parsed data for ${collectionSlug}: ${JSON.stringify(parsedData)}`,

package/src/mcp/tools/resource/update.ts

@@ -7,6 +7,10 @@ import { z } from 'zod'
 import type { PluginMCPServerConfig } from '../../../types.js'
 
 import { toCamelCase } from '../../../utils/camelCase.js'
+import {
+  getCollectionVirtualFieldNames,
+  stripVirtualFields,
+} from '../../../utils/getVirtualFieldNames.js'
 import { convertCollectionSchemaToZod } from '../../../utils/schemaConversion/convertCollectionSchemaToZod.js'
 import { transformPointDataToPayload } from '../../../utils/transformPointDataToPayload.js'
 import { toolSchemas } from '../schemas.js'
@@ -54,6 +58,9 @@ export const updateResourceTool = (
         // Transform point fields from object format to tuple array
         parsedData = transformPointDataToPayload(parsedData)
 
+        const virtualFieldNames = getCollectionVirtualFieldNames(payload.config, collectionSlug)
+        parsedData = stripVirtualFields(parsedData, virtualFieldNames)
+
         if (verboseLogs) {
           payload.logger.info(
             `[payload-mcp] Parsed data for ${collectionSlug}: ${JSON.stringify(parsedData)}`,

package/src/mcp/tools/schemas.ts

@@ -350,7 +350,6 @@ export const toolSchemas = {
         .any()
         .optional()
         .describe('Database configuration updates (for update_database type)'),
-      generalConfig: z.any().optional().describe('General configuration updates'),
       newContent: z
         .string()
         .optional()

package/src/utils/getVirtualFieldNames.ts

@@ -0,0 +1,53 @@
+import type { SanitizedConfig } from 'payload'
+
+import { fieldIsVirtual } from 'payload/shared'
+
+/**
+ * Returns the names of all top-level virtual fields for a given collection slug.
+ */
+export function getCollectionVirtualFieldNames(config: SanitizedConfig, slug: string): string[] {
+  const collection = config.collections.find((c) => c.slug === slug)
+
+  if (!collection) {
+    return []
+  }
+
+  return collection.flattenedFields
+    .filter((field) => 'name' in field && fieldIsVirtual(field))
+    .map((field) => (field as { name: string }).name)
+}
+
+/**
+ * Returns the names of all top-level virtual fields for a given global slug.
+ */
+export function getGlobalVirtualFieldNames(config: SanitizedConfig, slug: string): string[] {
+  const global = config.globals.find((g) => g.slug === slug)
+
+  if (!global) {
+    return []
+  }
+
+  return global.flattenedFields
+    .filter((field) => 'name' in field && fieldIsVirtual(field))
+    .map((field) => (field as { name: string }).name)
+}
+
+/**
+ * Strips virtual field values from a data object given a list of virtual field names.
+ */
+export function stripVirtualFields(
+  data: Record<string, unknown>,
+  virtualFieldNames: string[],
+): Record<string, unknown> {
+  if (virtualFieldNames.length === 0) {
+    return data
+  }
+
+  const stripped = { ...data }
+
+  for (const name of virtualFieldNames) {
+    delete stripped[name]
+  }
+
+  return stripped
+}

package/src/utils/schemaConversion/convertCollectionSchemaToZod.ts

@@ -14,9 +14,7 @@ export const convertCollectionSchemaToZod = (schema: JSONSchema4) => {
 
   const sanitized = sanitizeJsonSchema(schemaClone)
   const pointTransformed = transformPointFieldsForMCP(sanitized)
-  const simplifiedSchema = simplifyRelationshipFields(pointTransformed)
-
-  const zodSchemaAsString = jsonSchemaToZod(simplifiedSchema)
+  const zodSchemaAsString = jsonSchemaToZod(simplifyRelationshipFields(pointTransformed))
 
   // Transpile TypeScript to JavaScript
   const transpileResult = ts.transpileModule(zodSchemaAsString, {

package/src/utils/schemaConversion/removeVirtualFieldsFromSchema.ts

@@ -0,0 +1,27 @@
+import type { JSONSchema4 } from 'json-schema'
+
+/**
+ * Removes virtual fields from a JSON Schema by name so they don't appear
+ * in the generated MCP tool input schema.
+ */
+export function removeVirtualFieldsFromSchema(
+  schema: JSONSchema4,
+  virtualFieldNames: string[],
+): JSONSchema4 {
+  if (virtualFieldNames.length === 0) {
+    return schema
+  }
+
+  for (const name of virtualFieldNames) {
+    delete schema?.properties?.[name]
+  }
+
+  if (Array.isArray(schema.required)) {
+    schema.required = schema.required.filter((field) => !virtualFieldNames.includes(field))
+    if (schema.required.length === 0) {
+      delete schema.required
+    }
+  }
+
+  return schema
+}

package/src/utils/schemaConversion/sanitizeJsonSchema.ts

@@ -4,6 +4,11 @@ import type { JSONSchema4 } from 'json-schema'
  * Removes internal Payload properties (id, createdAt, updatedAt) from a
  * JSON Schema so they don't appear in the generated Zod validation schema.
  * Also strips `id` from the `required` array when present.
+ *
+ * Additionally normalizes nullable type arrays (e.g. `['array', 'null']` →
+ * `'array'`) throughout the schema tree. Without this, `json-schema-to-zod`
+ * emits a Zod union which the MCP SDK serialises back as `anyOf`, stripping
+ * the concrete `type` from the output and breaking schema introspection.
  */
 export function sanitizeJsonSchema(schema: JSONSchema4): JSONSchema4 {
   delete schema?.properties?.id
@@ -17,5 +22,41 @@ export function sanitizeJsonSchema(schema: JSONSchema4): JSONSchema4 {
     }
   }
 
+  if (schema.properties && typeof schema.properties === 'object') {
+    for (const key of Object.keys(schema.properties)) {
+      const prop = schema.properties[key] as JSONSchema4
+      if (!prop || typeof prop !== 'object') {
+        continue
+      }
+      normalizeNullableType(prop)
+      if (prop.properties) {
+        sanitizeJsonSchema(prop)
+      }
+      if (prop.items && typeof prop.items === 'object' && !Array.isArray(prop.items)) {
+        sanitizeJsonSchema(prop.items)
+      }
+    }
+  }
+
   return schema
 }
+
+/**
+ * Strips `'null'` from a `type` array only when the remaining type is a
+ * complex structural type (`array` or `object`).
+ *
+ * Simple scalar types (`string`, `number`, `boolean`) are intentionally
+ * preserved as `['string', 'null']` so that the MCP SDK serialises them as a
+ * compact inline `type` array. Complex types however cause `zodToJsonSchema`
+ * to emit `anyOf: [{ type: 'array', items: ... }, { type: 'null' }]`, which
+ * has no top-level `type` property and breaks schema introspection by clients.
+ */
+function normalizeNullableType(schema: JSONSchema4): void {
+  if (!Array.isArray(schema.type)) {
+    return
+  }
+  const nonNullTypes = schema.type.filter((t) => t !== 'null')
+  if (nonNullTypes.length === 1 && (nonNullTypes[0] === 'array' || nonNullTypes[0] === 'object')) {
+    schema.type = nonNullTypes[0]
+  }
+}

package/dist/mcp/helpers/conversion.d.ts

@@ -1,2 +0,0 @@
-export declare const toCamelCase: (str: string) => string;
-//# sourceMappingURL=conversion.d.ts.map

package/dist/mcp/helpers/conversion.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"conversion.d.ts","sourceRoot":"","sources":["../../../src/mcp/helpers/conversion.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,WAAW,QAAS,MAAM,KAAG,MAEzC,CAAA"}

package/dist/mcp/helpers/conversion.js

@@ -1,5 +0,0 @@
-export const toCamelCase = (str)=>{
-    return str.replace(/-([a-z])/g, (match, letter)=>letter.toUpperCase());
-};
-
-//# sourceMappingURL=conversion.js.map

package/dist/mcp/helpers/conversion.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../../src/mcp/helpers/conversion.ts"],"sourcesContent":["export const toCamelCase = (str: string): string => {\n  return str.replace(/-([a-z])/g, (match, letter) => letter.toUpperCase())\n}\n"],"names":["toCamelCase","str","replace","match","letter","toUpperCase"],"mappings":"AAAA,OAAO,MAAMA,cAAc,CAACC;IAC1B,OAAOA,IAAIC,OAAO,CAAC,aAAa,CAACC,OAAOC,SAAWA,OAAOC,WAAW;AACvE,EAAC"}

package/dist/mcp/helpers/validation.d.ts

@@ -1,9 +0,0 @@
-/**
- * Validates collection-specific data for resource creation
- */
-export declare function validateCollectionData(collection: string, data: Record<string, unknown>, availableCollections: string[]): null | string;
-/**
- * Checks if a collection slug is valid
- */
-export declare function validateCollectionSlug(collection: string, collections: Partial<Record<string, true>>): string | undefined;
-//# sourceMappingURL=validation.d.ts.map

package/dist/mcp/helpers/validation.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../../src/mcp/helpers/validation.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,oBAAoB,EAAE,MAAM,EAAE,GAC7B,IAAI,GAAG,MAAM,CAWf;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,sBAM3C"}

package/dist/mcp/helpers/validation.js

@@ -1,22 +0,0 @@
-/**
- * Validates collection-specific data for resource creation
- */ export function validateCollectionData(collection, data, availableCollections) {
-    // Check if collection exists
-    if (!availableCollections.includes(collection)) {
-        return `Unknown collection: ${collection}. Available collections: ${availableCollections.join(', ')}`;
-    }
-    if (!data || typeof data !== 'object' || Object.keys(data).length === 0) {
-        return `Collection "${collection}" requires data to be provided`;
-    }
-    return null;
-}
-/**
- * Checks if a collection slug is valid
- */ export function validateCollectionSlug(collection, collections) {
-    const collectionSlugs = Object.keys(collections);
-    if (!collectionSlugs.includes(collection)) {
-        return `Collection "${collection}" is not valid`;
-    }
-}
-
-//# sourceMappingURL=validation.js.map

package/dist/mcp/helpers/validation.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../../src/mcp/helpers/validation.ts"],"sourcesContent":["/**\n * Validates collection-specific data for resource creation\n */\nexport function validateCollectionData(\n  collection: string,\n  data: Record<string, unknown>,\n  availableCollections: string[],\n): null | string {\n  // Check if collection exists\n  if (!availableCollections.includes(collection)) {\n    return `Unknown collection: ${collection}. Available collections: ${availableCollections.join(', ')}`\n  }\n\n  if (!data || typeof data !== 'object' || Object.keys(data).length === 0) {\n    return `Collection \"${collection}\" requires data to be provided`\n  }\n\n  return null\n}\n\n/**\n * Checks if a collection slug is valid\n */\nexport function validateCollectionSlug(\n  collection: string,\n  collections: Partial<Record<string, true>>,\n) {\n  const collectionSlugs = Object.keys(collections)\n  if (!collectionSlugs.includes(collection)) {\n    return `Collection \"${collection}\" is not valid`\n  }\n}\n"],"names":["validateCollectionData","collection","data","availableCollections","includes","join","Object","keys","length","validateCollectionSlug","collections","collectionSlugs"],"mappings":"AAAA;;CAEC,GACD,OAAO,SAASA,uBACdC,UAAkB,EAClBC,IAA6B,EAC7BC,oBAA8B;IAE9B,6BAA6B;IAC7B,IAAI,CAACA,qBAAqBC,QAAQ,CAACH,aAAa;QAC9C,OAAO,CAAC,oBAAoB,EAAEA,WAAW,yBAAyB,EAAEE,qBAAqBE,IAAI,CAAC,OAAO;IACvG;IAEA,IAAI,CAACH,QAAQ,OAAOA,SAAS,YAAYI,OAAOC,IAAI,CAACL,MAAMM,MAAM,KAAK,GAAG;QACvE,OAAO,CAAC,YAAY,EAAEP,WAAW,8BAA8B,CAAC;IAClE;IAEA,OAAO;AACT;AAEA;;CAEC,GACD,OAAO,SAASQ,uBACdR,UAAkB,EAClBS,WAA0C;IAE1C,MAAMC,kBAAkBL,OAAOC,IAAI,CAACG;IACpC,IAAI,CAACC,gBAAgBP,QAAQ,CAACH,aAAa;QACzC,OAAO,CAAC,YAAY,EAAEA,WAAW,cAAc,CAAC;IAClD;AACF"}

package/src/mcp/helpers/conversion.ts

@@ -1,3 +0,0 @@
-export const toCamelCase = (str: string): string => {
-  return str.replace(/-([a-z])/g, (match, letter) => letter.toUpperCase())
-}

package/src/mcp/helpers/validation.ts

@@ -1,32 +0,0 @@
-/**
- * Validates collection-specific data for resource creation
- */
-export function validateCollectionData(
-  collection: string,
-  data: Record<string, unknown>,
-  availableCollections: string[],
-): null | string {
-  // Check if collection exists
-  if (!availableCollections.includes(collection)) {
-    return `Unknown collection: ${collection}. Available collections: ${availableCollections.join(', ')}`
-  }
-
-  if (!data || typeof data !== 'object' || Object.keys(data).length === 0) {
-    return `Collection "${collection}" requires data to be provided`
-  }
-
-  return null
-}
-
-/**
- * Checks if a collection slug is valid
- */
-export function validateCollectionSlug(
-  collection: string,
-  collections: Partial<Record<string, true>>,
-) {
-  const collectionSlugs = Object.keys(collections)
-  if (!collectionSlugs.includes(collection)) {
-    return `Collection "${collection}" is not valid`
-  }
-}