@abinnovision/payloadcms-mcpx 2.0.0-beta.18 → 2.0.0-beta.20

package/dist/tools/describe-schema.mjs

@@ -1,11 +1,11 @@
 import { defineMcpxTool } from "../define-tool.mjs";
 import { jsonResult } from "../result.mjs";
+import { SchemaError } from "../schema/errors.mjs";
 import { nodePropertiesFor } from "../schema/lexical.mjs";
 import { translatorFor } from "../i18n.mjs";
-import { SchemaError } from "../schema/errors.mjs";
 import { nodeDescriber, reachableSchemaPaths } from "../schema/describe.mjs";
 import "../schema/index.mjs";
-import { entityShape } from "./shared.mjs";
+import { entityShape, reaches } from "./shared.mjs";
 import { resolveEntity } from "./document.mjs";
 import { z } from "zod";
 //#region src/tools/describe-schema.ts
@@ -30,7 +30,7 @@ const PATHS_LIMIT = 400;
 		readOnlyHint: true,
 		openWorldHint: false
 	},
-	isEnabled: (scope) => scope.collections.readable.length + scope.globals.readable.length > 0,
+	isEnabled: (scope) => reaches(scope, "read"),
 	inputSchema: (scope) => ({
 		...entityShape(scope, "read", "Instead of \"collection\"."),
 		paths: z.array(z.string()).max(PATHS_LIMIT).optional().describe("Schema paths from \"next\". Omit for the top-level node."),
@@ -43,9 +43,12 @@ const PATHS_LIMIT = 400;
 		const expanded = args.expand === true ? reachableSchemaPaths(config, ref) : void 0;
 		const requested = expanded?.paths ?? (args.paths && args.paths.length > 0 ? args.paths : [""]);
 		const failures = [];
+		const nodeTypes = [];
 		const nodes = requested.map((schemaPath) => {
 			try {
-				return describeNode(config, ref, schemaPath);
+				const node = describeNode(config, ref, schemaPath);
+				nodeTypes.push(...node.fields.flatMap((field) => field.nodes ?? []));
+				return node;
 			} catch (error) {
 				if (error instanceof SchemaError) return {
 					error: error.message,
@@ -62,7 +65,6 @@ const PATHS_LIMIT = 400;
 			err: failures[0],
 			msg: `[payloadcms-mcpx] Describing ${String(failures.length)} schema paths failed.`
 		});
-		const nodeTypes = nodes.flatMap((node) => (node.fields ?? []).flatMap((field) => field.nodes ?? []));
 		if (nodeTypes.length > 0) nodes.push({ nodeProperties: nodePropertiesFor(nodeTypes) });
 		if (expanded?.truncated) nodes.push({ error: `Result truncated after ${String(400)} nodes. Request explicit paths instead.` });
 		return jsonResult(nodes);

package/dist/tools/document.mjs

@@ -1,34 +1,44 @@
-import { errorResult } from "../result.mjs";
+import { definedProps } from "../guards.mjs";
+import { errorResult, jsonResult } from "../result.mjs";
+import { documentLinks } from "./links.mjs";
 import { collectPublishBlockers } from "../write/publish-blockers.mjs";
 import { slugsFor } from "./shared.mjs";
 import { APIError, Forbidden, NotFound } from "payload";
 //#region src/tools/document.ts
 /**
+* `payload.globals` is `{ config: SanitizedGlobalConfig[] }`, an array, not the
+* slug-keyed map `payload.collections` is.
+*/ const globalConfig = (payload, slug) => payload.globals.config.find((candidate) => candidate.slug === slug);
+/**
+* For a tool that takes a collection and no global, so the result needs no
+* check for one.
+*/ const resolveCollection = (scope, slug, operation) => {
+	const found = scope.req.payload.collections[slug]?.config;
+	if (!slugsFor(scope, operation).collections.includes(slug) || !found) throw new Forbidden(scope.req.t);
+	return {
+		kind: "collection",
+		slug,
+		config: found
+	};
+};
+/**
 * A raw input shape leaves no top-level `.refine` to express "exactly one of
 * collection and global", so the rule is enforced here, with a message naming
 * the offending arguments.
 */ const resolveEntity = (scope, args, operation) => {
 	const { collection, global } = args;
-	const allowedSlugs = slugsFor(scope, operation);
 	if (collection !== void 0 && global !== void 0) throw new APIError("Pass either \"collection\" or \"global\", not both.", 400);
-	if (collection === void 0 && global === void 0) throw new APIError("One of \"collection\" or \"global\" is required. Call listCapabilities to see which slugs are available.", 400);
-	if (collection !== void 0) {
-		const found = scope.req.payload.collections[collection];
-		if (!allowedSlugs.collections.includes(collection) || !found) throw new Forbidden(scope.req.t);
+	if (collection !== void 0) return resolveCollection(scope, collection, operation);
+	if (global !== void 0) {
+		const found = globalConfig(scope.req.payload, global);
+		if (!slugsFor(scope, operation).globals.includes(global) || !found) throw new Forbidden(scope.req.t);
 		return {
-			kind: "collection",
-			slug: collection,
-			config: found.config
+			kind: "global",
+			slug: global,
+			config: found
 		};
 	}
-	const slug = global;
-	const found = scope.req.payload.globals.config.find((candidate) => candidate.slug === slug);
-	if (!allowedSlugs.globals.includes(slug) || !found) throw new Forbidden(scope.req.t);
-	return {
-		kind: "global",
-		slug,
-		config: found
-	};
+	throw new APIError("One of \"collection\" or \"global\" is required. Call listCapabilities to see which slugs are available.", 400);
 };
 /**
 * Resolves the entity and checks `id` against it. A collection document needs
@@ -48,7 +58,45 @@ import { APIError, Forbidden, NotFound } from "payload";
 };
 /**
 * What a response names its subject by: a document's id, or a global's slug.
-*/ const identityOf = (target, id) => target.kind === "collection" ? { id } : { global: target.slug };
+*/ const identityOf = (target) => target.kind === "collection" ? { id: target.id } : { global: target.slug };
+/**
+* The fields every write result starts with, read from the saved `doc`.
+*/ const documentSummary = (target, doc) => ({
+	...target.kind === "collection" ? { id: doc["id"] } : { global: target.slug },
+	status: doc["_status"],
+	updatedAt: doc["updatedAt"]
+});
+/**
+* Names the blockers of a check, and whether the check itself failed.
+*/ const blockerFields = (result, key) => ({
+	...result.blockers.length > 0 ? { [key]: result.blockers } : {},
+	...result.unavailable ? { [`${key}Unavailable`]: true } : {}
+});
+/**
+* What a tool that wrote a document returns: the document, re-read privileged
+* in `locale`, with its links and publish blockers. `extra` follows them.
+*/ const writtenResult = async (scope, args) => {
+	const { target, locale } = args;
+	const saved = await readDraft(scope, {
+		target,
+		locale,
+		privileged: true
+	});
+	const validation = await collectPublishBlockers(scope.req, {
+		doc: saved,
+		entity: target
+	});
+	return jsonResult({
+		...documentSummary(target, saved),
+		...await documentLinks(scope.req, {
+			target,
+			doc: saved,
+			locale
+		}),
+		...blockerFields(validation, "publishBlockers"),
+		...args.extra
+	});
+};
 const sameInstant = (left, right) => (typeof left === "string" || left instanceof Date) && new Date(left).getTime() === new Date(right).getTime();
 /**
 * Refuses a write when the document changed since the client read it.
@@ -75,7 +123,8 @@ const sameInstant = (left, right) => (typeof left === "string" || left instanceo
 			...shared,
 			collection: args.target.slug,
 			id: args.target.id,
-			disableErrors: true
+			disableErrors: true,
+			...args.trash ? { trash: true } : {}
 		});
 		if (!doc) throw new NotFound(scope.req.t);
 		return doc;
@@ -86,39 +135,76 @@ const sameInstant = (left, right) => (typeof left === "string" || left instanceo
 	});
 };
 /**
+* Updates a collection document or a global with no fallback locale, so a value
+* missing in the written locale is not backfilled from another and persisted.
+*/ const updateTarget = async (scope, target, write) => {
+	const { payload } = scope.req;
+	const { data, draft, file, ...optional } = write;
+	const shared = {
+		data,
+		depth: 0,
+		draft,
+		fallbackLocale: false,
+		overrideAccess: false,
+		req: scope.req,
+		...definedProps(optional)
+	};
+	if (target.kind === "collection") await payload.update({
+		...shared,
+		...definedProps({ file }),
+		collection: target.slug,
+		id: target.id
+	});
+	else await payload.updateGlobal({
+		...shared,
+		slug: target.slug
+	});
+};
+/**
+* Runs `run`, then puts back the request's locale and fallback locale, which
+* Payload's local API assigns in place.
+*/ const withRequestLocale = async (req, run) => {
+	const { fallbackLocale, locale } = req;
+	try {
+		return await run();
+	} finally {
+		if (locale !== void 0) req.locale = locale;
+		if (fallbackLocale !== void 0) req.fallbackLocale = fallbackLocale;
+	}
+};
+/**
 * {@link collectPublishBlockers} over the draft of each locale, each blocker
 * tagged with its locale. Locales run in turn because hooks share `req`, and
 * the request's locale and fallback locale are restored afterwards.
 */ const collectLocaleBlockers = async (scope, target, locales) => {
 	const { req } = scope;
-	const { fallbackLocale, locale: requestLocale } = req;
 	const blockers = [];
-	let unavailable = false;
-	for (const locale of locales) try {
-		const doc = await readDraft(scope, {
-			target,
-			locale,
-			privileged: true
-		});
-		const result = await collectPublishBlockers(req, {
-			doc,
-			entity: target
-		});
-		unavailable ||= result.unavailable === true;
-		blockers.push(...result.blockers.map((entry) => ({
-			...entry,
-			locale
-		})));
-	} catch (error) {
-		req.payload.logger.warn(`[payloadcms-mcpx] Could not read the ${target.slug} draft in ${locale}: ${error instanceof Error ? error.message : "unknown error"}`);
-		unavailable = true;
-	}
-	if (requestLocale !== void 0) req.locale = requestLocale;
-	if (fallbackLocale !== void 0) req.fallbackLocale = fallbackLocale;
 	return {
 		blockers,
-		...unavailable ? { unavailable: true } : {}
+		...await withRequestLocale(req, async () => {
+			let failed = false;
+			for (const locale of locales) try {
+				const doc = await readDraft(scope, {
+					target,
+					locale,
+					privileged: true
+				});
+				const result = await collectPublishBlockers(req, {
+					doc,
+					entity: target
+				});
+				failed ||= result.unavailable === true;
+				blockers.push(...result.blockers.map((entry) => ({
+					...entry,
+					locale
+				})));
+			} catch (error) {
+				req.payload.logger.warn(`[payloadcms-mcpx] Could not read the ${target.slug} draft in ${locale}: ${error instanceof Error ? error.message : "unknown error"}`);
+				failed = true;
+			}
+			return failed;
+		}) ? { unavailable: true } : {}
 	};
 };
 //#endregion
-export { collectLocaleBlockers, identityOf, readDraft, resolveDocument, resolveEntity, staleReadResult };
+export { blockerFields, collectLocaleBlockers, documentSummary, globalConfig, identityOf, readDraft, resolveCollection, resolveDocument, resolveEntity, staleReadResult, updateTarget, withRequestLocale, writtenResult };

package/dist/tools/duplicate-document.mjs

@@ -1,11 +1,10 @@
 import { defineMcpxTool } from "../define-tool.mjs";
-import { idSchema, liveWriteSentence, localeOf, slugEnum, slugsFor } from "./shared.mjs";
-import { resolveEntity } from "./document.mjs";
-import { createdResult } from "./create-document.mjs";
+import { idSchema, liveWriteSentence, localeOf, slugsFor, stringEnum } from "./shared.mjs";
+import { resolveCollection, writtenResult } from "./document.mjs";
 import { withDuplicateIntent } from "../write/publish-intent.mjs";
 import { Forbidden } from "payload";
 //#region src/tools/duplicate-document.ts
-const duplicableSlugs = (scope) => slugsFor(scope, "create").collections.filter((slug) => scope.req.payload.config.collections.find((collection) => collection.slug === slug)?.disableDuplicate !== true && !scope.exposure.collections.some((entity) => entity.slug === slug && entity.isUpload));
+const duplicableSlugs = (scope) => slugsFor(scope, "create").collections.filter((slug) => scope.req.payload.collections[slug]?.config.disableDuplicate !== true && !scope.exposure.collections.some((entity) => entity.slug === slug && entity.isUpload));
 const DESCRIPTION = (scope) => `Copies a document into a new one in the same collection. Use it instead of getDocument and createDocument to copy a document. It copies the latest version, the draft if there is one, in every locale. Unique text fields get " - Copy" appended. Returns the same fields as createDocument. To rename the copy, call patchDocument with the returned "updatedAt".
 
 ${liveWriteSentence(scope, "create")}`;
@@ -23,12 +22,12 @@ ${liveWriteSentence(scope, "create")}`;
 	},
 	isEnabled: (scope) => duplicableSlugs(scope).length > 0,
 	inputSchema: (scope) => ({
-		collection: slugEnum(duplicableSlugs(scope)),
+		collection: stringEnum(duplicableSlugs(scope)),
 		id: idSchema
 	}),
 	handler: async ({ args, scope }) => {
-		const target = resolveEntity(scope, { collection: args.collection }, "create");
-		if (target.kind === "global" || !duplicableSlugs(scope).includes(target.slug)) throw new Forbidden(scope.req.t);
+		const target = resolveCollection(scope, args.collection, "create");
+		if (!duplicableSlugs(scope).includes(target.slug)) throw new Forbidden(scope.req.t);
 		const created = await scope.req.payload.duplicate({
 			collection: target.slug,
 			id: args.id,
@@ -38,9 +37,11 @@ ${liveWriteSentence(scope, "create")}`;
 			overrideAccess: false,
 			req: scope.req
 		});
-		return await createdResult(scope, {
-			target,
-			id: created["id"],
+		return await writtenResult(scope, {
+			target: {
+				...target,
+				id: created["id"]
+			},
 			locale: localeOf(scope, void 0)
 		});
 	}

package/dist/tools/find-documents.mjs

@@ -1,9 +1,10 @@
 import { defineMcpxTool } from "../define-tool.mjs";
+import { definedProps } from "../guards.mjs";
 import { jsonResult } from "../result.mjs";
 import { stripAdminHidden } from "../schema/admin-hidden.mjs";
 import "../schema/index.mjs";
-import { READ_LOCALE_DESCRIPTION, depthShape, localeOf, localeShape, slugEnum } from "./shared.mjs";
-import { resolveEntity } from "./document.mjs";
+import { READ_LOCALE_DESCRIPTION, depthShape, localeOf, localeShape, pageFields, pageShape, stringEnum } from "./shared.mjs";
+import { resolveCollection } from "./document.mjs";
 import { assertQueryable } from "./query-paths.mjs";
 import { mcpxReadRequest } from "./read-request.mjs";
 import { z } from "zod";
@@ -23,11 +24,10 @@ import { z } from "zod";
 	},
 	isEnabled: (scope) => scope.collections.readable.length > 0,
 	inputSchema: (scope) => ({
-		collection: slugEnum(scope.collections.readable),
+		collection: stringEnum(scope.collections.readable),
 		where: z.record(z.string(), z.unknown()).optional(),
 		sort: z.string().optional().describe("e.g. \"-updatedAt\" for descending."),
-		limit: z.number().int().min(1).max(scope.limits.maxLimit).optional().describe("Default 10."),
-		page: z.number().int().min(1).optional(),
+		...pageShape(scope),
 		...depthShape(scope),
 		select: z.record(z.string(), z.unknown()).optional().describe("Fields to return, e.g. {\"title\":true}."),
 		...localeShape(scope, {
@@ -37,7 +37,7 @@ import { z } from "zod";
 		draft: z.boolean().optional().describe("Default true: latest drafts.")
 	}),
 	handler: async ({ args, scope }) => {
-		resolveEntity(scope, { collection: args.collection }, "read");
+		const target = resolveCollection(scope, args.collection, "read");
 		const locale = localeOf(scope, args.locale);
 		assertQueryable(scope, {
 			collection: args.collection,
@@ -52,22 +52,17 @@ import { z } from "zod";
 			limit: args.limit ?? 10,
 			overrideAccess: false,
 			req: mcpxReadRequest(scope),
-			...args.page === void 0 ? {} : { page: args.page },
-			...args.sort === void 0 ? {} : { sort: args.sort },
-			...args.where === void 0 ? {} : { where: args.where },
-			...args.select === void 0 ? {} : { select: args.select },
-			...locale === void 0 ? {} : { locale }
+			...definedProps({
+				page: args.page,
+				sort: args.sort,
+				where: args.where,
+				select: args.select,
+				locale
+			})
 		});
 		return jsonResult({
-			docs: result.docs.map((doc) => stripAdminHidden(scope.req.payload.config, {
-				kind: "collection",
-				slug: args.collection
-			}, doc)),
-			totalDocs: result.totalDocs,
-			page: result.page,
-			totalPages: result.totalPages,
-			limit: result.limit,
-			hasNextPage: result.hasNextPage
+			docs: result.docs.map((doc) => stripAdminHidden(scope.req.payload.config, target, doc)),
+			...pageFields(result)
 		});
 	}
 });

package/dist/tools/find-versions.mjs

@@ -1,6 +1,7 @@
 import { defineMcpxTool } from "../define-tool.mjs";
+import { definedProps } from "../guards.mjs";
 import { jsonResult } from "../result.mjs";
-import { draftVersionSlugs, entityShape, idShape, localeOf, localeShape, slugsFor, widen } from "./shared.mjs";
+import { entityShape, idShape, localeOf, localeShape, pageFields, pageShape, reaches, slugsFor, slugsWhere, widen } from "./shared.mjs";
 import { resolveDocument } from "./document.mjs";
 import { queryVersions } from "./versions.mjs";
 import { z } from "zod";
@@ -9,7 +10,7 @@ import { hasDraftsEnabled } from "payload/shared";
 //#region src/tools/find-versions.ts
 const DESCRIPTION = `Lists the versions of one document or global, newest first, autosaves included. Returns per version "versionId", "createdAt", "updatedAt", "status", "latest", "autosave" and, where set, "publishedLocale", without the content. Read a version with getDocument "versionId", or compare it with "diffFrom".`;
 const statusShape = (scope) => {
-	const { collections, globals } = draftVersionSlugs(scope);
+	const { collections, globals } = slugsWhere(scope, (entity) => entity.hasDrafts, slugsFor(scope, "versions"));
 	if (collections.length + globals.length === 0) return widen({});
 	return widen({ status: z.enum(["published", "draft"]).optional() });
 };
@@ -25,15 +26,11 @@ const statusShape = (scope) => {
 		readOnlyHint: true,
 		openWorldHint: false
 	},
-	isEnabled: (scope) => {
-		const { collections, globals } = slugsFor(scope, "versions");
-		return collections.length + globals.length > 0;
-	},
+	isEnabled: (scope) => reaches(scope, "versions"),
 	inputSchema: (scope) => ({
 		...entityShape(scope, "versions"),
 		...idShape(scope, "versions"),
-		limit: z.number().int().min(1).max(scope.limits.maxLimit).optional().describe("Default 10."),
-		page: z.number().int().min(1).optional(),
+		...pageShape(scope),
 		...statusShape(scope),
 		...localeShape(scope, {
 			required: false,
@@ -49,8 +46,10 @@ const statusShape = (scope) => {
 			locale: localeOf(scope, args.locale)
 		}, {
 			limit: args.limit ?? 10,
-			...args.page === void 0 ? {} : { page: args.page },
-			...args.status === void 0 ? {} : { status: args.status }
+			...definedProps({
+				page: args.page,
+				status: args.status
+			})
 		});
 		const versions = result.docs.map((doc) => ({
 			versionId: doc.id,
@@ -63,10 +62,7 @@ const statusShape = (scope) => {
 		}));
 		return jsonResult({
 			versions,
-			totalDocs: result.totalDocs,
-			page: result.page,
-			totalPages: result.totalPages,
-			hasNextPage: result.hasNextPage
+			...pageFields(result)
 		});
 	}
 });

package/dist/tools/get-document.mjs

@@ -1,13 +1,13 @@
 import { defineMcpxTool } from "../define-tool.mjs";
 import { errorResult, jsonResult } from "../result.mjs";
-import { JSON_POINTER_PATTERN, prototypeSegmentProblem, splitPath } from "../schema/path.mjs";
-import { findRichTextField } from "../schema/walk.mjs";
 import { SchemaError } from "../schema/errors.mjs";
+import { JSON_POINTER_PATTERN, prototypeSegmentProblem, splitPath } from "../schema/path.mjs";
+import { findFieldAt } from "../schema/walk.mjs";
 import { lexicalOutline } from "../schema/outline.mjs";
 import { resolveDataPointer } from "../schema/pointer.mjs";
 import "../schema/index.mjs";
 import { downloadHandoff, downloadSlugs } from "../upload/file.mjs";
-import { READ_LOCALE_DESCRIPTION, depthShape, entityShape, idSchema, idShape, localeOf, localeShape, slugsFor, widen } from "./shared.mjs";
+import { READ_LOCALE_DESCRIPTION, depthShape, entityShape, idSchema, idShape, localeOf, localeShape, reaches, slugsFor, widen } from "./shared.mjs";
 import { identityOf, resolveDocument } from "./document.mjs";
 import { diffDocuments, loadPublished, loadVersion, readLive } from "./versions.mjs";
 import { z } from "zod";
@@ -19,10 +19,6 @@ const VERSION_PARAGRAPH = `
 
 "versionId" and "diffFrom" work where findVersions does. To revert, call getDocument with the old version as "versionId", the version findVersions marks "latest" as "diffFrom" and the locale you will write, then apply the returned "patch" with patchDocument.`;
 const DESCRIPTION = `Reads one document or global, or with "path" only the value at that pointer. Returns the latest draft by default, with the "updatedAt" a write takes as "expectedUpdatedAt".`;
-const exposesVersions = (scope) => {
-	const { collections, globals } = slugsFor(scope, "versions");
-	return collections.length + globals.length > 0;
-};
 const assertVersionArgs = (scope, target, args) => {
 	if (args.versionId === void 0 && args.diffFrom === void 0) return;
 	const { collections, globals } = slugsFor(scope, "versions");
@@ -41,7 +37,7 @@ const diffResult = async (scope, read, diff, doc) => {
 	});
 };
 const versionShape = (scope) => {
-	if (!exposesVersions(scope)) return widen({});
+	if (!reaches(scope, "versions")) return widen({});
 	return widen({
 		versionId: idSchema.optional().describe("From findVersions. Not with \"draft\"."),
 		diffFrom: idSchema.optional().describe("Version id, or \"published\" for the newest version published in any locale. Returns {from, to, patch}, the JSON Patch from that version to what is read.")
@@ -65,12 +61,12 @@ const withDownload = async (scope, doc, target) => typeof doc["filename"] === "s
 * the `expectedUpdatedAt` timestamp without a second call.
 */ const getDocument = defineMcpxTool({
 	name: "getDocument",
-	description: (scope) => exposesVersions(scope) ? DESCRIPTION + VERSION_PARAGRAPH : DESCRIPTION,
+	description: (scope) => reaches(scope, "versions") ? DESCRIPTION + VERSION_PARAGRAPH : DESCRIPTION,
 	annotations: {
 		readOnlyHint: true,
 		openWorldHint: false
 	},
-	isEnabled: (scope) => scope.collections.readable.length + scope.globals.readable.length > 0,
+	isEnabled: (scope) => reaches(scope, "read"),
 	inputSchema: (scope) => ({
 		...entityShape(scope, "read"),
 		...idShape(scope, "read"),
@@ -121,7 +117,7 @@ const withDownload = async (scope, doc, target) => typeof doc["filename"] === "s
 		const path = pointer.toString();
 		const value = pointer.get(doc);
 		const envelope = {
-			...identityOf(target, args.id),
+			...identityOf(target),
 			status: doc["_status"],
 			updatedAt: doc["updatedAt"],
 			path
@@ -141,7 +137,7 @@ const withDownload = async (scope, doc, target) => typeof doc["filename"] === "s
 			if (!(error instanceof SchemaError)) throw error;
 			return errorResult(error.message);
 		}
-		const field = resolution.descriptor?.type === "richText" && !resolution.lexical ? findRichTextField(resolution.fields, splitPath(resolution.descriptor.path)) : void 0;
+		const field = resolution.descriptor?.type === "richText" && !resolution.lexical ? findFieldAt(resolution.fields, splitPath(resolution.descriptor.path), "richText") : void 0;
 		if (!field) return errorResult(OUTLINE_ERROR);
 		return jsonResult({
 			...envelope,

package/dist/tools/links.mjs

@@ -1,3 +1,4 @@
+import { publicOrigin } from "../request.mjs";
 import { formatAdminURL } from "payload/shared";
 //#region src/tools/links.ts
 const livePreviewOf = (req, target) => {
@@ -35,7 +36,7 @@ const previewOf = async (req, args) => {
 */ const documentLinks = async (req, args) => {
 	const { target, doc, locale } = args;
 	const { config } = req.payload;
-	const origin = config.serverURL || new URL(req.url ?? "").origin;
+	const origin = publicOrigin(req);
 	const path = target.kind === "collection" ? `/collections/${target.slug}/${String(doc["id"])}` : `/globals/${target.slug}`;
 	const adminUrl = formatAdminURL({
 		adminRoute: config.routes.admin,

package/dist/tools/list-capabilities.mjs

@@ -2,6 +2,7 @@ import { defineMcpxTool } from "../define-tool.mjs";
 import { jsonResult } from "../result.mjs";
 import { translateStatic, translatorFor } from "../i18n.mjs";
 import { slugsFor } from "./shared.mjs";
+import { globalConfig } from "./document.mjs";
 import { MCPX_ISSUES_URL, MCPX_REPOSITORY_URL } from "../version.mjs";
 import { hasDraftValidationEnabled } from "payload/shared";
 //#region src/tools/list-capabilities.ts
@@ -59,7 +60,7 @@ const translateLabel = (scope, label, fallback) => {
 		});
 		const globals = scope.exposure.globals.flatMap((entry) => {
 			const capability = scope.capabilities.globals[entry.slug];
-			const config = payload.globals.config.find((candidate) => candidate.slug === entry.slug);
+			const config = globalConfig(payload, entry.slug);
 			if (!capability || !config || !capability.read) return [];
 			const description = translate(config.admin.description);
 			return [{

package/dist/tools/patch-document.mjs

@@ -1,13 +1,11 @@
 import { defineMcpxTool } from "../define-tool.mjs";
 import { isPlainObject } from "../guards.mjs";
-import { errorResult, jsonResult } from "../result.mjs";
+import { errorResult } from "../result.mjs";
 import { JSON_POINTER_PATTERN } from "../schema/path.mjs";
 import "../schema/index.mjs";
-import { collectPublishBlockers } from "../write/publish-blockers.mjs";
 import { assertAcceptsFile, fileShape, fileSlugs, fileWriteRefusal, uploadHandoff, uploadedFile } from "../upload/file.mjs";
-import { entityShape, idShape, liveWriteSentence, localeOf, localeShape } from "./shared.mjs";
-import { identityOf, readDraft, resolveDocument, staleReadResult } from "./document.mjs";
-import { documentLinks } from "./links.mjs";
+import { entityShape, expectedUpdatedAtShape, idShape, liveWriteSentence, localeOf, localeShape, reaches } from "./shared.mjs";
+import { readDraft, resolveDocument, staleReadResult, updateTarget, writtenResult } from "./document.mjs";
 import { withTransaction } from "../write/transaction.mjs";
 import { applyPatchOperations, isElementPointer } from "../write/patch.mjs";
 import { buildWriteData } from "../write/write-data.mjs";
@@ -88,7 +86,7 @@ const notAppliedPointers = (patches, intended, saved) => patches.flatMap((operat
 		idempotentHint: false,
 		openWorldHint: false
 	},
-	isEnabled: (scope) => scope.collections.writable.length + scope.globals.writable.length > 0,
+	isEnabled: (scope) => reaches(scope, "write"),
 	inputSchema: (scope) => ({
 		...entityShape(scope, "write"),
 		...idShape(scope, "write"),
@@ -97,7 +95,7 @@ const notAppliedPointers = (patches, intended, saved) => patches.flatMap((operat
 			description: "Localized fields are written in this locale only."
 		}),
 		patches: fileSlugs(scope).length === 0 ? z.array(PATCH_OPERATION_SCHEMA).min(1).max(PATCHES_LIMIT) : z.array(PATCH_OPERATION_SCHEMA).max(PATCHES_LIMIT).describe("May be empty when \"file\" is given."),
-		expectedUpdatedAt: z.string().optional().describe("\"updatedAt\" from your last read. Refused if the document changed since."),
+		...expectedUpdatedAtShape,
 		...fileShape(scope, (slugs) => `Replaces the file of a document in ${slugs}. The call returns an "upload" for the bytes instead of writing.`)
 	}),
 	handler: async ({ args, scope }) => {
@@ -110,11 +108,6 @@ const notAppliedPointers = (patches, intended, saved) => patches.flatMap((operat
 		if (file !== void 0) assertAcceptsFile(scope, target, file);
 		if (patches.length === 0 && file === void 0) throw new APIError("\"patches\" may be empty only when \"file\" is given.", 400);
 		const report = async (next) => {
-			const saved = await readDraft(scope, {
-				target,
-				locale,
-				privileged: true
-			});
 			const readable = await readDraft(scope, {
 				target,
 				locale
@@ -123,22 +116,10 @@ const notAppliedPointers = (patches, intended, saved) => patches.flatMap((operat
 				throw error;
 			});
 			const notApplied = readable ? notAppliedPointers(patches, next, readable) : [];
-			const validation = await collectPublishBlockers(scope.req, {
-				doc: saved,
-				entity: target
-			});
-			return jsonResult({
-				...identityOf(target, saved["id"]),
-				status: saved["_status"],
-				updatedAt: saved["updatedAt"],
-				...await documentLinks(scope.req, {
-					target,
-					doc: saved,
-					locale
-				}),
-				...validation.blockers.length > 0 ? { publishBlockers: validation.blockers } : {},
-				...validation.unavailable ? { publishBlockersUnavailable: true } : {},
-				...notApplied.length > 0 ? { notApplied } : {}
+			return await writtenResult(scope, {
+				target,
+				locale,
+				extra: notApplied.length > 0 ? { notApplied } : {}
 			});
 		};
 		const outcome = await withTransaction(scope.req, async () => {
@@ -167,24 +148,11 @@ const notAppliedPointers = (patches, intended, saved) => patches.flatMap((operat
 					expectedUpdatedAt: doc["updatedAt"]
 				} };
 			}
-			const write = {
+			await updateTarget(scope, target, {
 				data: buildWriteData(payload.config, target.config, applied.next),
-				depth: 0,
 				draft: true,
-				overrideAccess: false,
-				req: scope.req,
-				...locale === void 0 ? {} : { locale }
-			};
-			if (target.kind === "collection") await payload.update({
-				...write,
-				collection: target.slug,
-				id: target.id,
-				...bytes === void 0 ? {} : { file: bytes }
-			});
-			else await payload.updateGlobal({
-				...write,
-				fallbackLocale: false,
-				slug: target.slug
+				locale,
+				file: bytes
 			});
 			return bytes === void 0 ? { done: await report(applied.next) } : { written: applied.next };
 		});