@contentrain/mcp 1.5.2 → 1.8.0

package/dist/{server-RwV1Ig5l.mjs → server-tTuinKHD.mjs}

@@ -1,22 +1,22 @@
-import { i as planContentDelete, n as planModelDelete, r as planContentSave, t as planModelSave } from "./ops-DjEWi5Wa.mjs";
+import { i as planContentDelete, n as planModelDelete, r as planContentSave, t as planModelSave } from "./ops-Dh2T3u53.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-Lw7vpK9n.mjs";
+import { n as readVocabulary, t as readConfig } from "./config-DlFcTxFG.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 } from "./context-DS40WOdw.mjs";
-import { i as mergeBranch, n as createTransaction, r as ensureContentBranch, t as buildBranchName } from "./transaction-LiTjan9Q.mjs";
-import { n as isMerged, t as LocalProvider } from "./local-BJEAd4Ub.mjs";
-import { t as detectStack } from "./detect-DL9mFmaS.mjs";
-import { n as checkBranchHealth, r as cleanupMergedBranches } from "./branch-lifecycle-DjX3MXNG.mjs";
+import { n as readContext } from "./context-CYN__o3Q.mjs";
+import { a as deleteRemoteBranch, c as pruneMergedRemoteBranches, i as cleanupMergedBranches, n as checkBranchHealth, s as listRemoteCrBranches } from "./branch-lifecycle-D7tXOE4f.mjs";
+import { i as mergeBranch, n as createTransaction, r as ensureContentBranch, t as buildBranchName } from "./transaction-qliKvBRL.mjs";
+import { n as isMerged, t as LocalProvider } from "./local-BZEUWBoC.mjs";
+import { t as detectStack } from "./detect-eWS6lvoH.mjs";
 import { t as TOOL_ANNOTATIONS } from "./annotations-BFJbfSKe.mjs";
 import { n as listTemplates, t as getTemplate } from "./templates-VrLVqfe5.mjs";
-import { t as validateProject } from "./validator-Bo06QPVB.mjs";
+import { t as validateProject } from "./validator-Z3DGNWQ6.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-BJ3nKEls.mjs";
-import { t as runDoctor } from "./doctor-Dxu_SzZy.mjs";
+import { n as applyExtract, r as applyReuse } from "./apply-manager-BRmB27H5.mjs";
+import { t as runDoctor } from "./doctor-qiUKCy9b.mjs";
 import { join } from "node:path";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { CONTENTRAIN_BRANCH } from "@contentrain/types";
@@ -1030,7 +1030,7 @@ const validateModel = validateModelDefinition;
 //#endregion
 //#region src/tools/content.ts
 function registerContentTools(server, provider, projectRoot) {
-	server.tool("contentrain_content_save", "Save content entries. Entry format varies by model kind: DICTIONARY — provide \"locale\" and \"data\" (flat key-value, all string values); \"id\" and \"slug\" are ignored; data keys are the identities. COLLECTION — provide \"locale\" and \"data\"; \"id\" is optional (auto-generated if omitted); \"slug\" is ignored. DOCUMENT — provide \"slug\" (required), \"locale\", and \"data\"; use the \"body\" key inside data for markdown content. SINGLETON — provide only \"locale\" and \"data\". Changes are auto-committed to git — do NOT manually edit .contentrain/ files after calling this tool.", {
+	server.tool("contentrain_content_save", "Save content entries. Entry format varies by model kind: DICTIONARY — provide \"locale\" and \"data\" (flat key-value, all string values); \"id\" and \"slug\" are ignored; data keys are the identities. COLLECTION — provide \"locale\" and \"data\"; \"id\" is optional (auto-generated if omitted); \"slug\" is ignored. DOCUMENT — provide \"slug\" (required), \"locale\", and \"data\"; use the \"body\" key inside data for markdown content. SINGLETON — provide only \"locale\" and \"data\". MEDIA FIELDS (image/video/file): for a media-library asset, pass its storage path (\"media/...\") or URL; in cloud mode these are automatically normalized to absolute public delivery URLs on save (in markdown bodies too), so saved content renders in a browser anywhere with no SDK — in local mode the relative path is kept as-is. For external images (e.g. a CDN or Unsplash URL), pass the URL directly; it is saved untouched. Changes are auto-committed to git — do NOT manually edit .contentrain/ files after calling this tool.", {
 		model: z.string().describe("Model ID"),
 		entries: z.array(z.object({
 			id: z.string().optional().describe("Entry ID (collection only, auto-generated if omitted)"),
@@ -1118,7 +1118,8 @@ function registerContentTools(server, provider, projectRoot) {
 				model,
 				entries: input.entries,
 				config,
-				vocabulary
+				vocabulary,
+				mediaBaseUrl: provider.mediaBaseUrl
 			});
 		} catch (error) {
 			return {
@@ -1575,10 +1576,15 @@ function registerWorkflowTools(server, provider, projectRoot) {
 				await git.push(remoteName, CONTENTRAIN_BRANCH);
 			} catch {}
 			const cleanup = await cleanupMergedBranches(projectRoot);
+			const remotePrune = await pruneMergedRemoteBranches(projectRoot, {
+				config,
+				max: 20
+			});
 			const nextSteps = [];
 			if (pushed.length > 0) nextSteps.push("Create PRs on your git platform for review");
 			if (pushed.length > 0) nextSteps.push("For merge: use contentrain_merge or direct user to http://localhost:3333/branches");
 			if (errors.length > 0) nextSteps.push("Fix push errors and retry");
+			if (remotePrune.errors.length > 0) nextSteps.push("Some merged remote branches could not be pruned — run `contentrain prune`");
 			if (cleanup.remaining >= 50) nextSteps.push(`Warning: ${cleanup.remaining} active contentrain branches. Consider reviewing old branches.`);
 			return { content: [{
 				type: "text",
@@ -1592,6 +1598,7 @@ function registerWorkflowTools(server, provider, projectRoot) {
 						deleted: cleanup.deleted,
 						remaining: cleanup.remaining
 					} : void 0,
+					remote_cleanup: remotePrune.deleted.length > 0 ? { deleted: remotePrune.deleted.length } : void 0,
 					next_steps: nextSteps
 				}, null, 2)
 			}] };
@@ -1643,10 +1650,12 @@ function registerWorkflowTools(server, provider, projectRoot) {
 					action: result.action,
 					commit: result.commit,
 					sync: result.sync,
+					...result.remote ? { remote: result.remote } : {},
 					next_steps: [
 						"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` : ""
+						result.sync.skipped.length > 0 ? `${result.sync.skipped.length} file(s) skipped due to local changes — resolve manually` : "",
+						result.remote?.warning ? `Remote copy not deleted (${result.remote.warning}) — delete it manually: git push <remote> --delete ${targetBranch}` : ""
 					].filter(Boolean)
 				}, null, 2)
 			}] };
@@ -1660,12 +1669,17 @@ function registerWorkflowTools(server, provider, projectRoot) {
 			};
 		}
 	});
