@contentrain/mcp 1.4.0 → 1.5.1

package/dist/{server-BkhhtEE2.mjs → server-BpQvNZke.mjs}

@@ -1,22 +1,22 @@
 import { i as planContentDelete, n as planModelDelete, r as planContentSave, t as planModelSave } from "./ops-DjEWi5Wa.mjs";
 import { n as contentFilePath, t as contentDirPath } from "./paths-CYl5vCBD.mjs";
 import { a as readJson, n as ensureDir, r as pathExists, s as writeJson, t as contentrainDir } from "./fs-DLbVB-Ek.mjs";
-import { n as readVocabulary, t as readConfig } from "./config-BIl5Ybj0.mjs";
+import { n as readVocabulary, t as readConfig } from "./config-Lw7vpK9n.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-BhLsUgaB.mjs";
 import { n as readMeta, r as writeMeta } from "./meta-manager-C900rEyG.mjs";
-import { n as readContext, t as buildContextChange } from "./context-J0OU9Nfp.mjs";
-import { i as mergeBranch, n as createTransaction, r as ensureContentBranch, t as buildBranchName } from "./transaction-DgkNgWSI.mjs";
-import { t as LocalProvider } from "./local-DvP4Y4T-.mjs";
+import { n as readContext } from "./context-DS40WOdw.mjs";
+import { i as mergeBranch, n as createTransaction, r as ensureContentBranch, t as buildBranchName } from "./transaction-0D_edyh0.mjs";
+import { n as isMerged, t as LocalProvider } from "./local-BEl5L7p5.mjs";
 import { t as detectStack } from "./detect-DL9mFmaS.mjs";
-import { n as checkBranchHealth, r as cleanupMergedBranches } from "./branch-lifecycle-CFVpTpNT.mjs";
-import { t as TOOL_ANNOTATIONS } from "./annotations-Clhbw2lh.mjs";
+import { n as checkBranchHealth, r as cleanupMergedBranches } from "./branch-lifecycle-DjX3MXNG.mjs";
+import { t as TOOL_ANNOTATIONS } from "./annotations-BFJbfSKe.mjs";
 import { n as listTemplates, t as getTemplate } from "./templates-VrLVqfe5.mjs";
-import { t as OverlayReader } from "./overlay-reader-DOdyDRIv.mjs";
-import { t as validateProject } from "./validator-B0nNRFeU.mjs";
+import { t as validateProject } from "./validator-Bo06QPVB.mjs";
+import { t as OverlayReader } from "./overlay-reader-CUs9jgqk.mjs";
 import { t as buildGraph } from "./graph-builder-DXv2JEp-.mjs";
 import { n as scanSummary, t as scanCandidates } from "./scanner-DKMwc03k.mjs";
-import { n as applyExtract, r as applyReuse } from "./apply-manager-D5ym5Jba.mjs";
-import { t as runDoctor } from "./doctor-CgBoT6h1.mjs";
+import { n as applyExtract, r as applyReuse } from "./apply-manager-CDss8ZIr.mjs";
+import { t as runDoctor } from "./doctor-Dxu_SzZy.mjs";
 import { join } from "node:path";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { CONTENTRAIN_BRANCH } from "@contentrain/types";
