emdash 0.39.1 → 0.40.1

package/dist/astro/routes/api/mcp.mjs

@@ -1,21 +1,401 @@
-import "../../../config-CGVeT8Hc.mjs";
+import "../../../dialect-helpers-7_IqPdh9.mjs";
+import { r as getI18nConfig } from "../../../config-CvmjJcVw.mjs";
+import "../../../after-PcEvMY_6.mjs";
+import "../../../options-DhrI7eMv.mjs";
 import { i as encodeBase64, t as decodeBase64 } from "../../../base64-DvnNgP7e.mjs";
+import "../../../secrets-CIi0nFiR.mjs";
+import "../../../object-cache-CqWNY5uP.mjs";
 import { i as InvalidCursorError, o as decodeCursor } from "../../../types-BkUg2yHx.mjs";
-import { n as siteSettingsTag, r as taxonomyTag, t as menuTag } from "../../../chrome-tags-D7LGB91U.mjs";
-import { t as apiError } from "../../../error-CCTCskie.mjs";
-import "../../../redirects-BCiTaIQ-.mjs";
-import { Dt as updateCollectionBody, F as createTaxonomyDefBody, Ot as updateFieldBody, X as updateTaxonomyDefBody, _r as bylineUpdateBody, _t as createCollectionBody, dr as bylineCreateBody, kt as CONTENT_TYPE_RE, tr as contentSeoInput, yr as contentBylineInputSchema } from "../../../entry-lock-CwWdnFyR.mjs";
-import "../../../comments-BVzzt6x5.mjs";
-import "../../../relations-B4w-G5U9.mjs";
-import "../../../status-DLoBmcDz.mjs";
+import "../../../media-CPXTbb1R.mjs";
+import "../../../audit-RfCugiSB.mjs";
+import "../../../request-cache-DzLYKm_x.mjs";
+import "../../../byline-registry-gnKscbQX.mjs";
+import "../../../field-defs-cache-HIgBbqZZ.mjs";
+import "../../../byline-DYmkXqvo.mjs";
+import "../../../fts-manager-S-K0laoS.mjs";
+import { n as siteSettingsTag, r as taxonomyTag, t as menuTag } from "../../../chrome-tags-DApCQSIk.mjs";
+import "../../../loader-BzqeR1ZN.mjs";
+import "../../../collection-slugs-cache-CjGk__zp.mjs";
+import "../../../capture-triggers-kJyl_yyM.mjs";
+import "../../../activation-LOkDM5WT.mjs";
+import "../../../block-type-registry-DUI_3KxT.mjs";
+import "../../../collection-deletion-BIm28mo3.mjs";
+import { r as isTransferError, t as TransferError } from "../../../errors-DgE1zJGG.mjs";
+import "../../../canonical-YhEQezjg.mjs";
+import { f as toSha256Digest } from "../../../digest-BarSh-pN.mjs";
+import "../../../hash-SDAW6zC-.mjs";
+import "../../../zod-generator-D6uE4WiS.mjs";
+import "../../../collection-deletion-processor-Br6rxs3u.mjs";
+import "../../../settings-DYidIB26.mjs";
+import "../../../site-settings-DOgRUoFX.mjs";
+import "../../../errors-BF0_LFhW.mjs";
+import "../../../settings-B4vDl1fK.mjs";
+import { t as apiError } from "../../../error-CfvOHP0M.mjs";
+import "../../../redirects-Cv9apQKj.mjs";
+import { Ct as updateCollectionBody, I as createTaxonomyDefBody, St as updateBlockTypeBody, Yt as bylineCreateBody, Z as updateTaxonomyDefBody, dt as createBlockTypeBody, ft as createCollectionBody, rn as contentBylineInputSchema, tn as bylineUpdateBody, wt as updateFieldBody, zt as contentSeoInput } from "../../../entry-lock-BJYdBfXb.mjs";
+import { t as CONTENT_TYPE_RE } from "../../../media-Pu1L6xir.mjs";
+import "../../../comments-fHZ8ON9O.mjs";
+import "../../../relations-CK9CYUyr.mjs";
+import "../../../menus-BM7BPLOb.mjs";
+import "../../../status-DZKIG4a9.mjs";
 import "../../../api/schemas/index.mjs";
