@contentrain/mcp 3.10.1 → 3.11.1

package/dist/{server-24UHN9Ll.d.mts → server-CQKCQ8H_.d.mts}

@@ -56,10 +56,10 @@ interface CreateServerOptions {
  * (`TOOL_REQUIREMENTS`) cannot be met by the resolved provider +
  * projectRoot pair are not registered, so `tools/list` only advertises
  * tools that can actually succeed. With a `LocalProvider` (stdio and CLI
- * flows) all 19 tools remain registered — behavior there is unchanged.
+ * flows) all 22 core tools remain registered — behavior there is unchanged.
  */
 declare function createServer(projectRoot: string): McpServer;
 declare function createServer(opts: CreateServerOptions): McpServer;
 //#endregion
 export { createServer as i, DEFAULT_INSTRUCTIONS as n, ToolProvider as r, CreateServerOptions as t };
-//# sourceMappingURL=server-24UHN9Ll.d.mts.map
+//# sourceMappingURL=server-CQKCQ8H_.d.mts.map

package/dist/{server-24UHN9Ll.d.mts.map → server-CQKCQ8H_.d.mts.map}

@@ -1 +1 @@
-{"version":3,"file":"server-24UHN9Ll.d.mts","names":[],"sources":["../src/server.ts"],"mappings":";;;;;;AAaA;;;;;KAAY,YAAA,GAAe,YAAA;;;;;AA6B3B;cAVa,oBAAA;AAAA,UAUI,mBAAA;EAOQ;;;;;;EAAvB,QAAA,GAAW,YAAA;EAuEG;;;;;AAChB;EAjEE,WAAA;;;;;;EAMA,YAAA;AAAA;;;;;;;;;;;;;;;;;;;;;iBA0Dc,YAAA,CAAa,WAAA,WAAsB,SAAA;AAAA,iBACnC,YAAA,CAAa,IAAA,EAAM,mBAAA,GAAsB,SAAA"}
+{"version":3,"file":"server-CQKCQ8H_.d.mts","names":[],"sources":["../src/server.ts"],"mappings":";;;;;;AAaA;;;;;KAAY,YAAA,GAAe,YAAA;;;;;AA6B3B;cAVa,oBAAA;AAAA,UAUI,mBAAA;EAOQ;;;;;;EAAvB,QAAA,GAAW,YAAA;EAuEG;;;;;AAChB;EAjEE,WAAA;;;;;;EAMA,YAAA;AAAA;;;;;;;;;;;;;;;;;;;;;iBA0Dc,YAAA,CAAa,WAAA,WAAsB,SAAA;AAAA,iBACnC,YAAA,CAAa,IAAA,EAAM,mBAAA,GAAsB,SAAA"}

package/dist/{server-DvWJelCh.mjs → server-aQKtD1N5.mjs}