@@ -42,6 +42,17 @@ function registerContextTools(server, provider, projectRoot) {
 		const models = await listModels(provider);
 		const context = projectRoot ? await readContext(projectRoot) : await readContext(provider);
 		const vocabulary = await readVocabulary(provider);
+		let stats = context?.stats ?? null;
+		if (projectRoot) {
+			const fullModels = await Promise.all(models.map((m) => readModel(provider, m.id)));
+			const entryCounts = await Promise.all(fullModels.filter((m) => m !== null).map((m) => countEntries(provider, m)));
+			stats = {
+				models: models.length,
+				entries: entryCounts.reduce((acc, c) => acc + c.total, 0),
+				locales: config?.locales.supported ?? context?.stats?.locales ?? ["en"],
+				...context?.stats?.lastSync ? { lastSync: context.stats.lastSync } : {}
+			};
+		}
 		const errors = [];
 		if (!config) errors.push(".contentrain/config.json missing");
 		const result = {
@@ -54,9 +65,9 @@ function registerContextTools(server, provider, projectRoot) {
 				repository: config.repository
 			} : null,
 			models,
-			context: context ? {
-				lastOperation: context.lastOperation,
-				stats: context.stats
+			context: context || stats ? {
+				lastOperation: context?.lastOperation ?? null,
+				stats
 			} : null,
 			vocabulary: vocabulary && Object.keys(vocabulary.terms).length > 0 ? {
 				size: Object.keys(vocabulary.terms).length,
@@ -362,6 +373,47 @@ function generateImportSnippet(model, stack, locale) {
 	return snippets;
 }
 //#endregion
+//#region src/git/errors.ts
+/**
+* Error normalization for git-backed MCP operations.
+*
+* `simple-git` surfaces a failed `git commit`/`push`/`merge` as a `GitError`
+* whose `message` is the raw subprocess stderr — which, for hook tooling
+* (commitlint, husky, lefthook), is colorized multi-line text. Returning that
+* verbatim inside a JSON error produces an unreadable ANSI-escaped blob.
+*
+* This helper strips ANSI, preserves any structured fields the thrown error
+* already carries (`code`/`agent_hint`/`developer_action`), and detects git
+* hook rejections so the agent gets an actionable, structured envelope.
+*/
+const ANSI_RE = new RegExp(`${String.fromCharCode(27)}\\[[0-9;]*m`, "g");
+function stripAnsi(input) {
+	return input.replace(ANSI_RE, "");
+}
+/**
+* Normalize any thrown error into a structured, ANSI-free envelope for MCP
+* tool responses. `stage` labels where it happened (e.g. 'content_save').
+*/
+function normalizeOperationError(err, stage) {
+	const e = err;
+	const message = stripAnsi(e?.message ?? String(err)).trim();
+	const out = { error: message };
+	if (stage) out.stage = stage;
+	if (e?.code) out.code = e.code;
+	if (e?.agent_hint) out.agent_hint = e.agent_hint;
+	if (e?.developer_action) out.developer_action = e.developer_action;
+	if (!out.code) {
+		const hookName = /\b(commit-msg|pre-commit|prepare-commit-msg|pre-push)\b/i.exec(message)?.[1];
+		const hookTool = /\b(commitlint|husky|lefthook)\b/i.exec(message)?.[1];
+		if (hookName || hookTool) {
+			out.stage = out.stage ?? "git-commit";
+			out.hook = hookName ?? hookTool;
+			out.agent_hint = out.agent_hint ?? "A git hook rejected the Contentrain commit. Contentrain commits with --no-verify, but a wrapping CLI or server-side hook may still run. Ask the developer to allow machine-generated \"[contentrain]\" commits or to exclude cr/* branches from the hook.";
+		}
+	}
+	return out;
+}
+//#endregion
 //#region src/tools/guards.ts
 /**
 * Emit a uniform "capability not available" response for tools that
@@ -413,7 +465,10 @@ function registerSetupTools(server, _provider, projectRoot) {
 			"-n",
 			"1",
 			"--all"
-		]).then((out) => out.trim().length > 0).catch(() => false)) await git.commit("initial commit", { "--allow-empty": null });
+		]).then((out) => out.trim().length > 0).catch(() => false)) await git.commit("initial commit", {
+			"--allow-empty": null,
+			"--no-verify": null
+		});
 		const initHealth = await checkBranchHealth(projectRoot);
 		if (initHealth.blocked) return {
 			content: [{
@@ -513,7 +568,7 @@ function registerSetupTools(server, _provider, projectRoot) {
 			return {
 				content: [{
 					type: "text",
-					text: JSON.stringify({ error: `Init failed: ${error instanceof Error ? error.message : String(error)}` })
+					text: JSON.stringify({ ...normalizeOperationError(error, "init") })
 				}],
 				isError: true
 			};
@@ -608,7 +663,7 @@ function registerSetupTools(server, _provider, projectRoot) {
 			return {
 				content: [{
 					type: "text",
-					text: JSON.stringify({ error: `Scaffold failed: ${error instanceof Error ? error.message : String(error)}` })
+					text: JSON.stringify({ ...normalizeOperationError(error, "scaffold") })
 				}],
 				isError: true
 			};
@@ -695,11 +750,17 @@ async function mergeVocabulary(projectRoot, newTerms, _locales) {
 *   the project's configured workflow. Selective-sync result is surfaced
 *   to the caller via `sync`.
 *
-* - **Any other RepoProvider** — the context.json write becomes an extra
-*   `FileChange` bundled into the plan so the whole commit lands
-*   atomically through the generic `RepoWriter.applyPlan`. Remote flows
+* - **Any other RepoProvider** — only the plan's own changes are
+*   committed. Feature branches NEVER carry `.contentrain/context.json`:
+*   the file embeds timestamps, so two parallel cr/* branches forked from
+*   the same contentrain commit would always conflict on it and the
+*   second merge would fail permanently. This mirrors the local
+*   transaction flow, which regenerates context.json on the contentrain
+*   branch after merge (single-threaded, deterministic). Remote flows
 *   always report `pending-review`; Studio (or whatever orchestrator is
-*   driving the server) owns the merge.
+*   driving the server) owns the merge AND the post-merge context
+*   regeneration on the contentrain branch (`buildContextChange` from
+*   `@contentrain/mcp/core/context` is exported for exactly that).
 *
 * The return shape is deliberately uniform so callers don't have to
 * branch on provider type again.
@@ -719,8 +780,7 @@ async function commitThroughProvider(provider, input) {
 			sync: result.sync
 		};
 	}
-	const contextChange = await buildContextChange(new OverlayReader(provider, changes), contextPayload);
-	const allChanges = [...changes, contextChange].toSorted((a, b) => a.path.localeCompare(b.path));
+	const allChanges = changes.toSorted((a, b) => a.path.localeCompare(b.path));
 	return {
 		commitSha: (await provider.applyPlan({
 			branch,
@@ -836,7 +896,7 @@ function registerModelTools(server, provider, projectRoot) {
 			return {
 				content: [{
 					type: "text",
-					text: JSON.stringify({ error: `Model save failed: ${error instanceof Error ? error.message : String(error)}` })
+					text: JSON.stringify({ ...normalizeOperationError(error, "model_save") })
 				}],
 				isError: true
 			};
@@ -959,7 +1019,7 @@ function registerModelTools(server, provider, projectRoot) {
 			return {
 				content: [{
 					type: "text",
-					text: JSON.stringify({ error: `Delete failed: ${error instanceof Error ? error.message : String(error)}` })
+					text: JSON.stringify({ ...normalizeOperationError(error, "model_delete") })
 				}],
 				isError: true
 			};
@@ -1064,7 +1124,7 @@ function registerContentTools(server, provider, projectRoot) {
 			return {
 				content: [{
 					type: "text",
-					text: JSON.stringify({ error: `Content save failed: ${error instanceof Error ? error.message : String(error)}` })
+					text: JSON.stringify({ ...normalizeOperationError(error, "content_save") })
 				}],
 				isError: true
 			};
@@ -1095,12 +1155,12 @@ function registerContentTools(server, provider, projectRoot) {
 			return {
 				content: [{
 					type: "text",
-					text: JSON.stringify({ error: `Content save failed: ${error instanceof Error ? error.message : String(error)}` })
+					text: JSON.stringify({ ...normalizeOperationError(error, "content_save") })
 				}],
 				isError: true
 			};
 		}
-		const validationResult = projectRoot ? await validateProject(projectRoot, { model: input.model }) : await validateProject(new OverlayReader(provider, plan.changes), { model: input.model });
+		const validationResult = await validateProject(new OverlayReader(provider, plan.changes), { model: input.model });
 		const allAdvisories = plan.result.flatMap((r) => r.advisories ?? []);
 		return { content: [{
 			type: "text",
@@ -1181,7 +1241,7 @@ function registerContentTools(server, provider, projectRoot) {
 			return {
 				content: [{
 					type: "text",
-					text: JSON.stringify({ error: `Delete failed: ${error instanceof Error ? error.message : String(error)}` })
+					text: JSON.stringify({ ...normalizeOperationError(error, "content_delete") })
 				}],
 				isError: true
 			};
@@ -1226,7 +1286,7 @@ function registerContentTools(server, provider, projectRoot) {
 			return {
 				content: [{
 					type: "text",
-					text: JSON.stringify({ error: `Delete failed: ${error instanceof Error ? error.message : String(error)}` })
+					text: JSON.stringify({ ...normalizeOperationError(error, "content_delete") })
 				}],
 				isError: true
 			};
@@ -1273,7 +1333,7 @@ function registerContentTools(server, provider, projectRoot) {
 			return {
 				content: [{
 					type: "text",
-					text: JSON.stringify({ error: `List failed: ${error instanceof Error ? error.message : String(error)}` })
+					text: JSON.stringify({ ...normalizeOperationError(error, "content_list") })
 				}],
 				isError: true
 			};
@@ -1282,6 +1342,49 @@ function registerContentTools(server, provider, projectRoot) {
 }
 //#endregion
 //#region src/tools/workflow.ts
+/**
+* Resolve a merge target from either an exact branch name or a
+* model/locale/latest selector. Returns the concrete branch, or an error with
+* candidate branches when the selector is ambiguous or matches nothing.
+*/
+async function resolveMergeBranch(git, input) {
+	const summary = await git.branchLocal();
+	const crBranches = summary.all.filter((b) => b.startsWith("cr/") && b !== CONTENTRAIN_BRANCH);
+	if (input.branch) {
+		if (summary.all.includes(input.branch)) return { branch: input.branch };
+		return {
+			error: `Branch "${input.branch}" not found locally.`,
+			candidates: crBranches
+		};
+	}
+	if (!input.model) return {
+		error: "Provide either \"branch\" (exact name) or \"model\" (to resolve the branch).",
+		candidates: crBranches
+	};
+	const prefix = input.locale ? `cr/content/${input.model}/${input.locale}/` : `cr/content/${input.model}/`;
+	let matches = crBranches.filter((b) => b.startsWith(prefix));
+	if (matches.length === 0) matches = crBranches.filter((b) => b.split("/").includes(input.model));
+	if (matches.length === 0) return {
+		error: `No pending cr/* branch found for model "${input.model}".`,
+		candidates: crBranches
+	};
+	if (matches.length === 1) return { branch: matches[0] };
+	if (!input.latest) return {
+		error: `Multiple branches match model "${input.model}". Pass latest:true or an exact branch.`,
+		candidates: matches
+	};
+	return { branch: (await Promise.all(matches.map(async (b) => {
+		return {
+			b,
+			t: await git.raw([
+				"log",
+				"-1",
+				"--format=%ct",
+				b
+			]).then((s) => Number(s.trim())).catch(() => 0)
+		};
+	}))).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.", {
 		model: z.string().optional().describe("Model ID to validate (omit for all models)"),
@@ -1311,7 +1414,7 @@ function registerWorkflowTools(server, provider, projectRoot) {
 					isError: true
 				};
 				const branch = buildBranchName("fix", "validate");
-				const tx = await createTransaction(projectRoot, branch);
+				const tx = await createTransaction(projectRoot, branch, { workflowOverride: "auto-merge" });
 				try {
 					await tx.write(async (wt) => {
 						result = await validateProject(wt, {
@@ -1404,16 +1507,22 @@ function registerWorkflowTools(server, provider, projectRoot) {
 		} catch {
 			hasRemote = false;
 		}
-		if (!hasRemote) return {
-			content: [{
-				type: "text",
-				text: JSON.stringify({
-					error: `No remote "${remoteName}" found. Configure a git remote first.`,
-					next_steps: [`git remote add ${remoteName} <url>`]
-				})
-			}],
-			isError: true
-		};
+		if (!hasRemote) {
+			const pending = (await git.branchLocal().catch(() => ({ all: [] }))).all.filter((b) => b.startsWith("cr/") && b !== CONTENTRAIN_BRANCH);
+			return {
+				content: [{
+					type: "text",
+					text: JSON.stringify({
+						error: `No remote "${remoteName}" configured — contentrain_submit (push) is unavailable.`,
+						stage: "submit",
+						agent_hint: "This project has no git remote. In a local/solo workflow, land pending review branches with contentrain_merge instead of submit, or set workflow:\"auto-merge\" in config.json so saves merge locally without a remote.",
+						pending_branches: pending,
+						next_steps: [pending.length > 0 ? `Merge a pending branch locally: contentrain_merge { branch: "${pending[0]}", confirm: true }` : "Make changes with contentrain_content_save — auto-merge lands them locally without a remote", `Or add a remote to enable submit: git remote add ${remoteName} <url>`]
+					}, null, 2)
+				}],
+				isError: true
+			};
+		}
 		try {
 			const baseBranch = config.repository?.default_branch ?? process.env["CONTENTRAIN_BRANCH"] ?? ((await git.raw(["branch", "--show-current"])).trim() || "main");
 			const branchSummary = await git.branchLocal();
@@ -1496,8 +1605,11 @@ function registerWorkflowTools(server, provider, projectRoot) {
 			};
 		}
 	});
-	server.tool("contentrain_merge", "Merge a review-mode branch into contentrain. Local git operation — no external platform needed. Merges the feature branch into the contentrain branch, advances the base branch via update-ref, and selectively syncs .contentrain/ files to the working tree.", {
-		branch: z.string().describe("Branch name to merge (e.g. cr/normalize/extract/...)"),
+	server.tool("contentrain_merge", "Merge a review-mode branch into contentrain. Local git operation — no external platform needed. Merges the feature branch into the contentrain branch, advances the base branch via update-ref, selectively syncs .contentrain/ files to the working tree, and prunes the merged branch. Target by exact \"branch\" name, or resolve by \"model\" (+ optional \"locale\"/\"latest\").", {
+		branch: z.string().optional().describe("Exact branch name to merge (e.g. cr/content/blog-post/...). Omit to resolve by model."),
+		model: z.string().optional().describe("Resolve the branch by model id (e.g. \"blog-post\")."),
+		locale: z.string().optional().describe("Narrow model resolution to a locale."),
+		latest: z.boolean().optional().describe("When multiple branches match the model, merge the most recently committed one."),
 		confirm: z.literal(true).describe("Must be true to confirm the merge")
 	}, TOOL_ANNOTATIONS["contentrain_merge"], async (input) => {
 		if (!provider.capabilities.localWorktree || !projectRoot) return capabilityError("contentrain_merge", "localWorktree");
@@ -1509,26 +1621,30 @@ function registerWorkflowTools(server, provider, projectRoot) {
 			isError: true
 		};
 		try {
-			if (!(await simpleGit(projectRoot).branchLocal()).all.includes(input.branch)) return {
+			const resolved = await resolveMergeBranch(simpleGit(projectRoot), input);
+			if ("error" in resolved) return {
 				content: [{
 					type: "text",
 					text: JSON.stringify({
-						error: `Branch "${input.branch}" not found locally.`,
-						next_steps: ["Check branch name with git branch -l", "Use contentrain_submit to push first if needed"]
-					})
+						error: resolved.error,
+						candidates: resolved.candidates,
+						next_steps: ["Pass an exact { branch } or { model, latest: true }", "List pending branches with contentrain_branch_list"]
+					}, null, 2)
 				}],
 				isError: true
 			};
-			const result = await mergeBranch(projectRoot, input.branch);
+			const targetBranch = resolved.branch;
+			const result = await mergeBranch(projectRoot, targetBranch);
 			return { content: [{
 				type: "text",
 				text: JSON.stringify({
 					status: "merged",
+					branch: targetBranch,
 					action: result.action,
 					commit: result.commit,
 					sync: result.sync,
 					next_steps: [
-						"Run `npx contentrain generate` to update SDK client",
+						"Run `contentrain generate` (or `npx contentrain-query generate`) to update the SDK client",
 						"Run contentrain_validate to verify content integrity",
 						result.sync.skipped.length > 0 ? `${result.sync.skipped.length} file(s) skipped due to local changes — resolve manually` : ""
 					].filter(Boolean)
@@ -1538,7 +1654,102 @@ function registerWorkflowTools(server, provider, projectRoot) {
 			return {
 				content: [{
 					type: "text",
-					text: JSON.stringify({ error: `Merge failed: ${error instanceof Error ? error.message : String(error)}` })
+					text: JSON.stringify(normalizeOperationError(error, "merge"), null, 2)
+				}],
+				isError: true
+			};
+		}
+	});
+	server.tool("contentrain_branch_list", "List pending contentrain (cr/*) branches with their merge status against the contentrain branch. Use this to discover branch names for contentrain_merge / contentrain_branch_delete, and to monitor branch-health limits (warning at 50, blocked at 80 unmerged).", { unmerged_only: z.boolean().optional().describe("Only list branches not yet merged into contentrain. Default: false") }, TOOL_ANNOTATIONS["contentrain_branch_list"], async (input) => {
+		if (!provider.capabilities.localWorktree || !projectRoot) return capabilityError("contentrain_branch_list", "localWorktree");
+		try {
+			const git = simpleGit(projectRoot);
+			const summary = await git.branchLocal();
+			const crBranches = summary.all.filter((b) => b.startsWith("cr/") && b !== CONTENTRAIN_BRANCH);
+			const ordered = (await Promise.all(crBranches.map(async (name) => {
+				const [merged, ts] = await Promise.all([isMerged(projectRoot, name, CONTENTRAIN_BRANCH), git.raw([
+					"log",
+					"-1",
+					"--format=%cI",
+					name
+				]).then((s) => s.trim()).catch(() => "")]);
+				return {
+					name,
+					sha: summary.branches[name]?.commit ?? "",
+					merged,
+					lastCommit: ts
+				};
+			}))).toSorted((left, right) => right.lastCommit.localeCompare(left.lastCommit));
+			const filtered = input.unmerged_only ? ordered.filter((b) => !b.merged) : ordered;
+			const health = await checkBranchHealth(projectRoot);
+			return { content: [{
+				type: "text",
+				text: JSON.stringify({
+					total: ordered.length,
+					unmerged: ordered.filter((b) => !b.merged).length,
+					branches: filtered,
+					health: {
+						warning: health.warning,
+						blocked: health.blocked,
+						message: health.message
+					},
+					next_steps: ["Merge a branch: contentrain_merge { branch: \"...\", confirm: true }", "Delete a stale branch: contentrain_branch_delete { branch: \"...\", confirm: true }"]
+				}, null, 2)
+			}] };
+		} catch (error) {
+			return {
+				content: [{
+					type: "text",
+					text: JSON.stringify(normalizeOperationError(error, "branch_list"), null, 2)
+				}],
+				isError: true
+			};
+		}
+	});
+	server.tool("contentrain_branch_delete", "Delete a pending contentrain (cr/*) branch that will not be merged — e.g. a branch left behind by a failed operation, or a superseded draft. Only cr/* branches can be deleted; the contentrain branch is protected. This is destructive: the branch and its unmerged commits are removed.", {
+		branch: z.string().describe("The cr/* branch to delete"),
+		confirm: z.literal(true).describe("Must be true to confirm deletion")
+	}, TOOL_ANNOTATIONS["contentrain_branch_delete"], async (input) => {
+		if (!provider.capabilities.localWorktree || !projectRoot) return capabilityError("contentrain_branch_delete", "localWorktree");
+		if (!input.branch.startsWith("cr/") || input.branch === CONTENTRAIN_BRANCH) return {
+			content: [{
+				type: "text",
+				text: JSON.stringify({ error: `Refusing to delete "${input.branch}". Only cr/* feature branches can be deleted (the contentrain branch is protected).` })
+			}],
+			isError: true
+		};
+		try {
+			const git = simpleGit(projectRoot);
+			if (!(await git.branchLocal()).all.includes(input.branch)) return {
+				content: [{
+					type: "text",
+					text: JSON.stringify({
+						error: `Branch "${input.branch}" not found locally.`,
+						next_steps: ["List branches with contentrain_branch_list"]
+					})
+				}],
+				isError: true
+			};
+			const merged = await isMerged(projectRoot, input.branch, CONTENTRAIN_BRANCH);
+			await git.raw([
+				"branch",
+				"-D",
+				input.branch
+			]);
+			return { content: [{
+				type: "text",
+				text: JSON.stringify({
+					status: "deleted",
+					branch: input.branch,
+					was_merged: merged,
+					warning: merged ? void 0 : "Branch was not merged — its commits were discarded."
+				}, null, 2)
+			}] };
+		} catch (error) {
+			return {
+				content: [{
+					type: "text",
+					text: JSON.stringify(normalizeOperationError(error, "branch_delete"), null, 2)
 				}],
 				isError: true
 			};
@@ -1938,7 +2149,7 @@ function registerBulkTools(server, _provider, projectRoot) {
 					return {
 						content: [{
 							type: "text",
-							text: JSON.stringify({ error: `copy_locale failed: ${error instanceof Error ? error.message : String(error)}` })
+							text: JSON.stringify({ ...normalizeOperationError(error, "bulk_copy_locale") })
 						}],
 						isError: true
 					};
@@ -2022,7 +2233,7 @@ function registerBulkTools(server, _provider, projectRoot) {
 					return {
 						content: [{
 							type: "text",
-							text: JSON.stringify({ error: `update_status failed: ${error instanceof Error ? error.message : String(error)}` })
+							text: JSON.stringify({ ...normalizeOperationError(error, "bulk_update_status") })
 						}],
 						isError: true
 					};
@@ -2090,7 +2301,7 @@ function registerBulkTools(server, _provider, projectRoot) {
 					return {
 						content: [{
 							type: "text",
-							text: JSON.stringify({ error: `delete_entries failed: ${error instanceof Error ? error.message : String(error)}` })
+							text: JSON.stringify({ ...normalizeOperationError(error, "bulk_delete_entries") })
 						}],
 						isError: true
 					};
@@ -2122,7 +2333,7 @@ function registerDoctorTools(server, _provider, projectRoot) {
 }
 //#endregion
 //#region package.json
-var version = "1.4.0";
+var version = "1.5.1";
 //#endregion
 //#region src/server.ts
 function createServer(input) {
@@ -2163,4 +2374,4 @@ function resolveServerContext(input) {
 //#endregion
 export { createServer as t };
 
-//# sourceMappingURL=server-BkhhtEE2.mjs.map
+//# sourceMappingURL=server-BpQvNZke.mjs.map