emdash 0.37.0 → 0.39.0

package/src/mcp/server.ts

@@ -12,6 +12,7 @@
 import type { Permission, RoleLevel } from "@emdash-cms/auth";
 import { canActOnOwn, hasPermission, Permissions, Role } from "@emdash-cms/auth";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import type { APIContext } from "astro";
 import { z } from "zod";
 
 import {
@@ -30,6 +31,7 @@ import {
 import type { MediaUsageRepairRequest } from "../api/schemas/media-usage.js";
 import type { EmDashHandlers } from "../astro/types.js";
 import { hasScope } from "../auth/api-tokens.js";
+import { menuTag, siteSettingsTag, taxonomyTag } from "../cache/chrome-tags.js";
 import { convertDataForRead, convertDataForWrite } from "../client/portable-text.js";
 import type { FieldSchema } from "../client/portable-text.js";
 import { decodeCursor, InvalidCursorError } from "../database/repositories/types.js";
@@ -166,6 +168,9 @@ const schemaUpdateCollectionToolSchema = z.object({
 	hasSeo: updateCollectionBody.shape.hasSeo.describe(
 		"Whether the collection supports SEO metadata",
 	),
+	group: updateCollectionBody.shape.group.describe(
+		"Admin sidebar folder shared with other collections of the same group; pass null to move the collection back inline",
+	),
 	commentsEnabled: updateCollectionBody.shape.commentsEnabled.describe(
 		"Whether comments are enabled for this collection",
 	),
@@ -178,6 +183,9 @@ const schemaUpdateCollectionToolSchema = z.object({
 	commentsAutoApproveUsers: updateCollectionBody.shape.commentsAutoApproveUsers.describe(
 		"Whether comments from authenticated users are automatically approved",
 	),
+	editLocking: updateCollectionBody.shape.editLocking.describe(
+		"Whether opening an entry takes an edit lock that refuses other editors' writes",
+	),
 	titleField: updateCollectionBody.shape.titleField.describe(
 		"Field slug to use as the Title column in admin lists; pass null to fall back to the default",
 	),
@@ -457,6 +465,8 @@ interface EmDashExtra {
 	userRole: RoleLevel;
 	/** Token scopes — undefined for session auth (all access allowed). */
 	tokenScopes?: string[];
+	/** The route cache of the MCP request, used to invalidate the same tags the REST routes do. */
+	cache?: APIContext["cache"];
 }
 
 function isPublished(t: unknown): boolean {
@@ -480,6 +490,24 @@ function getEmDash(extra: { authInfo?: { extra?: Record<string, unknown> } }): E
 	return getExtra(extra).emdash;
 }
 
+/**
+ * Unwrap a write result, first invalidating `tags` in the route cache when the
+ * write succeeded. Pass `changedEarlier` when an earlier step of the same tool
+ * already changed live content, so a failure in a later step still invalidates.
+ */
+async function unwrapAndInvalidate(
+	extra: { authInfo?: { extra?: Record<string, unknown> } },
+	result: HandlerResult,
+	tags: string[],
+	changedEarlier = false,
+): Promise<SuccessEnvelope | ErrorEnvelope> {
+	if (result.success || changedEarlier) {
+		const { cache } = getExtra(extra);
+		if (cache?.enabled) await cache.invalidate({ tags });
+	}
+	return unwrap(result);
+}
+
 async function getCollectionFields(
 	ec: EmDashHandlers,
 	collection: string,
@@ -711,7 +739,7 @@ export function createMcpServer(
 	}) as typeof server.registerTool;
 
 	for (const tool of pluginTools) {
-		if (!(tool.permission in Permissions)) continue;
+		if (!Object.hasOwn(Permissions, tool.permission)) continue;
 		server.registerTool(
 			`${tool.pluginId}__${tool.name}`,
 			{
@@ -756,6 +784,7 @@ export function createMcpServer(
 					);
 				}
 				if (!request) return respondError("INTERNAL_ERROR", "Missing MCP request context");
+				const routeCache = payload.cache;
 				const result = await payload.emdash.handlePluginMcpTool(
 					tool.pluginId,
 					tool.name,
@@ -764,6 +793,7 @@ export function createMcpServer(
 					payload.userId,
 					request,
 					payload.user,
+					routeCache?.enabled ? (tags) => routeCache.invalidate({ tags }) : undefined,
 				);
 				if (!result.success) return unwrap(result);
 				if (tool.outputSchema) {
@@ -972,7 +1002,8 @@ export function createMcpServer(
 		async (args, extra) => {
 			requireScope(extra, "content:write");
 			requireRole(extra, Role.CONTRIBUTOR);
-			const { emdash, userId } = getExtra(extra);
+			const { emdash, userId, userRole } = getExtra(extra);
+			const actor = { id: userId, role: userRole };
 
 			// Creating a translation requires edit permission on the source item
 			if (args.translationOf) {
@@ -990,7 +1021,7 @@ export function createMcpServer(
 
 			// Publishing requires publish permission — create as draft then publish
 			if (args.status === "published") {
-				const user = { id: userId, role: getExtra(extra).userRole };
+				const user = { id: userId, role: userRole };
 				if (!hasPermission(user, "content:publish_own")) {
 					throw new EmDashAuthError(
 						"Insufficient permissions: publishing requires content:publish_own",
@@ -1005,16 +1036,26 @@ export function createMcpServer(
 					translationOf: args.translationOf,
 					bylines: args.bylines,
 					taxonomies: args.taxonomies,
+					actor,
 				});
 				if (!result.success) return unwrap(result);
 				const itemId = extractContentId(result.data);
 				if (itemId) {
-					return unwrap(await emdash.handleContentPublish(args.collection, itemId));
+					return unwrapAndInvalidate(
+						extra,
+						await emdash.handleContentPublish(args.collection, itemId, {
+							actor: { ...actor, source: "mcp" },
+							origin: { source: "mcp" },
+						}),
+						[args.collection, itemId],
+						true,
+					);
 				}
-				return unwrap(result);
+				return unwrapAndInvalidate(extra, result, [args.collection]);
 			}
 
-			return unwrap(
+			return unwrapAndInvalidate(
+				extra,
 				await emdash.handleContentCreate(args.collection, {
 					data,
 					slug: args.slug,
@@ -1023,7 +1064,9 @@ export function createMcpServer(
 					translationOf: args.translationOf,
 					bylines: args.bylines,
 					taxonomies: args.taxonomies,
+					actor,
 				}),
+				[args.collection],
 			);
 		},
 	);
@@ -1100,6 +1143,7 @@ export function createMcpServer(
 			requireScope(extra, "content:write");
 			requireRole(extra, Role.AUTHOR);
 			const { emdash, userId, userRole } = getExtra(extra);
+			const actor = { id: userId, role: userRole };
 
 			// Fetch item to check ownership
 			const existing = await emdash.handleContentGet(args.collection, args.id, args.locale);
@@ -1132,6 +1176,7 @@ export function createMcpServer(
 			if (args.status === "published") {
 				requireOwnership(extra, ownerId, "content:publish_own", "content:publish_any");
 				let rev: string | undefined = args._rev;
+				let liveChanged = false;
 				if (
 					args.data ||
 					args.slug ||
@@ -1143,7 +1188,7 @@ export function createMcpServer(
 					const updateResult = await emdash.handleContentUpdate(args.collection, resolvedId, {
 						data,
 						slug: args.slug,
-						authorId: userId,
+						actor,
 						locale: args.locale,
 						seo: args.seo,
 						bylines: args.bylines,
@@ -1152,16 +1197,25 @@ export function createMcpServer(
 						_rev: args._rev,
 					});
 					if (!updateResult.success) return unwrap(updateResult);
+					liveChanged = updateResult.liveContentChanged !== false;
 					rev = extractContentRev(updateResult.data);
 				}
-				return unwrap(
-					await emdash.handleContentPublish(args.collection, resolvedId, { _rev: rev }),
+				return unwrapAndInvalidate(
+					extra,
+					await emdash.handleContentPublish(args.collection, resolvedId, {
+						_rev: rev,
+						actor: { ...actor, source: "mcp" },
+						origin: { source: "mcp" },
+					}),
+					[args.collection, resolvedId],
+					liveChanged,
 				);
 			}
 
 			if (args.status === "draft") {
 				requireOwnership(extra, ownerId, "content:publish_own", "content:publish_any");
 				let rev: string | undefined = args._rev;
+				let liveChanged = false;
 				if (
 					args.data ||
 					args.slug ||
@@ -1173,7 +1227,7 @@ export function createMcpServer(
 					const updateResult = await emdash.handleContentUpdate(args.collection, resolvedId, {
 						data,
 						slug: args.slug,
-						authorId: userId,
+						actor,
 						locale: args.locale,
 						seo: args.seo,
 						bylines: args.bylines,
@@ -1182,26 +1236,34 @@ export function createMcpServer(
 						_rev: args._rev,
 					});
 					if (!updateResult.success) return unwrap(updateResult);
+					liveChanged = updateResult.liveContentChanged !== false;
 					rev = extractContentRev(updateResult.data);
 				}
-				return unwrap(
-					await emdash.handleContentUnpublish(args.collection, resolvedId, { _rev: rev }),
+				return unwrapAndInvalidate(
+					extra,
+					await emdash.handleContentUnpublish(args.collection, resolvedId, {
+						_rev: rev,
+						actor: { ...actor, source: "mcp" },
+						origin: { source: "mcp" },
+					}),
+					[args.collection, resolvedId],
+					liveChanged,
 				);
 			}
 
-			return unwrap(
-				await emdash.handleContentUpdate(args.collection, resolvedId, {
-					data,
-					slug: args.slug,
-					authorId: userId,
-					locale: args.locale,
-					seo: args.seo,
-					bylines: args.bylines,
-					taxonomies: args.taxonomies,
-					publishedAt: args.publishedAt,
-					_rev: args._rev,
-				}),
-			);
+			const result = await emdash.handleContentUpdate(args.collection, resolvedId, {
+				data,
+				slug: args.slug,
+				actor,
+				locale: args.locale,
+				seo: args.seo,
+				bylines: args.bylines,
+				taxonomies: args.taxonomies,
+				publishedAt: args.publishedAt,
+				_rev: args._rev,
+			});
+			if (result.liveContentChanged === false) return unwrap(result);
+			return unwrapAndInvalidate(extra, result, [args.collection, resolvedId]);
 		},
 	);
 
@@ -1237,7 +1299,10 @@ export function createMcpServer(
 			);
 
 			const resolvedId = extractContentId(existing.data) ?? args.id;
-			return unwrap(await ec.handleContentDelete(args.collection, resolvedId));
+			return unwrapAndInvalidate(extra, await ec.handleContentDelete(args.collection, resolvedId), [
+				args.collection,
+				resolvedId,
+			]);
 		},
 	);
 
@@ -1245,7 +1310,9 @@ export function createMcpServer(
 		"content_restore",
 		{
 			title: "Restore Content",
-			description: "Restore a soft-deleted content item from the trash back to its previous state.",
+			description:
+				"Restore a soft-deleted content item from the trash. It comes back as a draft " +
+				"with no schedule, even if it was published or scheduled before it was trashed.",
 			inputSchema: z.object({
 				collection: z.string().describe("Collection slug"),
 				id: z.string().describe("Content item ID or slug"),
@@ -1269,7 +1336,11 @@ export function createMcpServer(
 			);
 
 			const resolvedId = extractContentId(existing.data) ?? args.id;
-			return unwrap(await ec.handleContentRestore(args.collection, resolvedId));
+			return unwrapAndInvalidate(
+				extra,
+				await ec.handleContentRestore(args.collection, resolvedId),
+				[args.collection, resolvedId],
+			);
 		},
 	);
 
@@ -1290,7 +1361,11 @@ export function createMcpServer(
 			requireScope(extra, "content:write");
 			requireRole(extra, Role.ADMIN);
 			const ec = getEmDash(extra);
-			return unwrap(await ec.handleContentPermanentDelete(args.collection, args.id));
+			return unwrapAndInvalidate(
+				extra,
+				await ec.handleContentPermanentDelete(args.collection, args.id),
+				[args.collection, args.id],
+			);
 		},
 	);
 
@@ -1343,11 +1418,15 @@ export function createMcpServer(
 			}
 
 			const resolvedId = extractContentId(existing.data) ?? args.id;
-			return unwrap(
+			return unwrapAndInvalidate(
+				extra,
 				await emdash.handleContentPublish(args.collection, resolvedId, {
 					publishedAt: args.publishedAt,
 					_rev: args._rev,
+					actor: { id: userId, role: userRole, source: "mcp" },
+					origin: { source: "mcp" },
 				}),
+				[args.collection, resolvedId],
 			);
 		},
 	);
@@ -1358,7 +1437,8 @@ export function createMcpServer(
 			title: "Unpublish Content",
 			description:
 				"Unpublish a content item, reverting it to draft status. It will no " +
-				"longer be visible on the live site, but its content and publication date are preserved.",
+				"longer be visible on the live site, but its content and publication date are preserved. " +
+				"Any pending schedule is cancelled.",
 			inputSchema: z.object({
 				collection: z.string().describe("Collection slug"),
 				id: z.string().describe("Content item ID or slug"),
@@ -1368,7 +1448,7 @@ export function createMcpServer(
 		async (args, extra) => {
 			requireScope(extra, "content:write");
 			requireRole(extra, Role.AUTHOR);
-			const ec = getEmDash(extra);
+			const { emdash: ec, userId, userRole } = getExtra(extra);
 
 			// Fetch item to check ownership
 			const existing = await ec.handleContentGet(args.collection, args.id);
@@ -1383,8 +1463,14 @@ export function createMcpServer(
 			);
 
 			const resolvedId = extractContentId(existing.data) ?? args.id;
-			return unwrap(
-				await ec.handleContentUnpublish(args.collection, resolvedId, { _rev: args._rev }),
+			return unwrapAndInvalidate(
+				extra,
+				await ec.handleContentUnpublish(args.collection, resolvedId, {
+					_rev: args._rev,
+					actor: { id: userId, role: userRole, source: "mcp" },
+					origin: { source: "mcp" },
+				}),
+				[args.collection, resolvedId],
 			);
 		},
 	);
@@ -1400,15 +1486,16 @@ export function createMcpServer(
 			inputSchema: z.object({
 				collection: z.string().describe("Collection slug"),
 				id: z.string().describe("Content item ID or slug"),
-				scheduledAt: z
-					.string()
-					.describe("ISO 8601 datetime for publication (e.g. '2025-06-01T09:00:00Z')"),
+				_rev: z.string({ error: REV_MISSING_ERROR }).describe(REV_PARAM_DESCRIPTION),
+				scheduledAt: contentDateTimeInputSchema.describe(
+					"ISO 8601 datetime for publication (e.g. '2025-06-01T09:00:00Z')",
+				),
 			}),
 		},
 		async (args, extra) => {
 			requireScope(extra, "content:write");
 			requireRole(extra, Role.AUTHOR);
-			const ec = getEmDash(extra);
+			const { emdash: ec, userId, userRole } = getExtra(extra);
 
 			// Fetch item to check ownership
 			const existing = await ec.handleContentGet(args.collection, args.id);
@@ -1423,7 +1510,15 @@ export function createMcpServer(
 			);
 
 			const resolvedId = extractContentId(existing.data) ?? args.id;
-			return unwrap(await ec.handleContentSchedule(args.collection, resolvedId, args.scheduledAt));
+			return unwrapAndInvalidate(
+				extra,
+				await ec.handleContentSchedule(args.collection, resolvedId, args.scheduledAt, {
+					_rev: args._rev,
+					actor: { id: userId, role: userRole, source: "mcp" },
+					origin: { source: "mcp" },
+				}),
+				[args.collection, resolvedId],
+			);
 		},
 	);
 
@@ -1432,9 +1527,9 @@ export function createMcpServer(
 		{
 			title: "Cancel Scheduled Publication",
 			description:
-				"Cancel a previously scheduled publication. The item remains in its current " +
-				"status (typically 'draft' or 'scheduled'); only the scheduledAt timestamp is " +
-				"cleared. Idempotent — calling on an item that isn't scheduled is a no-op.",
+				"Cancel a previously scheduled publication. Scheduled drafts return to draft status; " +
+				"published items stay published. The scheduledAt timestamp is cleared. Idempotent — " +
+				"calling on an item that isn't scheduled is a no-op.",
 			inputSchema: z.object({
 				collection: z.string().describe("Collection slug"),
 				id: z.string().describe("Content item ID or slug"),
@@ -1457,7 +1552,11 @@ export function createMcpServer(
 			);
 
 			const resolvedId = extractContentId(existing.data) ?? args.id;
-			return unwrap(await ec.handleContentUnschedule(args.collection, resolvedId));
+			return unwrapAndInvalidate(
+				extra,
+				await ec.handleContentUnschedule(args.collection, resolvedId),
+				[args.collection, resolvedId],
+			);
 		},
 	);
 
@@ -1488,8 +1587,8 @@ export function createMcpServer(
 		{
 			title: "Discard Draft",
 			description:
-				"Discard the current draft changes and revert to the last published " +
-				"version. Only works on items that have been published at least once.",
+				"Discard the current draft revision. Published content reverts to its live " +
+				"version; an item without a pending draft is unchanged.",
 			inputSchema: z.object({
 				collection: z.string().describe("Collection slug"),
 				id: z.string().describe("Content item ID or slug"),
@@ -1515,8 +1614,10 @@ export function createMcpServer(
 			);
 
 			const resolvedId = extractContentId(existing.data) ?? args.id;
-			return unwrap(
+			return unwrapAndInvalidate(
+				extra,
 				await ec.handleContentDiscardDraft(args.collection, resolvedId, { _rev: args._rev }),
+				[args.collection, resolvedId],
 			);
 		},
 	);
@@ -1565,7 +1666,9 @@ export function createMcpServer(
 			requireScope(extra, "content:write");
 			requireRole(extra, Role.CONTRIBUTOR);
 			const ec = getEmDash(extra);
-			return unwrap(await ec.handleContentDuplicate(args.collection, args.id));
+			return unwrapAndInvalidate(extra, await ec.handleContentDuplicate(args.collection, args.id), [
+				args.collection,
+			]);
 		},
 	);
 
@@ -1877,6 +1980,12 @@ export function createMcpServer(
 				routable: createCollectionBody.shape.routable.describe(
 					"Require a slug before publishing (default: true)",
 				),
+				editLocking: createCollectionBody.shape.editLocking.describe(
+					"Take an edit lock when an entry is opened (default: true)",
+				),
+				group: createCollectionBody.shape.group.describe(
+					"Admin sidebar folder shared with other collections of the same group",
+				),
 			}),
 		},
 		async (args, extra) => {
@@ -1896,6 +2005,8 @@ export function createMcpServer(
 					// ['drafts', 'revisions'] when undefined; pass through verbatim.
 					supports: args.supports,
 					routable: args.routable,
+					editLocking: args.editLocking,
+					group: args.group,
 				});
 				ec.invalidateUrlPatternCache();
 				return jsonResult(collection);
@@ -2249,9 +2360,8 @@ export function createMcpServer(
 				return respondError("NO_STORAGE", "Storage not configured");
 			}
 			try {
-				const { handleMediaUpload } = await import("../api/handlers/media-upload.js");
 				return unwrap(
-					await handleMediaUpload(emdash.db, emdash.storage, {
+					await emdash.handleMediaUpload({
 						filename: args.filename,
 						base64: args.base64,
 						url: args.url,
@@ -2543,7 +2653,8 @@ export function createMcpServer(
 			const ec = getEmDash(extra);
 			try {
 				const { handleTaxonomyCreate } = await import("../api/handlers/taxonomies.js");
-				return unwrap(
+				return unwrapAndInvalidate(
+					extra,
 					await handleTaxonomyCreate(ec.db, {
 						name: args.name,
 						label: args.label,
@@ -2553,6 +2664,7 @@ export function createMcpServer(
 						locale: args.locale,
 						translationOf: args.translationOf,
 					}),
+					[taxonomyTag(args.name)],
 				);
 			} catch (error) {
 				return respondHandlerError(error, "TAXONOMY_CREATE_ERROR");
@@ -2590,7 +2702,8 @@ export function createMcpServer(
 			const ec = getEmDash(extra);
 			try {
 				const { handleTaxonomyUpdate } = await import("../api/handlers/taxonomies.js");
-				return unwrap(
+				return unwrapAndInvalidate(
+					extra,
 					await handleTaxonomyUpdate(ec.db, args.name, {
 						label: args.label,
 						labelSingular: args.labelSingular,
@@ -2598,6 +2711,7 @@ export function createMcpServer(
 						collections: args.collections,
 						locale: args.locale,
 					}),
+					[taxonomyTag(args.name)],
 				);
 			} catch (error) {
 				return respondHandlerError(error, "TAXONOMY_UPDATE_ERROR");
@@ -2623,7 +2737,9 @@ export function createMcpServer(
 			const ec = getEmDash(extra);
 			try {
 				const { handleTaxonomyDelete } = await import("../api/handlers/taxonomies.js");
-				return unwrap(await handleTaxonomyDelete(ec.db, args.name));
+				return unwrapAndInvalidate(extra, await handleTaxonomyDelete(ec.db, args.name), [
+					taxonomyTag(args.name),
+				]);
 			} catch (error) {
 				return respondHandlerError(error, "TAXONOMY_DELETE_ERROR");
 			}
@@ -2756,7 +2872,8 @@ export function createMcpServer(
 			const ec = getEmDash(extra);
 			try {
 				const { handleTermCreate } = await import("../api/handlers/taxonomies.js");
-				return unwrap(
+				return unwrapAndInvalidate(
+					extra,
 					await handleTermCreate(ec.db, args.taxonomy, {
 						slug: args.slug,
 						label: args.label,
@@ -2765,6 +2882,7 @@ export function createMcpServer(
 						locale: args.locale,
 						translationOf: args.translationOf,
 					}),
+					[taxonomyTag(args.taxonomy)],
 				);
 			} catch (error) {
 				return respondHandlerError(error, "TAXONOMY_TERM_CREATE_ERROR");
@@ -2783,7 +2901,9 @@ export function createMcpServer(
 				"parent must exist, belong to the same taxonomy, and not introduce a cycle " +
 				"(a term cannot be its own ancestor). The new parent's ancestor chain must " +
 				"not exceed 100 levels — reparenting under a chain of 100+ ancestors is " +
-				"rejected.",
+				"rejected. Translations of a term can share a slug: pass `locale` to " +
+				"update a specific translation; otherwise the lowest matching locale is " +
+				"updated.",
 			inputSchema: z.object({
 				taxonomy: z.string().describe("Taxonomy name (e.g. 'categories', 'tags')"),
 				termSlug: z.string().describe("Current slug of the term to update"),
@@ -2791,6 +2911,7 @@ export function createMcpServer(
 				label: z.string().optional().describe("New display name"),
 				parentId: z.string().nullable().optional().describe("New parent term ID; null to detach"),
 				description: z.string().optional().describe("New description"),
+				locale: z.string().optional().describe("Locale of the term to update (e.g. 'fr')"),
 			}),
 		},
 		async (args, extra) => {
@@ -2799,13 +2920,21 @@ export function createMcpServer(
 			const ec = getEmDash(extra);
 			try {
 				const { handleTermUpdate } = await import("../api/handlers/taxonomies.js");
-				return unwrap(
-					await handleTermUpdate(ec.db, args.taxonomy, args.termSlug, {
-						slug: args.slug,
-						label: args.label,
-						parentId: args.parentId,
-						description: args.description,
-					}),
+				return unwrapAndInvalidate(
+					extra,
+					await handleTermUpdate(
+						ec.db,
+						args.taxonomy,
+						args.termSlug,
+						{
+							slug: args.slug,
+							label: args.label,
+							parentId: args.parentId,
+							description: args.description,
+						},
+						{ locale: args.locale },
+					),
+					[taxonomyTag(args.taxonomy)],
 				);
 			} catch (error) {
 				return respondHandlerError(error, "TAXONOMY_TERM_UPDATE_ERROR");
@@ -2820,10 +2949,13 @@ export function createMcpServer(
 			description:
 				"Permanently delete a term from a taxonomy. Any content tagged with this " +
 				"term loses the association. Cannot delete a term that has children — " +
-				"delete children first.",
+				"delete children first. Translations of a term can share a slug: pass " +
+				"`locale` to delete a specific translation; otherwise the lowest matching " +
+				"locale is deleted.",
 			inputSchema: z.object({
 				taxonomy: z.string().describe("Taxonomy name"),
 				termSlug: z.string().describe("Slug of the term to delete"),
+				locale: z.string().optional().describe("Locale of the term to delete (e.g. 'fr')"),
 			}),
 			annotations: { destructiveHint: true },
 		},
@@ -2833,7 +2965,11 @@ export function createMcpServer(
 			const ec = getEmDash(extra);
 			try {
 				const { handleTermDelete } = await import("../api/handlers/taxonomies.js");
-				return unwrap(await handleTermDelete(ec.db, args.taxonomy, args.termSlug));
+				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");
 			}
@@ -2972,13 +3108,15 @@ export function createMcpServer(
 			const ec = getEmDash(extra);
 			try {
 				const { handleMenuCreate } = await import("../api/handlers/menus.js");
-				return unwrap(
+				return unwrapAndInvalidate(
+					extra,
 					await handleMenuCreate(ec.db, {
 						name: args.name,
 						label: args.label,
 						locale: args.locale,
 						translationOf: args.translationOf,
 					}),
+					[menuTag(args.name)],
 				);
 			} catch (error) {
 				return respondHandlerError(error, "MENU_CREATE_ERROR");
@@ -3005,8 +3143,10 @@ export function createMcpServer(
 			const ec = getEmDash(extra);
 			try {
 				const { handleMenuUpdate } = await import("../api/handlers/menus.js");
-				return unwrap(
+				return unwrapAndInvalidate(
+					extra,
 					await handleMenuUpdate(ec.db, args.name, { label: args.label, locale: args.locale }),
+					[menuTag(args.name)],
 				);
 			} catch (error) {
 				return respondHandlerError(error, "MENU_UPDATE_ERROR");
@@ -3033,7 +3173,11 @@ export function createMcpServer(
 			const ec = getEmDash(extra);
 			try {
 				const { handleMenuDelete } = await import("../api/handlers/menus.js");
-				return unwrap(await handleMenuDelete(ec.db, args.name, { locale: args.locale }));
+				return unwrapAndInvalidate(
+					extra,
+					await handleMenuDelete(ec.db, args.name, { locale: args.locale }),
+					[menuTag(args.name)],
+				);
 			} catch (error) {
 				return respondHandlerError(error, "MENU_DELETE_ERROR");
 			}
@@ -3096,8 +3240,10 @@ export function createMcpServer(
 			const ec = getEmDash(extra);
 			try {
 				const { handleMenuSetItems } = await import("../api/handlers/menus.js");
-				return unwrap(
+				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");
@@ -3257,7 +3403,9 @@ export function createMcpServer(
 			const ec = getEmDash(extra);
 			try {
 				const { handleSettingsUpdate } = await import("../api/handlers/settings.js");
-				return unwrap(await handleSettingsUpdate(ec.db, ec.storage, args));
+				return unwrapAndInvalidate(extra, await handleSettingsUpdate(ec.db, ec.storage, args), [
+					siteSettingsTag(),
+				]);
 			} catch (error) {
 				return respondHandlerError(error, "SETTINGS_UPDATE_ERROR");
 			}