-	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) => {
+	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"),
+		remote: z.boolean().optional().describe("Also check the git remote: annotate entries with on_remote and report remote-only cr/* leftovers. Requires network. 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 remoteList = input.remote ? await listRemoteCrBranches(projectRoot) : void 0;
+			const remoteNames = remoteList && !remoteList.error ? new Set(remoteList.branches.map((b) => b.name)) : void 0;
 			const ordered = (await Promise.all(crBranches.map(async (name) => {
 				const [merged, ts] = await Promise.all([isMerged(projectRoot, name, CONTENTRAIN_BRANCH), git.raw([
 					"log",
@@ -1677,17 +1691,21 @@ function registerWorkflowTools(server, provider, projectRoot) {
 					name,
 					sha: summary.branches[name]?.commit ?? "",
 					merged,
-					lastCommit: ts
+					lastCommit: ts,
+					...remoteNames ? { on_remote: remoteNames.has(name) } : {}
 				};
 			}))).toSorted((left, right) => right.lastCommit.localeCompare(left.lastCommit));
 			const filtered = input.unmerged_only ? ordered.filter((b) => !b.merged) : ordered;
 			const health = await checkBranchHealth(projectRoot);
+			const localNames = new Set(crBranches);
+			const remoteExtras = input.remote ? remoteList === null ? { remote_error: "No git remote configured." } : remoteList.error ? { remote_error: remoteList.error } : { remote_only: remoteList.branches.filter((b) => !localNames.has(b.name)).map((b) => b.name) } : {};
 			return { content: [{
 				type: "text",
 				text: JSON.stringify({
 					total: ordered.length,
 					unmerged: ordered.filter((b) => !b.merged).length,
 					branches: filtered,
+					...remoteExtras,
 					health: {
 						warning: health.warning,
 						blocked: health.blocked,
@@ -1720,28 +1738,45 @@ function registerWorkflowTools(server, provider, projectRoot) {
 		};
 		try {
 			const git = simpleGit(projectRoot);
-			if (!(await git.branchLocal()).all.includes(input.branch)) return {
-				content: [{
+			if (!(await git.branchLocal()).all.includes(input.branch)) {
+				const remoteOnly = await deleteRemoteBranch(projectRoot, input.branch);
+				if (remoteOnly.deleted) return { content: [{
 					type: "text",
 					text: JSON.stringify({
-						error: `Branch "${input.branch}" not found locally.`,
-						next_steps: ["List branches with contentrain_branch_list"]
-					})
-				}],
-				isError: true
-			};
+						status: "deleted",
+						branch: input.branch,
+						scope: "remote-only",
+						message: "Branch was not present locally; its remote copy was deleted."
+					}, null, 2)
+				}] };
+				return {
+					content: [{
+						type: "text",
+						text: JSON.stringify({
+							error: `Branch "${input.branch}" not found locally${remoteOnly.skipped === "not-found" ? " or on the remote" : ""}.`,
+							...remoteOnly.warning ? { remote_warning: remoteOnly.warning } : {},
+							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
 			]);
+			const remote = await deleteRemoteBranch(projectRoot, input.branch);
 			return { content: [{
 				type: "text",
 				text: JSON.stringify({
 					status: "deleted",
 					branch: input.branch,
 					was_merged: merged,
+					remote_deleted: remote.deleted,
+					...remote.skipped ? { remote_skipped: remote.skipped } : {},
+					...remote.warning ? { remote_warning: remote.warning } : {},
 					warning: merged ? void 0 : "Branch was not merged — its commits were discarded."
 				}, null, 2)
 			}] };
@@ -2333,7 +2368,7 @@ function registerDoctorTools(server, _provider, projectRoot) {
 }
 //#endregion
 //#region package.json
-var version = "1.5.2";
+var version = "1.8.0";
 //#endregion
 //#region src/server.ts
 function createServer(input) {
@@ -2374,4 +2409,4 @@ function resolveServerContext(input) {
 //#endregion
 export { createServer as t };
 
-//# sourceMappingURL=server-RwV1Ig5l.mjs.map
+//# sourceMappingURL=server-tTuinKHD.mjs.map