@contentrain/mcp 1.11.0 → 2.0.1

package/dist/{server-DSEl2wzT.mjs → server-DKbnhtvV.mjs}

@@ -1,23 +1,23 @@
-import { i as planContentDelete, n as planModelDelete, r as planContentSave, t as planModelSave } from "./ops-B422KP_S.mjs";
+import { i as planContentDelete, n as planModelDelete, r as planContentSave, t as planModelSave } from "./ops-CGKIKwDc.mjs";
 import { n as contentFilePath, t as contentDirPath } from "./paths-CmVw5Cw2.mjs";
 import { a as readJson, n as ensureDir, r as pathExists, s as writeJson, t as contentrainDir } from "./fs-DLbVB-Ek.mjs";
 import { a as writeMetaEntries, i as writeMeta, r as readMeta } from "./meta-manager-CJUiTgP2.mjs";
 import { n as readVocabulary, t as readConfig } from "./config-oxxgznz7.mjs";
-import { S as writeContent, _ as resolveMdFilePath, a as fieldDefZodSchema, c as validateModelDefinition, d as listContent, g as resolveLocaleStrategy, h as resolveJsonFilePath, l as writeModel, m as resolveContentDir, n as checkReferences, o as listModels, r as countEntries, s as readModel, u as deleteContent } from "./model-manager-SiesTJrS.mjs";
-import { n as readContext } from "./context-CrS-IvVm.mjs";
+import { S as writeContent, _ as resolveMdFilePath, a as fieldDefZodSchema, c as validateModelDefinition, d as listContent, g as resolveLocaleStrategy, h as resolveJsonFilePath, l as writeModel, m as resolveContentDir, n as checkReferences, o as listModels, r as countEntries, s as readModel, u as deleteContent } from "./model-manager-DP2CZiMT.mjs";
+import { n as readContext } from "./context-DjglDPvj.mjs";
 import { a as deleteRemoteBranch, c as pruneMergedRemoteBranches, i as cleanupMergedBranches, n as checkBranchHealth, s as listRemoteCrBranches } from "./branch-lifecycle-BAfgSQBv.mjs";
-import { i as mergeBranch, n as createTransaction, r as ensureContentBranch, t as buildBranchName } from "./transaction-BHOsiEn1.mjs";
-import { n as isMerged, t as LocalProvider } from "./local-DqmDeNxI.mjs";
+import { i as mergeBranch, n as createTransaction, r as ensureContentBranch, t as buildBranchName } from "./transaction-DC_dNON9.mjs";
+import { n as isMerged, t as LocalProvider } from "./local-EJTxd5MR.mjs";
 import { n as isToolAvailable, t as TOOL_REQUIREMENTS } from "./availability-sWWRz2W0.mjs";
 import { t as detectStack } from "./detect-wVSI9VuY.mjs";
 import { t as TOOL_ANNOTATIONS } from "./annotations-D3tlsF38.mjs";
 import { n as listTemplates, t as getTemplate } from "./templates-D6EllixQ.mjs";
-import { t as validateProject } from "./validator-Ck0puppQ.mjs";
+import { t as validateProject } from "./validator-D5VncJ8M.mjs";
 import { t as OverlayReader } from "./overlay-reader-BOb105gS.mjs";
 import { t as buildGraph } from "./graph-builder-CRUX_8mA.mjs";
 import { n as scanSummary, t as scanCandidates } from "./scanner-VOwrKLGC.mjs";
-import { n as applyExtract, r as applyReuse } from "./apply-manager-tRqDkzBV.mjs";
-import { t as runDoctor } from "./doctor-BRPXxKhx.mjs";
+import { n as applyExtract, r as applyReuse } from "./apply-manager-a5l93F4O.mjs";
+import { t as runDoctor } from "./doctor-pw8EWRFR.mjs";
 import { join } from "node:path";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { CONTENTRAIN_BRANCH } from "@contentrain/types";
@@ -830,7 +830,7 @@ function registerModelTools(server, provider, projectRoot) {
 			}],
 			isError: true
 		};
-		const errors = validateModel(input);
+		const { errors, warnings: schemaWarnings } = validateModel(input);
 		if (errors.length > 0) return {
 			content: [{
 				type: "text",
@@ -924,6 +924,7 @@ function registerModelTools(server, provider, projectRoot) {
 					valid: true,
 					errors: []
 				},
+				...schemaWarnings.length > 0 ? { schema_warnings: schemaWarnings } : {},
 				git: {
 					branch,
 					action: workflowAction,
@@ -934,7 +935,7 @@ function registerModelTools(server, provider, projectRoot) {
 				content_path: contentPath + "/",
 				...displayPath ? { example_file: displayPath } : {},
 				...importSnippet ? { import_snippet: importSnippet } : {},
-				next_steps: ["Add content with contentrain_content_save"]
+				next_steps: [...schemaWarnings.length > 0 ? ["REVIEW: see schema_warnings — some declared constraints are not enforced by MCP"] : [], "Add content with contentrain_content_save"]
 			}, null, 2)
 		}] };
 	});
@@ -1133,6 +1134,19 @@ function registerContentTools(server, provider, projectRoot) {
 			};
 		}
 		const entryIds = plan.result.map((r) => r.id ?? r.slug ?? r.locale).filter((v) => Boolean(v));
