contentrain 0.15.42 → 0.16.0

package/README.md

@@ -248,7 +248,7 @@ Most write operations create feature branches from the dedicated `contentrain` b
 
 When baseBranch has diverged (commits `contentrain` lacks — the state a dual-domain migration PR leaves behind), a write is a **partial success**: it lands on `contentrain` and reports `base_advance: "blocked_diverged"` instead of failing. `contentrain status` shows the relation in both directions; `contentrain reconcile` merges the branches content-aware (a two-parent merge commit) so the fast-forward advance works again.
 
-Merging a review branch (via `contentrain merge`, `contentrain diff`, the Serve UI, or the MCP tools) also deletes its remote copy, so merged branches never pile up as phantom pending reviews. The same applies to rejected/deleted drafts. This is best-effort — an offline or permission failure only produces a warning — and can be disabled with `remoteBranchCleanup: false` in `config.json`. Note that deleting a pushed branch closes any open PR/MR on it.
+Merging a review branch (via `contentrain merge`, `contentrain diff`, the Serve UI, or the MCP tools) also deletes its remote copy, so merged branches never pile up as phantom pending reviews. The same applies to rejected/deleted drafts. This is best-effort — an offline or permission failure only produces a warning — and can be disabled with `remoteBranchCleanup: false` in `config.json`. In local mode (`"git": { "push": false }` in `config.json`, or `CONTENTRAIN_NO_PUSH=1`) nothing is pushed or deleted on the remote, and `merge`/`prune` print that they skipped it. Note that deleting a pushed branch closes any open PR/MR on it.
 
 Use:
 

package/dist/index.mjs

@@ -2,7 +2,7 @@
 import { i as pc } from "./ui-B8l_LC36.mjs";
 import { defineCommand, runMain } from "citty";
 //#region package.json
