@contentrain/mcp 1.11.0 → 2.0.1

package/dist/{transaction-BHOsiEn1.mjs.map → transaction-DC_dNON9.mjs.map}

@@ -1 +1 @@
-{"version":3,"file":"transaction-BHOsiEn1.mjs","names":["removeFile"],"sources":["../src/providers/local/migration.ts","../src/git/transaction.ts"],"sourcesContent":["import type { SimpleGit } from 'simple-git'\n\n/**\n * Migration: the first MCP release used `contentrain/*` feature branches.\n * Once we introduced the singleton `contentrain` branch (tracking the\n * committed content state), those old feature branches became a ref-\n * namespace conflict — git cannot hold both `contentrain` (a leaf ref)\n * and `contentrain/foo` (implying a directory) simultaneously.\n *\n * `migrateLegacyBranches` removes the old-prefix branches so the\n * singleton `contentrain` ref can be created. It is idempotent and\n * safe to call before every `ensureContentBranch` run.\n *\n * Strategy:\n * 1. Delete merged `contentrain/*` branches first (`-d`). Their commits\n *    are already on the base branch via the old auto-merge flow.\n * 2. Force-delete whatever remains (`-D`). Any unmerged leftover is\n *    from an abandoned or partially-committed legacy branch — content\n *    on `main` always wins, and the singleton `contentrain` branch is\n *    about to be created from `main`/`baseBranch` anyway.\n *\n * Returns the number of branches that were deleted. Callers may log it;\n * the git transaction layer does not need the count for correctness.\n */\nexport async function migrateLegacyBranches(\n  git: SimpleGit,\n  baseBranch: string,\n): Promise<number> {\n  const branches = await git.branchLocal()\n  const oldPrefixBranches = branches.all.filter(b => b.startsWith('contentrain/'))\n  if (oldPrefixBranches.length === 0) return 0\n\n  let deleted = 0\n\n  // 1) Delete merged legacy branches first — the safe path.\n  let mergedLegacy: string[] = []\n  try {\n    const mergedOutput = await git.raw(['branch', '--merged', baseBranch])\n    mergedLegacy = mergedOutput.split('\\n')\n      .map(b => b.trim().replace(/^\\*\\s*/, ''))\n      .filter(b => b.startsWith('contentrain/'))\n  } catch {\n    // `branch --merged` fails before baseBranch exists — fall through.\n  }\n\n  for (const b of mergedLegacy) {\n    try {\n      await git.raw(['branch', '-d', b])\n      deleted++\n    } catch {\n      // Branch may be protected or already gone — safe to skip.\n    }\n  }\n\n  // 2) Force-delete any unmerged legacy branches still present.\n  const remaining = (await git.branchLocal()).all.filter(b => b.startsWith('contentrain/'))\n  for (const b of remaining) {\n    try {\n      await git.raw(['branch', '-D', b])\n      deleted++\n    } catch {\n      // Skip — best-effort cleanup.\n    }\n  }\n\n  return deleted\n}\n","import { simpleGit, type 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 { deleteRemoteBranch, type RemoteDeleteResult } from './branch-lifecycle.js'\nimport { authorConfig } from './identity.js'\nimport { branchTimestamp } from '../util/id.js'\nimport { migrateLegacyBranches } from '../providers/local/migration.js'\nimport type { SyncResult, WorkflowMode } 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  // Clean up legacy `contentrain/*` feature branches so the singleton\n  // `contentrain` ref can be created. Idempotent — safe to call even\n  // when no legacy branches exist.\n  await migrateLegacyBranches(git, baseBranch)\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  // Which changed files still exist in contentrainTip (HEAD after update-ref)?\n  // ONE `ls-tree` over the changed paths lists exactly the survivors, instead\n  // of a `cat-file -e` spawn per file. Falls back to per-file probing if\n  // ls-tree fails so behavior is preserved on any edge.\n  const filesInTip = new Set<string>()\n  try {\n    const lsOutput = await git.raw(['ls-tree', '-r', '--name-only', contentrainTip, '--', ...changedFiles])\n    for (const f of lsOutput.split('\\n')) {\n      const trimmed = f.trim()\n      if (trimmed) filesInTip.add(trimmed)\n    }\n  } catch {\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\n  // Partition: dirty developer files are skipped; survivors get checked out\n  // from HEAD; the rest were deleted in the new HEAD and are removed on disk.\n  const toCheckout: string[] = []\n  const toRemove: string[] = []\n  for (const file of changedFiles) {\n    if (dirtyFiles.has(file)) skipped.push(file)\n    else if (filesInTip.has(file)) toCheckout.push(file)\n    else toRemove.push(file)\n  }\n\n  // ONE `git checkout HEAD -- f1 f2 …` restores every clean survivor at once.\n  // On failure, fall back to per-file so a single unresolvable path still\n  // yields precise skip accounting (dirty files were already excluded).\n  if (toCheckout.length > 0) {\n    try {\n      await git.checkout(['HEAD', '--', ...toCheckout])\n      synced.push(...toCheckout)\n    } catch {\n      for (const file of toCheckout) {\n        try {\n          await git.checkout(['HEAD', '--', file])\n          synced.push(file)\n        } catch {\n          skipped.push(file)\n        }\n      }\n    }\n  }\n\n  // Deletions are working-tree fs removals — no git spawn, safe to parallelize.\n  await Promise.all(toRemove.map(async (file) => {\n    try {\n      await removeFile(join(projectRoot, file), { force: true })\n      synced.push(file)\n    } catch {\n      skipped.push(file)\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?: WorkflowMode },\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  // Commit identity comes from `-c user.*` config (see authorConfig) — passed\n  // as args, never via `.env()`, so simple-git's block-unsafe guard is never\n  // triggered by an inherited EDITOR/GIT_ASKPASS/etc.\n  const wtGit = simpleGit(worktreePath, { config: authorConfig() })\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  let pendingReview = false\n  let savedContextUpdate: ContextUpdate | undefined\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      // context.json is intentionally NOT committed on the feature branch — it\n      // is regenerated on the contentrain branch after the merge (see\n      // complete()). Committing it per-branch caused cross-branch merge\n      // conflicts on a single mutable file. `--no-verify` keeps the repo's\n      // commit-msg / pre-commit hooks (commitlint, lefthook, husky) from\n      // rejecting these machine-generated infra commits.\n      savedContextUpdate = contextUpdate\n      await wtGit.add('.')\n      const result = await wtGit.commit(message, { '--allow-empty': null, '--no-verify': 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        // Pending-review branches must survive for a later contentrain_merge.\n        pendingReview = true\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      // Regenerate context.json on the contentrain branch (post-merge,\n      // single-threaded) and fold it into the tip before advancing the base.\n      if (savedContextUpdate) {\n        await regenerateContextOnContentrain(wtGit, worktreePath, savedContextUpdate)\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      // `rev-list --count` instead of `merge-base --is-ancestor`: the latter\n      // signals via exit code with empty stderr, which simple-git reports as\n      // success — the guard would silently pass on divergence.\n      if (!(await isAncestor(git, previousBaseRef, contentrainTip))) {\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      // Prune the feature branch unless it is a pending-review branch that must\n      // survive for a later contentrain_merge. Auto-merged branches (already in\n      // contentrain) and failed/empty branches are both safe to delete, so\n      // failed saves and merged saves no longer leak dangling cr/* refs.\n      if (!pendingReview) {\n        await safeDeleteBranch(git, branch)\n      }\n    },\n  }\n}\n\nexport async function mergeBranch(\n  projectRoot: string,\n  branchName: string,\n): Promise<{ action: 'merged'; commit: string; sync: SyncResult; remote?: RemoteDeleteResult }> {\n  const git = simpleGit(projectRoot)\n  const config = await readConfig(projectRoot)\n  const remoteName = process.env['CONTENTRAIN_REMOTE'] ?? 'origin'\n\n  // Detect base branch\n  const baseBranch = process.env['CONTENTRAIN_BRANCH']\n    ?? config?.repository?.default_branch\n    ?? ((await git.raw(['branch', '--show-current'])).trim() || 'main')\n\n  // Ensure contentrain branch exists\n  await ensureContentBranch(projectRoot)\n\n  // Check remote\n  let hasRemote = false\n  try {\n    const remotes = await git.getRemotes()\n    hasRemote = remotes.some(r => r.name === remoteName)\n  } catch {\n    hasRemote = false\n  }\n\n  // Create temp worktree on contentrain branch\n  const worktreePath = join(tmpdir(), `cr-merge-${randomUUID()}`)\n  await git.raw(['worktree', 'add', worktreePath, CONTENTRAIN_BRANCH])\n\n  // Commit identity from `-c user.*` config (see authorConfig) — guard-safe,\n  // no `.env()` spread.\n  const wtGit = simpleGit(worktreePath, { config: authorConfig() })\n\n  try {\n    // Merge the feature branch into contentrain\n    try {\n      await wtGit.merge([branchName, '--no-edit'])\n    } catch {\n      try { await wtGit.merge(['--abort']) } catch { /* not in merge state */ }\n      throw Object.assign(new Error(\n        `Merge conflict when merging branch \"${branchName}\" 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 ${branchName}`,\n      })\n    }\n\n    // Regenerate context.json on contentrain post-merge (deterministic,\n    // single-threaded) so review-mode branches — which carry no context.json —\n    // still produce up-to-date stats once landed.\n    await regenerateContextOnContentrain(wtGit, worktreePath, { tool: 'contentrain_merge', model: '*' })\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    // (See complete() — merge-base --is-ancestor is unusable via simple-git.)\n    if (!(await isAncestor(git, previousBaseRef, contentrainTip))) {\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    try {\n      await git.raw(['read-tree', 'HEAD'])\n    } catch {\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)\n    if (hasRemote) {\n      try {\n        await git.push(remoteName, CONTENTRAIN_BRANCH)\n      } catch {\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      try {\n        await git.push(remoteName, baseBranch)\n      } catch {\n        // push may fail, local merge succeeded\n      }\n    }\n\n    // Prune the now-merged feature branch so merged cr/* refs don't accumulate.\n    await safeDeleteBranch(git, branchName)\n\n    // Delete the remote copy too (review-mode branches were pushed on save).\n    // Best-effort and config-gated inside the helper: a failure surfaces as\n    // `remote.warning`, never as a failed merge.\n    let remote: RemoteDeleteResult | undefined\n    if (hasRemote) {\n      remote = await deleteRemoteBranch(projectRoot, branchName, { config })\n    }\n\n    return {\n      action: 'merged' as const,\n      commit: contentrainTip,\n      sync,\n      ...(remote ? { remote } : {}),\n    }\n  } finally {\n    // Cleanup worktree\n    try {\n      await git.raw(['worktree', 'remove', worktreePath, '--force'])\n    } catch {\n      // worktree may already be cleaned up\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\n/**\n * True when `ancestor` is an ancestor of (or equal to) `descendant`.\n * Implemented with `rev-list --count` because `merge-base --is-ancestor`\n * signals via exit code with empty stderr — simple-git reports that as\n * success, so it cannot express a negative verdict.\n */\nasync function isAncestor(git: SimpleGit, ancestor: string, descendant: string): Promise<boolean> {\n  try {\n    const count = Number((await git.raw(['rev-list', '--count', ancestor, `^${descendant}`])).trim())\n    return count === 0\n  } catch {\n    return false\n  }\n}\n\n/**\n * Force-delete a local branch, swallowing all errors. Never deletes the\n * singleton `contentrain` branch. Used to prune feature branches after they\n * are merged (auto-merge / contentrain_merge) or when a transaction fails\n * before completing — so failed/merged `cr/*` refs do not accumulate.\n */\nasync function safeDeleteBranch(git: SimpleGit, branch: string): Promise<void> {\n  if (!branch || branch === CONTENTRAIN_BRANCH) return\n  try {\n    await git.raw(['branch', '-D', branch])\n  } catch {\n    // Branch may not exist, be checked out, or already be deleted — ignore.\n  }\n}\n\n/**\n * Regenerate `.contentrain/context.json` deterministically inside a worktree\n * that is currently on the `contentrain` branch, then commit it (hooks\n * bypassed). Called AFTER a feature branch is merged so context.json is only\n * ever written on `contentrain`, single-threaded — eliminating the per-branch\n * merge conflicts that came from committing it on every feature branch.\n */\nasync function regenerateContextOnContentrain(\n  wtGit: SimpleGit,\n  worktreePath: string,\n  contextUpdate: ContextUpdate,\n): Promise<void> {\n  await writeContext(worktreePath, contextUpdate)\n  await wtGit.add('.contentrain/context.json')\n  try {\n    await wtGit.commit('[contentrain] context: update', { '--no-verify': null })\n  } catch {\n    // Nothing staged (context.json unchanged) — fine.\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"transaction-DC_dNON9.mjs","names":["removeFile"],"sources":["../src/providers/local/migration.ts","../src/git/transaction.ts"],"sourcesContent":["import type { SimpleGit } from 'simple-git'\n\n/**\n * Migration: the first MCP release used `contentrain/*` feature branches.\n * Once we introduced the singleton `contentrain` branch (tracking the\n * committed content state), those old feature branches became a ref-\n * namespace conflict — git cannot hold both `contentrain` (a leaf ref)\n * and `contentrain/foo` (implying a directory) simultaneously.\n *\n * `migrateLegacyBranches` removes the old-prefix branches so the\n * singleton `contentrain` ref can be created. It is idempotent and\n * safe to call before every `ensureContentBranch` run.\n *\n * Strategy:\n * 1. Delete merged `contentrain/*` branches first (`-d`). Their commits\n *    are already on the base branch via the old auto-merge flow.\n * 2. Force-delete whatever remains (`-D`). Any unmerged leftover is\n *    from an abandoned or partially-committed legacy branch — content\n *    on `main` always wins, and the singleton `contentrain` branch is\n *    about to be created from `main`/`baseBranch` anyway.\n *\n * Returns the number of branches that were deleted. Callers may log it;\n * the git transaction layer does not need the count for correctness.\n */\nexport async function migrateLegacyBranches(\n  git: SimpleGit,\n  baseBranch: string,\n): Promise<number> {\n  const branches = await git.branchLocal()\n  const oldPrefixBranches = branches.all.filter(b => b.startsWith('contentrain/'))\n  if (oldPrefixBranches.length === 0) return 0\n\n  let deleted = 0\n\n  // 1) Delete merged legacy branches first — the safe path.\n  let mergedLegacy: string[] = []\n  try {\n    const mergedOutput = await git.raw(['branch', '--merged', baseBranch])\n    mergedLegacy = mergedOutput.split('\\n')\n      .map(b => b.trim().replace(/^\\*\\s*/, ''))\n      .filter(b => b.startsWith('contentrain/'))\n  } catch {\n    // `branch --merged` fails before baseBranch exists — fall through.\n  }\n\n  for (const b of mergedLegacy) {\n    try {\n      await git.raw(['branch', '-d', b])\n      deleted++\n    } catch {\n      // Branch may be protected or already gone — safe to skip.\n    }\n  }\n\n  // 2) Force-delete any unmerged legacy branches still present.\n  const remaining = (await git.branchLocal()).all.filter(b => b.startsWith('contentrain/'))\n  for (const b of remaining) {\n    try {\n      await git.raw(['branch', '-D', b])\n      deleted++\n    } catch {\n      // Skip — best-effort cleanup.\n    }\n  }\n\n  return deleted\n}\n","import { simpleGit, type 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 { deleteRemoteBranch, type RemoteDeleteResult } from './branch-lifecycle.js'\nimport { authorConfig } from './identity.js'\nimport { branchTimestamp } from '../util/id.js'\nimport { migrateLegacyBranches } from '../providers/local/migration.js'\nimport type { SyncResult, WorkflowMode } 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  // Clean up legacy `contentrain/*` feature branches so the singleton\n  // `contentrain` ref can be created. Idempotent — safe to call even\n  // when no legacy branches exist.\n  await migrateLegacyBranches(git, baseBranch)\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  // Which changed files still exist in contentrainTip (HEAD after update-ref)?\n  // ONE `ls-tree` over the changed paths lists exactly the survivors, instead\n  // of a `cat-file -e` spawn per file. Falls back to per-file probing if\n  // ls-tree fails so behavior is preserved on any edge.\n  const filesInTip = new Set<string>()\n  try {\n    const lsOutput = await git.raw(['ls-tree', '-r', '--name-only', contentrainTip, '--', ...changedFiles])\n    for (const f of lsOutput.split('\\n')) {\n      const trimmed = f.trim()\n      if (trimmed) filesInTip.add(trimmed)\n    }\n  } catch {\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\n  // Partition: dirty developer files are skipped; survivors get checked out\n  // from HEAD; the rest were deleted in the new HEAD and are removed on disk.\n  const toCheckout: string[] = []\n  const toRemove: string[] = []\n  for (const file of changedFiles) {\n    if (dirtyFiles.has(file)) skipped.push(file)\n    else if (filesInTip.has(file)) toCheckout.push(file)\n    else toRemove.push(file)\n  }\n\n  // ONE `git checkout HEAD -- f1 f2 …` restores every clean survivor at once.\n  // On failure, fall back to per-file so a single unresolvable path still\n  // yields precise skip accounting (dirty files were already excluded).\n  if (toCheckout.length > 0) {\n    try {\n      await git.checkout(['HEAD', '--', ...toCheckout])\n      synced.push(...toCheckout)\n    } catch {\n      for (const file of toCheckout) {\n        try {\n          await git.checkout(['HEAD', '--', file])\n          synced.push(file)\n        } catch {\n          skipped.push(file)\n        }\n      }\n    }\n  }\n\n  // Deletions are working-tree fs removals — no git spawn, safe to parallelize.\n  await Promise.all(toRemove.map(async (file) => {\n    try {\n      await removeFile(join(projectRoot, file), { force: true })\n      synced.push(file)\n    } catch {\n      skipped.push(file)\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?: WorkflowMode },\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  // Commit identity comes from `-c user.*` config (see authorConfig) — passed\n  // as args, never via `.env()`, so simple-git's block-unsafe guard is never\n  // triggered by an inherited EDITOR/GIT_ASKPASS/etc.\n  const wtGit = simpleGit(worktreePath, { config: authorConfig() })\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  let pendingReview = false\n  let savedContextUpdate: ContextUpdate | undefined\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      // context.json is intentionally NOT committed on the feature branch — it\n      // is regenerated on the contentrain branch after the merge (see\n      // complete()). Committing it per-branch caused cross-branch merge\n      // conflicts on a single mutable file. `--no-verify` keeps the repo's\n      // commit-msg / pre-commit hooks (commitlint, lefthook, husky) from\n      // rejecting these machine-generated infra commits.\n      savedContextUpdate = contextUpdate\n      await wtGit.add('.')\n      const result = await wtGit.commit(message, { '--allow-empty': null, '--no-verify': 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        // Pending-review branches must survive for a later contentrain_merge.\n        pendingReview = true\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      // Regenerate context.json on the contentrain branch (post-merge,\n      // single-threaded) and fold it into the tip before advancing the base.\n      if (savedContextUpdate) {\n        await regenerateContextOnContentrain(wtGit, worktreePath, savedContextUpdate)\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      // `rev-list --count` instead of `merge-base --is-ancestor`: the latter\n      // signals via exit code with empty stderr, which simple-git reports as\n      // success — the guard would silently pass on divergence.\n      if (!(await isAncestor(git, previousBaseRef, contentrainTip))) {\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      // Prune the feature branch unless it is a pending-review branch that must\n      // survive for a later contentrain_merge. Auto-merged branches (already in\n      // contentrain) and failed/empty branches are both safe to delete, so\n      // failed saves and merged saves no longer leak dangling cr/* refs.\n      if (!pendingReview) {\n        await safeDeleteBranch(git, branch)\n      }\n    },\n  }\n}\n\nexport async function mergeBranch(\n  projectRoot: string,\n  branchName: string,\n): Promise<{ action: 'merged'; commit: string; sync: SyncResult; remote?: RemoteDeleteResult }> {\n  const git = simpleGit(projectRoot)\n  const config = await readConfig(projectRoot)\n  const remoteName = process.env['CONTENTRAIN_REMOTE'] ?? 'origin'\n\n  // Detect base branch\n  const baseBranch = process.env['CONTENTRAIN_BRANCH']\n    ?? config?.repository?.default_branch\n    ?? ((await git.raw(['branch', '--show-current'])).trim() || 'main')\n\n  // Ensure contentrain branch exists\n  await ensureContentBranch(projectRoot)\n\n  // Check remote\n  let hasRemote = false\n  try {\n    const remotes = await git.getRemotes()\n    hasRemote = remotes.some(r => r.name === remoteName)\n  } catch {\n    hasRemote = false\n  }\n\n  // Create temp worktree on contentrain branch\n  const worktreePath = join(tmpdir(), `cr-merge-${randomUUID()}`)\n  await git.raw(['worktree', 'add', worktreePath, CONTENTRAIN_BRANCH])\n\n  // Commit identity from `-c user.*` config (see authorConfig) — guard-safe,\n  // no `.env()` spread.\n  const wtGit = simpleGit(worktreePath, { config: authorConfig() })\n\n  try {\n    // Merge the feature branch into contentrain\n    try {\n      await wtGit.merge([branchName, '--no-edit'])\n    } catch {\n      try { await wtGit.merge(['--abort']) } catch { /* not in merge state */ }\n      throw Object.assign(new Error(\n        `Merge conflict when merging branch \"${branchName}\" 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 ${branchName}`,\n      })\n    }\n\n    // Regenerate context.json on contentrain post-merge (deterministic,\n    // single-threaded) so review-mode branches — which carry no context.json —\n    // still produce up-to-date stats once landed.\n    await regenerateContextOnContentrain(wtGit, worktreePath, { tool: 'contentrain_merge', model: '*' })\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    // (See complete() — merge-base --is-ancestor is unusable via simple-git.)\n    if (!(await isAncestor(git, previousBaseRef, contentrainTip))) {\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    try {\n      await git.raw(['read-tree', 'HEAD'])\n    } catch {\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)\n    if (hasRemote) {\n      try {\n        await git.push(remoteName, CONTENTRAIN_BRANCH)\n      } catch {\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      try {\n        await git.push(remoteName, baseBranch)\n      } catch {\n        // push may fail, local merge succeeded\n      }\n    }\n\n    // Prune the now-merged feature branch so merged cr/* refs don't accumulate.\n    await safeDeleteBranch(git, branchName)\n\n    // Delete the remote copy too (review-mode branches were pushed on save).\n    // Best-effort and config-gated inside the helper: a failure surfaces as\n    // `remote.warning`, never as a failed merge.\n    let remote: RemoteDeleteResult | undefined\n    if (hasRemote) {\n      remote = await deleteRemoteBranch(projectRoot, branchName, { config })\n    }\n\n    return {\n      action: 'merged' as const,\n      commit: contentrainTip,\n      sync,\n      ...(remote ? { remote } : {}),\n    }\n  } finally {\n    // Cleanup worktree\n    try {\n      await git.raw(['worktree', 'remove', worktreePath, '--force'])\n    } catch {\n      // worktree may already be cleaned up\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\n/**\n * True when `ancestor` is an ancestor of (or equal to) `descendant`.\n * Implemented with `rev-list --count` because `merge-base --is-ancestor`\n * signals via exit code with empty stderr — simple-git reports that as\n * success, so it cannot express a negative verdict.\n */\nasync function isAncestor(git: SimpleGit, ancestor: string, descendant: string): Promise<boolean> {\n  try {\n    const count = Number((await git.raw(['rev-list', '--count', ancestor, `^${descendant}`])).trim())\n    return count === 0\n  } catch {\n    return false\n  }\n}\n\n/**\n * Force-delete a local branch, swallowing all errors. Never deletes the\n * singleton `contentrain` branch. Used to prune feature branches after they\n * are merged (auto-merge / contentrain_merge) or when a transaction fails\n * before completing — so failed/merged `cr/*` refs do not accumulate.\n */\nasync function safeDeleteBranch(git: SimpleGit, branch: string): Promise<void> {\n  if (!branch || branch === CONTENTRAIN_BRANCH) return\n  try {\n    await git.raw(['branch', '-D', branch])\n  } catch {\n    // Branch may not exist, be checked out, or already be deleted — ignore.\n  }\n}\n\n/**\n * Regenerate `.contentrain/context.json` deterministically inside a worktree\n * that is currently on the `contentrain` branch, then commit it (hooks\n * bypassed). Called AFTER a feature branch is merged so context.json is only\n * ever written on `contentrain`, single-threaded — eliminating the per-branch\n * merge conflicts that came from committing it on every feature branch.\n */\nasync function regenerateContextOnContentrain(\n  wtGit: SimpleGit,\n  worktreePath: string,\n  contextUpdate: ContextUpdate,\n): Promise<void> {\n  await writeContext(worktreePath, contextUpdate)\n  await wtGit.add('.contentrain/context.json')\n  try {\n    await wtGit.commit('[contentrain] context: update', { '--no-verify': null })\n  } catch {\n    // Nothing staged (context.json unchanged) — fine.\n  }\n}\n"],"mappings":"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"}

package/dist/{validator-Ck0puppQ.mjs → validator-D5VncJ8M.mjs}

@@ -2,7 +2,7 @@ import { i as metaFilePath, n as contentFilePath, r as documentFilePath, t as co
 import { c as writeText, s as writeJson } from "./fs-DLbVB-Ek.mjs";
 import { i as writeMeta } from "./meta-manager-CJUiTgP2.mjs";
 import { t as readConfig } from "./config-oxxgznz7.mjs";
-import { C as LocalReader, f as parseFrontmatter, g as resolveLocaleStrategy, o as listModels, s as readModel } from "./model-manager-SiesTJrS.mjs";
+import { C as LocalReader, f as parseFrontmatter, g as resolveLocaleStrategy, o as listModels, s as readModel } from "./model-manager-DP2CZiMT.mjs";
 import { join } from "node:path";
 import { detectSecrets, validateFieldValue } from "@contentrain/types";
 import { rm } from "node:fs/promises";
@@ -31,7 +31,9 @@ function validateContent(data, fields, modelId, locale, entryId, ctx) {
 		errors
 	};
 }
-function validateField(value, def, modelId, locale, entryId, fieldId, ctx) {
+/** Bounds `items`-inside-`items` nesting; far above any real schema. */
+const MAX_FIELD_DEPTH = 10;
+function validateField(value, def, modelId, locale, entryId, fieldId, ctx, depth = 0) {
 	const errors = [];
 	const errCtx = {
 		model: modelId,
@@ -39,6 +41,11 @@ function validateField(value, def, modelId, locale, entryId, fieldId, ctx) {
 		entry: entryId,
 		field: fieldId
 	};
+	if (depth > MAX_FIELD_DEPTH) return [{
+		severity: "error",
+		...errCtx,
+		message: `${fieldId} exceeds the maximum nesting depth of ${MAX_FIELD_DEPTH}`
+	}];
 	if (value !== null && value !== void 0 && value !== "") {
 		const secretErrors = detectSecrets(value);
 		for (const e of secretErrors) errors.push({
@@ -79,16 +86,6 @@ function validateField(value, def, modelId, locale, entryId, fieldId, ctx) {
 			}
 		}
 	}
-	if (def.type === "email" && typeof value === "string" && !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(value)) errors.push({
-		severity: "warning",
-		...errCtx,
-		message: `${fieldId} may not be a valid email`
-	});
-	if (def.type === "url" && typeof value === "string" && !/^https?:\/\/.+/.test(value) && !value.startsWith("/")) errors.push({
-		severity: "warning",
-		...errCtx,
-		message: `${fieldId} may not be a valid URL`
-	});
 	if (def.type === "relation" && def.model) {
 		const targets = Array.isArray(def.model) ? def.model : [def.model];
 		if (targets.length > 1) if (typeof value !== "object" || value === null || !("model" in value) || !("ref" in value)) errors.push({
@@ -154,65 +151,19 @@ function validateField(value, def, modelId, locale, entryId, fieldId, ctx) {
 			});
 		}
 	}
-	if (def.type === "array" && Array.isArray(value) && def.items && typeof def.items === "string") for (let i = 0; i < value.length; i++) errors.push(...validateArrayItemType(value[i], def.items, errCtx, `${fieldId}[${i}]`));
-	if (def.type === "object" && def.fields && typeof value === "object" && value !== null && !Array.isArray(value)) {
-		const nested = validateContent(value, def.fields, modelId, locale, entryId);
-		errors.push(...nested.errors);
+	if (def.type === "array" && Array.isArray(value) && def.items) {
+		const itemDef = typeof def.items === "string" ? { type: def.items } : def.items;
+		for (let i = 0; i < value.length; i++) errors.push(...validateField(value[i], itemDef, modelId, locale, entryId, `${fieldId}[${i}]`, void 0, depth + 1));
 	}
-	if (def.type === "array" && Array.isArray(value) && def.items && typeof def.items === "object" && def.items.type === "object" && def.items.fields) {
-		for (let i = 0; i < value.length; i++) if (typeof value[i] === "object" && value[i] !== null) {
-			const nested = validateContent(value[i], def.items.fields, modelId, locale, entryId);
-			for (const e of nested.errors) errors.push({
-				...e,
-				field: `${fieldId}[${i}].${e.field}`
-			});
-		}
+	if (def.type === "object" && def.fields && typeof value === "object" && value !== null && !Array.isArray(value)) {
+		const nested = validateContent(value, def.fields, modelId, locale, entryId, ctx);
+		for (const e of nested.errors) errors.push({
+			...e,
+			field: e.field ? `${fieldId}.${e.field}` : fieldId
+		});
 	}
 	return errors;
 }
-function validateArrayItemType(value, itemType, errCtx, fieldPath) {
-	const ctx = {
-		...errCtx,
-		field: fieldPath
-	};
-	switch (itemType) {
-		case "string":
-		case "email":
-		case "url":
-		case "slug":
-		case "image":
-		case "video":
-		case "file":
-			if (typeof value !== "string") return [{
-				severity: "error",
-				...ctx,
-				message: `${fieldPath} must be a string`
-			}];
-			break;
-		case "number":
-		case "integer":
-		case "decimal":
-			if (typeof value !== "number") return [{
-				severity: "error",
-				...ctx,
-				message: `${fieldPath} must be a number`
-			}];
-			if (itemType === "integer" && !Number.isInteger(value)) return [{
-				severity: "error",
-				...ctx,
-				message: `${fieldPath} must be an integer`
-			}];
-			break;
-		case "boolean":
-			if (typeof value !== "boolean") return [{
-				severity: "error",
-				...ctx,
-				message: `${fieldPath} must be a boolean`
-			}];
-			break;
-	}
-	return [];
-}
 //#endregion
 //#region src/core/validator/relation-integrity.ts
 /**
@@ -501,6 +452,8 @@ async function validateCollectionModel(reader, projectRoot, model, config, issue
 			});
 		}
 	}
+	const strayResult = await checkStrayNonI18nMeta(reader, projectRoot, model, config, issues, fix);
+	fixed += strayResult.fixed;
 	for (const locale of locales) {
 		const metaRelPath = metaFilePath(model, locale, config.locales.default);
 		const metaData = await readJsonViaReader(reader, metaRelPath);
@@ -536,7 +489,7 @@ async function validateCollectionModel(reader, projectRoot, model, config, issue
 				entry: entryId,
 				message: `Orphan content: entry "${entryId}" has no metadata`
 			});
-			if (fix && projectRoot) {
+			if (fix && projectRoot && !strayResult.unresolved) {
 				await writeMeta(projectRoot, model, {
 					locale,
 					entryId,
@@ -561,38 +514,87 @@ async function validateCollectionModel(reader, projectRoot, model, config, issue
 			});
 		}
 	}
-	await checkStrayNonI18nMeta(reader, model, config, issues);
 	return {
 		entries: entriesChecked,
 		fixed
 	};
 }
 /**
-* Flag meta files a non-i18n model should not have.
+* Flag — and, with `fix`, remediate — meta files a non-i18n model should not have.
 *
 * Such a model keeps all content in one `data.json` and therefore exactly one
 * meta record, at the default locale. Earlier writes derived the meta path from
 * the caller's locale, so saving under a non-default locale left a second meta
-* file — and readers disagreed about which was authoritative. Reported rather
-* than auto-removed: the stray may hold the only `published` status in the
-* project, so deleting it silently could unpublish content.
+* file, and readers disagreed about which was authoritative.
+*
+* The `fix` remediation is deterministic and never decides a status:
+*   - default-locale meta present  → the strays are redundant, so delete them
+*     (the default-locale record stays authoritative — no status is merged).
+*   - default-locale meta absent, exactly one stray → that stray holds the only
+*     record, so migrate it to the default path (move) rather than orphan the
+*     content.
+*   - default-locale meta absent, several strays → which is authoritative is
+*     ambiguous, so leave the warning for the agent to resolve by hand.
+*
+* Returns the count of files remediated and whether strays remain unresolved.
+* `unresolved` gates the caller's orphan-content fabrication: while a non-i18n
+* model's meta still lives in a stray, the content is not truly orphaned, so
+* minting a draft default-locale record would both be wrong and set up a trap
+* (a later fix pass would then treat the real stray as redundant and delete it).
 */
-async function checkStrayNonI18nMeta(reader, model, config, issues) {
-	if (model.i18n) return;
+async function checkStrayNonI18nMeta(reader, projectRoot, model, config, issues, fix) {
+	if (model.i18n) return {
+		fixed: 0,
+		unresolved: false
+	};
+	const metaDir = `.contentrain/meta/${model.id}`;
 	const expected = `${config.locales.default}.json`;
 	let files;
 	try {
-		files = await reader.listDirectory(`.contentrain/meta/${model.id}`);
+		files = await reader.listDirectory(metaDir);
 	} catch {
-		return;
+		return {
+			fixed: 0,
+			unresolved: false
+		};
 	}
 	const strays = files.filter((f) => f.endsWith(".json") && f !== expected);
-	if (strays.length === 0) return;
+	if (strays.length === 0) return {
+		fixed: 0,
+		unresolved: false
+	};
 	issues.push({
 		severity: "warning",
 		model: model.id,
-		message: `Meta layout mismatch: "${model.id}" has i18n disabled, so its content lives in a single data.json and its meta belongs at ${expected} alone — but [${strays.join(", ")}] also exist. Readers may disagree about which file is authoritative. Merge any status you want to keep into ${expected}, then remove the extras.`
+		message: `Meta layout mismatch: "${model.id}" has i18n disabled, so its content lives in a single data.json and its meta belongs at ${expected} alone — but [${strays.join(", ")}] also exist. Readers may disagree about which file is authoritative. Run contentrain_validate fix:true to prune the extras (the default-locale meta stays authoritative).`
 	});
+	if (!fix || !projectRoot) return {
+		fixed: 0,
+		unresolved: true
+	};
+	if (await readJsonViaReader(reader, `${metaDir}/${expected}`) === null) {
+		if (strays.length !== 1) return {
+			fixed: 0,
+			unresolved: true
+		};
+		const stray = strays[0];
+		const content = await readJsonViaReader(reader, `${metaDir}/${stray}`);
+		if (content === null) return {
+			fixed: 0,
+			unresolved: true
+		};
+		await writeJson(join(projectRoot, metaDir, expected), content);
+		await rm(join(projectRoot, metaDir, stray), { force: true });
+		return {
+			fixed: 1,
+			unresolved: false
+		};
+	}
+	await Promise.all(strays.map((stray) => rm(join(projectRoot, metaDir, stray), { force: true })));
+	return {
+		fixed: strays.length,
+		unresolved: false
+	};
 }
 async function validateSingletonModel(reader, projectRoot, model, config, issues, fix) {
 	let entriesChecked = 0;
@@ -783,11 +785,24 @@ async function validateDocumentModel(reader, projectRoot, model, config, issues,
 	};
 	const slugs = await discoverDocumentSlugs(reader, cDir, model);
 	const locales = model.i18n ? config.locales.supported : [config.locales.default];
+	const rawByKey = /* @__PURE__ */ new Map();
+	const frontmatterByLocale = {};
+	for (const slug of slugs) {
+		if (slug.startsWith(".")) continue;
+		for (const locale of locales) {
+			const raw = await readTextViaReader(reader, documentFilePath(model, locale, slug));
+			if (!raw) continue;
+			rawByKey.set(`${slug}\u0000${locale}`, raw);
+			const { frontmatter } = parseFrontmatter(raw);
+			frontmatterByLocale[locale] ??= {};
+			frontmatterByLocale[locale][slug] = frontmatter;
+		}
+	}
 	for (const slug of slugs) {
 		if (slug.startsWith(".")) continue;
 		for (const locale of locales) {
 			const filePath = documentFilePath(model, locale, slug);
-			const raw = await readTextViaReader(reader, filePath);
+			const raw = rawByKey.get(`${slug}\u0000${locale}`) ?? null;
 			if (!raw) {
 				if (model.i18n) {
 					issues.push({
@@ -825,7 +840,10 @@ async function validateDocumentModel(reader, projectRoot, model, config, issues,
 			});
 			if (model.fields) {
 				const fieldsWithoutBody = Object.fromEntries(Object.entries(model.fields).filter(([name]) => name !== "body"));
-				const entryResult = validateContent(frontmatter, fieldsWithoutBody, model.id, locale);
+				const entryResult = validateContent(frontmatter, fieldsWithoutBody, model.id, locale, void 0, {
+					allEntries: frontmatterByLocale[locale] ?? {},
+					currentEntryId: slug
+				});
 				for (const err of entryResult.errors) issues.push({
 					...err,
 					slug
@@ -972,4 +990,4 @@ async function validateProject(input, options) {
 //#endregion
 export { validateContent as i, validateScheduleFields as n, checkRelationIntegrity as r, validateProject as t };
 
-//# sourceMappingURL=validator-Ck0puppQ.mjs.map
+//# sourceMappingURL=validator-D5VncJ8M.mjs.map