+		const validationResult = await validateProject(new OverlayReader(provider, plan.changes), { model: input.model });
+		const blocking = validationResult.issues.filter((i) => i.severity === "error" && touchesSavedEntries(i, plan.result));
+		if (blocking.length > 0) return {
+			content: [{
+				type: "text",
+				text: JSON.stringify({
+					error: "Validation failed — nothing was written.",
+					issues: blocking.map(describeIssue),
+					hint: "Fix the values and call contentrain_content_save again. Nothing was committed, so there is no branch to clean up."
+				}, null, 2)
+			}],
+			isError: true
+		};
 		const branch = buildBranchName("content", input.model);
 		const message = `[contentrain] content: ${input.model}`;
 		const contextPayload = {
@@ -1163,8 +1177,8 @@ function registerContentTools(server, provider, projectRoot) {
 				isError: true
 			};
 		}
-		const validationResult = await validateProject(new OverlayReader(provider, plan.changes), { model: input.model });
 		const allAdvisories = plan.result.flatMap((r) => r.advisories ?? []);
+		const warnings = validationResult.issues.filter((i) => i.severity === "warning" && touchesSavedEntries(i, plan.result)).map((i) => `${i.field ?? i.locale}: ${i.message}`);
 		return { content: [{
 			type: "text",
 			text: JSON.stringify({
@@ -1181,14 +1195,15 @@ function registerContentTools(server, provider, projectRoot) {
 					advisories: allAdvisories,
 					advisory_note: "Save succeeded. Review these warnings and consider consolidating duplicate values."
 				} : {},
+				...warnings.length > 0 ? { warnings } : {},
 				validation: {
-					valid: validationResult.valid,
-					errors: validationResult.issues.filter((i) => i.severity === "error").map((i) => i.message)
+					valid: true,
+					errors: []
 				},
 				context_updated: true,
 				next_steps: [
 					...allAdvisories.length > 0 ? ["ADVISORY: Duplicate values detected — review advisories above"] : [],
-					...!validationResult.valid ? ["WARNING: Content has validation errors — run contentrain_validate for details"] : [],
+					...warnings.length > 0 ? ["REVIEW: see warnings above — the save was not blocked by them"] : [],
 					...model.kind === "collection" ? ["Use contentrain_content_list to verify", "Add more entries or publish"] : ["Use contentrain_content_list to verify"]
 				]
 			}, null, 2)
@@ -1345,6 +1360,35 @@ function registerContentTools(server, provider, projectRoot) {
 		}
 	});
 }
+/** Trim a validation issue to the fields that locate it, dropping empty ones. */
+function describeIssue(issue) {
+	const out = {};
+	if (issue.entry) out["entry"] = issue.entry;
+	if (issue.slug) out["slug"] = issue.slug;
+	if (issue.locale) out["locale"] = issue.locale;
+	if (issue.field) out["field"] = issue.field;
+	out["message"] = issue.message;
+	return out;
+}
+/**
+* Does a validation issue belong to one of the entries this save is writing?
+*
+* The write gate blocks on errors, but `validateProject` inspects the whole model.
+* Without this filter, a pre-existing bad entry somewhere else in the model would
+* block an unrelated — and perfectly valid — save, leaving the caller stuck behind
+* a problem they did not create and may not be able to fix.
+*
+* Matching is by identity: entry ID for collections, slug for documents, and
+* locale alone for singletons and dictionaries, which have one record per locale.
+*/
+function touchesSavedEntries(issue, results) {
+	return results.some((r) => {
+		if (issue.locale && r.locale && issue.locale !== r.locale) return false;
+		if (r.id) return issue.entry === r.id;
+		if (r.slug) return issue.slug === r.slug;
+		return !issue.entry && !issue.slug;
+	});
+}
 //#endregion
 //#region src/tools/workflow.ts
 /**
@@ -1391,9 +1435,9 @@ async function resolveMergeBranch(git, input) {
 	}))).toSorted((left, right) => right.t - left.t)[0].b };
 }
 function registerWorkflowTools(server, provider, projectRoot) {
-	server.tool("contentrain_validate", "Validate project content against model schemas. Detects required field violations, type mismatches, broken relations, secret leaks, i18n parity issues, and more. If fix:true, auto-fixes structural issues (canonical sort, orphan meta, missing locale files) — do NOT manually edit .contentrain/ files.", {
+	server.tool("contentrain_validate", "Validate project content against model schemas. Detects required field violations, type mismatches, broken relations, secret leaks, i18n parity issues, and more. If fix:true, auto-fixes structural issues (canonical sort, orphan meta, missing locale files, stray non-i18n meta layout) — do NOT manually edit .contentrain/ files.", {
 		model: z.string().optional().describe("Model ID to validate (omit for all models)"),
-		fix: z.boolean().optional().describe("Auto-fix structural issues (canonical sort, orphan meta, missing locale files). Default: false")
+		fix: z.boolean().optional().describe("Auto-fix structural issues (canonical sort, orphan meta, missing locale files, stray non-i18n meta layout). Default: false")
 	}, TOOL_ANNOTATIONS["contentrain_validate"], async (input) => {
 		if (input.fix && !projectRoot) return capabilityError("contentrain_validate", "localWorktree");
 		if (!await readConfig(provider)) return {
@@ -2557,7 +2601,7 @@ function registerMediaTools(server, provider, _projectRoot) {
 }
 //#endregion
 //#region package.json
-var version = "1.11.0";
+var version = "2.0.1";
 //#endregion
 //#region src/server.ts
 /**
@@ -2627,4 +2671,4 @@ function resolveServerContext(input) {
 //#endregion
 export { createServer as n, DEFAULT_INSTRUCTIONS as t };
 
-//# sourceMappingURL=server-DSEl2wzT.mjs.map
+//# sourceMappingURL=server-DKbnhtvV.mjs.map