@abinnovision/payloadcms-mcpx 2.0.0-beta.19 → 2.0.0-beta.22

package/dist/tools/publish-document.mjs

@@ -1,11 +1,10 @@
 import { defineMcpxTool } from "../define-tool.mjs";
 import { jsonResult } from "../result.mjs";
-import { entityShape, idShape, localeOf, localeShape } from "./shared.mjs";
-import { collectLocaleBlockers, identityOf, readDraft, resolveDocument, staleReadResult } from "./document.mjs";
 import { documentLinks } from "./links.mjs";
+import { entityShape, expectedUpdatedAtShape, idShape, localeOf, localeShape, reaches } from "./shared.mjs";
+import { blockerFields, collectLocaleBlockers, documentSummary, readDraft, resolveDocument, staleReadResult, updateTarget } from "./document.mjs";
 import { withPublishIntent } from "../write/publish-intent.mjs";
 import { withTransaction } from "../write/transaction.mjs";
-import { z } from "zod";
 /**
 * Publishes a draft. Available where the config exposes `publish` on an entity
 * with drafts and the key has both the `write` and `publish` checkboxes.
@@ -16,16 +15,15 @@ import { z } from "zod";
 		destructiveHint: true,
 		openWorldHint: false
 	},
-	isEnabled: (scope) => scope.collections.publishable.length + scope.globals.publishable.length > 0,
+	isEnabled: (scope) => reaches(scope, "publish"),
 	inputSchema: (scope) => ({
 		...entityShape(scope, "publish"),
 		...idShape(scope, "publish"),
 		...localeShape(scope, { required: false }),
-		expectedUpdatedAt: z.string().optional().describe("\"updatedAt\" from your last read. Refused if the document changed since.")
+		...expectedUpdatedAtShape
 	}),
 	handler: async ({ args, scope }) => {
 		const target = resolveDocument(scope, args, "publish");
-		const { payload } = scope.req;
 		const locale = localeOf(scope, args.locale);
 		const { localization } = scope;
 		return await withTransaction(scope.req, async () => {
@@ -35,24 +33,11 @@ import { z } from "zod";
 			});
 			const stale = staleReadResult(doc, args.expectedUpdatedAt, "The document changed since you read it. Read it again before publishing.");
 			if (stale) return stale;
-			const write = {
+			await updateTarget(scope, target, {
 				data: withPublishIntent({}),
-				depth: 0,
 				draft: false,
-				fallbackLocale: false,
-				overrideAccess: false,
-				req: scope.req,
-				...locale === void 0 ? {} : { locale },
-				...args.locale === void 0 ? {} : { publishSpecificLocale: args.locale }
-			};
-			if (target.kind === "collection") await payload.update({
-				...write,
-				collection: target.slug,
-				id: target.id
-			});
-			else await payload.updateGlobal({
-				...write,
-				slug: target.slug
+				locale,
+				publishSpecificLocale: args.locale
 			});
 			const saved = await readDraft(scope, {
 				target,
@@ -61,16 +46,13 @@ import { z } from "zod";
 			});
 			const others = await collectLocaleBlockers(scope, target, localization?.locales.filter((entry) => entry !== locale) ?? []);
 			return jsonResult({
-				...identityOf(target, saved["id"]),
-				status: saved["_status"],
-				updatedAt: saved["updatedAt"],
+				...documentSummary(target, saved),
 				...await documentLinks(scope.req, {
 					target,
 					doc: saved,
 					locale
 				}),
-				...others.blockers.length > 0 ? { otherLocaleBlockers: others.blockers } : {},
-				...others.unavailable ? { otherLocaleBlockersUnavailable: true } : {}
+				...blockerFields(others, "otherLocaleBlockers")
 			});
 		});
 	}

package/dist/tools/query-paths.mjs

@@ -48,7 +48,7 @@ const isRefusedPath = (scope, args, seen = /* @__PURE__ */ new Set()) => {
 	const reaches = (path) => isRefusedPath(scope, {
 		collection: args.collection,
 		path: normalise(path),
-		locale: args.locale ?? void 0
+		locale: args.locale
 	});
 	for (const path of wherePaths(args.where)) if (reaches(path)) throw new APIError(`This key cannot query through "${path}".`, 400);
 	for (const path of sortPaths(args.sort)) if (reaches(path) || normalise(path).split(".").some(reaches)) throw new APIError(`This key cannot query through "${path}".`, 400);

package/dist/tools/run-confirmed.mjs

@@ -1,7 +1,8 @@
 import { defineMcpxTool, isToolEnabled, toolInputSchema } from "../define-tool.mjs";
-import { grantKvSlug } from "../grants/grant.mjs";
+import { grantContext } from "../grants/grant.mjs";
 import { claimConfirmation, readConfirmation } from "../grants/confirmation.mjs";
-import { jsonResult } from "../result.mjs";
+import { jsonResult, parseResult } from "../result.mjs";
+import { withRequestLocale } from "./document.mjs";
 import { z } from "zod";
 import { APIError } from "payload";
 //#region src/tools/run-confirmed.ts
@@ -11,14 +12,6 @@ const CONFIRMED = {
 	confirmed: true,
 	request: () => Promise.reject(/* @__PURE__ */ new Error("A confirmed run cannot request a confirmation."))
 };
-const parseResult = (result) => {
-	const [first] = result.content;
-	try {
-		return first?.type === "text" ? JSON.parse(first.text) : {};
-	} catch {
-		return { text: first?.type === "text" ? first.text : void 0 };
-	}
-};
 const execute = async (tool, confirmation, scope, extra) => {
 	const { req } = scope;
 	const args = toolInputSchema(tool, scope).safeParse(confirmation.args);
@@ -26,42 +19,40 @@ const execute = async (tool, confirmation, scope, extra) => {
 		status: "skipped",
 		reason: NO_LONGER_ALLOWED
 	};
-	const { fallbackLocale, locale } = req;
-	req.locale = confirmation.locale;
-	req.fallbackLocale = confirmation.fallbackLocale;
-	try {
-		const result = await tool.handler({
-			args: args.data,
-			scope,
-			req,
-			extra,
-			confirmation: CONFIRMED
-		});
-		const data = parseResult(result);
-		return result.isError === true ? {
-			status: "skipped",
-			reason: String(data["error"])
-		} : {
-			status: "done",
-			result: data
-		};
-	} catch (error) {
-		if (error instanceof APIError && error.isPublic) return {
-			status: "skipped",
-			reason: error.message
-		};
-		req.payload.logger.error({
-			err: error,
-			msg: "[payloadcms-mcpx] Confirmed call failed."
-		});
-		return {
-			status: "skipped",
-			reason: "Internal error"
-		};
-	} finally {
-		if (locale !== void 0) req.locale = locale;
-		if (fallbackLocale !== void 0) req.fallbackLocale = fallbackLocale;
-	}
+	return await withRequestLocale(req, async () => {
+		req.locale = confirmation.locale;
+		req.fallbackLocale = confirmation.fallbackLocale;
+		try {
+			const result = await tool.handler({
+				args: args.data,
+				scope,
+				req,
+				extra,
+				confirmation: CONFIRMED
+			});
+			const data = parseResult(result);
+			return result.isError === true ? {
+				status: "skipped",
+				reason: String(data["error"])
+			} : {
+				status: "done",
+				result: data
+			};
+		} catch (error) {
+			if (error instanceof APIError && error.isPublic) return {
+				status: "skipped",
+				reason: error.message
+			};
+			req.payload.logger.error({
+				err: error,
+				msg: "[payloadcms-mcpx] Confirmed call failed."
+			});
+			return {
+				status: "skipped",
+				reason: "Internal error"
+			};
+		}
+	});
 };
 const claimApproved = async (req, slug, apiKeyId, id) => {
 	const { payload } = req;
@@ -95,10 +86,7 @@ const claimApproved = async (req, slug, apiKeyId, id) => {
 	inputSchema: { ids: z.array(z.string().max(64)).min(1).max(50).describe("\"id\" of each \"confirmation\".") },
 	handler: async ({ args, scope, extra }) => {
 		const { req } = scope;
-		const { payload } = req;
-		const slug = grantKvSlug(payload.config);
-		const apiKeyId = req.context.mcpx?.apiKeyId;
-		if (slug === void 0 || apiKeyId === void 0) throw new Error("Confirmations need a database KV and a key.");
+		const { slug, apiKeyId } = grantContext(req);
 		const outcomes = [];
 		for (const id of args.ids) {
 			const confirmation = await claimApproved(req, slug, apiKeyId, id);

package/dist/tools/shared.mjs

@@ -1,11 +1,10 @@
-import { canCreate, isLiveWrite } from "../capabilities.mjs";
 import { acceptsFiles } from "../upload/file.mjs";
 import { z } from "zod";
 //#region src/tools/shared.ts
 /**
-* An out-of-scope slug fails schema validation before a handler runs, so a
+* A value outside the list fails schema validation before a handler runs, so a
 * client only ever sees what its key may touch.
-*/ const slugEnum = (slugs) => z.enum(slugs);
+*/ const stringEnum = (values) => z.enum(values);
 /**
 * Payload's id type follows the adapter, so both forms are handed on as read.
 */ const idSchema = z.union([z.string(), z.number()]);
@@ -15,7 +14,10 @@ const slugsOf = (scope, key) => ({
 });
 const slugsWhere = (scope, predicate, allowed) => {
 	const pick = (entities, slugs) => entities.filter((entity) => slugs.includes(entity.slug) && predicate(entity)).map((entity) => entity.slug);
-	return [...pick(scope.exposure.collections, allowed.collections), ...pick(scope.exposure.globals, allowed.globals)];
+	return {
+		collections: pick(scope.exposure.collections, allowed.collections),
+		globals: pick(scope.exposure.globals, allowed.globals)
+	};
 };
 /**
 * Collections this key may write but not create in: upload collections whose
@@ -29,52 +31,33 @@ const widen = (branch) => branch;
 * The one list the shape helpers and {@link resolveEntity} both read.
 */ const slugsFor = (scope, operation) => {
 	switch (operation) {
-		case "create": return {
-			collections: slugsWhere(scope, (entity) => canCreate(entity) && (!entity.isUpload || acceptsFiles(scope, entity.slug)), {
-				collections: scope.collections.writable,
-				globals: []
-			}),
+		case "create": return slugsWhere(scope, (entity) => entity.write && (!entity.isUpload || acceptsFiles(scope, entity.slug)), {
+			collections: scope.collections.writable,
 			globals: []
-		};
+		});
 		case "delete": return {
 			collections: scope.collections.deletable,
 			globals: []
 		};
 		case "publish": return slugsOf(scope, "publishable");
 		case "read": return slugsOf(scope, "readable");
-		case "versions": return {
-			collections: slugsWhere(scope, (entity) => entity.hasVersions, {
-				collections: scope.collections.readable,
-				globals: []
-			}),
-			globals: slugsWhere(scope, (entity) => entity.hasVersions, {
-				collections: [],
-				globals: scope.globals.readable
-			})
-		};
+		case "versions": return slugsWhere(scope, (entity) => entity.hasVersions, slugsOf(scope, "readable"));
 		case "write": return slugsOf(scope, "writable");
 	}
 };
 /**
-* The slugs of {@link slugsFor} `"versions"` that also have drafts. Only they
-* have `_status` on their versions, so only they can be queried by status.
-*/ const draftVersionSlugs = (scope) => {
-	const { collections, globals } = slugsFor(scope, "versions");
-	return {
-		collections: slugsWhere(scope, (entity) => entity.hasDrafts, {
-			collections,
-			globals: []
-		}),
-		globals: slugsWhere(scope, (entity) => entity.hasDrafts, {
-			collections: [],
-			globals
-		})
-	};
+* Whether `operation` reaches any collection or global.
+*/ const reaches = (scope, operation) => {
+	const { collections, globals } = slugsFor(scope, operation);
+	return collections.length + globals.length > 0;
 };
 /**
 * Slugs reachable by `operation` whose writes go live, because they have no
 * draft to write.
-*/ const liveWriteSlugs = (scope, operation) => slugsWhere(scope, isLiveWrite, slugsFor(scope, operation));
+*/ const liveWriteSlugs = (scope, operation) => {
+	const { collections, globals } = slugsWhere(scope, (entity) => entity.liveWrite, slugsFor(scope, operation));
+	return [...collections, ...globals];
+};
 /**
 * Stated on the tools that write, since a client calling them must know before
 * the call which writes are public.
@@ -89,11 +72,11 @@ const widen = (branch) => branch;
 * `globalRule` states that rule on `global` for a tool without an `id`.
 */ const entityShape = (scope, operation, globalRule) => {
 	const { collections, globals } = slugsFor(scope, operation);
-	if (globals.length === 0) return widen({ collection: slugEnum(collections) });
-	if (collections.length === 0) return widen({ global: slugEnum(globals) });
-	const global = slugEnum(globals).optional();
+	if (globals.length === 0) return widen({ collection: stringEnum(collections) });
+	if (collections.length === 0) return widen({ global: stringEnum(globals) });
+	const global = stringEnum(globals).optional();
 	return widen({
-		collection: slugEnum(collections).optional(),
+		collection: stringEnum(collections).optional(),
 		global: globalRule === void 0 ? global : global.describe(globalRule)
 	});
 };
@@ -111,7 +94,7 @@ const widen = (branch) => branch;
 */ const READ_LOCALE_DESCRIPTION = "Default: the default locale. A value missing in this locale is shown from the default locale.";
 const localeShape = (scope, options) => {
 	if (!scope.localization) return widen({});
-	const enumerated = z.enum(scope.localization.locales);
+	const enumerated = stringEnum(scope.localization.locales);
 	const locale = options.required ? enumerated : enumerated.optional();
 	return widen({ locale: options.description === void 0 ? locale : locale.describe(options.description) });
 };
@@ -120,6 +103,25 @@ const localeShape = (scope, options) => {
 * it can write back, and populating a relation costs a query.
 */ const depthShape = (scope) => ({ depth: z.number().int().min(0).max(scope.limits.maxDepth).optional().describe("Default 0. A relationship into a collection this key cannot read stays an id.") });
 /**
+* For the writes that refuse a document changed since the client read it.
+*/ const expectedUpdatedAtShape = { expectedUpdatedAt: z.string().optional().describe("\"updatedAt\" from your last read. Refused if the document changed since.") };
+/**
+* `limit` is bounded by the configured ceiling, so the client sees it instead
+* of being clamped silently.
+*/ const pageShape = (scope) => ({
+	limit: z.number().int().min(1).max(scope.limits.maxLimit).optional().describe("Default 10."),
+	page: z.number().int().min(1).optional()
+});
+/**
+* The paging fields of a result.
+*/ const pageFields = (result) => ({
+	totalDocs: result.totalDocs,
+	page: result.page,
+	totalPages: result.totalPages,
+	limit: result.limit,
+	hasNextPage: result.hasNextPage
+});
+/**
 * The locale to operate on: the explicit argument, else the request's, else
 * the default. `undefined` when localization is off.
 */ const localeOf = (scope, locale) => {
@@ -129,4 +131,4 @@ const localeShape = (scope, options) => {
 	return requested && locales.includes(requested) ? requested : defaultLocale;
 };
 //#endregion
-export { READ_LOCALE_DESCRIPTION, depthShape, draftVersionSlugs, entityShape, idSchema, idShape, liveWriteSentence, liveWriteSlugs, localeOf, localeShape, patchOnlySlugs, slugEnum, slugsFor, widen };
+export { READ_LOCALE_DESCRIPTION, depthShape, entityShape, expectedUpdatedAtShape, idSchema, idShape, liveWriteSentence, liveWriteSlugs, localeOf, localeShape, pageFields, pageShape, patchOnlySlugs, reaches, slugsFor, slugsWhere, stringEnum, widen };

package/dist/tools/validate-document.mjs

@@ -1,8 +1,8 @@
 import { defineMcpxTool } from "../define-tool.mjs";
 import { jsonResult } from "../result.mjs";
 import { collectPublishBlockers } from "../write/publish-blockers.mjs";
-import { entityShape, idShape, localeOf, localeShape } from "./shared.mjs";
-import { collectLocaleBlockers, identityOf, readDraft, resolveDocument } from "./document.mjs";
+import { entityShape, idShape, localeOf, localeShape, reaches } from "./shared.mjs";
+import { collectLocaleBlockers, documentSummary, readDraft, resolveDocument } from "./document.mjs";
 /**
 * Gated on write, which implies read, because publish blockers only mean
 * something to a caller who can act on them.
@@ -15,7 +15,7 @@ import { collectLocaleBlockers, identityOf, readDraft, resolveDocument } from ".
 	name: "validateDocument",
 	description: `Lists what still blocks publishing one document or global, without saving. Checks one locale when "locale" is given, otherwise every locale. Returns "publishBlockers", each with a pointer and a message, and a "locale" when every locale was checked. An empty list means it can be published, unless "publishBlockersUnavailable" is true: then the check itself failed. The check runs the field hooks a save runs.`,
 	annotations: { 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"),
@@ -39,9 +39,7 @@ import { collectLocaleBlockers, identityOf, readDraft, resolveDocument } from ".
 			entity: target
 		});
 		return jsonResult({
-			...identityOf(target, doc["id"]),
-			status: doc["_status"],
-			updatedAt: doc["updatedAt"],
+			...documentSummary(target, doc),
 			publishBlockers: validation.blockers,
 			...validation.unavailable ? { publishBlockersUnavailable: true } : {}
 		});

package/dist/tools/versions.mjs

@@ -1,3 +1,4 @@
+import { definedProps, isPlainObject } from "../guards.mjs";
 import { stripAdminHidden } from "../schema/admin-hidden.mjs";
 import "../schema/index.mjs";
 import { mcpxReadRequest } from "./read-request.mjs";
@@ -21,8 +22,10 @@ const NEWEST_FIRST = ["-updatedAt", "-id"];
 		draft: options.draft,
 		overrideAccess: false,
 		req: mcpxReadRequest(scope),
-		...options.select === void 0 ? {} : { select: options.select },
-		...read.locale === void 0 ? {} : { locale: read.locale }
+		...definedProps({
+			select: options.select,
+			locale: read.locale
+		})
 	};
 	const doc = await (read.target.kind === "collection" ? scope.req.payload.findByID({
 		...shared,
@@ -51,7 +54,7 @@ const assertReadable = async (scope, read) => {
 * `parent` comes back as a raw id or, populated, as the document itself.
 */ const isVersionOf = (version, id) => {
 	const parent = version["parent"];
-	const parentId = typeof parent === "object" && parent !== null ? parent["id"] : parent;
+	const parentId = isPlainObject(parent) ? parent["id"] : parent;
 	return (typeof parentId === "string" || typeof parentId === "number") && String(parentId) === String(id);
 };
 /**
@@ -68,7 +71,7 @@ const assertReadable = async (scope, read) => {
 		disableErrors: true,
 		overrideAccess: false,
 		req: mcpxReadRequest(scope),
-		...read.locale === void 0 ? {} : { locale: read.locale }
+		...definedProps({ locale: read.locale })
 	};
 	const version = await (read.target.kind === "collection" ? payload.findVersionByID({
 		...shared,
@@ -96,8 +99,10 @@ const assertReadable = async (scope, read) => {
 		overrideAccess: false,
 		req: mcpxReadRequest(scope),
 		where,
-		...options.page === void 0 ? {} : { page: options.page },
-		...read.locale === void 0 ? {} : { locale: read.locale }
+		...definedProps({
+			page: options.page,
+			locale: read.locale
+		})
 	};
 	return await (read.target.kind === "collection" ? scope.req.payload.findVersions({
 		...shared,

package/dist/types.d.mts

@@ -12,17 +12,6 @@ declare module "payload" {
     "@abinnovision/payloadcms-mcpx": McpxPluginOptions;
   }
 }
-/**
- * How far an exposed entity lets MCP writes reach.
- *
- * - `false`: no write tool touches it.
- * - `"draft"`: writes land as drafts and nothing MCP does changes what the
- *   public sees. Requires `versions.drafts`.
- * - `"live"`: MCP may change live content. On an entity with drafts that
- *   exposes `publishDocument`. On one without, there is no draft, so the write
- *   itself is permitted and lands live.
- */
-export type McpxWriteMode = "draft" | "live" | false;
 /**
  * What an entity exposes. The config names the entities that are reachable and
  * only takes capabilities away; a key's checkboxes decide per key. `true` is
@@ -62,12 +51,12 @@ export interface McpxCollectionOptions {
 export type McpxGlobalOptions = Omit<McpxCollectionOptions, "delete">;
 export type McpxToolExtra = RequestHandlerExtra<ServerRequest, ServerNotification>;
 /**
- * What the config exposes, before an API key's checkboxes narrow it.
+ * What the config exposes, before an API key's checkboxes narrow it. The
+ * operations are the config's side of {@link McpxEntityCapabilities}: `write`
+ * covers draft and live writes, and `publish` is only true where drafts exist.
  */
-export interface McpxExposedEntity {
+export interface McpxExposedEntity extends McpxEntityCapabilities {
   slug: string;
-  read: boolean;
-  write: McpxWriteMode;
   hasDrafts: boolean;
   /**
    * The entity has Payload `versions`, with or without drafts, and is
@@ -75,13 +64,9 @@ export interface McpxExposedEntity {
    */
   hasVersions: boolean;
   /**
-   * The config exposes `deleteDocument`. Always `false` on a global.
+   * Writes go live immediately, as the entity keeps no drafts.
    */
-  delete: boolean;
-  /**
-   * The config lets a key move documents to trash without approval.
-   */
-  deleteUnattended: boolean;
+  liveWrite: boolean;
   /**
    * An upload document is a file, which only an upload grant can supply.
    */
@@ -92,7 +77,7 @@ export interface McpxExposedEntity {
   fieldName: string;
 }
 /**
- * The slugs a key may read, write and publish.
+ * The slugs a key may read, write, publish and delete.
  */
 export interface McpxScopeSlugs {
   readable: string[];
@@ -299,8 +284,9 @@ export type McpxPluginOptions = {
      */
     slug?: string;
     /**
-     * Add a "Connect a client" tab to saved keys, holding ready-to-paste MCP
-     * client config. Default `true`. The snippets contain the key in full.
+     * Add a "Connect a client" button to saved keys, opening a drawer with
+     * ready-to-paste MCP client config. Default `true`. The snippets contain
+     * the key in full.
      */
     setupGuide?: boolean;
     /**
@@ -346,9 +332,10 @@ export type McpxPluginOptions = {
   diagnostics?: boolean;
 };
 /**
- * What a key may do with one entity. Globals reuse this shape.
+ * One entity's operations, as the config exposes them or as a key may use
+ * them. Globals reuse this shape.
  */
-export interface McpxCollectionCapabilities {
+export interface McpxEntityCapabilities {
   read: boolean;
   write: boolean;
   /**
@@ -368,8 +355,8 @@ export interface McpxCollectionCapabilities {
  * In force for one request: the plugin config and the key checkboxes together.
  */
 export interface McpxResolvedCapabilities {
-  collections: Record<string, McpxCollectionCapabilities>;
-  globals: Record<string, McpxCollectionCapabilities>;
+  collections: Record<string, McpxEntityCapabilities>;
+  globals: Record<string, McpxEntityCapabilities>;
   tools: Record<string, boolean>;
 }
 /**

package/dist/upload/file.mjs

@@ -1,4 +1,5 @@
-import { grantKvSlug, issueGrant } from "../grants/grant.mjs";
+import { grantContext, issueGrant } from "../grants/grant.mjs";
+import { publicOrigin } from "../request.mjs";
 import { errorResult, jsonResult } from "../result.mjs";
 import { SchemaError } from "../schema/errors.mjs";
 import { resolveDataPointer } from "../schema/pointer.mjs";
@@ -24,7 +25,7 @@ const fileSchema = (maxBytes) => z.strictObject({
 const allowedMimeTypes = (scope, slug) => {
 	if (!scope.uploads || !scope.collections.writable.includes(slug)) return [];
 	const entity = scope.exposure.collections.find((candidate) => candidate.slug === slug);
-	const config = scope.req.payload.config.collections.find((candidate) => candidate.slug === slug);
+	const config = scope.req.payload.collections[slug]?.config;
 	return entity?.isUpload === true && Array.isArray(config?.upload.mimeTypes) ? config.upload.mimeTypes : [];
 };
 /**
@@ -115,20 +116,10 @@ const isClientWritable = (scope, target, path) => {
 	return blockers.length === 0 ? void 0 : errorResult("Nothing was written: the document fails validation.", { validationErrors: blockers });
 };
 const handoffUrl = (req, path) => {
-	const request = new URL(req.url ?? "");
-	const url = new URL(req.payload.config.serverURL || request.origin);
-	url.pathname = `${request.pathname.replace(/\/+$/, "")}/${path}`;
+	const url = new URL(publicOrigin(req));
+	url.pathname = `${new URL(req.url ?? "").pathname.replace(/\/+$/, "")}/${path}`;
 	return url.toString();
 };
-const grantContext = (req) => {
-	const slug = grantKvSlug(req.payload.config);
-	const apiKeyId = req.context.mcpx?.apiKeyId;
-	if (slug === void 0 || apiKeyId === void 0) throw new Error("A handoff was offered without a database KV or key.");
-	return {
-		slug,
-		apiKeyId
-	};
-};
 /**
 * Stores the call as a grant and returns where to PUT its file. Nothing else
 * is written: the PUT runs the same call again with the bytes attached.
@@ -137,11 +128,12 @@ const grantContext = (req) => {
 	const { payload } = req;
 	const { slug, apiKeyId } = grantContext(req);
 	const url = handoffUrl(req, "upload");
-	const { grantId, exp } = await issueGrant(payload, slug, {
+	const { id, exp } = await issueGrant(payload, slug, {
 		kind: "upload",
 		apiKeyId,
 		tool: call.tool,
 		args: call.args,
+		file: call.args.file,
 		locale: req.locale ?? null,
 		fallbackLocale: req.fallbackLocale ?? null
 	});
@@ -150,7 +142,7 @@ const grantContext = (req) => {
 		method: "PUT",
 		headers: {
 			"content-type": call.args.file.mimeType,
-			"x-mcpx-grant": grantId
+			"x-mcpx-grant": id
 		},
 		expiresAt: new Date(exp).toISOString(),
 		maxBytes: uploadMaxBytes(payload.config)
@@ -168,7 +160,7 @@ const grantContext = (req) => {
 	const { req } = scope;
 	const { slug, apiKeyId } = grantContext(req);
 	const url = handoffUrl(req, "file");
-	const { grantId, exp } = await issueGrant(req.payload, slug, {
+	const { id, exp } = await issueGrant(req.payload, slug, {
 		kind: "download",
 		apiKeyId,
 		...target,
@@ -177,7 +169,7 @@ const grantContext = (req) => {
 	return {
 		url,
 		method: "GET",
-		headers: { "x-mcpx-grant": grantId },
+		headers: { "x-mcpx-grant": id },
 		expiresAt: new Date(exp).toISOString()
 	};
 };