@contentrain/mcp 1.0.7 → 1.1.1

package/dist/transaction-B0V0_SE2.mjs

@@ -0,0 +1,288 @@
+import { t as readConfig } from "./config-B5kc2oeV.mjs";
+import { n as writeContext } from "./context-DIDt_TxX.mjs";
+import { t as branchTimestamp } from "./id-DV_T9Ic8.mjs";
+import { join } from "node:path";
+import { rm } from "node:fs/promises";
+import { CONTENTRAIN_BRANCH } from "@contentrain/types";
+import { simpleGit } from "simple-git";
+import { tmpdir } from "node:os";
+import { randomUUID } from "node:crypto";
+//#region src/git/transaction.ts
+async function ensureContentBranch(projectRoot) {
+	const git = simpleGit(projectRoot);
+	const config = await readConfig(projectRoot);
+	const branches = await git.branchLocal();
+	if (branches.all.includes(CONTENTRAIN_BRANCH)) return;
+	const baseBranch = config?.repository?.default_branch || (await git.raw(["branch", "--show-current"])).trim() || "main";
+	if (branches.all.filter((b) => b.startsWith("contentrain/")).length > 0) {
+		let mergedBranches = [];
+		try {
+			mergedBranches = (await git.raw([
+				"branch",
+				"--merged",
+				baseBranch
+			])).split("\n").map((b) => b.trim().replace(/^\*\s*/, "")).filter((b) => b.startsWith("contentrain/"));
+		} catch {}
+		for (const b of mergedBranches) try {
+			await git.raw([
+				"branch",
+				"-d",
+				b
+			]);
+		} catch {}
+		const remaining = (await git.branchLocal()).all.filter((b) => b.startsWith("contentrain/"));
+		if (remaining.length > 0) for (const b of remaining) try {
+			await git.raw([
+				"branch",
+				"-D",
+				b
+			]);
+		} catch {}
+	}
+	await git.branch([CONTENTRAIN_BRANCH, baseBranch]);
+	const remoteName = process.env["CONTENTRAIN_REMOTE"] ?? "origin";
+	try {
+		if ((await git.getRemotes()).some((r) => r.name === remoteName)) await git.push([
+			"-u",
+			remoteName,
+			CONTENTRAIN_BRANCH
+		]);
+	} catch {}
+}
+async function selectiveSync(projectRoot, _worktreePath, contentrainTip, _previousBaseRef, dirtyFilesBeforeUpdate) {
+	const git = simpleGit(projectRoot);
+	const synced = [];
+	const skipped = [];
+	const compareRef = _previousBaseRef ?? contentrainTip;
+	let changedFiles = [];
+	try {
+		changedFiles = (await git.raw([
+			"diff-tree",
+			"--name-only",
+			"-r",
+			"--no-commit-id",
+			compareRef,
+			contentrainTip
+		])).split("\n").filter((f) => f.trim().length > 0);
+	} catch {
+		try {
+			changedFiles = (await git.raw([
+				"ls-tree",
+				"-r",
+				"--name-only",
+				contentrainTip,
+				".contentrain/"
+			])).split("\n").filter((f) => f.trim().length > 0);
+		} catch {
+			return {
+				synced,
+				skipped
+			};
+		}
+	}
+	if (changedFiles.length === 0) return {
+		synced,
+		skipped
+	};
+	const dirtyFiles = dirtyFilesBeforeUpdate ?? /* @__PURE__ */ new Set();
+	const filesInTip = /* @__PURE__ */ new Set();
+	for (const file of changedFiles) try {
+		await git.raw([
+			"cat-file",
+			"-e",
+			`${contentrainTip}:${file}`
+		]);
+		filesInTip.add(file);
+	} catch {}
+	for (const file of changedFiles) if (dirtyFiles.has(file)) skipped.push(file);
+	else if (filesInTip.has(file)) try {
+		await git.checkout([
+			"HEAD",
+			"--",
+			file
+		]);
+		synced.push(file);
+	} catch {
+		skipped.push(file);
+	}
+	else try {
+		await rm(join(projectRoot, file), { force: true });
+		synced.push(file);
+	} catch {
+		skipped.push(file);
+	}
+	return {
+		synced,
+		skipped,
+		warning: skipped.length > 0 ? `${skipped.length} file(s) skipped due to local changes: ${skipped.join(", ")}. Commit your changes, then run: git checkout HEAD -- ${skipped.join(" ")}` : void 0
+	};
+}
+async function createTransaction(projectRoot, branchName, options) {
+	const git = simpleGit(projectRoot);
+	const config = await readConfig(projectRoot);
+	const workflow = options?.workflowOverride ?? config?.workflow ?? "auto-merge";
+	const remoteName = process.env["CONTENTRAIN_REMOTE"] ?? "origin";
+	let baseBranch = process.env["CONTENTRAIN_BRANCH"] ?? config?.repository?.default_branch ?? "";
+	let currentBranch = "";
+	let hasRemote = false;
+	const [branchResult, remotes] = await Promise.all([git.raw(["branch", "--show-current"]).catch(() => ""), git.getRemotes().catch(() => [])]);
+	currentBranch = branchResult.trim();
+	if (!baseBranch) baseBranch = currentBranch || "main";
+	hasRemote = remotes.some((r) => r.name === remoteName);
+	if (currentBranch === CONTENTRAIN_BRANCH) throw Object.assign(/* @__PURE__ */ new Error(`The '${CONTENTRAIN_BRANCH}' branch is checked out in your working directory. Contentrain manages this branch automatically. Switch to your working branch and retry.`), {
+		code: "CONTENT_BRANCH_CHECKED_OUT",
+		agent_hint: "Ask the developer to switch to their working branch (e.g., main or a feature branch), then retry the operation.",
+		developer_action: `git checkout ${baseBranch}`
+	});
+	await ensureContentBranch(projectRoot);
+	if (hasRemote) await Promise.all([git.fetch(remoteName, baseBranch).catch(() => {}), git.fetch(remoteName, CONTENTRAIN_BRANCH).catch(() => {})]);
+	const worktreePath = join(tmpdir(), `cr-${randomUUID()}`);
+	const branch = branchName;
+	await git.raw([
+		"worktree",
+		"add",
+		worktreePath,
+		CONTENTRAIN_BRANCH
+	]);
+	const wtGit = simpleGit(worktreePath);
+	const authorName = process.env["CONTENTRAIN_AUTHOR_NAME"] ?? "Contentrain";
+	const authorEmail = process.env["CONTENTRAIN_AUTHOR_EMAIL"] ?? "mcp@contentrain.io";
+	await wtGit.addConfig("user.name", authorName);
+	await wtGit.addConfig("user.email", authorEmail);
+	try {
+		await wtGit.merge([baseBranch, "--no-edit"]);
+	} catch {
+		try {
+			await wtGit.merge(["--abort"]);
+		} catch {}
+		if (hasRemote) try {
+			await wtGit.merge([`${remoteName}/${baseBranch}`, "--no-edit"]);
+		} catch {
+			try {
+				await wtGit.merge(["--abort"]);
+			} catch {}
+		}
+	}
+	if (hasRemote) try {
+		await wtGit.merge([`${remoteName}/${CONTENTRAIN_BRANCH}`, "--no-edit"]);
+	} catch {
+		try {
+			await wtGit.merge(["--abort"]);
+		} catch {}
+	}
+	await wtGit.checkout(["-b", branch]);
+	let commitHash = "";
+	return {
+		worktree: worktreePath,
+		branch,
+		async write(callback) {
+			await callback(worktreePath);
+		},
+		async commit(message, contextUpdate) {
+			if (contextUpdate) await writeContext(worktreePath, contextUpdate);
+			await wtGit.add(".");
+			commitHash = (await wtGit.commit(message, { "--allow-empty": null })).commit || "";
+			return commitHash;
+		},
+		async complete() {
+			if (workflow === "review") {
+				if (hasRemote) await git.push(remoteName, branch);
+				return {
+					action: "pending-review",
+					commit: commitHash
+				};
+			}
+			await wtGit.checkout(CONTENTRAIN_BRANCH);
+			try {
+				await wtGit.merge([branch, "--no-edit"]);
+			} catch {
+				try {
+					await wtGit.merge(["--abort"]);
+				} catch {}
+				throw Object.assign(/* @__PURE__ */ new Error(`Merge conflict when merging branch "${branch}" into "${CONTENTRAIN_BRANCH}". The branch still exists with your changes intact. Resolve the conflict manually, or delete the branch and retry.`), {
+					code: "CONTENT_BRANCH_MERGE_CONFLICT",
+					agent_hint: "The feature branch could not be merged into the contentrain branch. Ask the developer to resolve the conflict.",
+					developer_action: `git checkout ${CONTENTRAIN_BRANCH} && git merge ${branch}`
+				});
+			}
+			const [contentrainTip, previousBaseRef, statusBeforeUpdate] = await Promise.all([
+				wtGit.raw(["rev-parse", "HEAD"]).then((s) => s.trim()),
+				git.raw(["rev-parse", baseBranch]).then((s) => s.trim()),
+				git.status()
+			]);
+			const dirtyFilesBeforeUpdate = new Set(statusBeforeUpdate.files.map((f) => f.path));
+			try {
+				await git.raw([
+					"merge-base",
+					"--is-ancestor",
+					previousBaseRef,
+					contentrainTip
+				]);
+			} catch {
+				throw Object.assign(/* @__PURE__ */ new Error(`Cannot fast-forward "${baseBranch}" to contentrain tip. The base branch has diverged. Merge "${baseBranch}" into "${CONTENTRAIN_BRANCH}" first.`), {
+					code: "BASE_UPDATE_FAILED",
+					agent_hint: `The base branch has commits not in contentrain. Merge ${baseBranch} into ${CONTENTRAIN_BRANCH} first.`,
+					developer_action: `git checkout ${CONTENTRAIN_BRANCH} && git merge ${baseBranch} && git checkout ${baseBranch}`
+				});
+			}
+			await git.raw([
+				"update-ref",
+				`refs/heads/${baseBranch}`,
+				contentrainTip
+			]);
+			try {
+				await git.raw(["read-tree", "HEAD"]);
+			} catch {
+				try {
+					await git.raw(["reset", "HEAD"]);
+				} catch {}
+			}
+			const sync = await selectiveSync(projectRoot, worktreePath, contentrainTip, previousBaseRef, dirtyFilesBeforeUpdate);
+			if (hasRemote) {
+				try {
+					await git.push(remoteName, CONTENTRAIN_BRANCH);
+				} catch {
+					try {
+						await wtGit.fetch(remoteName, CONTENTRAIN_BRANCH);
+						await wtGit.merge([`${remoteName}/${CONTENTRAIN_BRANCH}`, "--no-edit"]);
+						await git.push(remoteName, CONTENTRAIN_BRANCH);
+					} catch {}
+				}
+				try {
+					await git.push(remoteName, baseBranch);
+				} catch {}
+			}
+			return {
+				action: "auto-merged",
+				commit: commitHash,
+				sync,
+				...sync.warning ? { warning: sync.warning } : {}
+			};
+		},
+		async cleanup() {
+			try {
+				await git.raw([
+					"worktree",
+					"remove",
+					worktreePath,
+					"--force"
+				]);
+			} catch {}
+		}
+	};
+}
+function buildBranchName(scope, target, locale) {
+	const ts = branchTimestamp();
+	const parts = [
+		"cr",
+		scope,
+		target
+	];
+	if (locale) parts.push(locale);
+	parts.push(ts);
+	return parts.join("/");
+}
+//#endregion
+export { createTransaction as n, ensureContentBranch as r, buildBranchName as t };
+
+//# sourceMappingURL=transaction-B0V0_SE2.mjs.map