@@ -5,21 +5,21 @@ import { a as readJson, n as ensureDir, r as pathExists, s as writeJson, t as co
 import { a as writeMeta, i as readMeta, o as writeMetaEntries, r as mergeEntryMeta, t as applyStatusChange } from "./meta-manager-CSpKtjnP.mjs";
 import { t as OverlayReader } from "./overlay-reader-Bx1YxGXq.mjs";
 import { n as readVocabulary, t as readConfig } from "./config-BnNYu128.mjs";
-import { t as validateProject } from "./validator-S19GHR4V.mjs";
+import { t as validateProject } from "./validator-mfCY3eea.mjs";
 import { r as createGit } from "./identity-CxAB9Qb8.mjs";
 import { r as resolveInitDefaultBranch, t as resolveBaseBranch } from "./base-branch-Cw9DWvCC.mjs";
 import { a as contentBranchRelation, c as listRemoteCrBranches, d as LOCAL_MODE_NOTE, f as localModeReason, i as cleanupMergedBranches, n as checkBranchHealth, o as deleteRemoteBranch, p as pushPolicy, u as pruneMergedRemoteBranches } from "./branch-lifecycle-D4DxPgQg.mjs";
-import { i as ensureContentBranch, n as buildBranchName, o as mergeBranch, r as createTransaction } from "./transaction-DnrUATJF.mjs";
-import { n as withReadScope, r as isMerged, t as LocalProvider } from "./local-CBtRYFH4.mjs";
+import { i as ensureContentBranch, l as commitOptions, n as buildBranchName, o as mergeBranch, r as createTransaction, u as hookPolicy } from "./transaction-DCDf0y0T.mjs";
+import { n as withReadScope, r as isMerged, t as LocalProvider } from "./local-CCVjLKy2.mjs";
 import { n as isToolAvailable, t as TOOL_REQUIREMENTS } from "./availability-CO8Xfx3w.mjs";
 import { t as detectStack } from "./detect-B1QHYA0u.mjs";
 import { t as TOOL_ANNOTATIONS } from "./annotations-BYkjoj2d.mjs";
 import { n as listTemplates, t as getTemplate } from "./templates-Dn-iZyzp.mjs";
-import { t as normalizeOperationError } from "./errors-De8Noahk.mjs";
-import { t as reconcileBranches } from "./reconcile-DSflMfhj.mjs";
+import { t as normalizeOperationError } from "./errors-Cp6_Hlws.mjs";
+import { t as reconcileBranches } from "./reconcile-B7w5gow1.mjs";
 import { t as buildGraph } from "./graph-builder-BPhi-1KH.mjs";
 import { n as scanSummary, t as scanCandidates } from "./scanner-0sc_pARB.mjs";
-import { n as applyExtract, r as applyReuse } from "./apply-manager-B-O3eAbz.mjs";
+import { n as applyExtract, r as applyReuse } from "./apply-manager-DfLr1Q-T.mjs";
 import { t as runDoctor } from "./doctor-Br1NqEl2.mjs";
 import { join } from "node:path";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
@@ -484,12 +484,16 @@ const COMMIT_AUTHOR = {
 * hand-rolled literals, so `base_advance`/`remote_push` cannot drift between
 * tools. Both fields appear only when the provider reported them (local
 * auto-merge) — remote/review responses keep their previous shape.
+* `base_branch` is the resolved base branch of a local write (#509): where an
+* auto-merge lands and, unless pushing is off, what is pushed. It may differ
+* from the checked-out branch; the write's warning says so when it does.
 */
 function gitReport(input) {
 	return {
 		branch: input.branch,
 		action: input.action,
 		commit: input.commit,
+		...input.base_branch ? { base_branch: input.base_branch } : {},
 		...input.sync ? { sync: input.sync } : {},
 		...input.base_advance ? { base_advance: input.base_advance } : {},
 		...input.remote_push ? { remote_push: input.remote_push } : {},
@@ -550,7 +554,8 @@ async function commitThroughProvider(provider, input) {
 			sync: result.sync,
 			warning: result.warning,
 			base_advance: result.base_advance,
-			remote_push: result.remote_push
+			remote_push: result.remote_push,
+			...result.base_branch ? { base_branch: result.base_branch } : {}
 		};
 	}
 	const allChanges = changes.toSorted((a, b) => a.path.localeCompare(b.path));
@@ -595,10 +600,7 @@ function registerSetupTools(server, _provider, projectRoot) {
 			"-n",
 			"1",
 			"--all"
-		]).then((out) => out.trim().length > 0).catch(() => false)) await git.commit("initial commit", {
-			"--allow-empty": null,
-			"--no-verify": null
-		});
+		]).then((out) => out.trim().length > 0).catch(() => false)) await git.commit("initial commit", commitOptions(hookPolicy(await readConfig(projectRoot)), { "--allow-empty": null }));
 		const initHealth = await checkBranchHealth(projectRoot);
 		if (initHealth.blocked) return {
 			content: [{
@@ -693,7 +695,8 @@ function registerSetupTools(server, _provider, projectRoot) {
 						commit: gitResult.commit,
 						sync: gitResult.sync,
 						base_advance: gitResult.base_advance,
-						remote_push: gitResult.remote_push
+						remote_push: gitResult.remote_push,
+						base_branch: gitResult.base_branch
 					}),
 					...gitResult.warning ? { warning: gitResult.warning } : {},
 					next_steps: ["Create models with contentrain_model_save or contentrain_scaffold", "Use contentrain_scan to find hardcoded strings"]
@@ -800,7 +803,8 @@ function registerSetupTools(server, _provider, projectRoot) {
 						commit: gitResult.commit,
 						sync: gitResult.sync,
 						base_advance: gitResult.base_advance,
-						remote_push: gitResult.remote_push
+						remote_push: gitResult.remote_push,
+						base_branch: gitResult.base_branch
 					}),
 					...gitResult.warning ? { warning: gitResult.warning } : {},
 					context_updated: true,
@@ -1032,7 +1036,8 @@ function registerModelTools(server, provider, projectRoot) {
 					commit: commit.commitSha,
 					sync: commit.sync,
 					base_advance: commit.base_advance,
-					remote_push: commit.remote_push
+					remote_push: commit.remote_push,
+					base_branch: commit.base_branch
 				}),
 				...commit.warning ? { warning: commit.warning } : {},
 				context_updated: true,
@@ -1115,7 +1120,8 @@ function registerModelTools(server, provider, projectRoot) {
 						commit: commit.commitSha,
 						sync: commit.sync,
 						base_advance: commit.base_advance,
-						remote_push: commit.remote_push
+						remote_push: commit.remote_push,
+						base_branch: commit.base_branch
 					}),
 					...commit.warning ? { warning: commit.warning } : {},
 					files_removed: deletePlan.result,
