@contentrain/mcp 2.3.1 → 3.0.1

package/dist/{server-CUZnuHQx.mjs → server-D-zJWbdI.mjs}

@@ -1,29 +1,30 @@
-import { i as planContentDelete, n as planModelDelete, r as planContentSave, t as planModelSave } from "./ops-CGKIKwDc.mjs";
+import { a as planContentSave, i as planModelDelete, n as planVocabularySave, o as planContentDelete, r as planModelSave, t as planVocabularyDelete } from "./ops-BzbThweu.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-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-1SPznNt3.mjs";
-import { n as isMerged, t as LocalProvider } from "./local-8dJ5NIWL.mjs";
-import { n as isToolAvailable, t as TOOL_REQUIREMENTS } from "./availability-sWWRz2W0.mjs";
-import { t as detectStack } from "./detect-CdDU4Ew_.mjs";
-import { t as TOOL_ANNOTATIONS } from "./annotations-D3tlsF38.mjs";
-import { n as listTemplates, t as getTemplate } from "./templates-D6EllixQ.mjs";
-import { n as mapProviderError } from "./errors-e0YdjooK.mjs";
-import { t as validateProject } from "./validator-ChiYk6ap.mjs";
-import { t as OverlayReader } from "./overlay-reader-DNaVsgiS.mjs";
-import { t as buildGraph } from "./graph-builder-DK4Mh8Tn.mjs";
-import { n as scanSummary, t as scanCandidates } from "./scanner-CGWhmpDz.mjs";
-import { n as applyExtract, r as applyReuse } from "./apply-manager-SLCRLHN_.mjs";
-import { t as runDoctor } from "./doctor-BwJ_nmqS.mjs";
+import { a as writeMeta, i as readMeta, o as writeMetaEntries, r as mergeEntryMeta, t as applyStatusChange } from "./meta-manager-B_Se183X.mjs";
+import { r as createGit } from "./identity-D8QoGxhT.mjs";
+import { n as readVocabulary, t as readConfig } from "./config-VlRKRwAS.mjs";
+import { a as deleteRemoteBranch, c as pruneMergedRemoteBranches, i as cleanupMergedBranches, n as checkBranchHealth, s as listRemoteCrBranches } from "./branch-lifecycle-B6PXZ2N7.mjs";
+import { T as writeContent, _ as resolveContentDir, b as resolveMdFilePath, c as listModels, d as validateModelDefinition, f as writeModel, i as countEntries, l as readModel, m as listContent, o as fieldDefZodSchema, p as deleteContent, r as checkReferences, v as resolveJsonFilePath, y as resolveLocaleStrategy } from "./model-manager-DgyKMjLN.mjs";
+import { n as readContext } from "./context-C3x6I3cE.mjs";
+import { i as mergeBranch, n as createTransaction, r as ensureContentBranch, t as buildBranchName } from "./transaction-BW9ektWu.mjs";
+import { n as isMerged, t as LocalProvider } from "./local-Db5X9mjZ.mjs";
+import { n as isToolAvailable, t as TOOL_REQUIREMENTS } from "./availability-Dgcmvv99.mjs";
+import { t as detectStack } from "./detect-B0oXbQaP.mjs";
+import { t as TOOL_ANNOTATIONS } from "./annotations-C-tQVmot.mjs";
+import { n as listTemplates, t as getTemplate } from "./templates-CAkTIRkE.mjs";
+import { n as mapProviderError } from "./errors-CvBS12e7.mjs";
+import { t as validateProject } from "./validator-0sJ9vh1j.mjs";
+import { t as OverlayReader } from "./overlay-reader-CkU_pGXZ.mjs";
+import { t as buildGraph } from "./graph-builder-BEocwW13.mjs";
+import { n as scanSummary, t as scanCandidates } from "./scanner-BSvXjfkp.mjs";
+import { n as applyExtract, r as applyReuse } from "./apply-manager-BybvnUVC.mjs";
+import { t as runDoctor } from "./doctor-DNPuGgcg.mjs";
 import { join } from "node:path";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { CONTENTRAIN_BRANCH } from "@contentrain/types";
 import { appendFile, readFile, writeFile } from "node:fs/promises";