package/dist/transaction-B0V0_SE2.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"transaction-B0V0_SE2.mjs","names":["removeFile"],"sources":["../src/git/transaction.ts"],"sourcesContent":["import { simpleGit } from 'simple-git'\nimport { join } from 'node:path'\nimport { rm as removeFile } from 'node:fs/promises'\nimport { tmpdir } from 'node:os'\nimport { randomUUID } from 'node:crypto'\nimport { readConfig } from '../core/config.js'\nimport { writeContext } from '../core/context.js'\nimport { branchTimestamp } from '../util/id.js'\nimport type { SyncResult } from '@contentrain/types'\nimport { CONTENTRAIN_BRANCH } from '@contentrain/types'\n\nexport interface ContextUpdate {\n  tool: string\n  model: string\n  locale?: string\n  entries?: string[]\n}\n\nexport interface GitTransaction {\n  worktree: string\n  branch: string\n  write(callback: (worktreePath: string) => Promise<void>): Promise<void>\n  commit(message: string, contextUpdate?: ContextUpdate): Promise<string>\n  complete(): Promise<{ action: 'auto-merged' | 'pending-review'; commit: string; sync?: SyncResult; warning?: string }>\n  cleanup(): Promise<void>\n}\n\nexport async function ensureContentBranch(projectRoot: string): Promise<void> {\n  const git = simpleGit(projectRoot)\n  const config = await readConfig(projectRoot)\n\n  // Check if contentrain branch exists locally\n  const branches = await git.branchLocal()\n  if (branches.all.includes(CONTENTRAIN_BRANCH)) return\n\n  // Detect base branch\n  const baseBranch = config?.repository?.default_branch\n    || (await git.raw(['branch', '--show-current'])).trim()\n    || 'main'\n\n  // Migration: old system used `contentrain/*` feature branches which conflict\n  // with creating a `contentrain` branch (git ref namespace: path can't be both\n  // file and directory). Clean up merged old-prefix branches before creating.\n  const oldPrefixBranches = branches.all.filter(b => b.startsWith('contentrain/'))\n  if (oldPrefixBranches.length > 0) {\n    // Get merged branches (safe to delete)\n    let mergedBranches: string[] = []\n    try {\n      const mergedOutput = await git.raw(['branch', '--merged', baseBranch])\n      mergedBranches = mergedOutput.split('\\n')\n        .map(b => b.trim().replace(/^\\*\\s*/, ''))\n        .filter(b => b.startsWith('contentrain/'))\n    } catch { /* ignore */ }\n\n    // Delete merged old-prefix branches\n    for (const b of mergedBranches) {\n      try { await git.raw(['branch', '-d', b]) } catch { /* skip if protected */ }\n    }\n\n    // Check if unmerged old-prefix branches still block creation\n    const remaining = (await git.branchLocal()).all.filter(b => b.startsWith('contentrain/'))\n    if (remaining.length > 0) {\n      // Force-delete remaining old-prefix branches (they use the old system,\n      // content is already on main via previous auto-merges)\n      for (const b of remaining) {\n        try { await git.raw(['branch', '-D', b]) } catch { /* skip */ }\n      }\n    }\n  }\n\n  // Create contentrain branch from base\n  await git.branch([CONTENTRAIN_BRANCH, baseBranch])\n\n  // Push to remote if exists\n  const remoteName = process.env['CONTENTRAIN_REMOTE'] ?? 'origin'\n  try {\n    const remotes = await git.getRemotes()\n    if (remotes.some(r => r.name === remoteName)) {\n      await git.push(['-u', remoteName, CONTENTRAIN_BRANCH])\n    }\n  } catch {\n    // Remote push is best-effort\n  }\n}\n\nasync function selectiveSync(\n  projectRoot: string,\n  _worktreePath: string,\n  contentrainTip: string,\n  _previousBaseRef?: string,\n  dirtyFilesBeforeUpdate?: Set<string>,\n): Promise<SyncResult> {\n  const git = simpleGit(projectRoot)\n  const synced: string[] = []\n  const skipped: string[] = []\n\n  // Use git plumbing to find ALL files that differ between old and new commits.\n  // diff-tree is fast and ignores working tree / index state entirely.\n  // Not limited to .contentrain/ — some ops also modify .gitignore, etc.\n  const compareRef = _previousBaseRef ?? contentrainTip\n  let changedFiles: string[] = []\n  try {\n    const diffOutput = await git.raw([\n      'diff-tree', '--name-only', '-r', '--no-commit-id',\n      compareRef, contentrainTip,\n    ])\n    changedFiles = diffOutput.split('\\n').filter(f => f.trim().length > 0)\n  } catch {\n    // Fallback: list .contentrain/ files from the contentrainTip commit\n    try {\n      const lsOutput = await git.raw(['ls-tree', '-r', '--name-only', contentrainTip, '.contentrain/'])\n      changedFiles = lsOutput.split('\\n').filter(f => f.trim().length > 0)\n    } catch {\n      return { synced, skipped }\n    }\n  }\n\n  if (changedFiles.length === 0) return { synced, skipped }\n\n  // Use pre-captured dirty files (before update-ref) to avoid false positives.\n  // After update-ref, files appear as \"modified\" in status even though the developer\n  // didn't touch them. We use the pre-update state to know what was truly dirty.\n  const dirtyFiles = dirtyFilesBeforeUpdate ?? new Set<string>()\n\n  // Determine which changed files still exist in contentrainTip (HEAD after update-ref)\n  // Check each changed file individually — `ls-tree` on specific paths is efficient\n  const filesInTip = new Set<string>()\n  for (const file of changedFiles) {\n    try {\n      await git.raw(['cat-file', '-e', `${contentrainTip}:${file}`])\n      filesInTip.add(file)\n    } catch {\n      // File does not exist in tip (was deleted)\n    }\n  }\n\n  for (const file of changedFiles) {\n    if (dirtyFiles.has(file)) {\n      skipped.push(file)\n    } else if (filesInTip.has(file)) {\n      // File exists in new HEAD — checkout from HEAD\n      try {\n        await git.checkout(['HEAD', '--', file])\n        synced.push(file)\n      } catch {\n        skipped.push(file)\n      }\n    } else {\n      // File was deleted in new HEAD — remove from working tree\n      try {\n        const filePath = join(projectRoot, file)\n        await removeFile(filePath, { force: true })\n        synced.push(file)\n      } catch {\n        skipped.push(file)\n      }\n    }\n  }\n\n  const warning = skipped.length > 0\n    ? `${skipped.length} file(s) skipped due to local changes: ${skipped.join(', ')}. Commit your changes, then run: git checkout HEAD -- ${skipped.join(' ')}`\n    : undefined\n\n  return { synced, skipped, warning }\n}\n\nexport async function createTransaction(\n  projectRoot: string,\n  branchName: string,\n  options?: { workflowOverride?: 'review' | 'auto-merge' },\n): Promise<GitTransaction> {\n  const git = simpleGit(projectRoot)\n  const config = await readConfig(projectRoot)\n  const workflow = options?.workflowOverride ?? config?.workflow ?? 'auto-merge'\n\n  const remoteName = process.env['CONTENTRAIN_REMOTE'] ?? 'origin'\n\n  // Detect base branch + current branch + remote in ONE batch\n  // (reduces subprocess spawns from 4 to 2)\n  let baseBranch = process.env['CONTENTRAIN_BRANCH'] ?? config?.repository?.default_branch ?? ''\n  let currentBranch = ''\n  let hasRemote = false\n\n  const [branchResult, remotes] = await Promise.all([\n    git.raw(['branch', '--show-current']).catch(() => ''),\n    git.getRemotes().catch(() => []),\n  ])\n  currentBranch = branchResult.trim()\n  if (!baseBranch) baseBranch = currentBranch || 'main'\n  hasRemote = (remotes as { name: string }[]).some(r => r.name === remoteName)\n\n  // Check if developer is on contentrain branch\n  if (currentBranch === CONTENTRAIN_BRANCH) {\n    throw Object.assign(new Error(\n      `The '${CONTENTRAIN_BRANCH}' branch is checked out in your working directory. `\n      + `Contentrain manages this branch automatically. `\n      + `Switch to your working branch and retry.`,\n    ), {\n      code: 'CONTENT_BRANCH_CHECKED_OUT',\n      agent_hint: 'Ask the developer to switch to their working branch (e.g., main or a feature branch), then retry the operation.',\n      developer_action: `git checkout ${baseBranch}`,\n    })\n  }\n\n  // Ensure contentrain branch exists (with migration for old contentrain/* branches)\n  await ensureContentBranch(projectRoot)\n\n  // Fetch latest from remote (parallel fetch for both branches)\n  if (hasRemote) {\n    await Promise.all([\n      git.fetch(remoteName, baseBranch).catch(() => {}),\n      git.fetch(remoteName, CONTENTRAIN_BRANCH).catch(() => {}),\n    ])\n  }\n\n  const worktreePath = join(tmpdir(), `cr-${randomUUID()}`)\n  const branch = branchName\n\n  // Create worktree on contentrain branch\n  await git.raw(['worktree', 'add', worktreePath, CONTENTRAIN_BRANCH])\n\n  const wtGit = simpleGit(worktreePath)\n\n  // Configure author (sequential — git config uses lock file)\n  const authorName = process.env['CONTENTRAIN_AUTHOR_NAME'] ?? 'Contentrain'\n  const authorEmail = process.env['CONTENTRAIN_AUTHOR_EMAIL'] ?? 'mcp@contentrain.io'\n  await wtGit.addConfig('user.name', authorName)\n  await wtGit.addConfig('user.email', authorEmail)\n\n  // Sync contentrain with base branch (bring main changes into contentrain)\n  try {\n    await wtGit.merge([baseBranch, '--no-edit'])\n  } catch {\n    try { await wtGit.merge(['--abort']) } catch { /* not in merge state */ }\n    if (hasRemote) {\n      try {\n        await wtGit.merge([`${remoteName}/${baseBranch}`, '--no-edit'])\n      } catch {\n        try { await wtGit.merge(['--abort']) } catch { /* ignore */ }\n      }\n    }\n  }\n\n  // Sync with remote contentrain if exists\n  if (hasRemote) {\n    try {\n      await wtGit.merge([`${remoteName}/${CONTENTRAIN_BRANCH}`, '--no-edit'])\n    } catch {\n      try { await wtGit.merge(['--abort']) } catch { /* ignore */ }\n    }\n  }\n\n  // Create feature branch from contentrain\n  await wtGit.checkout(['-b', branch])\n\n  let commitHash = ''\n\n  return {\n    worktree: worktreePath,\n    branch,\n\n    async write(callback) {\n      await callback(worktreePath)\n    },\n\n    async commit(message, contextUpdate?) {\n      // Write context.json together with content (no separate commit)\n      if (contextUpdate) {\n        await writeContext(worktreePath, contextUpdate)\n      }\n      await wtGit.add('.')\n      const result = await wtGit.commit(message, { '--allow-empty': null })\n      commitHash = result.commit || ''\n      return commitHash\n    },\n\n    async complete() {\n      if (workflow === 'review') {\n        if (hasRemote) {\n          await git.push(remoteName, branch)\n        }\n        return { action: 'pending-review', commit: commitHash }\n      }\n\n      // auto-merge: merge feature branch into contentrain, then advance base\n\n      // Switch to contentrain branch in worktree\n      await wtGit.checkout(CONTENTRAIN_BRANCH)\n\n      // Merge feature branch into contentrain\n      try {\n        await wtGit.merge([branch, '--no-edit'])\n      } catch {\n        try {\n          await wtGit.merge(['--abort'])\n        } catch { /* not in merge state */ }\n        throw Object.assign(new Error(\n          `Merge conflict when merging branch \"${branch}\" into \"${CONTENTRAIN_BRANCH}\". `\n          + `The branch still exists with your changes intact. `\n          + `Resolve the conflict manually, or delete the branch and retry.`,\n        ), {\n          code: 'CONTENT_BRANCH_MERGE_CONFLICT',\n          agent_hint: 'The feature branch could not be merged into the contentrain branch. Ask the developer to resolve the conflict.',\n          developer_action: `git checkout ${CONTENTRAIN_BRANCH} && git merge ${branch}`,\n        })\n      }\n\n      // Get contentrain tip + old base ref + dirty files in parallel\n      const [contentrainTip, previousBaseRef, statusBeforeUpdate] = await Promise.all([\n        wtGit.raw(['rev-parse', 'HEAD']).then(s => s.trim()),\n        git.raw(['rev-parse', baseBranch]).then(s => s.trim()),\n        git.status(),\n      ])\n      const dirtyFilesBeforeUpdate = new Set(statusBeforeUpdate.files.map(f => f.path))\n\n      // Verify fast-forward: baseBranch must be an ancestor of contentrainTip\n      // (guaranteed by the merge above, but verify for safety)\n      try {\n        await git.raw(['merge-base', '--is-ancestor', previousBaseRef, contentrainTip])\n      } catch {\n        throw Object.assign(new Error(\n          `Cannot fast-forward \"${baseBranch}\" to contentrain tip. `\n          + `The base branch has diverged. Merge \"${baseBranch}\" into \"${CONTENTRAIN_BRANCH}\" first.`,\n        ), {\n          code: 'BASE_UPDATE_FAILED',\n          agent_hint: `The base branch has commits not in contentrain. Merge ${baseBranch} into ${CONTENTRAIN_BRANCH} first.`,\n          developer_action: `git checkout ${CONTENTRAIN_BRANCH} && git merge ${baseBranch} && git checkout ${baseBranch}`,\n        })\n      }\n\n      // Advance base branch to contentrain tip via update-ref\n      await git.raw(['update-ref', `refs/heads/${baseBranch}`, contentrainTip])\n\n      // Refresh index to match new HEAD.\n      // update-ref moves the branch pointer but leaves the index stale.\n      // read-tree updates the index to match HEAD without touching the working tree.\n      try {\n        await git.raw(['read-tree', 'HEAD'])\n      } catch {\n        // fallback: try reset for older git versions\n        try { await git.raw(['reset', 'HEAD']) } catch { /* ignore */ }\n      }\n\n      // Selective sync: copy .contentrain/ files to developer's working tree\n      const sync = await selectiveSync(projectRoot, worktreePath, contentrainTip, previousBaseRef, dirtyFilesBeforeUpdate)\n\n      // Push to remote (best-effort with retry)\n      if (hasRemote) {\n        // Push contentrain branch\n        try {\n          await git.push(remoteName, CONTENTRAIN_BRANCH)\n        } catch {\n          // Retry: fetch, merge, push\n          try {\n            await wtGit.fetch(remoteName, CONTENTRAIN_BRANCH)\n            await wtGit.merge([`${remoteName}/${CONTENTRAIN_BRANCH}`, '--no-edit'])\n            await git.push(remoteName, CONTENTRAIN_BRANCH)\n          } catch {\n            // Push failed after retry — continue, local state is fine\n          }\n        }\n\n        // Push base branch\n        try {\n          await git.push(remoteName, baseBranch)\n        } catch {\n          // push may fail, local merge succeeded\n        }\n      }\n\n      return {\n        action: 'auto-merged' as const,\n        commit: commitHash,\n        sync,\n        ...(sync.warning ? { warning: sync.warning } : {}),\n      }\n    },\n\n    async cleanup() {\n      try {\n        await git.raw(['worktree', 'remove', worktreePath, '--force'])\n      } catch {\n        // worktree may already be cleaned up\n      }\n    },\n  }\n}\n\nexport function buildBranchName(scope: string, target: string, locale?: string): string {\n  const ts = branchTimestamp()\n  const parts = ['cr', scope, target]\n  if (locale) parts.push(locale)\n  parts.push(ts)\n  return parts.join('/')\n}\n"],"mappings":";;;;;;;;;;AA2BA,eAAsB,oBAAoB,aAAoC;CAC5E,MAAM,MAAM,UAAU,YAAY;CAClC,MAAM,SAAS,MAAM,WAAW,YAAY;CAG5C,MAAM,WAAW,MAAM,IAAI,aAAa;AACxC,KAAI,SAAS,IAAI,SAAS,mBAAmB,CAAE;CAG/C,MAAM,aAAa,QAAQ,YAAY,mBACjC,MAAM,IAAI,IAAI,CAAC,UAAU,iBAAiB,CAAC,EAAE,MAAM,IACpD;AAML,KAD0B,SAAS,IAAI,QAAO,MAAK,EAAE,WAAW,eAAe,CAAC,CAC1D,SAAS,GAAG;EAEhC,IAAI,iBAA2B,EAAE;AACjC,MAAI;AAEF,qBADqB,MAAM,IAAI,IAAI;IAAC;IAAU;IAAY;IAAW,CAAC,EACxC,MAAM,KAAK,CACtC,KAAI,MAAK,EAAE,MAAM,CAAC,QAAQ,UAAU,GAAG,CAAC,CACxC,QAAO,MAAK,EAAE,WAAW,eAAe,CAAC;UACtC;AAGR,OAAK,MAAM,KAAK,eACd,KAAI;AAAE,SAAM,IAAI,IAAI;IAAC;IAAU;IAAM;IAAE,CAAC;UAAS;EAInD,MAAM,aAAa,MAAM,IAAI,aAAa,EAAE,IAAI,QAAO,MAAK,EAAE,WAAW,eAAe,CAAC;AACzF,MAAI,UAAU,SAAS,EAGrB,MAAK,MAAM,KAAK,UACd,KAAI;AAAE,SAAM,IAAI,IAAI;IAAC;IAAU;IAAM;IAAE,CAAC;UAAS;;AAMvD,OAAM,IAAI,OAAO,CAAC,oBAAoB,WAAW,CAAC;CAGlD,MAAM,aAAa,QAAQ,IAAI,yBAAyB;AACxD,KAAI;AAEF,OADgB,MAAM,IAAI,YAAY,EAC1B,MAAK,MAAK,EAAE,SAAS,WAAW,CAC1C,OAAM,IAAI,KAAK;GAAC;GAAM;GAAY;GAAmB,CAAC;SAElD;;AAKV,eAAe,cACb,aACA,eACA,gBACA,kBACA,wBACqB;CACrB,MAAM,MAAM,UAAU,YAAY;CAClC,MAAM,SAAmB,EAAE;CAC3B,MAAM,UAAoB,EAAE;CAK5B,MAAM,aAAa,oBAAoB;CACvC,IAAI,eAAyB,EAAE;AAC/B,KAAI;AAKF,kBAJmB,MAAM,IAAI,IAAI;GAC/B;GAAa;GAAe;GAAM;GAClC;GAAY;GACb,CAAC,EACwB,MAAM,KAAK,CAAC,QAAO,MAAK,EAAE,MAAM,CAAC,SAAS,EAAE;SAChE;AAEN,MAAI;AAEF,mBADiB,MAAM,IAAI,IAAI;IAAC;IAAW;IAAM;IAAe;IAAgB;IAAgB,CAAC,EACzE,MAAM,KAAK,CAAC,QAAO,MAAK,EAAE,MAAM,CAAC,SAAS,EAAE;UAC9D;AACN,UAAO;IAAE;IAAQ;IAAS;;;AAI9B,KAAI,aAAa,WAAW,EAAG,QAAO;EAAE;EAAQ;EAAS;CAKzD,MAAM,aAAa,0CAA0B,IAAI,KAAa;CAI9D,MAAM,6BAAa,IAAI,KAAa;AACpC,MAAK,MAAM,QAAQ,aACjB,KAAI;AACF,QAAM,IAAI,IAAI;GAAC;GAAY;GAAM,GAAG,eAAe,GAAG;GAAO,CAAC;AAC9D,aAAW,IAAI,KAAK;SACd;AAKV,MAAK,MAAM,QAAQ,aACjB,KAAI,WAAW,IAAI,KAAK,CACtB,SAAQ,KAAK,KAAK;UACT,WAAW,IAAI,KAAK,CAE7B,KAAI;AACF,QAAM,IAAI,SAAS;GAAC;GAAQ;GAAM;GAAK,CAAC;AACxC,SAAO,KAAK,KAAK;SACX;AACN,UAAQ,KAAK,KAAK;;KAIpB,KAAI;AAEF,QAAMA,GADW,KAAK,aAAa,KAAK,EACb,EAAE,OAAO,MAAM,CAAC;AAC3C,SAAO,KAAK,KAAK;SACX;AACN,UAAQ,KAAK,KAAK;;AASxB,QAAO;EAAE;EAAQ;EAAS,SAJV,QAAQ,SAAS,IAC7B,GAAG,QAAQ,OAAO,yCAAyC,QAAQ,KAAK,KAAK,CAAC,wDAAwD,QAAQ,KAAK,IAAI,KACvJ,KAAA;EAE+B;;AAGrC,eAAsB,kBACpB,aACA,YACA,SACyB;CACzB,MAAM,MAAM,UAAU,YAAY;CAClC,MAAM,SAAS,MAAM,WAAW,YAAY;CAC5C,MAAM,WAAW,SAAS,oBAAoB,QAAQ,YAAY;CAElE,MAAM,aAAa,QAAQ,IAAI,yBAAyB;CAIxD,IAAI,aAAa,QAAQ,IAAI,yBAAyB,QAAQ,YAAY,kBAAkB;CAC5F,IAAI,gBAAgB;CACpB,IAAI,YAAY;CAEhB,MAAM,CAAC,cAAc,WAAW,MAAM,QAAQ,IAAI,CAChD,IAAI,IAAI,CAAC,UAAU,iBAAiB,CAAC,CAAC,YAAY,GAAG,EACrD,IAAI,YAAY,CAAC,YAAY,EAAE,CAAC,CACjC,CAAC;AACF,iBAAgB,aAAa,MAAM;AACnC,KAAI,CAAC,WAAY,cAAa,iBAAiB;AAC/C,aAAa,QAA+B,MAAK,MAAK,EAAE,SAAS,WAAW;AAG5E,KAAI,kBAAkB,mBACpB,OAAM,OAAO,uBAAO,IAAI,MACtB,QAAQ,mBAAmB,4IAG5B,EAAE;EACD,MAAM;EACN,YAAY;EACZ,kBAAkB,gBAAgB;EACnC,CAAC;AAIJ,OAAM,oBAAoB,YAAY;AAGtC,KAAI,UACF,OAAM,QAAQ,IAAI,CAChB,IAAI,MAAM,YAAY,WAAW,CAAC,YAAY,GAAG,EACjD,IAAI,MAAM,YAAY,mBAAmB,CAAC,YAAY,GAAG,CAC1D,CAAC;CAGJ,MAAM,eAAe,KAAK,QAAQ,EAAE,MAAM,YAAY,GAAG;CACzD,MAAM,SAAS;AAGf,OAAM,IAAI,IAAI;EAAC;EAAY;EAAO;EAAc;EAAmB,CAAC;CAEpE,MAAM,QAAQ,UAAU,aAAa;CAGrC,MAAM,aAAa,QAAQ,IAAI,8BAA8B;CAC7D,MAAM,cAAc,QAAQ,IAAI,+BAA+B;AAC/D,OAAM,MAAM,UAAU,aAAa,WAAW;AAC9C,OAAM,MAAM,UAAU,cAAc,YAAY;AAGhD,KAAI;AACF,QAAM,MAAM,MAAM,CAAC,YAAY,YAAY,CAAC;SACtC;AACN,MAAI;AAAE,SAAM,MAAM,MAAM,CAAC,UAAU,CAAC;UAAS;AAC7C,MAAI,UACF,KAAI;AACF,SAAM,MAAM,MAAM,CAAC,GAAG,WAAW,GAAG,cAAc,YAAY,CAAC;UACzD;AACN,OAAI;AAAE,UAAM,MAAM,MAAM,CAAC,UAAU,CAAC;WAAS;;;AAMnD,KAAI,UACF,KAAI;AACF,QAAM,MAAM,MAAM,CAAC,GAAG,WAAW,GAAG,sBAAsB,YAAY,CAAC;SACjE;AACN,MAAI;AAAE,SAAM,MAAM,MAAM,CAAC,UAAU,CAAC;UAAS;;AAKjD,OAAM,MAAM,SAAS,CAAC,MAAM,OAAO,CAAC;CAEpC,IAAI,aAAa;AAEjB,QAAO;EACL,UAAU;EACV;EAEA,MAAM,MAAM,UAAU;AACpB,SAAM,SAAS,aAAa;;EAG9B,MAAM,OAAO,SAAS,eAAgB;AAEpC,OAAI,cACF,OAAM,aAAa,cAAc,cAAc;AAEjD,SAAM,MAAM,IAAI,IAAI;AAEpB,iBADe,MAAM,MAAM,OAAO,SAAS,EAAE,iBAAiB,MAAM,CAAC,EACjD,UAAU;AAC9B,UAAO;;EAGT,MAAM,WAAW;AACf,OAAI,aAAa,UAAU;AACzB,QAAI,UACF,OAAM,IAAI,KAAK,YAAY,OAAO;AAEpC,WAAO;KAAE,QAAQ;KAAkB,QAAQ;KAAY;;AAMzD,SAAM,MAAM,SAAS,mBAAmB;AAGxC,OAAI;AACF,UAAM,MAAM,MAAM,CAAC,QAAQ,YAAY,CAAC;WAClC;AACN,QAAI;AACF,WAAM,MAAM,MAAM,CAAC,UAAU,CAAC;YACxB;AACR,UAAM,OAAO,uBAAO,IAAI,MACtB,uCAAuC,OAAO,UAAU,mBAAmB,qHAG5E,EAAE;KACD,MAAM;KACN,YAAY;KACZ,kBAAkB,gBAAgB,mBAAmB,gBAAgB;KACtE,CAAC;;GAIJ,MAAM,CAAC,gBAAgB,iBAAiB,sBAAsB,MAAM,QAAQ,IAAI;IAC9E,MAAM,IAAI,CAAC,aAAa,OAAO,CAAC,CAAC,MAAK,MAAK,EAAE,MAAM,CAAC;IACpD,IAAI,IAAI,CAAC,aAAa,WAAW,CAAC,CAAC,MAAK,MAAK,EAAE,MAAM,CAAC;IACtD,IAAI,QAAQ;IACb,CAAC;GACF,MAAM,yBAAyB,IAAI,IAAI,mBAAmB,MAAM,KAAI,MAAK,EAAE,KAAK,CAAC;AAIjF,OAAI;AACF,UAAM,IAAI,IAAI;KAAC;KAAc;KAAiB;KAAiB;KAAe,CAAC;WACzE;AACN,UAAM,OAAO,uBAAO,IAAI,MACtB,wBAAwB,WAAW,6DACO,WAAW,UAAU,mBAAmB,UACnF,EAAE;KACD,MAAM;KACN,YAAY,yDAAyD,WAAW,QAAQ,mBAAmB;KAC3G,kBAAkB,gBAAgB,mBAAmB,gBAAgB,WAAW,mBAAmB;KACpG,CAAC;;AAIJ,SAAM,IAAI,IAAI;IAAC;IAAc,cAAc;IAAc;IAAe,CAAC;AAKzE,OAAI;AACF,UAAM,IAAI,IAAI,CAAC,aAAa,OAAO,CAAC;WAC9B;AAEN,QAAI;AAAE,WAAM,IAAI,IAAI,CAAC,SAAS,OAAO,CAAC;YAAS;;GAIjD,MAAM,OAAO,MAAM,cAAc,aAAa,cAAc,gBAAgB,iBAAiB,uBAAuB;AAGpH,OAAI,WAAW;AAEb,QAAI;AACF,WAAM,IAAI,KAAK,YAAY,mBAAmB;YACxC;AAEN,SAAI;AACF,YAAM,MAAM,MAAM,YAAY,mBAAmB;AACjD,YAAM,MAAM,MAAM,CAAC,GAAG,WAAW,GAAG,sBAAsB,YAAY,CAAC;AACvE,YAAM,IAAI,KAAK,YAAY,mBAAmB;aACxC;;AAMV,QAAI;AACF,WAAM,IAAI,KAAK,YAAY,WAAW;YAChC;;AAKV,UAAO;IACL,QAAQ;IACR,QAAQ;IACR;IACA,GAAI,KAAK,UAAU,EAAE,SAAS,KAAK,SAAS,GAAG,EAAE;IAClD;;EAGH,MAAM,UAAU;AACd,OAAI;AACF,UAAM,IAAI,IAAI;KAAC;KAAY;KAAU;KAAc;KAAU,CAAC;WACxD;;EAIX;;AAGH,SAAgB,gBAAgB,OAAe,QAAgB,QAAyB;CACtF,MAAM,KAAK,iBAAiB;CAC5B,MAAM,QAAQ;EAAC;EAAM;EAAO;EAAO;AACnC,KAAI,OAAQ,OAAM,KAAK,OAAO;AAC9B,OAAM,KAAK,GAAG;AACd,QAAO,MAAM,KAAK,IAAI"}