@@ -1288,7 +1294,8 @@ function registerContentTools(server, provider, projectRoot) {
 					commit: commit.commitSha,
 					sync: commit.sync,
 					base_advance: commit.base_advance,
-					remote_push: commit.remote_push
+					remote_push: commit.remote_push,
+					base_branch: commit.base_branch
 				}),
 				...commit.warning ? { warning: commit.warning } : {},
 				...allAdvisories.length > 0 ? {
@@ -1395,7 +1402,8 @@ function registerContentTools(server, provider, projectRoot) {
 						commit: commit.commitSha,
 						sync: commit.sync,
 						base_advance: commit.base_advance,
-						remote_push: commit.remote_push
+						remote_push: commit.remote_push,
+						base_branch: commit.base_branch
 					}),
 					...commit.warning ? { warning: commit.warning } : {},
 					context_updated: true,
@@ -1563,6 +1571,7 @@ function registerVocabularyTools(server, provider) {
 					total_terms: plan.result.total,
 					commit: commit.commitSha,
 					workflow_action: commit.workflowAction,
+					...commit.base_branch ? { base_branch: commit.base_branch } : {},
 					...commit.base_advance ? { base_advance: commit.base_advance } : {},
 					...commit.remote_push ? { remote_push: commit.remote_push } : {},
 					...commit.remote_push === "disabled" ? { remote_note: LOCAL_MODE_NOTE } : {},
@@ -1639,6 +1648,7 @@ function registerVocabularyTools(server, provider) {
 					total_terms: plan.result.total,
 					commit: commit.commitSha,
 					workflow_action: commit.workflowAction,
+					...commit.base_branch ? { base_branch: commit.base_branch } : {},
 					...commit.base_advance ? { base_advance: commit.base_advance } : {},
 					...commit.remote_push ? { remote_push: commit.remote_push } : {},
 					...commit.remote_push === "disabled" ? { remote_note: LOCAL_MODE_NOTE } : {},
@@ -1761,7 +1771,8 @@ function registerWorkflowTools(server, provider, projectRoot) {
 									commit: gitResult.commit,
 									sync: gitResult.sync,
 									base_advance: gitResult.base_advance,
-									remote_push: gitResult.remote_push
+									remote_push: gitResult.remote_push,
+									base_branch: gitResult.base_branch
 								}),
 								...gitResult.warning ? { warning: gitResult.warning } : {},
 								context_updated: true,
@@ -1988,6 +1999,7 @@ function registerWorkflowTools(server, provider, projectRoot) {
 					branch: targetBranch,
 					action: result.action,
 					commit: result.commit,
+					base_branch: result.base_branch,
 					sync: result.sync,
 					base_advance: result.base_advance,
 					remote_push: result.remote_push,
@@ -2632,7 +2644,8 @@ function registerBulkTools(server, _provider, projectRoot) {
 								commit: gitResult.commit,
 								sync: gitResult.sync,
 								base_advance: gitResult.base_advance,
-								remote_push: gitResult.remote_push
+								remote_push: gitResult.remote_push,
+								base_branch: gitResult.base_branch
 							}),
 							...gitResult.warning ? { warning: gitResult.warning } : {},
 							...divergenceNextSteps(gitResult).length > 0 ? { next_steps: divergenceNextSteps(gitResult) } : {},
@@ -2814,7 +2827,8 @@ function registerBulkTools(server, _provider, projectRoot) {
 								commit: gitResult.commit,
 								sync: gitResult.sync,
 								base_advance: gitResult.base_advance,
-								remote_push: gitResult.remote_push
+								remote_push: gitResult.remote_push,
+								base_branch: gitResult.base_branch
 							}),
 							...gitResult.warning ? { warning: gitResult.warning } : {},
 							...divergenceNextSteps(gitResult).length > 0 ? { next_steps: divergenceNextSteps(gitResult) } : {},
@@ -2907,7 +2921,8 @@ function registerBulkTools(server, _provider, projectRoot) {
 								commit: gitResult.commit,
 								sync: gitResult.sync,
 								base_advance: gitResult.base_advance,
-								remote_push: gitResult.remote_push
+								remote_push: gitResult.remote_push,
+								base_branch: gitResult.base_branch
 							}),
 							...gitResult.warning ? { warning: gitResult.warning } : {},
 							...divergenceNextSteps(gitResult).length > 0 ? { next_steps: divergenceNextSteps(gitResult) } : {},
@@ -3080,7 +3095,7 @@ function registerMediaTools(server, provider, _projectRoot) {
 }
 //#endregion
 //#region package.json
-var version = "3.10.1";
+var version = "3.11.1";
 //#endregion
 //#region src/server.ts
 /**
@@ -3157,4 +3172,4 @@ function resolveServerContext(input) {
 //#endregion
 export { createServer as n, DEFAULT_INSTRUCTIONS as t };
 
-//# sourceMappingURL=server-DvWJelCh.mjs.map
+//# sourceMappingURL=server-aQKtD1N5.mjs.map