@payloadcms/plugin-mcp 4.0.0-internal.811e0a4 → 4.0.0-internal.8867dba

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (142) hide show
  1. package/bin.js +7 -0
  2. package/dist/defaultAccess.d.ts.map +1 -1
  3. package/dist/defineTool.d.ts +8 -8
  4. package/dist/defineTool.d.ts.map +1 -1
  5. package/dist/endpoint/access.d.ts +2 -7
  6. package/dist/endpoint/access.d.ts.map +1 -1
  7. package/dist/endpoint/access.js +4 -11
  8. package/dist/endpoint/access.js.map +1 -1
  9. package/dist/mcp/buildMcpServer.d.ts.map +1 -1
  10. package/dist/mcp/builtin/collections/countTool.d.ts.map +1 -1
  11. package/dist/mcp/builtin/collections/countTool.js +1 -2
  12. package/dist/mcp/builtin/collections/countTool.js.map +1 -1
  13. package/dist/mcp/builtin/collections/countVersionsTool.d.ts.map +1 -1
  14. package/dist/mcp/builtin/collections/countVersionsTool.js +1 -2
  15. package/dist/mcp/builtin/collections/countVersionsTool.js.map +1 -1
  16. package/dist/mcp/builtin/collections/createTool.d.ts.map +1 -1
  17. package/dist/mcp/builtin/collections/createTool.js +15 -6
  18. package/dist/mcp/builtin/collections/createTool.js.map +1 -1
  19. package/dist/mcp/builtin/collections/deleteTool.d.ts.map +1 -1
  20. package/dist/mcp/builtin/collections/deleteTool.js +1 -2
  21. package/dist/mcp/builtin/collections/deleteTool.js.map +1 -1
  22. package/dist/mcp/builtin/collections/duplicateTool.d.ts.map +1 -1
  23. package/dist/mcp/builtin/collections/duplicateTool.js +1 -2
  24. package/dist/mcp/builtin/collections/duplicateTool.js.map +1 -1
  25. package/dist/mcp/builtin/collections/fileInput.d.ts +28 -0
  26. package/dist/mcp/builtin/collections/fileInput.d.ts.map +1 -0
  27. package/dist/mcp/builtin/collections/fileInput.js +117 -0
  28. package/dist/mcp/builtin/collections/fileInput.js.map +1 -0
  29. package/dist/mcp/builtin/collections/fileInput.spec.js +86 -0
  30. package/dist/mcp/builtin/collections/fileInput.spec.js.map +1 -0
  31. package/dist/mcp/builtin/collections/findDistinctTool.d.ts.map +1 -1
  32. package/dist/mcp/builtin/collections/findDistinctTool.js +1 -2
  33. package/dist/mcp/builtin/collections/findDistinctTool.js.map +1 -1
  34. package/dist/mcp/builtin/collections/findTool.d.ts.map +1 -1
  35. package/dist/mcp/builtin/collections/findTool.js +3 -4
  36. package/dist/mcp/builtin/collections/findTool.js.map +1 -1
  37. package/dist/mcp/builtin/collections/findVersionByIDTool.d.ts.map +1 -1
  38. package/dist/mcp/builtin/collections/findVersionByIDTool.js +1 -2
  39. package/dist/mcp/builtin/collections/findVersionByIDTool.js.map +1 -1
  40. package/dist/mcp/builtin/collections/findVersionsTool.d.ts.map +1 -1
  41. package/dist/mcp/builtin/collections/findVersionsTool.js +1 -2
  42. package/dist/mcp/builtin/collections/findVersionsTool.js.map +1 -1
  43. package/dist/mcp/builtin/collections/formatCollectionError.d.ts +1 -1
  44. package/dist/mcp/builtin/collections/formatCollectionError.d.ts.map +1 -1
  45. package/dist/mcp/builtin/collections/getCollectionSchemaTool.d.ts.map +1 -1
  46. package/dist/mcp/builtin/collections/getCollectionSchemaTool.js +45 -5
  47. package/dist/mcp/builtin/collections/getCollectionSchemaTool.js.map +1 -1
  48. package/dist/mcp/builtin/collections/restoreVersionTool.d.ts.map +1 -1
  49. package/dist/mcp/builtin/collections/restoreVersionTool.js +1 -2
  50. package/dist/mcp/builtin/collections/restoreVersionTool.js.map +1 -1
  51. package/dist/mcp/builtin/collections/updateTool.d.ts.map +1 -1
  52. package/dist/mcp/builtin/collections/updateTool.js +24 -12
  53. package/dist/mcp/builtin/collections/updateTool.js.map +1 -1
  54. package/dist/mcp/builtin/collections/uploadInstructionsTool.d.ts +2 -0
  55. package/dist/mcp/builtin/collections/uploadInstructionsTool.d.ts.map +1 -0
  56. package/dist/mcp/builtin/collections/uploadInstructionsTool.js +55 -0
  57. package/dist/mcp/builtin/collections/uploadInstructionsTool.js.map +1 -0
  58. package/dist/mcp/builtin/getConfigInfoTool.d.ts.map +1 -1
  59. package/dist/mcp/builtin/getConfigInfoTool.js +2 -5
  60. package/dist/mcp/builtin/getConfigInfoTool.js.map +1 -1
  61. package/dist/mcp/builtin/globals/countVersionsTool.d.ts.map +1 -1
  62. package/dist/mcp/builtin/globals/countVersionsTool.js +1 -2
  63. package/dist/mcp/builtin/globals/countVersionsTool.js.map +1 -1
  64. package/dist/mcp/builtin/globals/findTool.d.ts.map +1 -1
  65. package/dist/mcp/builtin/globals/findTool.js +2 -2
  66. package/dist/mcp/builtin/globals/findTool.js.map +1 -1
  67. package/dist/mcp/builtin/globals/findVersionByIDTool.d.ts.map +1 -1
  68. package/dist/mcp/builtin/globals/findVersionByIDTool.js +1 -2
  69. package/dist/mcp/builtin/globals/findVersionByIDTool.js.map +1 -1
  70. package/dist/mcp/builtin/globals/findVersionsTool.d.ts.map +1 -1
  71. package/dist/mcp/builtin/globals/findVersionsTool.js +1 -2
  72. package/dist/mcp/builtin/globals/findVersionsTool.js.map +1 -1
  73. package/dist/mcp/builtin/globals/getGlobalSchemaTool.d.ts.map +1 -1
  74. package/dist/mcp/builtin/globals/getGlobalSchemaTool.js +21 -3
  75. package/dist/mcp/builtin/globals/getGlobalSchemaTool.js.map +1 -1
  76. package/dist/mcp/builtin/globals/restoreVersionTool.js +1 -2
  77. package/dist/mcp/builtin/globals/restoreVersionTool.js.map +1 -1
  78. package/dist/mcp/builtin/globals/updateTool.d.ts.map +1 -1
  79. package/dist/mcp/builtin/globals/updateTool.js +2 -2
  80. package/dist/mcp/builtin/globals/updateTool.js.map +1 -1
  81. package/dist/mcp/builtin/validateEntityData.d.ts.map +1 -1
  82. package/dist/mcp/builtinTools.d.ts +6 -0
  83. package/dist/mcp/builtinTools.d.ts.map +1 -1
  84. package/dist/mcp/builtinTools.js +6 -0
  85. package/dist/mcp/builtinTools.js.map +1 -1
  86. package/dist/mcp/sanitizeMCPConfig.d.ts.map +1 -1
  87. package/dist/mcp/sanitizeMCPConfig.js +4 -1
  88. package/dist/mcp/sanitizeMCPConfig.js.map +1 -1
  89. package/dist/types.d.ts +44 -7
  90. package/dist/types.d.ts.map +1 -1
  91. package/dist/types.js +2 -4
  92. package/dist/types.js.map +1 -1
  93. package/dist/utils/camelCase.d.ts.map +1 -1
  94. package/dist/utils/resolveProjectRoot.d.ts.map +1 -1
  95. package/dist/utils/schemaConversion/filterFieldsByAccess.d.ts +28 -0
  96. package/dist/utils/schemaConversion/filterFieldsByAccess.d.ts.map +1 -0
  97. package/dist/utils/schemaConversion/filterFieldsByAccess.js +71 -0
  98. package/dist/utils/schemaConversion/filterFieldsByAccess.js.map +1 -0
  99. package/dist/utils/schemaConversion/getEntityInputSchema.d.ts +5 -3
  100. package/dist/utils/schemaConversion/getEntityInputSchema.d.ts.map +1 -1
  101. package/dist/utils/schemaConversion/getEntityInputSchema.js +40 -6
  102. package/dist/utils/schemaConversion/getEntityInputSchema.js.map +1 -1
  103. package/dist/utils/schemaConversion/sanitizeEntitySchema.d.ts.map +1 -1
  104. package/dist/utils/schemaConversion/sanitizeEntitySchema.spec.js +2 -2
  105. package/dist/utils/schemaConversion/sanitizeEntitySchema.spec.js.map +1 -1
  106. package/dist/utils/toStandardSchema.d.ts.map +1 -1
  107. package/package.json +4 -4
  108. package/src/endpoint/access.ts +3 -10
  109. package/src/mcp/builtin/collections/countTool.ts +1 -2
  110. package/src/mcp/builtin/collections/countVersionsTool.ts +2 -6
  111. package/src/mcp/builtin/collections/createTool.ts +15 -6
  112. package/src/mcp/builtin/collections/deleteTool.ts +1 -2
  113. package/src/mcp/builtin/collections/duplicateTool.ts +1 -2
  114. package/src/mcp/builtin/collections/fileInput.spec.ts +93 -0
  115. package/src/mcp/builtin/collections/fileInput.ts +154 -0
  116. package/src/mcp/builtin/collections/findDistinctTool.ts +3 -3
  117. package/src/mcp/builtin/collections/findTool.ts +3 -4
  118. package/src/mcp/builtin/collections/findVersionByIDTool.ts +1 -2
  119. package/src/mcp/builtin/collections/findVersionsTool.ts +1 -2
  120. package/src/mcp/builtin/collections/getCollectionSchemaTool.ts +43 -9
  121. package/src/mcp/builtin/collections/restoreVersionTool.ts +1 -2
  122. package/src/mcp/builtin/collections/updateTool.ts +26 -10
  123. package/src/mcp/builtin/collections/uploadInstructionsTool.ts +64 -0
  124. package/src/mcp/builtin/getConfigInfoTool.ts +2 -4
  125. package/src/mcp/builtin/globals/countVersionsTool.ts +2 -6
  126. package/src/mcp/builtin/globals/findTool.ts +2 -2
  127. package/src/mcp/builtin/globals/findVersionByIDTool.ts +1 -2
  128. package/src/mcp/builtin/globals/findVersionsTool.ts +1 -2
  129. package/src/mcp/builtin/globals/getGlobalSchemaTool.ts +25 -3
  130. package/src/mcp/builtin/globals/restoreVersionTool.ts +3 -3
  131. package/src/mcp/builtin/globals/updateTool.ts +2 -2
  132. package/src/mcp/builtinTools.ts +7 -0
  133. package/src/mcp/sanitizeMCPConfig.ts +4 -1
  134. package/src/types.ts +43 -7
  135. package/src/utils/schemaConversion/filterFieldsByAccess.ts +123 -0
  136. package/src/utils/schemaConversion/getEntityInputSchema.ts +47 -13
  137. package/src/utils/schemaConversion/sanitizeEntitySchema.spec.ts +2 -2
  138. package/dist/utils/localAPIDefaults.d.ts +0 -20
  139. package/dist/utils/localAPIDefaults.d.ts.map +0 -1
  140. package/dist/utils/localAPIDefaults.js +0 -19
  141. package/dist/utils/localAPIDefaults.js.map +0 -1
  142. package/src/utils/localAPIDefaults.ts +0 -22