package/dist/util/detect.mjs

@@ -1,2 +1,4 @@
-import { n as detectStackInfo, r as inferPlatform, t as detectStack } from "../detect-C8XmJ4S6.mjs";
+import "../serializer-CnHTtmc1.mjs";
+import "../fs-BnIQ4dKj.mjs";
+import { n as detectStackInfo, r as inferPlatform, t as detectStack } from "../detect-DinOQAmK.mjs";
 export { detectStack, detectStackInfo, inferPlatform };

package/dist/util/fs.mjs

@@ -1,2 +1,3 @@
-import { a as readJson, c as writeText, i as readDir, n as ensureDir, o as readText, r as pathExists, s as writeJson, t as contentrainDir } from "../fs-BbuGnVcG.mjs";
+import "../serializer-CnHTtmc1.mjs";
+import { a as readJson, c as writeText, i as readDir, n as ensureDir, o as readText, r as pathExists, s as writeJson, t as contentrainDir } from "../fs-BnIQ4dKj.mjs";
 export { contentrainDir, ensureDir, pathExists, readDir, readJson, readText, writeJson, writeText };

package/dist/util/id.d.mts

@@ -1,6 +1,7 @@
+import { generateEntryId } from "@contentrain/types";
+
 //#region src/util/id.d.ts
 declare function branchTimestamp(): string;