-import { simpleGit } from "simple-git";
+import "simple-git";
 import { z } from "zod";
 //#region src/tools/context.ts
 function registerContextTools(server, provider, projectRoot) {
@@ -127,6 +128,7 @@ function registerContextTools(server, provider, projectRoot) {
 			kind: modelDef.kind,
 			domain: modelDef.domain,
 			i18n: modelDef.i18n,
+			title_field: modelDef.title_field,
 			description: modelDef.description,
 			fields: modelDef.fields,
 			stats: {
@@ -167,6 +169,24 @@ function registerContextTools(server, provider, projectRoot) {
 						".contentrain/meta/{model-id}/": "Metadata files per model (status, source, timestamps)"
 					}
 				},
+				model_definition: {
+					description: "Shape of .contentrain/models/{model-id}.json. Keys are written in this order.",
+					required: {
+						id: "Kebab-case model ID, matching the file name.",
+						name: "Human-readable display name.",
+						kind: "One of: singleton, collection, document, dictionary.",
+						domain: "Organizational group; maps to the content subdirectory.",
+						i18n: "Whether the model stores content per locale.",
+						title_field: "Name of the field shown as an entry title in listings, pickers and relation references. Must name a field declared on this model whose type is one of: string, text, slug, email, url, code, markdown, richtext. Dictionary models have no fields — they use the reserved value \"key\", meaning the entry key is the title."
+					},
+					optional: {
+						description: "Model description for documentation and agent context.",
+						fields: "Field definitions. Dictionary models must NOT declare fields.",
+						content_path: "Framework-relative path for content files, replacing .contentrain/content/.",
+						locale_strategy: "How locale is encoded in file names: file (default), suffix, directory, none."
+					},
+					note: "title_field is declared, never inferred. A consumer that guesses the title from field order or length picks the icon over the headline — set it explicitly on create AND keep it correct when renaming or removing fields."
+				},
 				model_kinds: {
 					collection: {
 						description: "Multiple entries stored as an object-map keyed by entry ID",
@@ -269,12 +289,27 @@ function registerContextTools(server, provider, projectRoot) {
 					file: ".contentrain/vocabulary.json",
 					format: {
 						version: "number",
-						terms: "Record<category, Record<slug, translation_value>>"
+						terms: "Record<term-slug, Record<locale, translation>>"
+					},
+					example: {
+						version: 1,
+						terms: {
+							"sign-in": {
+								en: "Sign in",
+								tr: "Giriş yap"
+							},
+							"add-to-cart": {
+								en: "Add to cart",
+								tr: "Sepete ekle"
+							}
+						}
 					},
+					note: "OUTER key is the term (kebab-case, locale-independent); INNER key is a locale code. One term, one entry, all its translations inside. Grouping by locale at the top level is the common mistake and produces a vocabulary that matches nothing.",
 					usage: [
 						"Check vocabulary before creating dictionary entries — reuse canonical terms",
 						"If a new term is needed, consider adding it to vocabulary first",
-						"Vocabulary applies across ALL dictionary models and ALL locales"
+						"Vocabulary applies across ALL dictionary models and ALL locales",
+						"Write it with contentrain_vocabulary_save — never edit the file by hand"
 					]
 				}
 			}, null, 2)
@@ -471,7 +506,7 @@ function registerSetupTools(server, _provider, projectRoot) {
 		const supportedLocales = locales ?? ["en"];
 		const suggestedDomains = domains ?? suggestDomains(projectRoot);
 		const hasGit = await pathExists(join(projectRoot, ".git"));
-		const git = simpleGit(projectRoot);
+		const git = createGit(projectRoot);
 		if (!hasGit) await git.init();
 		if (!await git.raw([
 			"rev-list",
@@ -631,6 +666,20 @@ function registerSetupTools(server, _provider, projectRoot) {
 			const modelsCreated = [];
 			let contentCreated = 0;
 			let vocabAdded = 0;
+			const templateErrors = tmpl.models.flatMap((m) => validateModelDefinition(m).errors.map((e) => `[${m.id}] ${e}`));
+			if (templateErrors.length > 0) {
+				await tx.cleanup();
+				return {
+					content: [{
+						type: "text",
+						text: JSON.stringify({
+							error: `Scaffold template "${templateId}" is invalid`,
+							details: templateErrors
+						}, null, 2)
+					}],
+					isError: true
+				};
+			}
 			await tx.write(async (wt) => {
 				await Promise.all(tmpl.models.map(async (model) => {
 					await writeModel(wt, model);
@@ -752,12 +801,24 @@ async function mergeVocabulary(projectRoot, newTerms, _locales) {
 //#endregion
 //#region src/tools/commit-plan.ts
 /**
+* Context payload describing the operation, threaded into the local
+* transaction so it can regenerate `.contentrain/context.json` on the
+* contentrain branch after merge. Kept as a loose object so tool-specific
+* payloads can add optional fields (`locale`, `entries`) without churning
+* the helper's signature. Remote providers ignore it — see
+* `commitThroughProvider` below.
+*/
+const COMMIT_AUTHOR = {
+	name: "Contentrain",
+	email: "ai@contentrain.io"
+};
+/**
 * Commit a plan's changes through whichever provider is wired into the
 * tool handler. Encapsulates the LocalProvider vs remote RepoProvider
 * dispatch that every write-side tool (content_save, content_delete,
 * model_save, model_delete) used to inline:
 *
-* - **LocalProvider** — goes through the worktree-backed transaction.
+* - **localWorktree providers** — go through the worktree-backed transaction.
 *   `context` payload is threaded as an extra write-through and the
 *   transaction layer decides `auto-merged` vs `pending-review` based on
 *   the project's configured workflow. Selective-sync result is surfaced
@@ -780,16 +841,17 @@ async function mergeVocabulary(projectRoot, newTerms, _locales) {
 */
 async function commitThroughProvider(provider, input) {
 	const { branch, changes, message, contextPayload } = input;
-	if (provider instanceof LocalProvider) {
+	if (provider.capabilities.localWorktree) {
 		const result = await provider.applyPlan({
 			branch,
 			changes,
 			message,
+			author: COMMIT_AUTHOR,
 			context: contextPayload
 		});
 		return {
 			commitSha: result.sha,
-			workflowAction: result.workflowAction,
+			workflowAction: result.workflowAction ?? "pending-review",
 			sync: result.sync
 		};
 	}
@@ -799,10 +861,7 @@ async function commitThroughProvider(provider, input) {
 			branch,
 			changes: allChanges,
 			message,
-			author: {
-				name: "Contentrain",
-				email: "ai@contentrain.io"
-			},
+			author: COMMIT_AUTHOR,
 			base: CONTENTRAIN_BRANCH
 		})).sha,
 		workflowAction: "pending-review"
@@ -823,6 +882,7 @@ function registerModelTools(server, provider, projectRoot) {
 		]).describe("Model kind"),
 		domain: z.string().describe("Content domain (e.g. \"blog\", \"marketing\", \"system\")"),
 		i18n: z.boolean().describe("Whether this model supports localization"),
+		title_field: z.string().describe("Name of the field shown as an entry's title in listings, pickers and relation references. Must name a field on this model whose type is string, text, slug, email, url, code, markdown or richtext. Dictionary models have no fields — use \"key\"."),
 		description: z.string().optional().describe("Model description"),
 		fields: fieldDefSchema.optional().describe("Field definitions (not needed for dictionary)"),
 		content_path: z.string().optional().describe("Framework-relative path for content files (e.g. \"content/blog\", \"locales\"). When set, content is written here instead of .contentrain/content/"),
@@ -859,26 +919,25 @@ function registerModelTools(server, provider, projectRoot) {
 			}],
 			isError: true
 		};
-		if (provider instanceof LocalProvider) {
-			const health = await checkBranchHealth(provider.projectRoot);
-			if (health.blocked) return {
-				content: [{
-					type: "text",
-					text: JSON.stringify({
-						error: health.message,
-						action: "blocked",
-						hint: "Merge or delete old contentrain/* branches before creating new ones."
-					}, null, 2)
-				}],
-				isError: true
-			};
-		}
+		const readiness = await provider.checkWriteReadiness?.();
+		if (readiness?.blocked) return {
+			content: [{
+				type: "text",
+				text: JSON.stringify({
+					error: readiness.message,
+					action: "blocked",
+					hint: "Merge or delete old contentrain/* branches before creating new ones."
+				}, null, 2)
+			}],
+			isError: true
+		};
 		const model = {
 			id: input.id,
 			name: input.name,
 			kind: input.kind,
 			domain: input.domain,
 			i18n: input.i18n,
+			title_field: input.title_field,
 			description: input.description,
 			fields: input.fields,
 			content_path: input.content_path,
@@ -969,20 +1028,18 @@ function registerModelTools(server, provider, projectRoot) {
 			}],
 			isError: true
 		};
-		if (provider instanceof LocalProvider) {
-			const deleteHealth = await checkBranchHealth(provider.projectRoot);
-			if (deleteHealth.blocked) return {
-				content: [{
-					type: "text",
-					text: JSON.stringify({
-						error: deleteHealth.message,
-						action: "blocked",
-						hint: "Merge or delete old contentrain/* branches before creating new ones."
-					}, null, 2)
-				}],
-				isError: true
-			};
-		}
+		const deleteReadiness = await provider.checkWriteReadiness?.();
+		if (deleteReadiness?.blocked) return {
+			content: [{
+				type: "text",
+				text: JSON.stringify({
+					error: deleteReadiness.message,
+					action: "blocked",
+					hint: "Merge or delete old contentrain/* branches before creating new ones."
+				}, null, 2)
+			}],
+			isError: true
+		};
 		const refs = await checkReferences(provider, modelId);
 		if (refs.length > 0) return { content: [{
 			type: "text",
@@ -1111,20 +1168,18 @@ function registerContentTools(server, provider, projectRoot) {
 			if (entry.publish_at !== void 0) entry.data["publish_at"] = entry.publish_at;
 			if (entry.expire_at !== void 0) entry.data["expire_at"] = entry.expire_at;
 		}
-		if (provider instanceof LocalProvider) {
-			const health = await checkBranchHealth(provider.projectRoot);
-			if (health.blocked) return {
-				content: [{
-					type: "text",
-					text: JSON.stringify({
-						error: health.message,
-						action: "blocked",
-						hint: "Merge or delete old contentrain/* branches before creating new ones."
-					}, null, 2)
-				}],
-				isError: true
-			};
-		}
+		const readiness = await provider.checkWriteReadiness?.();
+		if (readiness?.blocked) return {
+			content: [{
+				type: "text",
+				text: JSON.stringify({
+					error: readiness.message,
+					action: "blocked",
+					hint: "Merge or delete old contentrain/* branches before creating new ones."
+				}, null, 2)
+			}],
+			isError: true
+		};
 		const vocabulary = await readVocabulary(provider);
 		let plan;
 		try {
@@ -1244,20 +1299,18 @@ function registerContentTools(server, provider, projectRoot) {
 			}],
 			isError: true
 		};
-		if (provider instanceof LocalProvider) {
-			const deleteHealth = await checkBranchHealth(provider.projectRoot);
-			if (deleteHealth.blocked) return {
-				content: [{
-					type: "text",
-					text: JSON.stringify({
-						error: deleteHealth.message,
-						action: "blocked",
-						hint: "Merge or delete old contentrain/* branches before creating new ones."
-					}, null, 2)
-				}],
-				isError: true
-			};
-		}
+		const deleteReadiness = await provider.checkWriteReadiness?.();
+		if (deleteReadiness?.blocked) return {
+			content: [{
+				type: "text",
+				text: JSON.stringify({
+					error: deleteReadiness.message,
+					action: "blocked",
+					hint: "Merge or delete old contentrain/* branches before creating new ones."
+				}, null, 2)
+			}],
+			isError: true
+		};
 		let deletePlan;
 		try {
 			deletePlan = await planContentDelete(provider, {
@@ -1401,6 +1454,162 @@ function touchesSavedEntries(issue, results) {
 	});
 }
 //#endregion
+//#region src/tools/vocabulary.ts
+/**
+* Vocabulary write tools.
+*
+* The vocabulary is the one piece of `.contentrain/` that had no tool. The
+* rules forbid hand-editing that directory, so the only way to add a canonical
+* term was to break the rule — which a field report duly did, having no
+* alternative.
+*
+* These go through the same plan → commit path as content and models, so a
+* vocabulary change lands on a `cr/*` branch and obeys the project's workflow
+* like everything else.
+*/
+function registerVocabularyTools(server, provider) {
+	server.tool("contentrain_vocabulary_save", "Add or update canonical vocabulary terms. Terms nest as { \"term-slug\": { \"en\": \"…\", \"tr\": \"…\" } } — the OUTER key is the term, the INNER key is a locale. Merges with the existing vocabulary: a term you omit is untouched. Changes are auto-committed to git — do NOT manually edit .contentrain/vocabulary.json.", { terms: z.record(z.string(), z.record(z.string(), z.string())).describe("Terms keyed by kebab-case term slug, each holding its translations keyed by locale code. Example: { \"sign-in\": { \"en\": \"Sign in\", \"tr\": \"Giriş yap\" } }") }, TOOL_ANNOTATIONS["contentrain_vocabulary_save"], async (input) => {
+		if (!await readConfig(provider)) return {
+			content: [{
+				type: "text",
+				text: JSON.stringify({ error: "Project not initialized. Run contentrain_init first." })
+			}],
+			isError: true
+		};
+		const readiness = await provider.checkWriteReadiness?.();
+		if (readiness?.blocked) return {
+			content: [{
+				type: "text",
+				text: JSON.stringify({
+					error: readiness.message,
+					action: "blocked",
+					hint: "Merge or delete old contentrain/* branches before creating new ones."
+				}, null, 2)
+			}],
+			isError: true
+		};
+		let plan;
+		try {
+			plan = await planVocabularySave(provider, { terms: input.terms });
+		} catch (error) {
+			return {
+				content: [{
+					type: "text",
+					text: JSON.stringify({
+						error: error instanceof Error ? error.message : String(error),
+						hint: "Terms nest as { \"term-slug\": { \"en\": \"…\" } }. Grouping by locale at the top level is the usual mistake."
+					}, null, 2)
+				}],
+				isError: true
+			};
+		}
+		const termCount = plan.result.added.length + plan.result.updated.length;
+		try {
+			const commit = await commitThroughProvider(provider, {
+				branch: buildBranchName("vocabulary", "save"),
+				changes: plan.changes,
+				message: `[contentrain] vocabulary: ${termCount} term(s)`,
+				contextPayload: {
+					tool: "contentrain_vocabulary_save",
+					model: "vocabulary"
+				}
+			});
+			return { content: [{
+				type: "text",
+				text: JSON.stringify({
+					status: "committed",
+					added: plan.result.added,
+					updated: plan.result.updated,
+					total_terms: plan.result.total,
+					commit: commit.commitSha,
+					workflow_action: commit.workflowAction,
+					...plan.advisories.length > 0 ? { advisories: plan.advisories } : {}
+				}, null, 2)
+			}] };
+		} catch (error) {
+			return {
+				content: [{
+					type: "text",
+					text: JSON.stringify({ ...normalizeOperationError(error, "vocabulary_save") })
+				}],
+				isError: true
+			};
+		}
+	});
+	server.tool("contentrain_vocabulary_delete", "Remove canonical vocabulary terms by slug. Content already using a term is not touched — the vocabulary only advises. Changes are auto-committed to git.", {
+		terms: z.array(z.string()).min(1).describe("Term slugs to remove"),
+		confirm: z.boolean().describe("Must be true — this deletes canonical terms")
+	}, TOOL_ANNOTATIONS["contentrain_vocabulary_delete"], async (input) => {
+		if (!input.confirm) return {
+			content: [{
+				type: "text",
+				text: JSON.stringify({ error: "Deleting vocabulary terms requires confirm: true" })
+			}],
+			isError: true
+		};
+		if (!await readConfig(provider)) return {
+			content: [{
+				type: "text",
+				text: JSON.stringify({ error: "Project not initialized. Run contentrain_init first." })
+			}],
+			isError: true
+		};
+		const plan = await planVocabularyDelete(provider, { terms: input.terms });
+		if (plan.changes.length === 0) return { content: [{
+			type: "text",
+			text: JSON.stringify({
+				status: "no-op",
+				deleted: [],
+				missing: plan.result.missing,
+				total_terms: plan.result.total,
+				...plan.advisories.length > 0 ? { advisories: plan.advisories } : {}
+			}, null, 2)
+		}] };
+		const readiness = await provider.checkWriteReadiness?.();
+		if (readiness?.blocked) return {
+			content: [{
+				type: "text",
+				text: JSON.stringify({
+					error: readiness.message,
+					action: "blocked"
+				}, null, 2)
+			}],
+			isError: true
+		};
+		try {
+			const commit = await commitThroughProvider(provider, {
+				branch: buildBranchName("vocabulary", "delete"),
+				changes: plan.changes,
+				message: `[contentrain] vocabulary: remove ${plan.result.deleted.length} term(s)`,
+				contextPayload: {
+					tool: "contentrain_vocabulary_delete",
+					model: "vocabulary"
+				}
+			});
+			return { content: [{
+				type: "text",
+				text: JSON.stringify({
+					status: "committed",
+					deleted: plan.result.deleted,
+					missing: plan.result.missing,
+					total_terms: plan.result.total,
+					commit: commit.commitSha,
+					workflow_action: commit.workflowAction,
+					...plan.advisories.length > 0 ? { advisories: plan.advisories } : {}
+				}, null, 2)
+			}] };
+		} catch (error) {
+			return {
+				content: [{
+					type: "text",
+					text: JSON.stringify({ ...normalizeOperationError(error, "vocabulary_delete") })
+				}],
+				isError: true
+			};
+		}
+	});
+}
+//#endregion
 //#region src/tools/workflow.ts
 /**
 * Resolve a merge target from either an exact branch name or a
@@ -1446,9 +1655,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, stray non-i18n meta layout) — 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) and backfills a missing model title_field — 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, stray non-i18n meta layout). Default: false")
+		fix: z.boolean().optional().describe("Auto-fix structural issues (canonical sort, orphan meta, missing locale files, stray non-i18n meta layout) and backfill a missing model title_field. Each backfilled title_field is reported as a notice naming the rule that chose it. Default: false")
 	}, TOOL_ANNOTATIONS["contentrain_validate"], async (input) => {
 		if (input.fix && !projectRoot) return capabilityError("contentrain_validate", "localWorktree");
 		if (!await readConfig(provider)) return {
@@ -1559,7 +1768,7 @@ function registerWorkflowTools(server, provider, projectRoot) {
 			}],
 			isError: true
 		};
-		const git = simpleGit(projectRoot);
+		const git = createGit(projectRoot);
 		const remoteName = process.env["CONTENTRAIN_REMOTE"] ?? "origin";
 		let hasRemote = false;
 		try {
@@ -1687,7 +1896,7 @@ function registerWorkflowTools(server, provider, projectRoot) {
 			isError: true
 		};
 		try {
-			const resolved = await resolveMergeBranch(simpleGit(projectRoot), input);
+			const resolved = await resolveMergeBranch(createGit(projectRoot), input);
 			if ("error" in resolved) return {
 				content: [{
 					type: "text",
@@ -1734,7 +1943,7 @@ function registerWorkflowTools(server, provider, projectRoot) {
 	}, TOOL_ANNOTATIONS["contentrain_branch_list"], async (input) => {
 		if (!provider.capabilities.localWorktree || !projectRoot) return capabilityError("contentrain_branch_list", "localWorktree");
 		try {
-			const git = simpleGit(projectRoot);
+			const git = createGit(projectRoot);
 			const summary = await git.branchLocal();
 			const crBranches = summary.all.filter((b) => b.startsWith("cr/") && b !== CONTENTRAIN_BRANCH);
 			const remoteList = input.remote ? await listRemoteCrBranches(projectRoot) : void 0;
@@ -1796,7 +2005,7 @@ function registerWorkflowTools(server, provider, projectRoot) {
 			isError: true
 		};
 		try {
-			const git = simpleGit(projectRoot);
+			const git = createGit(projectRoot);
 			if (!(await git.branchLocal()).all.includes(input.branch)) {
 				const remoteOnly = await deleteRemoteBranch(projectRoot, input.branch);
 				if (remoteOnly.deleted) return { content: [{
@@ -1964,6 +2173,7 @@ function registerNormalizeTools(server, provider, projectRoot) {
 			]).describe("Model kind"),
 			domain: z.string().describe("Content domain (e.g. \"marketing\", \"app\")"),
 			i18n: z.boolean().optional().describe("Enable i18n. Default: true"),
+			title_field: z.string().optional().describe("Field shown as an entry title. Inferred from the extracted fields when omitted; the dry run reports what was chosen. Dictionary models: \"key\"."),
 			fields: fieldDefZodSchema.optional().describe("Field definitions — shared schema with model_save for full parity"),
 			entries: z.array(z.object({
 				locale: z.string().optional().describe("Locale. Default: project default"),
@@ -2198,11 +2408,7 @@ function registerBulkTools(server, _provider, projectRoot) {
 						if (model.kind === "collection") {
 							const entries = sourceData;
 							const updates = {};
-							for (const entryId of Object.keys(entries)) updates[entryId] = {
-								status: "draft",
-								source: "agent",
-								updated_by: "contentrain-mcp"
-							};
+							for (const entryId of Object.keys(entries)) updates[entryId] = mergeEntryMeta(void 0);
 							copiedCount = (await writeMetaEntries(wt, model, {
 								locale: input.target_locale,
 								defaultLocale: config.locales.default
@@ -2211,11 +2417,7 @@ function registerBulkTools(server, _provider, projectRoot) {
 							await writeMeta(wt, model, {
 								locale: input.target_locale,
 								defaultLocale: config.locales.default
-							}, {
-								status: "draft",
-								source: "agent",
-								updated_by: "contentrain-mcp"
-							});
+							}, mergeEntryMeta(void 0));
 							copiedCount = 1;
 						}
 					});
@@ -2307,11 +2509,7 @@ function registerBulkTools(server, _provider, projectRoot) {
 							for (const entryId of input.entry_ids) {
 								const existing = metaData?.[entryId];
 								if (!existing) continue;
-								updates[entryId] = {
-									...existing,
-									status: input.status,
-									updated_by: "contentrain-mcp"
-								};
+								updates[entryId] = applyStatusChange(existing, input.status);
 								foundIds.add(entryId);
 							}
 							const written = await writeMetaEntries(wt, model, {
@@ -2328,11 +2526,7 @@ function registerBulkTools(server, _provider, projectRoot) {
 							await writeMeta(wt, model, {
 								locale,
 								defaultLocale: config.locales.default
-							}, {
-								...existing,
-								status: input.status,
-								updated_by: "contentrain-mcp"
-							});
+							}, applyStatusChange(existing, input.status));
 							updatedPerLocale[locale] = [model.id];
 						}
 					});
@@ -2612,7 +2806,7 @@ function registerMediaTools(server, provider, _projectRoot) {
 }
 //#endregion
 //#region package.json
-var version = "2.3.1";
+var version = "3.0.1";
 //#endregion
 //#region src/server.ts
 /**
@@ -2649,6 +2843,7 @@ function createServer(input) {
 	registerSetupTools(server, provider, projectRoot);
 	registerModelTools(server, provider, projectRoot);
 	registerContentTools(server, provider, projectRoot);
+	registerVocabularyTools(server, provider);
 	registerWorkflowTools(server, provider, projectRoot);
 	registerNormalizeTools(server, provider, projectRoot);
 	registerBulkTools(server, provider, projectRoot);
@@ -2665,7 +2860,10 @@ function resolveServerContext(input) {
 	const instructions = input.instructions ?? "Contentrain is git-native content governance: models define structure; content is canonical JSON/Markdown on a dedicated branch. Start with contentrain_status; call contentrain_describe_format before creating models or content, and contentrain_describe before editing a model's entries. Every write lands on an isolated cr/* branch and content_save validates before committing. Destructive tools require confirm:true; preview contentrain_apply with dry_run:true first. Content decisions stay with the agent.";
 	if (input.provider) {
 		let projectRoot = input.projectRoot;
-		if (!projectRoot && input.provider instanceof LocalProvider) projectRoot = input.provider.projectRoot;
+		if (!projectRoot) {
+			const maybeRoot = input.provider.projectRoot;
+			if (typeof maybeRoot === "string") projectRoot = maybeRoot;
+		}
 		return {
 			provider: input.provider,
 			projectRoot,
@@ -2682,4 +2880,4 @@ function resolveServerContext(input) {
 //#endregion
 export { createServer as n, DEFAULT_INSTRUCTIONS as t };
 
-//# sourceMappingURL=server-CUZnuHQx.mjs.map
+//# sourceMappingURL=server-D-zJWbdI.mjs.map