-import { i as hasScope$1 } from "../../../api-tokens-DS1VzN7_.mjs";
-import { n as convertDataForWrite, t as convertDataForRead } from "../../../portable-text-oAwodbPS.mjs";
+import { a as readSiteWriteFence, o as recordSiteWrite } from "../../../fence-CMDXJYc_.mjs";
+import { a as hasScope$1 } from "../../../api-tokens-CE1ECIg0.mjs";
+import { n as convertDataForWrite, t as convertDataForRead } from "../../../portable-text-5O_ZGUjB.mjs";
+import "../../../tar-_1AgTYFu.mjs";
+import { i as RECORD_KINDS } from "../../../kinds-CRu_T5T5.mjs";
+import "../../../paths-JxokKIbr.mjs";
+import "../../../transformations-9gfpwY65.mjs";
+import "../../../version-BRZXVifl.mjs";
+import "../../../receipt-B4wJj5Jq.mjs";
+import { S as TRANSFER_SCOPES, n as TransferApprovalRepository } from "../../../approvals-CqMfNxak.mjs";
+import { a as siteImportDecisionsInputSchema, t as isPlanExecutable } from "../../../plan-xjcWrAah.mjs";
+import { i as TransferOperationRepository } from "../../../stage-DgrBz_du.mjs";
+import { C as requestTransferApproval, E as analysisTargetContext, S as handleTransferCapabilities, T as loadImportPlan, _ as handleImportGet, c as handleExportGet, d as handleImportAdvance, f as handleImportAnalyze, h as handleImportExecute, i as handleExportAdvance, o as handleExportCreate, t as exportParamsDigest, w as openExportPackage, x as handleImportReceipt } from "../../../transfer-DgeCvHnj.mjs";
+import "../../../keys-yxLm5l35.mjs";
 import { z } from "zod";
 import { Permissions, Role, canActOnOwn, hasPermission } from "@emdash-cms/auth";
 import { WebStandardStreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/webStandardStreamableHttp.js";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 
+//#region src/mcp/transfer.ts
+/** Plan principals, warnings, and blockers listed per call; the totals are always reported. */
+const MCP_PLAN_LIST_LIMIT = 50;
+function failure(code, message, details) {
+	return {
+		success: false,
+		error: details === void 0 ? {
+			code,
+			message
+		} : {
+			code,
+			message,
+			details
+		}
+	};
+}
+function transferFailure(error, fallbackCode) {
+	if (isTransferError(error)) return failure(error.code, error.message);
+	console.error("[transfer] MCP tool failed:", error);
+	return failure(fallbackCode, "Site transfer request failed");
+}
+function storageMissing() {
+	return failure("STORAGE_NOT_CONFIGURED", "No storage backend is configured");
+}
+function tokenRequired() {
+	return failure("INSUFFICIENT_SCOPE", "Approval grants need a caller authenticated with an API or OAuth token");
+}
+function summarizeOperation(operation) {
+	const progress = operation.progress;
+	return {
+		id: operation.id,
+		kind: operation.kind,
+		state: operation.state,
+		stage: operation.stage,
+		progress: progress ? {
+			done: progress.done,
+			total: progress.total,
+			...progress.records === void 0 ? {} : { records: progress.records },
+			...progress.bytesDone === void 0 ? {} : { bytesDone: progress.bytesDone },
+			...progress.bytesTotal === void 0 ? {} : { bytesTotal: progress.bytesTotal }
+		} : null,
+		packageDigest: operation.packageDigest,
+		planDigest: operation.planDigest,
+		error: operation.errorCode ? { code: operation.errorCode } : null,
+		createdAt: operation.createdAt,
+		updatedAt: operation.updatedAt,
+		completedAt: operation.completedAt,
+		expiresAt: operation.expiresAt
+	};
+}
+function summarizeIssue(issue) {
+	return {
+		code: issue.code,
+		message: issue.message,
+		...issue.kind === void 0 ? {} : { kind: issue.kind },
+		...issue.id === void 0 ? {} : { id: issue.id },
+		...issue.count === void 0 ? {} : { count: issue.count },
+		...issue.detail === void 0 ? {} : { detail: { ...issue.detail } }
+	};
+}
+/** How many records a transformation touches; its listed ids and values are not returned. */
+function transformationCount(item) {
+	switch (item.code) {
+		case "redirect_loop_disabled":
+		case "search_unsupported": return item.ids.length;
+		case "locale_recased": return item.locales.length;
+		default: return item.count;
+	}
+}
+function summarizePlan(plan, planDigest) {
+	return {
+		packageDigest: plan.packageDigest,
+		planDigest,
+		executable: isPlanExecutable(plan),
+		origin: {
+			siteId: plan.origin.siteId,
+			packageId: plan.origin.packageId,
+			createdAt: plan.origin.createdAt,
+			emdashVersion: plan.origin.createdByEmDashVersion
+		},
+		counts: { ...plan.counts },
+		bytes: {
+			records: plan.bytes.records,
+			media: plan.bytes.media
+		},
+		principals: {
+			total: plan.principals.length,
+			items: plan.principals.toSorted((a, b) => b.references - a.references || a.id.localeCompare(b.id)).slice(0, MCP_PLAN_LIST_LIMIT).map((principal) => ({
+				id: principal.id,
+				displayName: principal.displayName,
+				references: principal.references,
+				suggestedUserId: principal.suggestedUserId ?? null,
+				mappedUserId: plan.decisions.principalMappings[principal.id] ?? null
+			}))
+		},
+		decisions: {
+			siteTitle: plan.decisions.siteTitle,
+			siteTagline: plan.decisions.siteTagline
+		},
+		transformations: plan.transformations.map((item) => ({
+			code: item.code,
+			..."kind" in item ? { kind: item.kind } : {},
+			count: transformationCount(item)
+		})),
+		warnings: {
+			total: plan.warnings.length,
+			items: plan.warnings.slice(0, MCP_PLAN_LIST_LIMIT).map(summarizeIssue)
+		},
+		blockers: {
+			total: plan.blockers.length,
+			items: plan.blockers.slice(0, MCP_PLAN_LIST_LIMIT).map(summarizeIssue)
+		},
+		estimatedSteps: plan.estimatedSteps
+	};
+}
+/**
+* Whether `caller` may drive or read `operationId` through a grant it
+* consumed for it, in place of the transfer scope.
+*/
+async function hasOperationGrant(db, caller, action, operationId) {
+	if (caller.tokenId === void 0) return false;
+	return new TransferApprovalRepository(db).hasConsumed({
+		userId: caller.userId,
+		action,
+		operationId,
+		tokenId: caller.tokenId
+	});
+}
+async function transferCapabilities(context) {
+	return handleTransferCapabilities(context.db, analysisTargetContext({
+		i18n: getI18nConfig(),
+		maxUploadSize: context.maxUploadSize
+	}));
+}
+async function startExport(context, caller, input) {
+	const options = input.comments === void 0 ? {} : { comments: input.comments };
+	if (!input.scoped) {
+		if (caller.tokenId === void 0) return tokenRequired();
+		if (input.approvalId === void 0) return withInstruction(await requestTransferApproval(context.db, {
+			userId: caller.userId,
+			action: "export",
+			paramsDigest: await exportParamsDigest(options),
+			requestedByTokenId: caller.tokenId
+		}));
+	}
+	const created = await handleExportCreate(context.db, {
+		userId: caller.userId,
+		options,
+		...input.scoped || input.approvalId === void 0 ? {} : { approval: {
+			id: input.approvalId,
+			tokenId: caller.tokenId
+		} }
+	});
+	if (!created.success) return created;
+	return {
+		success: true,
+		data: { operation: summarizeOperation(created.data.operation) }
+	};
+}
+/**
+* Put the approval id and the next step in the message text, which is all
+* many MCP clients show the model; `details` carries the same values.
+*/
+function withInstruction(result) {
+	if (result.success || result.error.code !== "TRANSFER_APPROVAL_REQUIRED") return result;
+	const details = result.error.details ?? {};
+	const approvalId = String(details.approvalId);
+	return failure("TRANSFER_APPROVAL_REQUIRED", `Approval ${approvalId} is pending until ${String(details.expiresAt)}. An admin must approve it in the EmDash admin under Settings → Transfer. Then call this tool again with the same arguments and approvalId "${approvalId}".`, details);
+}
+async function exportTotals(db, storage, operationId) {
+	const manifest = await openExportPackage({
+		db,
+		storage,
+		operation: await new TransferOperationRepository(db).require(operationId)
+	}).manifest();
+	const byKind = {};
+	let total = 0;
+	for (const kind of RECORD_KINDS) {
+		const summary = manifest.records[kind];
+		if (!summary) continue;
+		byKind[kind] = summary.count;
+		total += summary.count;
+	}
+	return {
+		records: {
+			total,
+			byKind
+		},
+		media: {
+			count: manifest.media.count,
+			totalBytes: manifest.media.totalBytes
+		},
+		files: {
+			count: manifest.files.count,
+			totalBytes: manifest.files.totalBytes
+		}
+	};
+}
+async function exportStatus(context, input) {
+	let operation;
+	let nextRequestInMs;
+	if (input.advance) {
+		if (!context.storage) return storageMissing();
+		const step = await handleExportAdvance(context.db, context.storage, { operationId: input.operationId });
+		if (!step.success) return step;
+		operation = step.data.operation;
+		nextRequestInMs = step.data.nextRequestInMs;
+	} else {
+		const read = await handleExportGet(context.db, input.operationId);
+		if (!read.success) return read;
+		operation = read.data.operation;
+		nextRequestInMs = operation.state === "pending" || operation.state === "running" ? 0 : null;
+	}
+	const status = {
+		operation: summarizeOperation(operation),
+		nextRequestInMs
+	};
+	if (operation.state === "complete" && operation.stagingCollectedAt === null) {
+		if (!context.storage) return storageMissing();
+		try {
+			status.totals = await exportTotals(context.db, context.storage, operation.id);
+		} catch (error) {
+			return transferFailure(error, "TRANSFER_EXPORT_ERROR");
+		}
+	}
+	return {
+		success: true,
+		data: status
+	};
+}
+async function analyzeImport(context, input) {
+	if (!context.storage) return storageMissing();
+	const result = await handleImportAnalyze(context.db, context.storage, {
+		operationId: input.operationId,
+		decisions: input.decisions,
+		target: analysisTargetContext({
+			i18n: getI18nConfig(),
+			maxUploadSize: context.maxUploadSize
+		})
+	});
+	if (!result.success) return result;
+	const { operation, plan, planDigest, nextRequestInMs } = result.data;
+	return {
+		success: true,
+		data: {
+			operation: summarizeOperation(operation),
+			...plan && planDigest ? { plan: summarizePlan(plan, planDigest) } : {},
+			nextRequestInMs
+		}
+	};
+}
+/**
+* Check what `handleImportExecute` would, before a pending grant is created,
+* so an admin is only ever asked to approve an import that can run.
+*/
+async function assertExecutable(context, input) {
+	const operation = await new TransferOperationRepository(context.db).get(input.operationId);
+	if (!operation || operation.kind !== "import") throw new TransferError("TRANSFER_OPERATION_NOT_FOUND", "Transfer operation not found");
+	if (operation.packageDigest !== input.packageDigest) throw new TransferError("TRANSFER_PACKAGE_DIGEST_MISMATCH", "Package digest does not match");
+	if (operation.planDigest === null || operation.planDigest !== input.planDigest) throw new TransferError("TRANSFER_PLAN_DIGEST_MISMATCH", "Plan digest does not match");
+	if (operation.state !== "planned") throw new TransferError("TRANSFER_INVALID_STATE", "Import is not waiting to be started");
+	const plan = await loadImportPlan(context.storage, operation);
+	if (!plan || !isPlanExecutable(plan)) throw new TransferError("TRANSFER_PLAN_BLOCKED", "The import plan has blockers");
+}
+async function startImport(context, caller, input) {
+	const storage = context.storage;
+	if (!storage) return storageMissing();
+	if (!input.scoped) {
+		if (caller.tokenId === void 0) return tokenRequired();
+		if (input.approvalId === void 0) {
+			try {
+				await assertExecutable({
+					...context,
+					storage
+				}, input);
+			} catch (error) {
+				return transferFailure(error, "TRANSFER_IMPORT_ERROR");
+			}
+			return withInstruction(await requestTransferApproval(context.db, {
+				userId: caller.userId,
+				action: "import",
+				operationId: input.operationId,
+				packageDigest: input.packageDigest,
+				planDigest: input.planDigest,
+				requestedByTokenId: caller.tokenId
+			}));
+		}
+	}
+	const executed = await handleImportExecute(context.db, storage, {
+		operationId: input.operationId,
+		userId: caller.userId,
+		packageDigest: input.packageDigest,
+		planDigest: input.planDigest,
+		...input.scoped || input.approvalId === void 0 ? {} : { approval: {
+			id: input.approvalId,
+			tokenId: caller.tokenId
+		} }
+	});
+	if (!executed.success) return executed;
+	return {
+		success: true,
+		data: { operation: summarizeOperation(executed.data.operation) }
+	};
+}
+async function importStatus(context, operationId) {
+	const result = await handleImportGet(context.db, operationId);
+	if (!result.success) return result;
+	return {
+		success: true,
+		data: {
+			operation: summarizeOperation(result.data.operation),
+			files: {
+				declared: result.data.files.declared,
+				verified: result.data.files.verified
+			}
+		}
+	};
+}
+async function resumeImport(context, caller, operationId) {
+	if (!context.storage) return storageMissing();
+	const step = await handleImportAdvance(context.db, context.storage, {
+		operationId,
+		userId: caller.userId
+	});
+	if (!step.success) return step;
+	return {
+		success: true,
+		data: {
+			operation: summarizeOperation(step.data.operation),
+			nextRequestInMs: step.data.nextRequestInMs
+		}
+	};
+}
+async function importReceipt(context, operationId) {
+	return handleImportReceipt(context.db, operationId);
+}
+
+//#endregion
 //#region src/mcp/server.ts
 const COLLECTION_SLUG_PATTERN = /^[a-z][a-z0-9_]*$/;
 /** http(s) scheme matcher used by `settings_update` URL validation. */
@@ -30,6 +410,25 @@ const REV_PARAM_DESCRIPTION = "Revision token proving you have read the current
 * read the schema, so the message says where the token comes from.
 */
 const REV_MISSING_ERROR = "_rev is required: call content_get for this item and pass back the _rev it returns.";
+const SHA256_DIGEST_PATTERN = /^sha256:[0-9a-f]{64}$/;
+const transferOperationIdSchema = z.string().regex(/^[0-9A-Za-z_-]{1,64}$/, "Invalid operation id").describe("Transfer operation id");
+const transferApprovalIdSchema = z.string().min(1).max(64).describe("Approval id from an earlier TRANSFER_APPROVAL_REQUIRED error, once approved");
+/**
+* The site transfer tools. Like the transfer REST API they are exempt from
+* the site write fence, so an import started over MCP can be driven to
+* completion over MCP.
+*/
+const TRANSFER_TOOL_NAMES = new Set([
+	"site_transfer_capabilities",
+	"site_export_start",
+	"site_export_status",
+	"site_import_analyze",
+	"site_import_start",
+	"site_import_status",
+	"site_import_resume",
+	"site_import_receipt"
+]);
+const APPROVAL_FLOW_DESCRIPTION = "If the token lacks the scope, the first call fails with TRANSFER_APPROVAL_REQUIRED and details.approvalId; an admin must approve that request in the EmDash admin (Settings → Transfer). Then repeat the call with the same arguments plus approvalId. Approvals are single-use, bound to this user, this token, and these exact arguments, and expire 15 minutes after they are requested or approved.";
 const TAXONOMY_CURSOR_VERSION = 2;
 const MAX_TAXONOMY_CURSOR_LENGTH = 2048;
 const contentDateTimeInputSchema = z.iso.datetime({
@@ -54,7 +453,7 @@ const settingsSocialSchema = z.object({
 });
 const settingsSeoSchema = z.object({
 	titleSeparator: z.string().max(10).optional().describe("Separator between page title and site title (e.g. ' | ')"),
-	defaultOgImage: settingsMediaReferenceSchema.optional().describe("Default Open Graph image when content has none"),
+	defaultOgImage: settingsMediaReferenceSchema.nullable().optional().describe("Default Open Graph image when content has none; null removes it"),
 	robotsTxt: z.string().max(5e3).optional().describe("Custom robots.txt body. Leave unset for the EmDash default."),
 	googleVerification: z.string().max(100).optional().describe("Google Search Console verification token"),
 	bingVerification: z.string().max(100).optional().describe("Bing Webmaster Tools verification token")
@@ -270,9 +669,10 @@ async function unwrapAndInvalidate(extra, result, tags, changedEarlier = false)
 }
 async function getCollectionFields(ec, collection) {
 	try {
-		const { SchemaRegistry } = await import("../../../schema-ILPFMPW3.mjs").then((n) => n.t);
+		const { SchemaRegistry } = await import("../../../schema-BABiRdsH.mjs").then((n) => n.t);
+		const { expandCollectionBlockFields } = await import("../../../block-values-C_VIPr5t.mjs").then((n) => n.t);
 		const col = await new SchemaRegistry(ec.db).getCollectionWithFields(collection);
-		return col ? col.fields : null;
+		return col ? (await expandCollectionBlockFields(ec.db, col)).fields : null;
 	} catch {
 		return null;
 	}
@@ -299,7 +699,7 @@ async function applyReadMarkdown(ec, collection, items) {
 	for (const item of items) if (item.data && typeof item.data === "object") item.data = convertDataForRead(item.data, fields, false);
 }
 async function invalidateBylines() {
-	const { invalidateBylineCache } = await import("../../../bylines-CHP44GkL.mjs").then((n) => n.t);
+	const { invalidateBylineCache } = await import("../../../bylines-BPwJqoYH.mjs").then((n) => n.t);
 	invalidateBylineCache();
 }
 /**
@@ -324,6 +724,46 @@ function requireRole(extra, minRole) {
 	if (getExtra(extra).userRole < minRole) throw new EmDashAuthError("Insufficient permissions for this operation", "INSUFFICIENT_PERMISSIONS");
 }
 /**
+* Whether the caller's token holds `scope` (`transfer:*`: any transfer
+* scope). A caller without token scopes holds none.
+*/
+function transferScopeHeld(extra, scope) {
+	const { tokenScopes } = getExtra(extra);
+	if (!tokenScopes) return false;
+	if (scope === "transfer:*") return TRANSFER_SCOPES.some((held) => hasScope$1(tokenScopes, held));
+	return hasScope$1(tokenScopes, scope);
+}
+function insufficientTransferScope(scope) {
+	return new EmDashAuthError(`Insufficient scope: requires ${scope === "transfer:*" ? TRANSFER_SCOPES.join(" or ") : scope}`, "INSUFFICIENT_SCOPE");
+}
+function requireTransferScope(extra, scope) {
+	if (!transferScopeHeld(extra, scope)) throw insufficientTransferScope(scope);
+}
+/**
+* Require `scope`, or a grant this user consumed with this token to start
+* `operationId`.
+*/
+async function requireTransferAccess(extra, scope, action, operationId) {
+	if (transferScopeHeld(extra, scope)) return;
+	const { emdash, userId, tokenId } = getExtra(extra);
+	if (await hasOperationGrant(emdash.db, {
+		userId,
+		tokenId
+	}, action, operationId)) return;
+	throw insufficientTransferScope(scope);
+}
+function transferContext(extra) {
+	const { emdash } = getExtra(extra);
+	return {
+		db: emdash.db,
+		storage: emdash.storage,
+		maxUploadSize: emdash.config.maxUploadSize
+	};
+}
+function transferDigest(value) {
+	return toSha256Digest(value.slice(7));
+}
+/**
 * Whether the current user may read non-published content (drafts, scheduled,
 * trashed, revisions, compare). SUBSCRIBER may hold content:read for
 * member-only published content but must not see drafts.
@@ -391,9 +831,16 @@ function createMcpServer(pluginTools = [], request) {
 	}, { capabilities: { logging: {} } });
 	const originalRegisterTool = server.registerTool.bind(server);
 	server.registerTool = ((name, config, callback) => {
+		const fenced = config.annotations?.readOnlyHint !== true && !TRANSFER_TOOL_NAMES.has(name);
 		const wrapped = async (...callbackArgs) => {
 			try {
-				return await callback(...callbackArgs);
+				if (!fenced) return await callback(...callbackArgs);
+				const { db } = getEmDash(callbackArgs.at(-1));
+				const fence = await readSiteWriteFence(db);
+				if (fence.error) return respondError(fence.error.code, fence.error.message);
+				const result = await callback(...callbackArgs);
+				if (fence.exportRunning && !("isError" in result && result.isError)) await recordSiteWrite(db);
+				return result;
 			} catch (error) {
 				return respondHandlerError(error, "INTERNAL_ERROR");
 			}
@@ -509,6 +956,8 @@ function createMcpServer(pluginTools = [], request) {
 			status: z.enum(["draft", "published"]).optional().describe("Initial status (default 'draft'). Requires publish permission."),
 			locale: z.string().optional().describe("Locale for this content (e.g. 'fr'). Defaults to default locale."),
 			translationOf: z.string().optional().describe("ID of the content item this is a translation of. Links items in the same translation group."),
+			migrateBlocks: z.boolean().optional().describe("Allow retained blocks to migrate to their type's active version"),
+			replaceBlocks: z.boolean().optional().describe("Treat an entirely keyless blocks array as an explicit replacement"),
 			bylines: z.array(contentBylineInputSchema).optional().describe("Bylines to credit. Each entry references an existing byline by id (see byline_list / byline_create) with an optional roleLabel. The first entry becomes the primary byline."),
 			taxonomies: z.record(z.string(), z.array(z.string())).optional().describe("Taxonomy term assignments as { taxonomyName: [termSlug, ...] }. Term slugs are resolved in the entry's locale. Call taxonomy_list to see available taxonomies and taxonomy_list_terms to look up slugs. Missing keys leave that taxonomy unchanged.")
 		}),
@@ -540,6 +989,8 @@ function createMcpServer(pluginTools = [], request) {
 				translationOf: args.translationOf,
 				bylines: args.bylines,
 				taxonomies: args.taxonomies,
+				migrateBlocks: args.migrateBlocks,
+				replaceBlocks: args.replaceBlocks,
 				actor
 			});
 			if (!result.success) return unwrap(result);
@@ -561,6 +1012,8 @@ function createMcpServer(pluginTools = [], request) {
 			translationOf: args.translationOf,
 			bylines: args.bylines,
 			taxonomies: args.taxonomies,
+			migrateBlocks: args.migrateBlocks,
+			replaceBlocks: args.replaceBlocks,
 			actor
 		}), [args.collection]);
 	});
@@ -578,6 +1031,8 @@ function createMcpServer(pluginTools = [], request) {
 			bylines: z.array(contentBylineInputSchema).optional().describe("Replace the byline list for this item. The first entry becomes the primary byline. Pass an empty array to clear all bylines."),
 			taxonomies: z.record(z.string(), z.array(z.string())).optional().describe("Replace taxonomy term assignments as { taxonomyName: [termSlug, ...] }. Term slugs are resolved in the entry's locale. Only named taxonomies are touched; other taxonomies are left unchanged. Pass an empty array to clear a taxonomy."),
 			publishedAt: contentDateTimeInputSchema.nullish().describe("Override the publication timestamp (ISO 8601). Requires content:publish_any permission. Pass null to clear. Useful for content migrations."),
+			migrateBlocks: z.boolean().optional().describe("Allow existing blocks to migrate to their type's active version"),
+			replaceBlocks: z.boolean().optional().describe("Treat an entirely keyless blocks array as an explicit replacement"),
 			_rev: z.string({ error: REV_MISSING_ERROR }).describe(REV_PARAM_DESCRIPTION)
 		})
 	}, async (args, extra) => {
@@ -614,6 +1069,8 @@ function createMcpServer(pluginTools = [], request) {
 					bylines: args.bylines,
 					taxonomies: args.taxonomies,
 					publishedAt: args.publishedAt,
+					migrateBlocks: args.migrateBlocks,
+					replaceBlocks: args.replaceBlocks,
 					_rev: args._rev
 				});
 				if (!updateResult.success) return unwrap(updateResult);
@@ -643,6 +1100,8 @@ function createMcpServer(pluginTools = [], request) {
 					bylines: args.bylines,
 					taxonomies: args.taxonomies,
 					publishedAt: args.publishedAt,
+					migrateBlocks: args.migrateBlocks,
+					replaceBlocks: args.replaceBlocks,
 					_rev: args._rev
 				});
 				if (!updateResult.success) return unwrap(updateResult);
@@ -667,6 +1126,8 @@ function createMcpServer(pluginTools = [], request) {
 			bylines: args.bylines,
 			taxonomies: args.taxonomies,
 			publishedAt: args.publishedAt,
+			migrateBlocks: args.migrateBlocks,
+			replaceBlocks: args.replaceBlocks,
 			_rev: args._rev
 		});
 		if (result.liveContentChanged === false) return unwrap(result);
@@ -883,7 +1344,12 @@ function createMcpServer(pluginTools = [], request) {
 	}, async (args, extra) => {
 		requireScope(extra, "content:write");
 		requireRole(extra, Role.CONTRIBUTOR);
-		return unwrapAndInvalidate(extra, await getEmDash(extra).handleContentDuplicate(args.collection, args.id), [args.collection]);
+		const { emdash, userId } = getExtra(extra);
+		const existing = await emdash.handleContentGet(args.collection, args.id);
+		if (!existing.success) return unwrap(existing);
+		requireOwnership(extra, extractContentAuthorId(existing.data), "content:edit_own", "content:edit_any");
+		const resolvedId = extractContentId(existing.data) ?? args.id;
+		return unwrapAndInvalidate(extra, await emdash.handleContentDuplicate(args.collection, resolvedId, userId), [args.collection]);
 	});
 	server.registerTool("content_translations", {
 		title: "Get Content Translations",
@@ -925,7 +1391,7 @@ function createMcpServer(pluginTools = [], request) {
 		requireScope(extra, "content:read");
 		const ec = getEmDash(extra);
 		try {
-			const { BylineRepository } = await import("../../../byline-C8ndlnP0.mjs").then((n) => n.n);
+			const { BylineRepository } = await import("../../../byline-DYmkXqvo.mjs").then((n) => n.n);
 			return jsonResult(await new BylineRepository(ec.db).findMany({
 				search: args.search,
 				isGuest: args.isGuest,
@@ -947,7 +1413,7 @@ function createMcpServer(pluginTools = [], request) {
 		requireScope(extra, "content:read");
 		const ec = getEmDash(extra);
 		try {
-			const { BylineRepository } = await import("../../../byline-C8ndlnP0.mjs").then((n) => n.n);
+			const { BylineRepository } = await import("../../../byline-DYmkXqvo.mjs").then((n) => n.n);
 			const byline = await new BylineRepository(ec.db).findById(args.id);
 			if (!byline) return respondError("NOT_FOUND", `Byline '${args.id}' not found`);
 			return jsonResult(byline);
@@ -965,7 +1431,7 @@ function createMcpServer(pluginTools = [], request) {
 		requireRole(extra, Role.EDITOR);
 		const ec = getEmDash(extra);
 		try {
-			const { handleBylineCreate } = await import("../../../bylines-DxjM4Usz.mjs").then((n) => n.t);
+			const { handleBylineCreate } = await import("../../../bylines-ukLaYpVZ.mjs").then((n) => n.t);
 			const result = await handleBylineCreate(ec.db, args);
 			if (result.success) await invalidateBylines();
 			return unwrap(result);
@@ -985,7 +1451,7 @@ function createMcpServer(pluginTools = [], request) {
 		requireRole(extra, Role.EDITOR);
 		const ec = getEmDash(extra);
 		try {
-			const { handleBylineUpdate } = await import("../../../bylines-DxjM4Usz.mjs").then((n) => n.t);
+			const { handleBylineUpdate } = await import("../../../bylines-ukLaYpVZ.mjs").then((n) => n.t);
 			const { id, ...input } = args;
 			const result = await handleBylineUpdate(ec.db, id, input);
 			if (result.success) await invalidateBylines();
@@ -1004,7 +1470,7 @@ function createMcpServer(pluginTools = [], request) {
 		requireRole(extra, Role.EDITOR);
 		const ec = getEmDash(extra);
 		try {
-			const { BylineRepository } = await import("../../../byline-C8ndlnP0.mjs").then((n) => n.n);
+			const { BylineRepository } = await import("../../../byline-DYmkXqvo.mjs").then((n) => n.n);
 			if (!await new BylineRepository(ec.db).delete(args.id)) return respondError("NOT_FOUND", `Byline '${args.id}' not found`);
 			await invalidateBylines();
 			return jsonResult({ deleted: args.id });
@@ -1021,7 +1487,7 @@ function createMcpServer(pluginTools = [], request) {
 		requireScope(extra, "content:read");
 		const ec = getEmDash(extra);
 		try {
-			const { handleBylineTranslations } = await import("../../../bylines-DxjM4Usz.mjs").then((n) => n.t);
+			const { handleBylineTranslations } = await import("../../../bylines-ukLaYpVZ.mjs").then((n) => n.t);
 			return unwrap(await handleBylineTranslations(ec.db, args.id));
 		} catch (error) {
 			return respondHandlerError(error, "BYLINE_TRANSLATIONS_ERROR");
@@ -1037,7 +1503,7 @@ function createMcpServer(pluginTools = [], request) {
 		requireRole(extra, Role.EDITOR);
 		const ec = getEmDash(extra);
 		try {
-			const { SchemaRegistry } = await import("../../../schema-ILPFMPW3.mjs").then((n) => n.t);
+			const { SchemaRegistry } = await import("../../../schema-BABiRdsH.mjs").then((n) => n.t);
 			return jsonResult({ items: await new SchemaRegistry(ec.db).listCollections() });
 		} catch (error) {
 			return respondHandlerError(error, "SCHEMA_LIST_ERROR");
@@ -1045,7 +1511,7 @@ function createMcpServer(pluginTools = [], request) {
 	});
 	server.registerTool("schema_get_collection", {
 		title: "Get Collection Schema",
-		description: "Get detailed info about a collection including all field definitions. Fields describe the data model: name, type (string, text, number, boolean, datetime, portableText, image, reference, json, select, multiSelect, slug), constraints, and validation rules. Use this to understand what data content_create and content_update expect.",
+		description: "Get detailed info about a collection including all field definitions. Fields describe the data model: name, type (string, text, number, boolean, datetime, portableText, image, reference, json, select, multiSelect, slug, blocks), constraints, and validation rules. Blocks fields include every allowed and retired block type version. Use this to understand what data content_create and content_update expect.",
 		inputSchema: z.object({ slug: z.string().describe("Collection slug (e.g. 'posts'). Use schema_list_collections to see available slugs.") }),
 		annotations: { readOnlyHint: true }
 	}, async (args, extra) => {
@@ -1053,14 +1519,79 @@ function createMcpServer(pluginTools = [], request) {
 		requireRole(extra, Role.EDITOR);
 		const ec = getEmDash(extra);
 		try {
-			const { SchemaRegistry } = await import("../../../schema-ILPFMPW3.mjs").then((n) => n.t);
+			const { SchemaRegistry, expandCollectionBlockFields } = await import("../../../schema-BABiRdsH.mjs").then((n) => n.t);
 			const collection = await new SchemaRegistry(ec.db).getCollectionWithFields(args.slug);
 			if (!collection) return respondError("NOT_FOUND", `Collection '${args.slug}' not found`);
-			return jsonResult(collection);
+			return jsonResult(await expandCollectionBlockFields(ec.db, collection));
 		} catch (error) {
 			return respondHandlerError(error, "SCHEMA_GET_ERROR");
 		}
 	});
+	server.registerTool("schema_list_block_types", {
+		title: "List Block Types",
+		description: "List every database-owned block type and all retained versions.",
+		inputSchema: z.object({}),
+		annotations: { readOnlyHint: true }
+	}, async (_args, extra) => {
+		requireScope(extra, "schema:read");
+		requireRole(extra, Role.EDITOR);
+		const ec = getEmDash(extra);
+		const { handleBlockTypeList } = await import("../../../block-types-BmZmLmAD.mjs").then((n) => n.t);
+		return unwrap(await handleBlockTypeList(ec.db));
+	});
+	server.registerTool("schema_get_block_type", {
+		title: "Get Block Type",
+		description: "Get one block type, including active, inactive, and historical versions.",
+		inputSchema: z.object({ slug: z.string().describe("Block type slug") }),
+		annotations: { readOnlyHint: true }
+	}, async (args, extra) => {
+		requireScope(extra, "schema:read");
+		requireRole(extra, Role.EDITOR);
+		const ec = getEmDash(extra);
+		const { handleBlockTypeGet } = await import("../../../block-types-BmZmLmAD.mjs").then((n) => n.t);
+		return unwrap(await handleBlockTypeGet(ec.db, args.slug));
+	});
+	server.registerTool("schema_create_block_type", {
+		title: "Create Block Type",
+		description: "Create a block type with active version 1.",
+		inputSchema: z.object(createBlockTypeBody.shape)
+	}, async (args, extra) => {
+		requireScope(extra, "schema:write");
+		requireRole(extra, Role.ADMIN);
+		const ec = getEmDash(extra);
+		const { handleBlockTypeCreate } = await import("../../../block-types-BmZmLmAD.mjs").then((n) => n.t);
+		return unwrap(await handleBlockTypeCreate(ec.db, args));
+	});
+	server.registerTool("schema_update_block_type", {
+		title: "Update Block Type",
+		description: "Update presentation or compatible fields in place. Set breaking to create an inactive retained version.",
+		inputSchema: z.object({
+			slug: z.string(),
+			...updateBlockTypeBody.shape
+		})
+	}, async (args, extra) => {
+		requireScope(extra, "schema:write");
+		requireRole(extra, Role.ADMIN);
+		const ec = getEmDash(extra);
+		const { slug, ...input } = args;
+		const { handleBlockTypeUpdate } = await import("../../../block-types-BmZmLmAD.mjs").then((n) => n.t);
+		return unwrap(await handleBlockTypeUpdate(ec.db, slug, input));
+	});
+	server.registerTool("schema_activate_block_type_version", {
+		title: "Activate Block Type Version",
+		description: "Make a retained version the active version used by newly created blocks.",
+		inputSchema: z.object({
+			slug: z.string(),
+			version: z.number().int().positive(),
+			expectedFingerprint: z.string().min(1)
+		})
+	}, async (args, extra) => {
+		requireScope(extra, "schema:write");
+		requireRole(extra, Role.ADMIN);
+		const ec = getEmDash(extra);
+		const { handleBlockTypeVersionActivate } = await import("../../../block-types-BmZmLmAD.mjs").then((n) => n.t);
+		return unwrap(await handleBlockTypeVersionActivate(ec.db, args.slug, args.version, args.expectedFingerprint));
+	});
 	server.registerTool("schema_create_collection", {
 		title: "Create Collection",
 		description: "Create a new content collection (content type). This creates a database table and schema definition. The slug must be lowercase alphanumeric with underscores, starting with a letter. Supports: 'drafts' (draft/publish workflow), 'revisions' (version history), 'preview' (live preview), 'scheduling' (timed publish), 'search' (full-text indexing), and 'seo' (SEO metadata).",
@@ -1080,7 +1611,7 @@ function createMcpServer(pluginTools = [], request) {
 		requireRole(extra, Role.ADMIN);
 		const ec = getEmDash(extra);
 		try {
-			const { SchemaRegistry } = await import("../../../schema-ILPFMPW3.mjs").then((n) => n.t);
+			const { SchemaRegistry } = await import("../../../schema-BABiRdsH.mjs").then((n) => n.t);
 			const collection = await new SchemaRegistry(ec.db).createCollection({
 				slug: args.slug,
 				label: args.label,
@@ -1111,7 +1642,7 @@ function createMcpServer(pluginTools = [], request) {
 		requireRole(extra, Role.ADMIN);
 		const ec = getEmDash(extra);
 		try {
-			const { SchemaRegistry } = await import("../../../schema-ILPFMPW3.mjs").then((n) => n.t);
+			const { SchemaRegistry } = await import("../../../schema-BABiRdsH.mjs").then((n) => n.t);
 			await new SchemaRegistry(ec.db).deleteCollection(args.slug, { force: args.force });
 			ec.invalidateUrlPatternCache();
 			return jsonResult({ deleted: args.slug });
@@ -1130,7 +1661,7 @@ function createMcpServer(pluginTools = [], request) {
 		const ec = getEmDash(extra);
 		const { slug, ...input } = args;
 		try {
-			const { handleSchemaCollectionUpdate } = await import("../../../schema-DQIE9Htn.mjs").then((n) => n.h);
+			const { handleSchemaCollectionUpdate } = await import("../../../schema-Du3MzCG0.mjs").then((n) => n.h);
 			const result = await handleSchemaCollectionUpdate(ec.db, slug, input);
 			if (result.success) ec.invalidateUrlPatternCache();
 			return unwrap(result);
@@ -1140,7 +1671,7 @@ function createMcpServer(pluginTools = [], request) {
 	});
 	server.registerTool("schema_create_field", {
 		title: "Add Field to Collection",
-		description: "Add a new field to a collection's schema. This adds a column to the database table. Field types: string (short text), text (long text), number (decimal), integer, boolean, datetime, select (single choice), multiSelect (multiple), portableText (rich text), image, file, reference (link to another collection), json, slug (URL-safe id). For select/multiSelect, provide choices in validation.options array.",
+		description: "Add a new field to a collection's schema. This adds a column to the database table. Field types: string (short text), text (long text), number (decimal), integer, boolean, datetime, select (single choice), multiSelect (multiple), portableText (rich text), image, file, reference (link to another collection), json, slug (URL-safe id), or blocks. For select/multiSelect, provide choices in validation.options array.",
 		inputSchema: z.object({
 			collection: z.string().describe("Collection slug to add the field to"),
 			slug: z.string().regex(COLLECTION_SLUG_PATTERN).describe("Field identifier (lowercase letters, numbers, underscores)"),
@@ -1159,7 +1690,8 @@ function createMcpServer(pluginTools = [], request) {
 				"file",
 				"reference",
 				"json",
-				"slug"
+				"slug",
+				"blocks"
 			]).describe("Data type for this field"),
 			required: z.boolean().optional().describe("Whether the field is required (default false)"),
 			unique: z.boolean().optional().describe("Whether values must be unique (default false)"),
@@ -1170,7 +1702,10 @@ function createMcpServer(pluginTools = [], request) {
 				minLength: z.number().optional(),
 				maxLength: z.number().optional(),
 				pattern: z.string().optional(),
-				options: z.array(z.string()).optional().describe("Allowed values for select/multiSelect")
+				options: z.array(z.string()).optional().describe("Allowed values for select/multiSelect"),
+				allowedTypes: z.array(z.string()).optional().describe("Ordered block type slugs allowed by a blocks field"),
+				minItems: z.number().int().min(0).optional(),
+				maxItems: z.number().int().min(1).optional()
 			}).optional().describe("Validation constraints"),
 			options: z.object({
 				collection: z.string().optional().describe("Target collection slug for reference fields"),
@@ -1185,7 +1720,7 @@ function createMcpServer(pluginTools = [], request) {
 		requireRole(extra, Role.ADMIN);
 		const ec = getEmDash(extra);
 		try {
-			const { SchemaRegistry } = await import("../../../schema-ILPFMPW3.mjs").then((n) => n.t);
+			const { SchemaRegistry } = await import("../../../schema-BABiRdsH.mjs").then((n) => n.t);
 			return jsonResult(await new SchemaRegistry(ec.db).createField(args.collection, {
 				slug: args.slug,
 				label: args.label,
@@ -1216,7 +1751,7 @@ function createMcpServer(pluginTools = [], request) {
 		requireRole(extra, Role.ADMIN);
 		const ec = getEmDash(extra);
 		try {
-			const { SchemaRegistry } = await import("../../../schema-ILPFMPW3.mjs").then((n) => n.t);
+			const { SchemaRegistry } = await import("../../../schema-BABiRdsH.mjs").then((n) => n.t);
 			await new SchemaRegistry(ec.db).deleteField(args.collection, args.fieldSlug);
 			return jsonResult({
 				deleted: args.fieldSlug,
@@ -1237,7 +1772,7 @@ function createMcpServer(pluginTools = [], request) {
 		const ec = getEmDash(extra);
 		const { collection, fieldSlug, ...input } = args;
 		try {
-			const { handleSchemaFieldUpdate } = await import("../../../schema-DQIE9Htn.mjs").then((n) => n.h);
+			const { handleSchemaFieldUpdate } = await import("../../../schema-Du3MzCG0.mjs").then((n) => n.h);
 			return unwrap(await handleSchemaFieldUpdate(ec.db, collection, fieldSlug, input));
 		} catch (error) {
 			return respondHandlerError(error, "SCHEMA_FIELD_UPDATE_ERROR");
@@ -1261,44 +1796,25 @@ function createMcpServer(pluginTools = [], request) {
 		}));
 	});
 	server.registerTool("media_create", {
-		title: "Register Uploaded Media",
-		description: "Register a media file that has already been uploaded to storage. The caller is responsible for placing the file at `storageKey` (typically using a signed upload URL obtained from the admin UI or a separate API). This tool persists the metadata record so the file is discoverable via media_list / media_get and can be referenced by content. To upload the file itself, use media_upload (base64 data or a public URL) instead.",
-		inputSchema: z.object({
-			filename: z.string().describe("Original filename (e.g. 'logo.png')"),
-			mimeType: z.string().describe("MIME type (e.g. 'image/png')"),
-			storageKey: z.string().describe("Storage path/key the file was uploaded to"),
-			size: z.number().int().nonnegative().optional().describe("File size in bytes"),
-			width: z.number().int().positive().optional().describe("Image width in pixels"),
-			height: z.number().int().positive().optional().describe("Image height in pixels"),
-			contentHash: z.string().optional().describe("Hash of the file contents (for dedupe)"),
-			blurhash: z.string().optional().describe("Blurhash for image placeholders"),
-			dominantColor: z.string().optional().describe("Hex color string for the image's dominant color")
-		})
+		title: "Confirm Signed Media Upload",
+		description: "Confirm a file after uploading it with a signed URL obtained from POST /_emdash/api/media/upload-url. `storageKey` must be the key returned for the same user. Confirmation checks that the stored file exists and matches the size fixed when the URL was issued, then makes it available through media_list / media_get. To upload through MCP, use media_upload instead.",
+		inputSchema: z.object({ storageKey: z.string().describe("Storage key returned by the signed upload URL request") })
 	}, async (args, extra) => {
 		requireScope(extra, "media:write");
 		requireRole(extra, Role.AUTHOR);
 		const { emdash, userId } = getExtra(extra);
-		return unwrap(await emdash.handleMediaCreate({
-			filename: args.filename,
-			mimeType: args.mimeType,
+		return unwrap(await emdash.handleMediaRegisterUpload({
 			storageKey: args.storageKey,
-			size: args.size,
-			width: args.width,
-			height: args.height,
-			contentHash: args.contentHash,
-			blurhash: args.blurhash,
-			dominantColor: args.dominantColor,
 			authorId: userId
 		}));
 	});
 	server.registerTool("media_upload", {
 		title: "Upload Media",
-		description: "Upload a media file from base64-encoded data or an external URL and register it in the media library. Returns the media item with id, storageKey, and url — ready to reference from content fields (e.g. featured_image) via content_create / content_update. Uploads are deduplicated by content hash: re-uploading identical bytes returns the existing item with deduplicated: true. URL fetches must resolve to a public http(s) host (SSRF-guarded). Subject to the global upload MIME allowlist and the configured maximum upload size.",
+		description: "Upload a media file from base64-encoded data and register it in the media library. Returns the media item with id, storageKey, and url — ready to reference from content fields (e.g. featured_image) via content_create / content_update. Uploads are deduplicated by content hash: re-uploading identical bytes returns the existing item with deduplicated: true. Subject to the global upload MIME allowlist and the configured maximum upload size.",
 		inputSchema: z.object({
 			filename: z.string().min(1).describe("Filename including extension (e.g. 'cover.png')"),
-			base64: z.string().optional().describe("Base64-encoded file contents. Provide exactly one of base64 / url."),
-			url: z.url().optional().describe("Public http(s) URL to fetch the file from. Provide exactly one of base64 / url."),
-			contentType: z.string().regex(CONTENT_TYPE_RE, "Invalid content type").optional().describe("MIME type (e.g. 'image/png'). Required with base64; with url it defaults to the response's Content-Type header."),
+			base64: z.string().describe("Base64-encoded file contents."),
+			contentType: z.string().regex(CONTENT_TYPE_RE, "Invalid content type").describe("MIME type (e.g. 'image/png')."),
 			alt: z.string().optional().describe("Alt text for accessibility")
 		}),
 		annotations: { destructiveHint: false }
@@ -1311,7 +1827,6 @@ function createMcpServer(pluginTools = [], request) {
 			return unwrap(await emdash.handleMediaUpload({
 				filename: args.filename,
 				base64: args.base64,
-				url: args.url,
 				contentType: args.contentType,
 				alt: args.alt,
 				authorId: userId,
@@ -1387,7 +1902,7 @@ function createMcpServer(pluginTools = [], request) {
 			};
 		} else input = { scope: "all" };
 		try {
-			const { handleMediaUsageRepair } = await import("../../../media-usage-Bd9rFPKN.mjs").then((n) => n.o);
+			const { handleMediaUsageRepair } = await import("../../../media-usage-De-zeR9E.mjs").then((n) => n.o);
 			return unwrap(await handleMediaUsageRepair(ec.db, input));
 		} catch (error) {
 			return respondHandlerError(error, "MEDIA_USAGE_REPAIR_ERROR");
@@ -1408,7 +1923,7 @@ function createMcpServer(pluginTools = [], request) {
 		requireScope(extra, "content:read");
 		const ec = getEmDash(extra);
 		try {
-			const { searchWithDb } = await import("../../../search-D6muneha.mjs").then((n) => n.t);
+			const { searchWithDb } = await import("../../../search-Bt1PL1jf.mjs").then((n) => n.t);
 			return jsonResult(await searchWithDb(ec.db, args.query, {
 				collections: args.collections,
 				locale: args.locale,
@@ -1428,7 +1943,7 @@ function createMcpServer(pluginTools = [], request) {
 		requireScope(extra, "content:read");
 		const ec = getEmDash(extra);
 		try {
-			const { handleTaxonomyList } = await import("../../../taxonomies-Bs5dJVDJ.mjs").then((n) => n.m);
+			const { handleTaxonomyList } = await import("../../../taxonomies-C_XMoRcX.mjs").then((n) => n.m);
 			return unwrap(await handleTaxonomyList(ec.db, { locale: args.locale }));
 		} catch (error) {
 			return respondHandlerError(error, "TAXONOMY_LIST_ERROR");
@@ -1446,7 +1961,7 @@ function createMcpServer(pluginTools = [], request) {
 		requireScope(extra, "content:read");
 		const ec = getEmDash(extra);
 		try {
-			const { handleTaxonomyGet } = await import("../../../taxonomies-Bs5dJVDJ.mjs").then((n) => n.m);
+			const { handleTaxonomyGet } = await import("../../../taxonomies-C_XMoRcX.mjs").then((n) => n.m);
 			return unwrap(await handleTaxonomyGet(ec.db, args.name, { locale: args.locale }));
 		} catch (error) {
 			return respondHandlerError(error, "TAXONOMY_GET_ERROR");
@@ -1454,13 +1969,13 @@ function createMcpServer(pluginTools = [], request) {
 	});
 	server.registerTool("taxonomy_create", {
 		title: "Create Taxonomy Definition",
-		description: "Create a new taxonomy definition. Definitions are per-locale; pass `locale` when the same taxonomy name exists in multiple translations. `collections` names which content types the taxonomy applies to. If `translationOf` is set, the new definition joins the source's translation group and inherits `hierarchical` and `collections` from the source when those fields are omitted.",
+		description: "Create a taxonomy definition in one locale. `label` and `labelSingular` belong to that locale; `hierarchical` and `collections` belong to the taxonomy and are the same in every locale. `collections` names which content types the taxonomy applies to. A definition for a name that already exists in another locale joins that taxonomy and takes its `hierarchical` and `collections`; passing different values is an error (change them with taxonomy_update).",
 		inputSchema: z.object({
 			name: createTaxonomyDefBody.shape.name.describe("Taxonomy name (lowercase letters, numbers, underscores)"),
 			label: createTaxonomyDefBody.shape.label.describe("Display name"),
 			labelSingular: createTaxonomyDefBody.shape.labelSingular.describe("Singular form of the display name"),
-			hierarchical: createTaxonomyDefBody.shape.hierarchical.describe("Whether the taxonomy supports parent/child terms (defaults to false, or inherited from translationOf)"),
-			collections: createTaxonomyDefBody.shape.collections.describe("Collection slugs this taxonomy applies to (defaults to [], or inherited from translationOf)"),
+			hierarchical: createTaxonomyDefBody.shape.hierarchical.describe("Whether the taxonomy supports parent/child terms, in every locale (defaults to false; must match when the taxonomy exists in another locale)"),
+			collections: createTaxonomyDefBody.shape.collections.describe("Collection slugs this taxonomy applies to, in every locale (defaults to []; must match when the taxonomy exists in another locale)"),
 			locale: z.string().optional().describe("Locale for this definition (e.g. 'fr-fr')"),
 			translationOf: z.string().optional().describe("Existing taxonomy definition id to create this locale variant from")
 		})
@@ -1469,7 +1984,7 @@ function createMcpServer(pluginTools = [], request) {
 		requireRole(extra, Role.EDITOR);
 		const ec = getEmDash(extra);
 		try {
-			const { handleTaxonomyCreate } = await import("../../../taxonomies-Bs5dJVDJ.mjs").then((n) => n.m);
+			const { handleTaxonomyCreate } = await import("../../../taxonomies-C_XMoRcX.mjs").then((n) => n.m);
 			return unwrapAndInvalidate(extra, await handleTaxonomyCreate(ec.db, {
 				name: args.name,
 				label: args.label,
@@ -1485,13 +2000,13 @@ function createMcpServer(pluginTools = [], request) {
 	});
 	server.registerTool("taxonomy_update", {
 		title: "Update Taxonomy Definition",
-		description: "Update an existing taxonomy definition. The taxonomy `name` cannot be changed. Pass `locale` to update a specific translation; otherwise the lowest matching locale is updated. Any field may be omitted to leave it unchanged.",
+		description: "Update an existing taxonomy definition. The taxonomy `name` cannot be changed. Pass `locale` to update a specific translation's `label` and `labelSingular`; otherwise the lowest matching locale is updated. `hierarchical` and `collections` change for every locale. Any field may be omitted to leave it unchanged.",
 		inputSchema: z.object({
 			name: z.string().describe("Taxonomy name to update"),
 			label: updateTaxonomyDefBody.shape.label.describe("New display name"),
 			labelSingular: updateTaxonomyDefBody.shape.labelSingular.describe("New singular display name; pass null to clear"),
-			hierarchical: updateTaxonomyDefBody.shape.hierarchical.describe("Whether the taxonomy supports parent/child terms"),
-			collections: updateTaxonomyDefBody.shape.collections.describe("Collection slugs this taxonomy applies to"),
+			hierarchical: updateTaxonomyDefBody.shape.hierarchical.describe("Whether the taxonomy supports parent/child terms, in every locale"),
+			collections: updateTaxonomyDefBody.shape.collections.describe("Collection slugs this taxonomy applies to, in every locale"),
 			locale: z.string().optional().describe("Locale of the definition to update")
 		})
 	}, async (args, extra) => {
@@ -1499,7 +2014,7 @@ function createMcpServer(pluginTools = [], request) {
 		requireRole(extra, Role.EDITOR);
 		const ec = getEmDash(extra);
 		try {
-			const { handleTaxonomyUpdate } = await import("../../../taxonomies-Bs5dJVDJ.mjs").then((n) => n.m);
+			const { handleTaxonomyUpdate } = await import("../../../taxonomies-C_XMoRcX.mjs").then((n) => n.m);
 			return unwrapAndInvalidate(extra, await handleTaxonomyUpdate(ec.db, args.name, {
 				label: args.label,
 				labelSingular: args.labelSingular,
@@ -1521,7 +2036,7 @@ function createMcpServer(pluginTools = [], request) {
 		requireRole(extra, Role.EDITOR);
 		const ec = getEmDash(extra);
 		try {
-			const { handleTaxonomyDelete } = await import("../../../taxonomies-Bs5dJVDJ.mjs").then((n) => n.m);
+			const { handleTaxonomyDelete } = await import("../../../taxonomies-C_XMoRcX.mjs").then((n) => n.m);
 			return unwrapAndInvalidate(extra, await handleTaxonomyDelete(ec.db, args.name), [taxonomyTag(args.name)]);
 		} catch (error) {
 			return respondHandlerError(error, "TAXONOMY_DELETE_ERROR");
@@ -1541,11 +2056,11 @@ function createMcpServer(pluginTools = [], request) {
 		requireScope(extra, "content:read");
 		const ec = getEmDash(extra);
 		try {
-			const { handleTaxonomyList } = await import("../../../taxonomies-Bs5dJVDJ.mjs").then((n) => n.m);
+			const { handleTaxonomyList } = await import("../../../taxonomies-C_XMoRcX.mjs").then((n) => n.m);
 			const listResult = await handleTaxonomyList(ec.db, { locale: args.locale });
 			if (!listResult.success) return unwrap(listResult);
 			if (!listResult.data.taxonomies.find((t) => t.name === args.taxonomy)) return respondError("NOT_FOUND", `Taxonomy '${args.taxonomy}' not found`);
-			const { TaxonomyRepository } = await import("../../../taxonomy-c1Q8PMFF.mjs").then((n) => n.n);
+			const { TaxonomyRepository } = await import("../../../taxonomy-C3Fu1YeH.mjs").then((n) => n.n);
 			const repo = new TaxonomyRepository(ec.db);
 			const limit = Math.min(args.limit ?? 50, 100);
 			let cursor;
@@ -1599,14 +2114,14 @@ function createMcpServer(pluginTools = [], request) {
 			parentId: z.string().optional().describe("Parent term ID for hierarchical taxonomies"),
 			description: z.string().optional().describe("Description of the term"),
 			locale: z.string().optional().describe("Locale for the new term (e.g. 'es')"),
-			translationOf: z.string().optional().describe("Term id to join as a translation (same translation_group)")
+			translationOf: z.string().optional().describe("Term id to join as a translation (same translation_group). The new term takes that term's parent and position; a different parentId moves the term in every locale")
 		})
 	}, async (args, extra) => {
 		requireScope(extra, "taxonomies:manage");
 		requireRole(extra, Role.EDITOR);
 		const ec = getEmDash(extra);
 		try {
-			const { handleTermCreate } = await import("../../../taxonomies-Bs5dJVDJ.mjs").then((n) => n.m);
+			const { handleTermCreate } = await import("../../../taxonomies-C_XMoRcX.mjs").then((n) => n.m);
 			return unwrapAndInvalidate(extra, await handleTermCreate(ec.db, args.taxonomy, {
 				slug: args.slug,
 				label: args.label,
@@ -1636,7 +2151,7 @@ function createMcpServer(pluginTools = [], request) {
 		requireRole(extra, Role.EDITOR);
 		const ec = getEmDash(extra);
 		try {
-			const { handleTermUpdate } = await import("../../../taxonomies-Bs5dJVDJ.mjs").then((n) => n.m);
+			const { handleTermUpdate } = await import("../../../taxonomies-C_XMoRcX.mjs").then((n) => n.m);
 			return unwrapAndInvalidate(extra, await handleTermUpdate(ec.db, args.taxonomy, args.termSlug, {
 				slug: args.slug,
 				label: args.label,
@@ -1661,7 +2176,7 @@ function createMcpServer(pluginTools = [], request) {
 		requireRole(extra, Role.EDITOR);
 		const ec = getEmDash(extra);
 		try {
-			const { handleTermDelete } = await import("../../../taxonomies-Bs5dJVDJ.mjs").then((n) => n.m);
+			const { handleTermDelete } = await import("../../../taxonomies-C_XMoRcX.mjs").then((n) => n.m);
 			return unwrapAndInvalidate(extra, await handleTermDelete(ec.db, args.taxonomy, args.termSlug, { locale: args.locale }), [taxonomyTag(args.taxonomy)]);
 		} catch (error) {
 			return respondHandlerError(error, "TAXONOMY_TERM_DELETE_ERROR");
@@ -1676,7 +2191,7 @@ function createMcpServer(pluginTools = [], request) {
 		requireScope(extra, "content:read");
 		const ec = getEmDash(extra);
 		try {
-			const { handleTermTranslations } = await import("../../../taxonomies-Bs5dJVDJ.mjs").then((n) => n.m);
+			const { handleTermTranslations } = await import("../../../taxonomies-C_XMoRcX.mjs").then((n) => n.m);
 			return unwrap(await handleTermTranslations(ec.db, args.id));
 		} catch (error) {
 			return respondHandlerError(error, "TERM_TRANSLATIONS_ERROR");
@@ -1691,7 +2206,7 @@ function createMcpServer(pluginTools = [], request) {
 		requireScope(extra, "content:read");
 		const ec = getEmDash(extra);
 		try {
-			const { handleMenuList } = await import("../../../menus-DgSUodmF.mjs").then((n) => n.d);
+			const { handleMenuList } = await import("../../../menus-ITeAbcIF.mjs").then((n) => n.d);
 			return unwrap(await handleMenuList(ec.db, { locale: args.locale }));
 		} catch (error) {
 			return respondHandlerError(error, "MENU_LIST_ERROR");
@@ -1709,7 +2224,7 @@ function createMcpServer(pluginTools = [], request) {
 		requireScope(extra, "content:read");
 		const ec = getEmDash(extra);
 		try {
-			const { handleMenuGet } = await import("../../../menus-DgSUodmF.mjs").then((n) => n.d);
+			const { handleMenuGet } = await import("../../../menus-ITeAbcIF.mjs").then((n) => n.d);
 			return unwrap(await handleMenuGet(ec.db, args.name, { locale: args.locale }));
 		} catch (error) {
 			return respondHandlerError(error, "MENU_GET_ERROR");
@@ -1724,7 +2239,7 @@ function createMcpServer(pluginTools = [], request) {
 		requireScope(extra, "content:read");
 		const ec = getEmDash(extra);
 		try {
-			const { handleMenuTranslations } = await import("../../../menus-DgSUodmF.mjs").then((n) => n.d);
+			const { handleMenuTranslations } = await import("../../../menus-ITeAbcIF.mjs").then((n) => n.d);
 			return unwrap(await handleMenuTranslations(ec.db, args.id));
 		} catch (error) {
 			return respondHandlerError(error, "MENU_TRANSLATIONS_ERROR");
@@ -1744,7 +2259,7 @@ function createMcpServer(pluginTools = [], request) {
 		requireRole(extra, Role.EDITOR);
 		const ec = getEmDash(extra);
 		try {
-			const { handleMenuCreate } = await import("../../../menus-DgSUodmF.mjs").then((n) => n.d);
+			const { handleMenuCreate } = await import("../../../menus-ITeAbcIF.mjs").then((n) => n.d);
 			return unwrapAndInvalidate(extra, await handleMenuCreate(ec.db, {
 				name: args.name,
 				label: args.label,
@@ -1768,7 +2283,7 @@ function createMcpServer(pluginTools = [], request) {
 		requireRole(extra, Role.EDITOR);
 		const ec = getEmDash(extra);
 		try {
-			const { handleMenuUpdate } = await import("../../../menus-DgSUodmF.mjs").then((n) => n.d);
+			const { handleMenuUpdate } = await import("../../../menus-ITeAbcIF.mjs").then((n) => n.d);
 			return unwrapAndInvalidate(extra, await handleMenuUpdate(ec.db, args.name, {
 				label: args.label,
 				locale: args.locale
@@ -1790,7 +2305,7 @@ function createMcpServer(pluginTools = [], request) {
 		requireRole(extra, Role.EDITOR);
 		const ec = getEmDash(extra);
 		try {
-			const { handleMenuDelete } = await import("../../../menus-DgSUodmF.mjs").then((n) => n.d);
+			const { handleMenuDelete } = await import("../../../menus-ITeAbcIF.mjs").then((n) => n.d);
 			return unwrapAndInvalidate(extra, await handleMenuDelete(ec.db, args.name, { locale: args.locale }), [menuTag(args.name)]);
 		} catch (error) {
 			return respondHandlerError(error, "MENU_DELETE_ERROR");
@@ -1825,7 +2340,7 @@ function createMcpServer(pluginTools = [], request) {
 		requireRole(extra, Role.EDITOR);
 		const ec = getEmDash(extra);
 		try {
-			const { handleMenuSetItems } = await import("../../../menus-DgSUodmF.mjs").then((n) => n.d);
+			const { handleMenuSetItems } = await import("../../../menus-ITeAbcIF.mjs").then((n) => n.d);
 			return unwrapAndInvalidate(extra, await handleMenuSetItems(ec.db, args.name, args.items, { locale: args.locale }), [menuTag(args.name)]);
 		} catch (error) {
 			return respondHandlerError(error, "MENU_SET_ITEMS_ERROR");
@@ -1872,7 +2387,7 @@ function createMcpServer(pluginTools = [], request) {
 		requireRole(extra, Role.EDITOR);
 		const ec = getEmDash(extra);
 		try {
-			const { handleSettingsGet } = await import("../../../settings-DCnWtfSZ.mjs").then((n) => n.r);
+			const { handleSettingsGet } = await import("../../../settings-Dyj6v8C4.mjs").then((n) => n.r);
 			return unwrap(await handleSettingsGet(ec.db, ec.storage));
 		} catch (error) {
 			return respondHandlerError(error, "SETTINGS_READ_ERROR");
@@ -1880,12 +2395,12 @@ function createMcpServer(pluginTools = [], request) {
 	});
 	server.registerTool("settings_update", {
 		title: "Update Site Settings",
-		description: "Update one or more site-wide settings. This is a partial update: only the fields provided are changed; omitted fields are left as-is. Returns the full settings object after the update. To set a media reference (logo, favicon, seo.defaultOgImage), pass an object with `mediaId` (and optional `alt`) — the media item must already exist (use media_create first).",
+		description: "Update one or more site-wide settings. This is a partial update: only the fields provided are changed; omitted fields are left as-is. Returns the full settings object after the update. To set a media reference (logo, favicon, seo.defaultOgImage), pass an object with `mediaId` (and optional `alt`) — the media item must already exist (use media_create first), or pass null to remove it.",
 		inputSchema: z.object({
 			title: z.string().optional().describe("Site title"),
 			tagline: z.string().optional().describe("Site tagline / short description"),
-			logo: settingsMediaReferenceSchema.optional().describe("Logo media reference ({ mediaId, alt? })"),
-			favicon: settingsMediaReferenceSchema.optional().describe("Favicon media reference ({ mediaId, alt? })"),
+			logo: settingsMediaReferenceSchema.nullable().optional().describe("Logo media reference ({ mediaId, alt? }); null removes it"),
+			favicon: settingsMediaReferenceSchema.nullable().optional().describe("Favicon media reference ({ mediaId, alt? }); null removes it"),
 			url: z.union([z.url().refine((u) => HTTP_SCHEME_PATTERN.test(u), "URL must use http or https"), z.literal("")]).optional().describe("Canonical site URL (http or https). Empty string clears it."),
 			postsPerPage: z.number().int().min(1).max(100).optional().describe("Default page size for content listings"),
 			dateFormat: z.string().optional().describe("Date format token string"),
@@ -1898,12 +2413,126 @@ function createMcpServer(pluginTools = [], request) {
 		requireRole(extra, Role.ADMIN);
 		const ec = getEmDash(extra);
 		try {
-			const { handleSettingsUpdate } = await import("../../../settings-DCnWtfSZ.mjs").then((n) => n.r);
+			const { handleSettingsUpdate } = await import("../../../settings-Dyj6v8C4.mjs").then((n) => n.r);
 			return unwrapAndInvalidate(extra, await handleSettingsUpdate(ec.db, ec.storage, args), [siteSettingsTag()]);
 		} catch (error) {
 			return respondHandlerError(error, "SETTINGS_UPDATE_ERROR");
 		}
 	});
+	server.registerTool("site_transfer_capabilities", {
+		title: "Get Site Transfer Capabilities",
+		description: "Site package format versions, features, and limits this site supports, and whether it can receive an import (its portable content is empty) with the reasons it cannot. Requires any transfer scope (transfer:export, transfer:analyze, or transfer:execute).",
+		inputSchema: z.object({}),
+		annotations: { readOnlyHint: true }
+	}, async (_args, extra) => {
+		requireRole(extra, Role.ADMIN);
+		requireTransferScope(extra, "transfer:*");
+		return unwrap(await transferCapabilities(transferContext(extra)));
+	});
+	server.registerTool("site_export_start", {
+		title: "Start Site Export",
+		description: "Start exporting the whole site as a portable site package (schema, content, media, settings; never users, credentials, or secrets). Returns the operation id and status only; drive it with site_export_status. The package itself is downloaded outside MCP, from the admin or the CLI. Requires the transfer:export scope. " + APPROVAL_FLOW_DESCRIPTION,
+		inputSchema: z.object({
+			comments: z.boolean().optional().describe("Include comments and reactions (default true)"),
+			approvalId: transferApprovalIdSchema.optional()
+		})
+	}, async (args, extra) => {
+		requireRole(extra, Role.ADMIN);
+		const scoped = transferScopeHeld(extra, "transfer:export");
+		const { userId, tokenId } = getExtra(extra);
+		return unwrap(await startExport(transferContext(extra), {
+			userId,
+			tokenId
+		}, {
+			...args,
+			scoped
+		}));
+	});
+	server.registerTool("site_export_status", {
+		title: "Get Site Export Status",
+		description: "Report an export's state, stage, and progress, and once it is complete its package digest and record and media totals. By default each call also runs one bounded export step, so call it repeatedly until nextRequestInMs is null; pass advance: false to only read. Requires the transfer:export scope, or the approval that started this export (same token).",
+		inputSchema: z.object({
+			operationId: transferOperationIdSchema,
+			advance: z.boolean().optional().describe("Run one bounded export step before reporting (default true)")
+		})
+	}, async (args, extra) => {
+		requireRole(extra, Role.ADMIN);
+		await requireTransferAccess(extra, "transfer:export", "export", args.operationId);
+		return unwrap(await exportStatus(transferContext(extra), {
+			operationId: args.operationId,
+			advance: args.advance ?? true
+		}));
+	});
+	server.registerTool("site_import_analyze", {
+		title: "Analyze Site Import",
+		description: "Validate an uploaded site package against this site and produce an import plan. The package must already be uploaded over HTTP, from the admin or the CLI; MCP never carries package bytes. Each call runs one bounded analysis step: repeat until nextRequestInMs is null, then read plan (counts, principals with suggested user mappings, warnings, blockers, packageDigest, planDigest). Pass decisions to map principals or keep this site's title and tagline; that produces a new planDigest. Principal emails are never returned. Writes no site content. Requires the transfer:analyze scope.",
+		inputSchema: z.object({
+			operationId: transferOperationIdSchema,
+			decisions: siteImportDecisionsInputSchema.optional().describe("principalMappings (principal id to target user id, or null to drop the reference) and siteTitle / siteTagline ('package' or 'target'). Omitted values keep the plan defaults.")
+		})
+	}, async (args, extra) => {
+		requireRole(extra, Role.ADMIN);
+		requireTransferScope(extra, "transfer:analyze");
+		return unwrap(await analyzeImport(transferContext(extra), args));
+	});
+	server.registerTool("site_import_start", {
+		title: "Start Site Import",
+		description: "Start importing an analyzed package into this site. packageDigest and planDigest must be the values from the latest site_import_analyze plan, which must have no blockers. Returns the operation id and status; drive it with site_import_resume. The site refuses ordinary content writes until the import completes or an admin abandons it. Requires the transfer:execute scope. " + APPROVAL_FLOW_DESCRIPTION,
+		inputSchema: z.object({
+			operationId: transferOperationIdSchema,
+			packageDigest: z.string().regex(SHA256_DIGEST_PATTERN, "Expected sha256:<64 hex>").describe("Package digest from the plan"),
+			planDigest: z.string().regex(SHA256_DIGEST_PATTERN, "Expected sha256:<64 hex>").describe("Plan digest from the latest analysis"),
+			approvalId: transferApprovalIdSchema.optional()
+		}),
+		annotations: { destructiveHint: true }
+	}, async (args, extra) => {
+		requireRole(extra, Role.ADMIN);
+		const scoped = transferScopeHeld(extra, "transfer:execute");
+		const { userId, tokenId } = getExtra(extra);
+		return unwrap(await startImport(transferContext(extra), {
+			userId,
+			tokenId
+		}, {
+			operationId: args.operationId,
+			packageDigest: transferDigest(args.packageDigest),
+			planDigest: transferDigest(args.planDigest),
+			approvalId: args.approvalId,
+			scoped
+		}));
+	});
+	server.registerTool("site_import_status", {
+		title: "Get Site Import Status",
+		description: "Report an import's state, stage, progress, digests, and uploaded file counts. Does not advance the import. Requires any transfer scope, or the approval that started this import (same token).",
+		inputSchema: z.object({ operationId: transferOperationIdSchema }),
+		annotations: { readOnlyHint: true }
+	}, async (args, extra) => {
+		requireRole(extra, Role.ADMIN);
+		await requireTransferAccess(extra, "transfer:*", "import", args.operationId);
+		return unwrap(await importStatus(transferContext(extra), args.operationId));
+	});
+	server.registerTool("site_import_resume", {
+		title: "Resume Site Import",
+		description: "Run one bounded step of a started import and report its status. Call repeatedly until nextRequestInMs is null; safe to repeat after a disconnect. Requires the transfer:execute scope, or the approval that started this import (same token).",
+		inputSchema: z.object({ operationId: transferOperationIdSchema })
+	}, async (args, extra) => {
+		requireRole(extra, Role.ADMIN);
+		await requireTransferAccess(extra, "transfer:execute", "import", args.operationId);
+		const { userId, tokenId } = getExtra(extra);
+		return unwrap(await resumeImport(transferContext(extra), {
+			userId,
+			tokenId
+		}, args.operationId));
+	});
+	server.registerTool("site_import_receipt", {
+		title: "Get Site Import Receipt",
+		description: "Return the verified receipt of a completed import: package and plan digests, origin and target site ids, logical digest, record counts, warnings, and the receipt's own digest. Requires any transfer scope, or the approval that started this import (same token).",
+		inputSchema: z.object({ operationId: transferOperationIdSchema }),
+		annotations: { readOnlyHint: true }
+	}, async (args, extra) => {
+		requireRole(extra, Role.ADMIN);
+		await requireTransferAccess(extra, "transfer:*", "import", args.operationId);
+		return unwrap(await importReceipt(transferContext(extra), args.operationId));
+	});
 	return server;
 }
 
@@ -1940,6 +2569,7 @@ const POST = async ({ request, locals, cache }) => {
 				userId: user.id,
 				userRole: user.role,
 				tokenScopes: locals.tokenScopes,
+				tokenId: locals.tokenId,
 				cache
 			}
 		} });