-declare function generateEntryId(): string;
 //#endregion
 export { branchTimestamp, generateEntryId };
 //# sourceMappingURL=id.d.mts.map

package/dist/util/id.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"id.d.mts","names":[],"sources":["../../src/util/id.ts"],"mappings":";iBAEgB,eAAA,CAAA;AAAA,iBAMA,eAAA,CAAA"}
+{"version":3,"file":"id.d.mts","names":[],"sources":["../../src/util/id.ts"],"mappings":";;;iBAEgB,eAAA,CAAA"}

package/dist/util/id.mjs

@@ -1,2 +1,2 @@
-import { n as generateEntryId, t as branchTimestamp } from "../id-BdD4HvMY.mjs";
+import { n as generateEntryId, t as branchTimestamp } from "../id-DV_T9Ic8.mjs";
 export { branchTimestamp, generateEntryId };

package/dist/util/serializer.d.mts

@@ -1,14 +1,2 @@
-//#region src/util/serializer.d.ts
-/**
- * Canonical JSON serialization — deterministic output for git diff stability.
- *
- * Rules (spec Section 14.10):
- * - Top-level keys: lexicographic sort
- * - Entry fields: follow fieldOrder if provided, else lexicographic
- * - 2-space indent, UTF-8, trailing newline
- * - Null/undefined values omitted
- */
-declare function canonicalStringify(data: unknown, fieldOrder?: string[]): string;
-//#endregion
-export { canonicalStringify };
-//# sourceMappingURL=serializer.d.mts.map
+import { canonicalStringify, sortKeys } from "@contentrain/types";
+export { canonicalStringify, sortKeys };

package/dist/util/serializer.mjs

@@ -1,2 +1,2 @@
-import { t as canonicalStringify } from "../serializer-Dueih-i2.mjs";
-export { canonicalStringify };
+import { n as sortKeys, t as canonicalStringify } from "../serializer-CnHTtmc1.mjs";
+export { canonicalStringify, sortKeys };