-var version = "0.15.42";
+var version = "0.16.0";
 //#endregion
 //#region src/utils/debug.ts
 /**
@@ -49,12 +49,12 @@ runMain(defineCommand({
 		status: () => import("./status-DSzoldCi.mjs").then((m) => m.default),
 		doctor: () => import("./doctor-B9MJgRO5.mjs").then((m) => m.default),
 		validate: () => import("./validate-CiP3MkeV.mjs").then((m) => m.default),
-		serve: () => import("./serve-C2c8aU-K.mjs").then((m) => m.default),
+		serve: () => import("./serve-BlnNcFpN.mjs").then((m) => m.default),
 		generate: () => import("./generate-Cd-4W6ja.mjs").then((m) => m.default),
 		diff: () => import("./diff-6EnRgpPR.mjs").then((m) => m.default),
-		merge: () => import("./merge-C8l80Cg-.mjs").then((m) => m.default),
+		merge: () => import("./merge-C2ZE_Vg4.mjs").then((m) => m.default),
 		reconcile: () => import("./reconcile-D1clXB6h.mjs").then((m) => m.default),
-		prune: () => import("./prune-CvTj9QMj.mjs").then((m) => m.default),
+		prune: () => import("./prune-BVT3jmRn.mjs").then((m) => m.default),
 		describe: () => import("./describe-C6-AWlKx.mjs").then((m) => m.default),
 		"describe-format": () => import("./describe-format-CR0-NMR8.mjs").then((m) => m.default),
 		scaffold: () => import("./scaffold-DX6eJ0n1.mjs").then((m) => m.default),

package/dist/{merge-C8l80Cg-.mjs → merge-C2ZE_Vg4.mjs}

@@ -67,6 +67,7 @@ var merge_default = defineCommand({
 			log.success(`Merged ${branch} (commit ${result.commit.slice(0, 8)})`);
 			if (result.base_advance === "blocked_diverged") log.warning(result.warning ?? "The base branch has diverged and was not advanced — run `contentrain reconcile`.");
 			if (result.remote_push === "rejected") log.warning("The remote refused the contentrain push — local and remote have diverged; fetch and run `contentrain reconcile`.");
+			if (result.remote_push === "disabled") log.info("Not pushed (local mode): pushing is off (git.push: false in config.json, or CONTENTRAIN_NO_PUSH=1).");
 			if (result.remote?.deleted) log.message(pc.dim("  Deleted remote copy."));
 			if (result.remote?.warning) log.warning(`Remote copy not deleted: ${result.remote.warning}`);
 			if (result.sync?.synced?.length) log.message(pc.dim(`  Synced ${result.sync.synced.length} file(s) to working tree.`));

package/dist/{prune-CvTj9QMj.mjs → prune-BVT3jmRn.mjs}

@@ -65,6 +65,7 @@ var prune_default = defineCommand({
 		}
 		intro(pc.bold("contentrain prune"));
 		if (preview.skipped === "disabled") log.info("Remote branch cleanup is disabled (remoteBranchCleanup: false in config.json).");
+		else if (preview.skipped === "local-mode") log.info("Local mode: pushing is off (git.push: false in config.json, or CONTENTRAIN_NO_PUSH=1) — the remote is left untouched; only local merged branches will be pruned.");
 		else if (preview.skipped === "no-remote") log.info("No git remote configured — only local merged branches will be pruned.");
 		else if (preview.skipped === "offline") log.warning(`Could not reach the remote: ${preview.errors[0] ?? "unknown error"}`);
 		else if (preview.deleted.length === 0) log.info("No merged cr/* branches on the remote.");

package/dist/{serve-C2c8aU-K.mjs → serve-BlnNcFpN.mjs}

@@ -139,7 +139,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-B5Iv0MyV.mjs");
+		const { createServeApp } = await import("./server-CO3WS3I8.mjs");
 		const { app, handleUpgrade } = await createServeApp({
 			projectRoot,
 			port,

package/dist/{server-B5Iv0MyV.mjs → server-CO3WS3I8.mjs}

@@ -7,7 +7,7 @@ import { InMemoryTransport } from "@modelcontextprotocol/sdk/inMemory.js";
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { createGit } from "@contentrain/mcp/git/identity";
 import { CONTENTRAIN_BRANCH, LOCAL_CAPABILITIES } from "@contentrain/types";
-import { mergeBranch } from "@contentrain/mcp/git/transaction";
+import { LOCAL_MODE_NOTE, mergeBranch } from "@contentrain/mcp/git/transaction";
 import { branchDiff, checkBranchHealth, deleteRemoteBranch } from "@contentrain/mcp/git/branch-lifecycle";
 import { resolveBaseBranch } from "@contentrain/mcp/git/base-branch";
 import { normalizeOperationError } from "@contentrain/mcp/git/errors";
@@ -465,6 +465,7 @@ async function createServeApp(options) {
 				sync: result.sync,
 				base_advance: result.base_advance,
 				remote_push: result.remote_push,
+				...result.remote_push === "disabled" ? { remote_note: LOCAL_MODE_NOTE } : {},
 				...result.warning ? { warning: result.warning } : {},
 				remote: result.remote
 			};
@@ -778,6 +779,7 @@ async function createServeApp(options) {
 				sync: result.sync,
 				base_advance: result.base_advance,
 				remote_push: result.remote_push,
+				...result.remote_push === "disabled" ? { remote_note: LOCAL_MODE_NOTE } : {},
 				...result.warning ? { warning: result.warning } : {},
 				remote: result.remote
 			};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "contentrain",
-  "version": "0.15.42",
+  "version": "0.16.0",
   "license": "MIT",
   "description": "CLI for Contentrain — AI content governance infrastructure",
   "type": "module",
@@ -47,12 +47,12 @@
     "simple-git": "^3.27.0",
     "ws": "^8.18.0",
     "zod": "^3.24.0",
-    "@contentrain/mcp": "3.9.33",
-    "@contentrain/query": "7.6.40",
+    "@contentrain/mcp": "3.10.0",
+    "@contentrain/query": "7.6.41",
     "@contentrain/rules": "0.7.3",
     "@contentrain/skills": "0.9.5",
-    "@contentrain/types": "1.60.0",
-    "@contentrain/wp-import": "0.12.0"
+    "@contentrain/types": "1.61.0",
+    "@contentrain/wp-import": "0.12.1"
   },
   "devDependencies": {
     "@types/ws": "^8.5.0",