contentrain 0.3.1 → 0.3.2

package/README.md

@@ -135,7 +135,7 @@ contentrain generate --watch
 
 ## 👀 Review Workflow
 
-Most write operations create `contentrain/*` branches in review mode.
+Most write operations create feature branches from the dedicated `contentrain` branch. In review mode, these branches are pushed to remote for team review. In auto-merge mode, they are merged into the `contentrain` branch and baseBranch is advanced via update-ref.
 
 Use:
 
@@ -146,7 +146,7 @@ contentrain diff
 
 to understand:
 
-- how many active review branches exist
+- how many active review branches exist on the `contentrain` branch
 - whether branch health is blocking new writes
 - what changed before merging or deleting a branch
 

package/dist/{diff-otz0kGqT.mjs → diff-Cq6iSnaD.mjs}

@@ -4,6 +4,10 @@ import { defineCommand } from "citty";
 import { confirm, intro, isCancel, log, outro, select } from "@clack/prompts";
 import { simpleGit } from "simple-git";
 import { readConfig } from "@contentrain/mcp/core/config";
+import { CONTENTRAIN_BRANCH } from "@contentrain/types";
+import { tmpdir } from "node:os";
+import { randomUUID } from "node:crypto";
+import { join } from "node:path";
 //#region src/commands/diff.ts
 var diff_default = defineCommand({
 	meta: {
@@ -19,17 +23,16 @@ var diff_default = defineCommand({
 		const projectRoot = await resolveProjectRoot(args.root);
 		const git = simpleGit(projectRoot);
 		intro(pc.bold("contentrain diff"));
-		const branches = await git.branch(["--list", "contentrain/*"]);
-		if (branches.all.length === 0) {
+		const featureBranches = (await git.branch(["--list", "cr/*"])).all.filter((b) => b !== CONTENTRAIN_BRANCH);
+		if (featureBranches.length === 0) {
 			log.message("No pending contentrain branches.");
 			outro("");
 			return;
 		}
-		log.info(pc.bold(`Pending branches (${branches.all.length})`));
-		const config = await readConfig(projectRoot);
-		const baseBranch = process.env["CONTENTRAIN_BRANCH"] ?? config?.repository?.default_branch ?? ((await git.raw(["branch", "--show-current"])).trim() || "main");
+		log.info(pc.bold(`Pending branches (${featureBranches.length})`));
+		const baseBranch = (await readConfig(projectRoot))?.repository?.default_branch ?? ((await git.raw(["branch", "--show-current"])).trim() || "main");
 		const branchInfos = [];
-		for (const branch of branches.all) try {
+		for (const branch of featureBranches) try {
 			const diffStat = await git.diffSummary([`${baseBranch}...${branch}`]);
 			branchInfos.push({
 				name: branch,
@@ -92,13 +95,42 @@ var diff_default = defineCommand({
 		}
 		if (action === "merge") {
 			const confirmMerge = await confirm({ message: `Merge ${selectedBranch} into ${baseBranch}?` });
-			if (!isCancel(confirmMerge) && confirmMerge) try {
-				await git.checkout(baseBranch);
-				await git.merge([selectedBranch, "--no-edit"]);
-				await git.deleteLocalBranch(selectedBranch, true);
-				log.success(`Merged and deleted ${selectedBranch}`);
-			} catch (error) {
-				log.error(`Merge failed: ${error instanceof Error ? error.message : String(error)}`);
+			if (!isCancel(confirmMerge) && confirmMerge) {
+				const mergePath = join(tmpdir(), `cr-merge-${randomUUID()}`);
+				try {
+					if (!(await git.branchLocal()).all.includes(CONTENTRAIN_BRANCH)) await git.branch([CONTENTRAIN_BRANCH, baseBranch]);
+					await git.raw([
+						"worktree",
+						"add",
+						mergePath,
+						CONTENTRAIN_BRANCH
+					]);
+					const mergeGit = simpleGit(mergePath);
+					await mergeGit.merge([baseBranch, "--no-edit"]).catch(() => {});
+					await mergeGit.merge([selectedBranch, "--no-edit"]);
+					const tip = (await mergeGit.raw(["rev-parse", "HEAD"])).trim();
+					await git.raw([
+						"update-ref",
+						`refs/heads/${baseBranch}`,
+						tip
+					]);
+					if ((await git.raw(["branch", "--show-current"])).trim() === baseBranch) await git.checkout([
+						tip,
+						"--",
+						".contentrain/"
+					]);
+					await git.deleteLocalBranch(selectedBranch, true);
+					log.success(`Merged and deleted ${selectedBranch}`);
+				} catch (error) {
+					log.error(`Merge failed: ${error instanceof Error ? error.message : String(error)}`);
+				} finally {
+					await git.raw([
+						"worktree",
+						"remove",
+						mergePath,
+						"--force"
+					]).catch(() => {});
+				}
 			}
 		} else if (action === "delete") {
 			const confirmDelete = await confirm({ message: `Delete ${selectedBranch}? This cannot be undone.` });

package/dist/index.mjs

@@ -5,17 +5,17 @@ import { defineCommand, runMain } from "citty";
 runMain(defineCommand({
 	meta: {
 		name: "contentrain",
-		version: "0.3.1",
+		version: "0.3.2",
 		description: "Contentrain CLI — AI content governance infrastructure"
 	},
 	subCommands: {
 		init: () => import("./init-BARgfYUV.mjs").then((m) => m.default),
-		status: () => import("./status-kF5miVty.mjs").then((m) => m.default),
+		status: () => import("./status-Bi9HYgcA.mjs").then((m) => m.default),
 		doctor: () => import("./doctor-DyKjAIKH.mjs").then((m) => m.default),
 		validate: () => import("./validate-DnVamp3p.mjs").then((m) => m.default),
-		serve: () => import("./serve-CaCZMeHF.mjs").then((m) => m.default),
+		serve: () => import("./serve-DL4LhWxl.mjs").then((m) => m.default),
 		generate: () => import("./generate-DDEDRLdy.mjs").then((m) => m.default),
-		diff: () => import("./diff-otz0kGqT.mjs").then((m) => m.default)
+		diff: () => import("./diff-Cq6iSnaD.mjs").then((m) => m.default)
 	}
 }));
 //#endregion

package/dist/{serve-CaCZMeHF.mjs → serve-DL4LhWxl.mjs}

@@ -66,7 +66,7 @@ var serve_default = defineCommand({
 			consola.warn("Serve UI not found. Running in API-only mode.");
 			consola.info("UI will be available after building: cd packages/cli/src/serve-ui && pnpm build");
 		}
-		const { createServeApp } = await import("./server-DW0KXB0T.mjs");
+		const { createServeApp } = await import("./server-WLDOAZa4.mjs");
 		const { app, handleUpgrade } = await createServeApp({
 			projectRoot,
 			port,

package/dist/{server-DW0KXB0T.mjs → server-WLDOAZa4.mjs}

@@ -1,4 +1,7 @@
 import { simpleGit } from "simple-git";
+import { CONTENTRAIN_BRANCH } from "@contentrain/types";
+import { tmpdir } from "node:os";
+import { randomUUID } from "node:crypto";
 import { join } from "node:path";
 import { readFile, unlink, writeFile } from "node:fs/promises";
 import { existsSync, readFileSync } from "node:fs";
@@ -202,18 +205,19 @@ async function createServeApp(options) {
 	}));
 	router.add("/api/branches", defineEventHandler(async () => {
 		const branches = await simpleGit(projectRoot).branchLocal();
-		const crBranches = branches.all.filter((b) => b.startsWith("contentrain/")).map((b) => ({
+		const crBranches = branches.all.filter((b) => b.startsWith("cr/")).map((b) => ({
 			name: b,
-			current: b === branches.current
+			current: b === branches.current,
+			system: b === CONTENTRAIN_BRANCH
 		}));
 		return {
 			branches: crBranches,
-			total: crBranches.length
+			total: crBranches.filter((b) => !b.system).length
 		};
 	}));
 	router.add("/api/branches/diff", defineEventHandler(async (event) => {
 		const branchName = getQuery(event)["name"];
-		if (!branchName?.startsWith("contentrain/")) throw createError({
+		if (!branchName?.startsWith("cr/")) throw createError({
 			statusCode: 400,
 			message: "Invalid branch name"
 		});
@@ -232,29 +236,53 @@ async function createServeApp(options) {
 			message: "Method not allowed"
 		});
 		const branchName = (await readBody(event)).branch;
-		if (!branchName?.startsWith("contentrain/")) throw createError({
+		if (!branchName?.startsWith("cr/")) throw createError({
 			statusCode: 400,
 			message: "Invalid branch name"
 		});
 		const git = simpleGit(projectRoot);
 		const baseBranch = getDefaultBranch();
-		await git.checkout(baseBranch);
-		await git.merge([
-			branchName,
-			"--no-edit",
-			"-X",
-			"theirs"
+		if (!(await git.branchLocal()).all.includes(CONTENTRAIN_BRANCH)) await git.branch([CONTENTRAIN_BRANCH, baseBranch]);
+		const mergePath = join(tmpdir(), `cr-merge-${randomUUID()}`);
+		await git.raw([
+			"worktree",
+			"add",
+			mergePath,
+			CONTENTRAIN_BRANCH
 		]);
-		await git.deleteLocalBranch(branchName, true);
-		broadcast({
-			type: "branch:merged",
-			branch: branchName
-		});
-		return {
-			status: "merged",
-			branch: branchName,
-			into: baseBranch
-		};
+		const mergeGit = simpleGit(mergePath);
+		try {
+			await mergeGit.merge([baseBranch, "--no-edit"]).catch(() => {});
+			await mergeGit.merge([branchName, "--no-edit"]);
+			const tip = (await mergeGit.raw(["rev-parse", "HEAD"])).trim();
+			await git.raw([
+				"update-ref",
+				`refs/heads/${baseBranch}`,
+				tip
+			]);
+			if ((await git.raw(["branch", "--show-current"])).trim() === baseBranch) await git.checkout([
+				tip,
+				"--",
+				".contentrain/"
+			]);
+			await git.deleteLocalBranch(branchName, true);
+			broadcast({
+				type: "branch:merged",
+				branch: branchName
+			});
+			return {
+				status: "merged",
+				branch: branchName,
+				into: baseBranch
+			};
+		} finally {
+			await git.raw([
+				"worktree",
+				"remove",
+				mergePath,
+				"--force"
+			]).catch(() => {});
+		}
 	}));
 	router.add("/api/branches/reject", defineEventHandler(async (event) => {
 		if (event.method !== "POST") throw createError({
@@ -262,7 +290,7 @@ async function createServeApp(options) {
 			message: "Method not allowed"
 		});
 		const branchName = (await readBody(event)).branch;
-		if (!branchName?.startsWith("contentrain/")) throw createError({
+		if (!branchName?.startsWith("cr/")) throw createError({
 			statusCode: 400,
 			message: "Invalid branch name"
 		});
@@ -417,7 +445,7 @@ async function createServeApp(options) {
 			const op = JSON.parse(raw)?.lastOperation;
 			if (op?.tool === "contentrain_scan" || op?.tool === "contentrain_apply") lastNormalize = op;
 		} catch {}
-		const branches = (await simpleGit(projectRoot).branchLocal()).all.filter((b) => b.startsWith("contentrain/normalize/")).map((b) => ({ name: b }));
+		const branches = (await simpleGit(projectRoot).branchLocal()).all.filter((b) => b.startsWith("cr/normalize/")).map((b) => ({ name: b }));
 		return {
 			lastOperation: lastNormalize,
 			pendingBranches: branches
@@ -511,23 +539,53 @@ async function createServeApp(options) {
 			message: "Method not allowed"
 		});
 		const branchName = (await readBody(event)).branch;
-		if (!branchName?.startsWith("contentrain/")) throw createError({
+		if (!branchName?.startsWith("cr/")) throw createError({
 			statusCode: 400,
 			message: "Invalid branch name"
 		});
 		const git = simpleGit(projectRoot);
-		const currentBranch = (await git.branchLocal()).current;
-		await git.merge([branchName]);
-		await git.deleteLocalBranch(branchName, true);
-		broadcast({
-			type: "branch:merged",
-			branch: branchName
-		});
-		return {
-			status: "merged",
-			branch: branchName,
-			into: currentBranch
-		};
+		const baseBranch = getDefaultBranch();
+		if (!(await git.branchLocal()).all.includes(CONTENTRAIN_BRANCH)) await git.branch([CONTENTRAIN_BRANCH, baseBranch]);
+		const mergePath = join(tmpdir(), `cr-merge-${randomUUID()}`);
+		await git.raw([
+			"worktree",
+			"add",
+			mergePath,
+			CONTENTRAIN_BRANCH
+		]);
+		const mergeGit = simpleGit(mergePath);
+		try {
+			await mergeGit.merge([baseBranch, "--no-edit"]).catch(() => {});
+			await mergeGit.merge([branchName, "--no-edit"]);
+			const tip = (await mergeGit.raw(["rev-parse", "HEAD"])).trim();
+			await git.raw([
+				"update-ref",
+				`refs/heads/${baseBranch}`,
+				tip
+			]);
+			if ((await git.raw(["branch", "--show-current"])).trim() === baseBranch) await git.checkout([
+				tip,
+				"--",
+				".contentrain/"
+			]);
+			await git.deleteLocalBranch(branchName, true);
+			broadcast({
+				type: "branch:merged",
+				branch: branchName
+			});
+			return {
+				status: "merged",
+				branch: branchName,
+				into: baseBranch
+			};
+		} finally {
+			await git.raw([
+				"worktree",
+				"remove",
+				mergePath,
+				"--force"
+			]).catch(() => {});
+		}
 	}));
 	router.add("/api/normalize/sources", defineEventHandler(async () => {
 		const sourcesPath = join(crDir, "normalize-sources.json");

package/dist/{status-kF5miVty.mjs → status-Bi9HYgcA.mjs}

@@ -3,6 +3,7 @@ import { i as pc, n as formatPercent, r as formatTable, t as formatCount } from
 import { defineCommand } from "citty";
 import { intro, log, outro } from "@clack/prompts";
 import { simpleGit } from "simple-git";
+import { CONTENTRAIN_BRANCH } from "@contentrain/types";
 import { countEntries, readModel } from "@contentrain/mcp/core/model-manager";
 import { validateProject } from "@contentrain/mcp/core/validator";
 //#region src/commands/status.ts
@@ -43,7 +44,22 @@ var status_default = defineCommand({
 					};
 				} catch {}
 				try {
-					jsonResult["pending_branches"] = (await simpleGit(projectRoot).branch(["--list", "contentrain/*"])).all;
+					const git = simpleGit(projectRoot);
+					const branches = await git.branch(["--list", "cr/*"]);
+					const allLocal = await git.branchLocal();
+					jsonResult["pending_branches"] = branches.all.filter((b) => b !== CONTENTRAIN_BRANCH);
+					const contentBranchExists = allLocal.all.includes(CONTENTRAIN_BRANCH);
+					const contentBranchInfo = { exists: contentBranchExists };
+					if (contentBranchExists) try {
+						const baseBranch = ctx.config?.repository?.default_branch ?? "main";
+						const aheadRaw = await git.raw([
+							"rev-list",
+							"--count",
+							`${baseBranch}..${CONTENTRAIN_BRANCH}`
+						]);
+						contentBranchInfo["ahead"] = Number.parseInt(aheadRaw.trim(), 10);
+					} catch {}
+					jsonResult["content_branch"] = contentBranchInfo;
 				} catch {}
 			}
 			process.stdout.write(JSON.stringify(jsonResult, null, 2));
@@ -91,9 +107,26 @@ var status_default = defineCommand({
 			], rows));
 		} else log.message("  No models yet. Run `contentrain init` with a template or create models.");
 		try {
-			const branches = await simpleGit(projectRoot).branch(["--list", "contentrain/*"]);
-			if (branches.all.length > 0) {
-				const count = branches.all.length;
+			const git = simpleGit(projectRoot);
+			if ((await git.branchLocal()).all.includes(CONTENTRAIN_BRANCH)) try {
+				const baseBranch = ctx.config?.repository?.default_branch ?? "main";
+				const aheadRaw = await git.raw([
+					"rev-list",
+					"--count",
+					`${baseBranch}..${CONTENTRAIN_BRANCH}`
+				]);
+				const ahead = Number.parseInt(aheadRaw.trim(), 10);
+				if (ahead > 0) {
+					log.info(pc.bold(`\nContent branch`));
+					log.message(`  ${pc.cyan(CONTENTRAIN_BRANCH)} is ${pc.yellow(String(ahead))} commit(s) ahead of ${baseBranch}`);
+				} else {
+					log.info(pc.bold(`\nContent branch`));
+					log.message(`  ${pc.cyan(CONTENTRAIN_BRANCH)} is in sync with ${baseBranch}`);
+				}
+			} catch {}
+			const featureBranches = (await git.branch(["--list", "cr/*"])).all.filter((b) => b !== CONTENTRAIN_BRANCH);
+			if (featureBranches.length > 0) {
+				const count = featureBranches.length;
 				if (count >= 80) {
 					log.error(pc.bold(`\nBLOCKED: ${count} active contentrain branches (limit: 80)`));
 					log.message(`  New writes are blocked. Merge or delete old branches with ${pc.cyan("contentrain diff")}.`);
@@ -101,7 +134,7 @@ var status_default = defineCommand({
 					log.warning(pc.bold(`\nWARNING: ${count} active contentrain branches (limit: 50)`));
 					log.message(`  Consider merging or deleting old branches with ${pc.cyan("contentrain diff")}.`);
 				} else log.info(pc.bold(`\nPending branches (${count})`));
-				for (const branch of branches.all) log.message(`  ${pc.yellow("●")} ${branch}`);
+				for (const branch of featureBranches) log.message(`  ${pc.yellow("●")} ${branch}`);
 				log.message(`  Run ${pc.cyan("contentrain diff")} to review.`);
 			}
 		} catch {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "contentrain",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "license": "MIT",
   "description": "CLI for Contentrain — AI content governance infrastructure",
   "type": "module",
@@ -46,10 +46,10 @@
     "picocolors": "^1.1.0",
     "simple-git": "^3.27.0",
     "ws": "^8.18.0",
-    "@contentrain/rules": "0.3.0",
-    "@contentrain/mcp": "1.0.7",
-    "@contentrain/query": "5.1.0",
-    "@contentrain/types": "0.2.0"
+    "@contentrain/rules": "0.3.1",
+    "@contentrain/mcp": "1.1.0",
+    "@contentrain/query": "5.1.1",
+    "@contentrain/types": "0.3.0"
   },
   "devDependencies": {
     "@types/ws": "^8.5.0",