@@ -9,15 +9,15 @@ import {
9
9
  getCollectionVirtualFieldNames,
10
10
  stripVirtualFields,
11
11
  } from '../../../utils/getVirtualFieldNames.js'
12
- import { localAPIDefaults } from '../../../utils/localAPIDefaults.js'
13
12
  import { getCollectionInputSchema } from '../../../utils/schemaConversion/getEntityInputSchema.js'
14
13
  import { transformPointDataToPayload } from '../../../utils/transformPointDataToPayload.js'
15
14
  import { whereSchema } from '../../../utils/whereSchema.js'
16
15
  import { validateCollectionData } from '../validateEntityData.js'
16
+ import { fileInputSchema, resolveFile } from './fileInput.js'
17
17
  import { formatCollectionError } from './formatCollectionError.js'
18
18
 
19
19
  const DEFAULT_DESCRIPTION =
20
- 'Update documents in any collection by passing the collection slug and data.'
20
+ 'Update documents in any collection. Files can use a URL, base64, or an upload prepared by getUploadInstructions.'
21
21
 
22
22
  export const updateDocumentTool = defineCollectionTool({
23
23
  access: (args) =>
@@ -32,7 +32,11 @@ export const updateDocumentTool = defineCollectionTool({
32
32
  description: DEFAULT_DESCRIPTION,
33
33
  input: z.object({
34
34
  id: z.union([z.string(), z.number()]).describe('The ID of the document to update').optional(),
35
- data: z.record(z.string(), z.unknown()).describe('The fields to update'),
35
+ data: z
36
+ .record(z.string(), z.unknown())
37
+ .describe(
38
+ 'The fields to update. Only include fields permitted by the schema returned by getCollectionSchema.',
39
+ ),
36
40
  depth: z
37
41
  .number()
38
42
  .describe('How many levels deep to populate relationships')
@@ -40,14 +44,16 @@ export const updateDocumentTool = defineCollectionTool({
40
44
  .default(0),
41
45
  draft: z
42
46
  .boolean()
43
- .describe('Whether to update the document as a draft')
47
+ .describe(
48
+ 'Only if getCollectionSchema includes _status; otherwise _status does not exist. true saves only a draft version; false updates main and versions. data._status: "published" overrides true.',
49
+ )
44
50
  .optional()
45
51
  .default(false),
46
52
  fallbackLocale: z
47
53
  .string()
48
54
  .describe('Optional: fallback locale code to use when requested locale is not available')
49
55
  .optional(),
50
- filePath: z.string().describe('File path for file uploads').optional(),
56
+ file: fileInputSchema.optional(),
51
57
  locale: z
52
58
  .string()
53
59
  .describe(
@@ -64,6 +70,12 @@ export const updateDocumentTool = defineCollectionTool({
64
70
  .describe('Whether to overwrite existing files')
65
71
  .optional()
66
72
  .default(false),
73
+ publishAllLocales: z
74
+ .boolean()
75
+ .describe(
76
+ 'For collections with localized publishing status, whether publishing should affect every locale. Set false with locale to publish only that locale.',
77
+ )
78
+ .optional(),
67
79
  select: z
68
80
  .record(z.string(), z.unknown())
69
81
  .describe(
@@ -86,10 +98,11 @@ export const updateDocumentTool = defineCollectionTool({
86
98
  depth,
87
99
  draft,
88
100
  fallbackLocale,
89
- filePath,
101
+ file: fileInput,
90
102
  locale,
91
103
  overrideLock,
92
104
  overwriteExistingFiles,
105
+ publishAllLocales,
93
106
  select,
94
107
  where,
95
108
  } = input
@@ -119,6 +132,7 @@ export const updateDocumentTool = defineCollectionTool({
119
132
  }
120
133
 
121
134
  const parsedData = transformPointDataToPayload(inputData)
135
+ const file = await resolveFile({ collectionSlug, input: fileInput, req })
122
136
 
123
137
  const whereClause: Where = where ?? {}
124
138
 
@@ -129,11 +143,12 @@ export const updateDocumentTool = defineCollectionTool({
129
143
  data: parsedData,
130
144
  depth,
131
145
  draft,
146
+ overrideAccess: authorizedMCP.overrideAccess,
132
147
  overrideLock,
133
148
  req,
134
- ...localAPIDefaults(authorizedMCP),
135
- ...(filePath ? { filePath } : {}),
149
+ ...(file ? { file } : {}),
136
150
  ...(overwriteExistingFiles ? { overwriteExistingFiles } : {}),
151
+ ...(publishAllLocales !== undefined ? { publishAllLocales } : {}),
137
152
  ...(locale ? { locale } : {}),
138
153
  ...(fallbackLocale ? { fallbackLocale } : {}),
139
154
  ...(select ? { select: select as SelectType } : {}),
@@ -155,12 +170,13 @@ export const updateDocumentTool = defineCollectionTool({
155
170
  data: parsedData,
156
171
  depth,
157
172
  draft,
173
+ overrideAccess: authorizedMCP.overrideAccess,
158
174
  overrideLock,
159
175
  req,
160
176
  where: whereClause,
161
- ...localAPIDefaults(authorizedMCP),
162
- ...(filePath ? { filePath } : {}),
177
+ ...(file ? { file } : {}),
163
178
  ...(overwriteExistingFiles ? { overwriteExistingFiles } : {}),
179
+ ...(publishAllLocales !== undefined ? { publishAllLocales } : {}),
164
180
  ...(locale ? { locale } : {}),
165
181
  ...(fallbackLocale ? { fallbackLocale } : {}),
166
182
  ...(select ? { select: select as SelectType } : {}),
@@ -0,0 +1,64 @@
1
+ import { getUploadInstructions as getPayloadUploadInstructions } from 'payload/internal'
2
+ import { z } from 'zod'
3
+
4
+ import { defaultAccess } from '../../../defaultAccess.js'
5
+ import { defineCollectionTool } from '../../../defineTool.js'
6
+
7
+ export const getUploadInstructionsTool = defineCollectionTool({
8
+ access: (args) =>
9
+ defaultAccess(args) &&
10
+ Boolean(
11
+ args.permissions?.collections?.[args.collectionSlug]?.create ||
12
+ args.permissions?.collections?.[args.collectionSlug]?.update,
13
+ ),
14
+ annotations: {
15
+ destructiveHint: false,
16
+ idempotentHint: false,
17
+ openWorldHint: true,
18
+ readOnlyHint: false,
19
+ title: 'Get Upload Instructions',
20
+ },
21
+ description:
22
+ 'Prepare a file upload before createDocument or updateDocument. Pass file metadata only, without base64 or file contents.',
23
+ input: z.object({
24
+ docPrefix: z.string().describe('Optional document folder or prefix').optional(),
25
+ filename: z.string().describe('The original file name'),
26
+ filesize: z.number().int().nonnegative().describe('The file size in bytes'),
27
+ mimeType: z.string().describe('The file MIME type'),
28
+ }),
29
+ }).handler(async ({ authorizedMCP, collectionSlug, input, req }) => {
30
+ try {
31
+ const instructions = await getPayloadUploadInstructions({
32
+ ...input,
33
+ collectionSlug,
34
+ overrideAccess: authorizedMCP.overrideAccess,
35
+ req,
36
+ })
37
+
38
+ const nextStep =
39
+ instructions.type === 'http'
40
+ ? 'Send the exact file bytes using request, then pass { source: "uploadReference", file } to createDocument or updateDocument.'
41
+ : `Call the local MCP tool named "${instructions.name}" with the file and data, then pass { source: "uploadReference", file } to createDocument or updateDocument.`
42
+
43
+ return {
44
+ content: [
45
+ {
46
+ type: 'text',
47
+ text: `Upload instructions for collection "${collectionSlug}":\n\`\`\`json\n${JSON.stringify(instructions)}\n\`\`\`\n${nextStep}`,
48
+ },
49
+ ],
50
+ structuredContent: { instructions },
51
+ }
52
+ } catch (error) {
53
+ const message = error instanceof Error ? error.message : 'Unknown error'
54
+ return {
55
+ content: [
56
+ {
57
+ type: 'text',
58
+ text: `Error getting upload instructions for collection "${collectionSlug}": ${message}`,
59
+ },
60
+ ],
61
+ isError: true,
62
+ }
63
+ }
64
+ })
@@ -12,10 +12,8 @@ export const getConfigInfoTool = defineTool({
12
12
  },
13
13
  description: 'List the Payload collection and global slugs visible to this MCP client.',
14
14
  }).handler(async ({ authorizedMCP, req }) => {
15
- const user = authorizedMCP.user
16
- const permissions = authorizedMCP.overrideAccess
17
- ? null
18
- : await getAccessResults({ req: { ...req, user } })
15
+ const user = req.user
16
+ const permissions = authorizedMCP.overrideAccess ? null : await getAccessResults({ req })
19
17
  const authorizedCollectionSlugs = new Set<string>()
20
18
  const authorizedGlobalSlugs = new Set<string>()
21
19
 
@@ -3,7 +3,6 @@ import { z } from 'zod'
3
3
  import { defaultAccess } from '../../../defaultAccess.js'
4
4
  import { defineGlobalTool } from '../../../defineTool.js'
5
5
  import { getLogger } from '../../../utils/getLogger.js'
6
- import { localAPIDefaults } from '../../../utils/localAPIDefaults.js'
7
6
  import { whereSchema } from '../../../utils/whereSchema.js'
8
7
 
9
8
  const DEFAULT_DESCRIPTION =
@@ -21,10 +20,7 @@ export const countGlobalVersionsTool = defineGlobalTool({
21
20
  },
22
21
  description: DEFAULT_DESCRIPTION,
23
22
  input: z.object({
24
- locale: z
25
- .string()
26
- .describe('Optional: locale code to count versions in')
27
- .optional(),
23
+ locale: z.string().describe('Optional: locale code to count versions in').optional(),
28
24
  where: whereSchema
29
25
  .describe(
30
26
  'Optional: where clause for filtering versions. Version document fields are usually under "version". Example: {"version.siteName":{"contains":"test"}}',
@@ -41,8 +37,8 @@ export const countGlobalVersionsTool = defineGlobalTool({
41
37
  try {
42
38
  const result = await payload.countGlobalVersions({
43
39
  global: globalSlug,
40
+ overrideAccess: authorizedMCP.overrideAccess,
44
41
  req,
45
- ...localAPIDefaults(authorizedMCP),
46
42
  ...(locale ? { locale } : {}),
47
43
  ...(where ? { where } : {}),
48
44
  })
@@ -5,7 +5,6 @@ import { z } from 'zod'
5
5
  import { defaultAccess } from '../../../defaultAccess.js'
6
6
  import { defineGlobalTool } from '../../../defineTool.js'
7
7
  import { getLogger } from '../../../utils/getLogger.js'
8
- import { localAPIDefaults } from '../../../utils/localAPIDefaults.js'
9
8
 
10
9
  const DEFAULT_DESCRIPTION = 'Find any Payload global by passing the global slug.'
11
10
 
@@ -66,7 +65,8 @@ export const findGlobalTool = defineGlobalTool({
66
65
  const findOptions: Parameters<typeof payload.findGlobal>[0] = {
67
66
  slug: globalSlug,
68
67
  depth,
69
- ...localAPIDefaults(authorizedMCP),
68
+ overrideAccess: authorizedMCP.overrideAccess,
69
+ req,
70
70
  }
71
71
 
72
72
  if (locale) {
@@ -5,7 +5,6 @@ import { z } from 'zod'
5
5
  import { defaultAccess } from '../../../defaultAccess.js'
6
6
  import { defineGlobalTool } from '../../../defineTool.js'
7
7
  import { getLogger } from '../../../utils/getLogger.js'
8
- import { localAPIDefaults } from '../../../utils/localAPIDefaults.js'
9
8
 
10
9
  const DEFAULT_DESCRIPTION =
11
10
  'Find a specific global version in any version-enabled global by passing the global slug and version ID.'
@@ -70,8 +69,8 @@ export const findGlobalVersionByIDTool = defineGlobalTool({
70
69
  id,
71
70
  slug: globalSlug,
72
71
  depth,
72
+ overrideAccess: authorizedMCP.overrideAccess,
73
73
  req,
74
- ...localAPIDefaults(authorizedMCP),
75
74
  ...(fallbackLocale ? { fallbackLocale } : {}),
76
75
  ...(locale ? { locale } : {}),
77
76
  ...(populate ? { populate: populate as PopulateType } : {}),
@@ -5,7 +5,6 @@ import { z } from 'zod'
5
5
  import { defaultAccess } from '../../../defaultAccess.js'
6
6
  import { defineGlobalTool } from '../../../defineTool.js'
7
7
  import { getLogger } from '../../../utils/getLogger.js'
8
- import { localAPIDefaults } from '../../../utils/localAPIDefaults.js'
9
8
  import { whereSchema } from '../../../utils/whereSchema.js'
10
9
 
11
10
  const DEFAULT_DESCRIPTION =
@@ -110,9 +109,9 @@ export const findGlobalVersionsTool = defineGlobalTool({
110
109
  slug: globalSlug,
111
110
  depth,
112
111
  limit,
112
+ overrideAccess: authorizedMCP.overrideAccess,
113
113
  page,
114
114
  req,
115
- ...localAPIDefaults(authorizedMCP),
116
115
  ...(fallbackLocale ? { fallbackLocale } : {}),
117
116
  ...(locale ? { locale } : {}),
118
117
  ...(pagination !== undefined ? { pagination } : {}),
@@ -1,3 +1,5 @@
1
+ import { getAccessResults } from 'payload'
2
+
1
3
  import { defaultAccess } from '../../../defaultAccess.js'
2
4
  import { defineGlobalTool } from '../../../defineTool.js'
3
5
  import { getGlobalInputSchema } from '../../../utils/schemaConversion/getEntityInputSchema.js'
@@ -6,7 +8,7 @@ export const getGlobalSchemaTool = defineGlobalTool({
6
8
  access: (args) => {
7
9
  const permissions = args.permissions?.globals?.[args.globalSlug]
8
10
 
9
- return defaultAccess(args) && Boolean(permissions?.read || permissions?.update)
11
+ return defaultAccess(args) && Boolean(permissions?.update)
10
12
  },
11
13
  annotations: {
12
14
  destructiveHint: false,
@@ -16,8 +18,28 @@ export const getGlobalSchemaTool = defineGlobalTool({
16
18
  title: 'Get Global Schema',
17
19
  },
18
20
  description: 'Get the input schema for updating a global.',
19
- }).handler(({ globalSlug, req }) => {
20
- const inputSchema = getGlobalInputSchema({ globalSlug, req })
21
+ }).handler(async ({ authorizedMCP, globalSlug, req }) => {
22
+ const permissions = authorizedMCP.overrideAccess
23
+ ? null
24
+ : (await getAccessResults({ req })).globals?.[globalSlug]
25
+
26
+ if (!authorizedMCP.overrideAccess && !permissions?.update) {
27
+ return {
28
+ content: [
29
+ {
30
+ type: 'text',
31
+ text: `Error: MCP access to "getGlobalSchema" is not enabled for global "${globalSlug}"`,
32
+ },
33
+ ],
34
+ isError: true,
35
+ }
36
+ }
37
+
38
+ const inputSchema = getGlobalInputSchema({
39
+ globalSlug,
40
+ req,
41
+ ...(permissions ? { permissions } : {}),
42
+ })
21
43
 
22
44
  if (!inputSchema) {
23
45
  return {
@@ -5,9 +5,9 @@ import { z } from 'zod'
5
5
  import { defaultAccess } from '../../../defaultAccess.js'
6
6
  import { defineGlobalTool } from '../../../defineTool.js'
7
7
  import { getLogger } from '../../../utils/getLogger.js'
8
- import { localAPIDefaults } from '../../../utils/localAPIDefaults.js'
9
8
 
10
- const DEFAULT_DESCRIPTION = 'Restore a global from a previous version in any version-enabled global.'
9
+ const DEFAULT_DESCRIPTION =
10
+ 'Restore a global from a previous version in any version-enabled global.'
11
11
 
12
12
  export const restoreGlobalVersionTool = defineGlobalTool({
13
13
  access: (args) =>
@@ -61,8 +61,8 @@ export const restoreGlobalVersionTool = defineGlobalTool({
61
61
  id,
62
62
  slug: globalSlug,
63
63
  depth,
64
+ overrideAccess: authorizedMCP.overrideAccess,
64
65
  req,
65
- ...localAPIDefaults(authorizedMCP),
66
66
  ...(fallbackLocale ? { fallbackLocale } : {}),
67
67
  ...(locale ? { locale } : {}),
68
68
  ...(populate ? { populate: populate as PopulateType } : {}),
@@ -9,7 +9,6 @@ import {
9
9
  getGlobalVirtualFieldNames,
10
10
  stripVirtualFields,
11
11
  } from '../../../utils/getVirtualFieldNames.js'
12
- import { localAPIDefaults } from '../../../utils/localAPIDefaults.js'
13
12
  import { transformPointDataToPayload } from '../../../utils/transformPointDataToPayload.js'
14
13
  import { validateGlobalData } from '../validateEntityData.js'
15
14
 
@@ -81,7 +80,8 @@ export const updateGlobalTool = defineGlobalTool({
81
80
  data: parsedData,
82
81
  depth,
83
82
  draft,
84
- ...localAPIDefaults(authorizedMCP),
83
+ overrideAccess: authorizedMCP.overrideAccess,
84
+ req,
85
85
  }
86
86
 
87
87
  if (locale) {
@@ -20,6 +20,7 @@ import { findVersionsTool } from './builtin/collections/findVersionsTool.js'
20
20
  import { getCollectionSchemaTool } from './builtin/collections/getCollectionSchemaTool.js'
21
21
  import { restoreVersionTool } from './builtin/collections/restoreVersionTool.js'
22
22
  import { updateDocumentTool } from './builtin/collections/updateTool.js'
23
+ import { getUploadInstructionsTool } from './builtin/collections/uploadInstructionsTool.js'
23
24
  import { getConfigInfoTool } from './builtin/getConfigInfoTool.js'
24
25
  import { countGlobalVersionsTool } from './builtin/globals/countVersionsTool.js'
25
26
  import { findGlobalTool } from './builtin/globals/findTool.js'
@@ -32,6 +33,7 @@ import { updateGlobalTool } from './builtin/globals/updateTool.js'
32
33
  type CollectionBuiltin = {
33
34
  mcpName: string
34
35
  requiresDuplicateEnabled?: boolean
36
+ requiresUpload?: boolean
35
37
  requiresVersions?: boolean
36
38
  tool: CollectionTool
37
39
  }
@@ -70,6 +72,11 @@ export const COLLECTION_BUILTINS = {
70
72
  },
71
73
  findVersions: { mcpName: 'findVersions', requiresVersions: true, tool: findVersionsTool },
72
74
  getCollectionSchema: { mcpName: 'getCollectionSchema', tool: getCollectionSchemaTool },
75
+ getUploadInstructions: {
76
+ mcpName: 'getUploadInstructions',
77
+ requiresUpload: true,
78
+ tool: getUploadInstructionsTool,
79
+ },
73
80
  restoreVersion: { mcpName: 'restoreVersion', requiresVersions: true, tool: restoreVersionTool },
74
81
  update: { mcpName: 'updateDocument', tool: updateDocumentTool },
75
82
  } satisfies Record<string, CollectionBuiltin>
@@ -127,7 +127,7 @@ const sanitizeCollectionConfig = ({
127
127
 
128
128
  for (const [
129
129
  toolKey,
130
- { mcpName, requiresDuplicateEnabled, requiresVersions, tool },
130
+ { mcpName, requiresDuplicateEnabled, requiresUpload, requiresVersions, tool },
131
131
  ] of COLLECTION_BUILTIN_ENTRIES) {
132
132
  if (requiresVersions && !collection.versions) {
133
133
  continue
@@ -135,6 +135,9 @@ const sanitizeCollectionConfig = ({
135
135
  if (requiresDuplicateEnabled && isDuplicateDisabled) {
136
136
  continue
137
137
  }
138
+ if (requiresUpload && !collection.upload) {
139
+ continue
140
+ }
138
141
  const matchedConfigEntry = collectionPluginConfig?.tools?.[toolKey]
139
142
  if (matchedConfigEntry === false) {
140
143
  continue
package/src/types.ts CHANGED
@@ -15,7 +15,6 @@ import type {
15
15
  MaybePromise,
16
16
  PayloadRequest,
17
17
  SanitizedPermissions,
18
- User,
19
18
  } from 'payload'
20
19
 
21
20
  import type { GetAuthorizedMCPArgs } from './endpoint/access.js'
@@ -99,6 +98,11 @@ export type GlobalToolHandlerArgs<TSchema = undefined> = {
99
98
  } & ToolHandlerArgs<TSchema>
100
99
 
101
100
  export type Tool<TSchema extends ToolInputSchema | undefined = ToolInputSchema | undefined> = {
101
+ /**
102
+ * Runs while authorizing each MCP request, before the tool is advertised or called. Return
103
+ * `false` to make the tool unavailable for that request. This is skipped when `overrideAccess`
104
+ * is enabled.
105
+ */
102
106
  access?: (args: MCPAccessArgs) => MaybePromise<boolean>
103
107
  annotations?: ToolAnnotations
104
108
  description: string
@@ -113,6 +117,12 @@ export type Tool<TSchema extends ToolInputSchema | undefined = ToolInputSchema |
113
117
  export type CollectionTool<
114
118
  TSchema extends ToolInputSchema | undefined = ToolInputSchema | undefined,
115
119
  > = {
120
+ /**
121
+ * Runs while authorizing each MCP request for this collection. Return `false` to reject calls
122
+ * to this tool for the collection. The shared tool is not advertised when no collections allow
123
+ * it, but can remain advertised when it is available for another collection. This is skipped
124
+ * when `overrideAccess` is enabled.
125
+ */
116
126
  access?: (args: CollectionMCPAccessArgs) => MaybePromise<boolean>
117
127
  handler: (args: CollectionToolHandlerArgs<TSchema>) => MaybePromise<MCPToolResponse>
118
128
  input?: TSchema
@@ -120,6 +130,12 @@ export type CollectionTool<
120
130
 
121
131
  export type GlobalTool<TSchema extends ToolInputSchema | undefined = ToolInputSchema | undefined> =
122
132
  {
133
+ /**
134
+ * Runs while authorizing each MCP request for this global. Return `false` to reject calls to
135
+ * this tool for the global. The shared tool is not advertised when no globals allow it, but
136
+ * can remain advertised when it is available for another global. This is skipped when
137
+ * `overrideAccess` is enabled.
138
+ */
123
139
  access?: (args: GlobalMCPAccessArgs) => MaybePromise<boolean>
124
140
  handler: (args: GlobalToolHandlerArgs<TSchema>) => MaybePromise<MCPToolResponse>
125
141
  input?: TSchema
@@ -131,6 +147,10 @@ export type GlobalTool<TSchema extends ToolInputSchema | undefined = ToolInputSc
131
147
  * required handler) from being silently accepted at a built-in key slot.
132
148
  */
133
149
  export type MCPBuiltInCollectionToolOverride = {
150
+ /**
151
+ * Replaces the built-in tool's access check. Return `false` to make the tool unavailable for
152
+ * this collection. This is skipped when `overrideAccess` is enabled.
153
+ */
134
154
  access?: (args: CollectionMCPAccessArgs) => MaybePromise<boolean>
135
155
  annotations?: ToolAnnotations
136
156
  description?: string
@@ -139,6 +159,10 @@ export type MCPBuiltInCollectionToolOverride = {
139
159
  }
140
160
 
141
161
  export type MCPBuiltInGlobalToolOverride = {
162
+ /**
163
+ * Replaces the built-in tool's access check. Return `false` to make the tool unavailable for
164
+ * this global. This is skipped when `overrideAccess` is enabled.
165
+ */
142
166
  access?: (args: GlobalMCPAccessArgs) => MaybePromise<boolean>
143
167
  annotations?: ToolAnnotations
144
168
  description?: string
@@ -183,6 +207,11 @@ export type PromptHandlerArgs<TSchema = undefined> = {
183
207
  }
184
208
 
185
209
  export type Prompt<TSchema extends ToolInputSchema = ToolInputSchema> = {
210
+ /**
211
+ * Runs while authorizing each MCP request, before the prompt is advertised or used. Return
212
+ * `false` to make the prompt unavailable for that request. This is skipped when
213
+ * `overrideAccess` is enabled.
214
+ */
186
215
  access?: (args: MCPAccessArgs) => MaybePromise<boolean>
187
216
  argsSchema: TSchema
188
217
  description: string
@@ -201,6 +230,11 @@ export type ResourceHandlerArgs = {
201
230
  }
202
231
 
203
232
  export type Resource = {
233
+ /**
234
+ * Runs while authorizing each MCP request, before the resource is advertised or read. Return
235
+ * `false` to make the resource unavailable for that request. This is skipped when
236
+ * `overrideAccess` is enabled.
237
+ */
204
238
  access?: (args: MCPAccessArgs) => MaybePromise<boolean>
205
239
  description: string
206
240
  handler: (args: ResourceHandlerArgs) => MaybePromise<{
@@ -248,7 +282,12 @@ export type MCPPluginConfig = {
248
282
  serverOptions?: MCPServerOptions
249
283
  verboseLogs?: boolean
250
284
  }
251
- /** Replace the default MCP authorization resolver. */
285
+ /**
286
+ * Replace the default MCP authorization resolver.
287
+ *
288
+ * This hook replaces the default authentication flow. It must set `req.user` to the
289
+ * authenticated Payload user, or to `null` for an anonymous caller, before returning.
290
+ */
252
291
  overrideGetAuthorizedMCP?: (
253
292
  args: {
254
293
  pluginConfig: SanitizedMCPPluginConfig
@@ -312,13 +351,10 @@ export type MCPItem =
312
351
  | GlobalMCPItem
313
352
 
314
353
  /**
315
- * The caller's identity + the MCP items authorized for this request. Disabled
316
- * items and items blocked by access callbacks or Payload operation access are
317
- * absent from `items`. Tool handlers receive this via `args.authorizedMCP` so
318
- * they can spread `localAPIDefaults(authorizedMCP)` into every local API call.
354
+ * The MCP items and access mode authorized for this request. The authenticated user is available
355
+ * as `req.user`.
319
356
  */
320
357
  export type AuthorizedMCP = {
321
358
  items: MCPItem[]
322
359
  overrideAccess: boolean
323
- user: null | User
324
360
  }
@@ -0,0 +1,123 @@
1
+ import type {
2
+ FlattenedBlock,
3
+ FlattenedField,
4
+ Operation,
5
+ SanitizedDocumentPermissions,
6
+ SanitizedFieldsPermissions,
7
+ } from 'payload'
8
+
9
+ type FieldOperation = Exclude<Operation, 'delete'>
10
+ type AllowedFieldOperations = Record<FieldOperation, boolean>
11
+
12
+ /**
13
+ * Filters fields using the access results in `permissions`. `shouldExcludeField` receives the
14
+ * operations allowed by the entity, field, and its parents and decides whether to remove the
15
+ * field.
16
+ *
17
+ * Arrays, groups, named tabs, and blocks are filtered recursively. Rows and unnamed tabs are
18
+ * flattened by Payload, so their children are filtered at the containing level.
19
+ *
20
+ * @example Include fields writable through any collection operation the user can perform.
21
+ * ```ts
22
+ * filterFieldsByAccess({
23
+ * fields,
24
+ * permissions: collectionPermissions,
25
+ * shouldExcludeField: ({ create, update }) => !create && !update,
26
+ * })
27
+ * ```
28
+ */
29
+ export const filterFieldsByAccess = ({
30
+ blocks,
31
+ fields,
32
+ permissions,
33
+ shouldExcludeField,
34
+ }: {
35
+ blocks?: FlattenedBlock[]
36
+ fields: FlattenedField[]
37
+ permissions: SanitizedDocumentPermissions
38
+ shouldExcludeField: (allowedOperations: AllowedFieldOperations) => boolean
39
+ }): FlattenedField[] => {
40
+ const filterFields = (
41
+ nestedFields: FlattenedField[],
42
+ nestedPermissions: SanitizedFieldsPermissions | undefined,
43
+ parentAllowedOperations: AllowedFieldOperations,
44
+ ): FlattenedField[] => {
45
+ const accessibleFields: FlattenedField[] = []
46
+
47
+ for (const field of nestedFields) {
48
+ const fieldPermissions = nestedPermissions === true ? true : nestedPermissions?.[field.name]
49
+ const isOperationAllowed = (operation: FieldOperation): boolean =>
50
+ parentAllowedOperations[operation] &&
51
+ (fieldPermissions === true || fieldPermissions?.[operation] === true)
52
+ const allowedOperations: AllowedFieldOperations = {
53
+ create: isOperationAllowed('create'),
54
+ read: isOperationAllowed('read'),
55
+ update: isOperationAllowed('update'),
56
+ }
57
+
58
+ if (shouldExcludeField(allowedOperations)) {
59
+ continue
60
+ }
61
+
62
+ if (field.type === 'blocks') {
63
+ const accessibleBlocks: (FlattenedBlock | string)[] = []
64
+
65
+ for (const blockOrReference of field.blocks) {
66
+ const block =
67
+ typeof blockOrReference === 'string'
68
+ ? blocks?.find(({ slug }) => slug === blockOrReference)
69
+ : blockOrReference
70
+
71
+ if (!block) {
72
+ continue
73
+ }
74
+
75
+ const blockPermissions =
76
+ fieldPermissions === true
77
+ ? true
78
+ : fieldPermissions?.blocks === true
79
+ ? true
80
+ : fieldPermissions?.blocks?.[block.slug]
81
+
82
+ accessibleBlocks.push({
83
+ ...block,
84
+ flattenedFields: filterFields(
85
+ block.flattenedFields,
86
+ blockPermissions === true ? true : blockPermissions?.fields,
87
+ allowedOperations,
88
+ ),
89
+ })
90
+ }
91
+
92
+ if (accessibleBlocks.length === 0) {
93
+ continue
94
+ }
95
+
96
+ accessibleFields.push({ ...field, blocks: accessibleBlocks })
97
+ continue
98
+ }
99
+
100
+ if (field.type === 'array' || field.type === 'group' || field.type === 'tab') {
101
+ accessibleFields.push({
102
+ ...field,
103
+ flattenedFields: filterFields(
104
+ field.flattenedFields,
105
+ fieldPermissions === true ? true : fieldPermissions?.fields,
106
+ allowedOperations,
107
+ ),
108
+ })
109
+ continue
110
+ }
111
+
112
+ accessibleFields.push(field)
113
+ }
114
+
115
+ return accessibleFields
116
+ }
117
+
118
+ return filterFields(fields, permissions.fields, {
119
+ create: 'create' in permissions && permissions.create === true,
120
+ read: permissions.read === true,
121
+ update: permissions.update === true,
122
+ })
123
+ }