@contentrain/mcp 3.10.1 → 3.11.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentrain/mcp",
-  "version": "3.10.1",
+  "version": "3.11.1",
   "mcpName": "io.github.Contentrain/contentrain",
   "license": "MIT",
   "description": "Local-first MCP server for AI-generated content governance — 27 deterministic tools (22 core + 5 media), stdio + HTTP transports, Local / GitHub / GitLab providers",
@@ -182,7 +182,7 @@
     "simple-git": "^3.36.0",
     "typescript": "^5.7.0",
     "zod": "^3.24.0",
-    "@contentrain/types": "1.62.0"
+    "@contentrain/types": "1.63.1"
   },
   "optionalDependencies": {
     "@astrojs/compiler": "^2.10.0",

package/dist/local-CBtRYFH4.mjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"local-CBtRYFH4.mjs","names":["mergeBranchOp","canonicalStringify","sortKeys","listBranchesOp","createBranchOp","deleteBranchOp","getBranchDiffOp","mergeBranchOp","isMergedOp","getDefaultBranchOp"],"sources":["../src/providers/local/branch-ops.ts","../src/git/ref-snapshot.ts","../src/providers/local/content-view.ts","../src/providers/local/rebase-changes.ts","../src/providers/local/provider.ts"],"sourcesContent":["import { CONTENTRAIN_BRANCH } from '@contentrain/types'\nimport { createGit } from '../../git/identity.js'\nimport type { Branch, FileDiff, MergeResult } from '../../core/contracts/index.js'\nimport { readConfig } from '../../core/config.js'\nimport { resolveBaseBranch } from '../../git/base-branch.js'\nimport { classifyMergedBranches, deleteRemoteBranch } from '../../git/branch-lifecycle.js'\nimport { mergeBranch as mergeBranchOp } from '../../git/transaction.js'\n\n/**\n * Branch/merge/diff helpers backed by the local simple-git worktree flow.\n *\n * Pure functions composed into `LocalProvider` — mirroring the shape of\n * `providers/github/branch-ops.ts` so the two providers share the same\n * surface at the `RepoProvider` boundary.\n */\n\nexport async function getDefaultBranch(projectRoot: string): Promise<string> {\n  return resolveBaseBranch(createGit(projectRoot), await readConfig(projectRoot))\n}\n\nexport async function listBranches(\n  projectRoot: string,\n  prefix?: string,\n): Promise<Branch[]> {\n  const git = createGit(projectRoot)\n  const summary = await git.branchLocal()\n  const names = prefix\n    ? summary.all.filter(n => n.startsWith(prefix))\n    : summary.all\n  const branches: Branch[] = []\n  for (const name of names) {\n    const info = summary.branches[name]\n    branches.push({ name, sha: info?.commit ?? '' })\n  }\n  return branches\n}\n\nexport async function createBranch(\n  projectRoot: string,\n  name: string,\n  fromRef: string,\n): Promise<void> {\n  const git = createGit(projectRoot)\n  await git.raw(['branch', name, fromRef])\n}\n\nexport async function deleteBranch(\n  projectRoot: string,\n  name: string,\n): Promise<void> {\n  const git = createGit(projectRoot)\n  await git.deleteLocalBranch(name, true)\n  // Parity with the remote-API providers, whose deleteBranch removes the\n  // remote ref: best-effort, config-gated inside the helper, never throws.\n  await deleteRemoteBranch(projectRoot, name)\n}\n\nexport async function getBranchDiff(\n  projectRoot: string,\n  branch: string,\n  base: string,\n): Promise<FileDiff[]> {\n  const git = createGit(projectRoot)\n  const raw = await git.raw(['diff', '--name-status', `${base}...${branch}`])\n  const diffs: FileDiff[] = []\n  for (const line of raw.split('\\n')) {\n    if (!line.trim()) continue\n    const [code, ...pathParts] = line.split('\\t')\n    const path = pathParts[pathParts.length - 1]\n    if (!code || !path) continue\n    const status: FileDiff['status'] = code.startsWith('A')\n      ? 'added'\n      : code.startsWith('D')\n        ? 'removed'\n        : 'modified'\n    diffs.push({ path, status, before: null, after: null })\n  }\n  return diffs\n}\n\nexport async function mergeBranch(\n  projectRoot: string,\n  branch: string,\n  into: string,\n): Promise<MergeResult> {\n  if (into !== CONTENTRAIN_BRANCH) {\n    throw Object.assign(new Error(\n      `LocalProvider.mergeBranch only supports merging into \"${CONTENTRAIN_BRANCH}\" (got \"${into}\"). `\n      + `The local flow merges feature branches into the content-tracking branch and fast-forwards the base branch via update-ref.`,\n    ), {\n      code: 'UNSUPPORTED_MERGE_TARGET',\n      agent_hint: `Pass \"${CONTENTRAIN_BRANCH}\" as the merge target, or use a non-local provider that supports arbitrary targets.`,\n      developer_action: `Merge \"${branch}\" into \"${CONTENTRAIN_BRANCH}\" instead.`,\n    })\n  }\n  const result = await mergeBranchOp(projectRoot, branch)\n  return {\n    merged: true,\n    sha: result.commit,\n    pullRequestUrl: null,\n    sync: result.sync,\n    ...(result.remote ? { remote: result.remote } : {}),\n  }\n}\n\nexport async function isMerged(\n  projectRoot: string,\n  branch: string,\n  into: string,\n): Promise<boolean> {\n  try {\n    const merged = await classifyMergedBranches(projectRoot, [branch], into)\n    return merged.has(branch)\n  } catch {\n    return false\n  }\n}\n","import { spawn } from 'node:child_process'\nimport type { RepoReader } from '../core/contracts/index.js'\nimport { gitBinary } from './identity.js'\n\n/**\n * RefSnapshotReader — a `RepoReader` over one subtree of one commit, read\n * with two git spawns in total however many files the caller touches.\n *\n * `GitRefReader` spawns `git show` per file, which is right for a planner\n * reading a handful of paths and wrong for a tool that walks every model and\n * every locale file (`content_list`, `status`, validation): a few hundred\n * spawns per call (#229). Here one `ls-tree -r` lists the subtree — which\n * answers `listDirectory` and `fileExists` from memory — and the first\n * `readFile` pulls every content blob under it through a single\n * `cat-file --batch`. Only content is batched ({@link batched}): media under\n * `assets_path`, and any large or non-text file, is read on demand, one\n * `cat-file blob` each, so a list or a save never loads the project's images.\n *\n * Bound to a commit sha, not a branch name, so a snapshot never changes\n * under its reader; {@link loadRefSnapshot} caches one per (repo, sha).\n *\n * Paths are repo-relative with `/` separators; the caller maps its own paths\n * (see LocalProvider). Only paths under `root` are in the snapshot — anything\n * else reads as missing.\n */\nexport class RefSnapshotReader implements RepoReader {\n  private blobs: Promise<Map<string, string>> | null = null\n  private readonly single = new Map<string, Promise<string>>()\n\n  constructor(\n    private readonly repoDir: string,\n    public readonly commit: string,\n    public readonly root: string,\n    /** repo-relative file path → blob oid and size in bytes */\n    private readonly files: ReadonlyMap<string, SnapshotFile>,\n    /** repo-relative directory path → child names */\n    private readonly dirs: ReadonlyMap<string, readonly string[]>,\n  ) {}\n\n  async readFile(path: string, _ref?: string): Promise<string> {\n    const p = trim(path)\n    const file = this.files.get(p)\n    if (!file) throw Object.assign(new Error(`ENOENT: ${path} is not in ${this.commit.slice(0, 8)}:${this.root}`), { code: 'ENOENT' })\n    if (!batched(p, file.size)) {\n      let text = this.single.get(file.oid)\n      if (!text) {\n        text = runGit(this.repoDir, ['cat-file', 'blob', file.oid]).then(buf => buf.toString('utf-8'))\n        text.catch(() => this.single.delete(file.oid))\n        this.single.set(file.oid, text)\n      }\n      return text\n    }\n    this.blobs ??= readBlobs(this.repoDir, [...new Set([...this.files].filter(([f, { size }]) => batched(f, size)).map(([, { oid }]) => oid))])\n    const text = (await this.blobs).get(file.oid)\n    if (text === undefined) throw new Error(`blob ${file.oid} for ${path} could not be read`)\n    return text\n  }\n\n  async listDirectory(path: string, _ref?: string): Promise<string[]> {\n    return [...(this.dirs.get(trim(path)) ?? [])]\n  }\n\n  async fileExists(path: string, _ref?: string): Promise<boolean> {\n    const p = trim(path)\n    return this.files.has(p) || this.dirs.has(p)\n  }\n}\n\ninterface SnapshotFile { oid: string, size: number }\n\n/** Largest blob the batch loads; a content file is far smaller. */\nconst BATCH_MAX_BYTES = 1024 * 1024\n\n/**\n * Whether the first `readFile` loads this file with the rest: a content file —\n * JSON (config, models, content, meta) or Markdown (documents) — no larger\n * than {@link BATCH_MAX_BYTES}. Media never matches by extension, wherever\n * `assets_path` points.\n */\nfunction batched(path: string, size: number): boolean {\n  return size <= BATCH_MAX_BYTES && /\\.(?:json|md|mdx)$/i.test(path)\n}\n\nconst snapshots = new Map<string, Promise<RefSnapshotReader>>()\nconst MAX_SNAPSHOTS = 8\n\n/**\n * The snapshot of `root` at `commit`, listed once per (repo, commit) for the\n * life of the process: a commit's tree never changes, so a later tool call on\n * an unmoved branch costs no spawn at all.\n */\nexport function loadRefSnapshot(repoDir: string, commit: string, root: string): Promise<RefSnapshotReader> {\n  const key = `${repoDir}\\0${commit}\\0${root}`\n  let hit = snapshots.get(key)\n  if (!hit) {\n    hit = listTree(repoDir, commit, root)\n    hit.catch(() => snapshots.delete(key))\n    snapshots.set(key, hit)\n    // Oldest-first eviction; a long-lived server sees a new tip per write.\n    if (snapshots.size > MAX_SNAPSHOTS) snapshots.delete(snapshots.keys().next().value!)\n  }\n  return hit\n}\n\nasync function listTree(repoDir: string, commit: string, root: string): Promise<RefSnapshotReader> {\n  const raw = await runGit(repoDir, ['ls-tree', '-r', '-l', '-z', '--full-tree', commit, '--', root])\n  const files = new Map<string, SnapshotFile>()\n  const children = new Map<string, Set<string>>()\n  for (const record of raw.toString('utf-8').split('\\0')) {\n    if (!record) continue\n    // \"<mode> <type> <oid> <size, space-padded>\\t<path>\"\n    const tab = record.indexOf('\\t')\n    const [, type, oid, size] = record.slice(0, tab).split(/ +/)\n    if (type !== 'blob' || !oid) continue\n    const path = record.slice(tab + 1)\n    files.set(path, { oid, size: Number(size) })\n    // Register every ancestor directory down from the repo root.\n    const parts = path.split('/')\n    for (let i = 0; i < parts.length; i++) {\n      const dir = parts.slice(0, i).join('/')\n      let set = children.get(dir)\n      if (!set) children.set(dir, set = new Set())\n      set.add(parts[i]!)\n    }\n  }\n  const dirs = new Map([...children].map(([dir, names]) => [dir, [...names].toSorted()] as const))\n  return new RefSnapshotReader(repoDir, commit, root, files, dirs)\n}\n\n/** The given blobs in one `cat-file --batch` process. */\nasync function readBlobs(repoDir: string, oids: string[]): Promise<Map<string, string>> {\n  const out = new Map<string, string>()\n  if (oids.length === 0) return out\n  const buf = await runGit(repoDir, ['cat-file', '--batch'], `${oids.join('\\n')}\\n`)\n  // Each record: \"<oid> <type> <size>\\n<size bytes>\\n\"\n  let at = 0\n  while (at < buf.length) {\n    const eol = buf.indexOf(0x0A, at)\n    if (eol < 0) break\n    const [oid, , size] = buf.subarray(at, eol).toString('utf-8').split(' ')\n    const bytes = Number(size)\n    if (!oid || !Number.isFinite(bytes)) break\n    out.set(oid, buf.subarray(eol + 1, eol + 1 + bytes).toString('utf-8'))\n    at = eol + 1 + bytes + 1\n  }\n  return out\n}\n\nfunction runGit(cwd: string, args: string[], stdin?: string): Promise<Buffer> {\n  return new Promise((resolve, reject) => {\n    const child = spawn(gitBinary(), args, { cwd, stdio: ['pipe', 'pipe', 'pipe'] })\n    const chunks: Buffer[] = []\n    let stderr = ''\n    child.stdout.on('data', (c: Buffer) => chunks.push(c))\n    child.stderr.on('data', (c: Buffer) => { stderr += c.toString() })\n    child.on('error', reject)\n    // git may exit before reading all of stdin (a bad ref, a missing object): the write then fails\n    // with EPIPE. The exit code below reports that failure; unhandled, it would crash the process.\n    child.stdin.on('error', () => {})\n    child.on('close', (code) => {\n      if (code === 0) resolve(Buffer.concat(chunks))\n      else reject(new Error(`git ${args[0]} exited ${code}: ${stderr.trim()}`))\n    })\n    child.stdin.end(stdin ?? '')\n  })\n}\n\nfunction trim(path: string): string {\n  let p = path.replaceAll('\\\\', '/')\n  while (p.startsWith('./')) p = p.slice(2)\n  while (p.endsWith('/')) p = p.slice(0, -1)\n  return p === '.' ? '' : p\n}\n","import { AsyncLocalStorage } from 'node:async_hooks'\nimport { readFile, stat } from 'node:fs/promises'\nimport { join, resolve } from 'node:path'\nimport { CONTENTRAIN_BRANCH, type ContentReadSource } from '@contentrain/types'\nimport { readConfig } from '../../core/config.js'\nimport { resolveBaseBranch } from '../../git/base-branch.js'\nimport { createGit } from '../../git/identity.js'\nimport { loadRefSnapshot, type RefSnapshotReader } from '../../git/ref-snapshot.js'\n\n/**\n * Where a LocalProvider reads `.contentrain/` from (#229).\n *\n * Content writes land on `contentrain` and the base branch; a checked-out\n * feature branch is deliberately left alone (#227). Its working tree is then\n * behind every write, so reading `.contentrain/` from it plans the next write\n * from a stale value and shows read tools stale content. On such a branch the\n * content is read from the `contentrain` ref instead. Everything else — source\n * files, scan, normalize — still comes from the working tree.\n *\n * Working tree, unchanged from before, when:\n * - the base branch is checked out (writes advance it, so it is current once\n *   pulled — #226's carry-over and `CONTENT_WORKING_TREE_STALE` still apply);\n * - HEAD is detached (a CI checkout validates the commit it checked out);\n * - HEAD is `contentrain` itself or a `cr/*` review branch (their tree IS\n *   the content under review);\n * - there is no `contentrain` branch yet, or git cannot answer.\n */\nexport type ContentView =\n  | { source: 'working_tree' }\n  | { source: 'ref', ref: string, commit: string, branch: string, reader: RefSnapshotReader, prefix: string }\n\n/** The `.contentrain` paths that are never committed: always the working tree. */\nconst UNTRACKED = ['.contentrain/.cache', '.contentrain/client']\n\nconst scope = new AsyncLocalStorage<Map<string, Promise<ContentView>>>()\n\n/**\n * Run `fn` with one content view per project for its whole duration: every\n * read inside answers from the same snapshot, resolved once. The MCP server\n * wraps each tool call in this, so a call costs a fixed handful of spawns\n * however many files it reads.\n */\nexport function withReadScope<T>(fn: () => T): T {\n  return scope.run(new Map(), fn)\n}\n\nexport function contentView(projectRoot: string): Promise<ContentView> {\n  const memo = scope.getStore()\n  if (!memo) return resolveView(projectRoot)\n  let view = memo.get(projectRoot)\n  if (!view) {\n    view = resolveView(projectRoot)\n    memo.set(projectRoot, view)\n  }\n  return view\n}\n\nexport function describeSource(view: ContentView): ContentReadSource {\n  return view.source === 'working_tree'\n    ? { source: 'working_tree' }\n    : { source: 'ref', ref: view.ref, commit: view.commit, checked_out: view.branch }\n}\n\n/**\n * The repo-relative path a snapshot answers for, or null when `path` must come\n * from the working tree (outside `.contentrain/`, or never committed).\n */\nexport function refPath(view: ContentView & { source: 'ref' }, projectRoot: string, path: string): string | null {\n  const abs = resolve(projectRoot, path)\n  const root = resolve(projectRoot)\n  if (abs !== root && !abs.startsWith(`${root}/`) && !abs.startsWith(`${root}\\\\`)) return null\n  const rel = abs.slice(root.length + 1).replaceAll('\\\\', '/')\n  if (rel !== '.contentrain' && !rel.startsWith('.contentrain/')) return null\n  if (UNTRACKED.some(p => rel === p || rel.startsWith(`${p}/`))) return null\n  return view.prefix + rel\n}\n\nasync function resolveView(projectRoot: string): Promise<ContentView> {\n  try {\n    const head = await headBranch(projectRoot)\n    if (!head || head === CONTENTRAIN_BRANCH || head.startsWith('cr/')) return { source: 'working_tree' }\n    const git = createGit(projectRoot)\n    const base = await resolveBaseBranch(git, await readConfig(projectRoot), { currentBranch: head })\n    if (head === base) return { source: 'working_tree' }\n    const [prefix, commit] = (await git.raw(['rev-parse', '--show-prefix', `refs/heads/${CONTENTRAIN_BRANCH}^{commit}`]))\n      .split('\\n').map(line => line.trim())\n    if (!commit) return { source: 'working_tree' }\n    const root = `${prefix ?? ''}.contentrain`\n    const reader = await loadRefSnapshot(projectRoot, commit, root)\n    return { source: 'ref', ref: CONTENTRAIN_BRANCH, commit, branch: head, reader, prefix: prefix ?? '' }\n  } catch {\n    return { source: 'working_tree' }\n  }\n}\n\n/**\n * The checked-out branch, or null when HEAD is detached. Read from the HEAD\n * file when `.git` sits at the project root (no spawn — this runs once per\n * tool call on every local project); asked of git otherwise (a linked\n * worktree, or a project in a monorepo subdirectory).\n */\nasync function headBranch(projectRoot: string): Promise<string | null> {\n  const dotGit = join(projectRoot, '.git')\n  try {\n    let gitDir = dotGit\n    if ((await stat(dotGit)).isFile()) {\n      const pointer = (await readFile(dotGit, 'utf-8')).match(/^gitdir:\\s*(.+)$/m)?.[1]?.trim()\n      if (!pointer) throw new Error('unreadable .git file')\n      gitDir = resolve(projectRoot, pointer)\n    }\n    const head = (await readFile(join(gitDir, 'HEAD'), 'utf-8')).trim()\n    return head.startsWith('ref: refs/heads/') ? head.slice('ref: refs/heads/'.length) : null\n  } catch {\n    const out = await createGit(projectRoot).raw(['symbolic-ref', '-q', '--short', 'HEAD']).catch(() => '')\n    return out.trim() || null\n  }\n}\n","import { MODEL_FIELD_ORDER } from '@contentrain/types'\nimport type { FileChange } from '../../core/contracts/index.js'\nimport { canonicalStringify, sortKeys } from '../../core/serialization/index.js'\n\n/**\n * Carry a plan's full-file changes over to the tree they are committed on.\n *\n * The local provider plans against the developer's working tree, but commits\n * in a worktree on the `contentrain` branch after fetching and merging the\n * remote. Those two trees differ whenever another writer (Studio, a teammate,\n * CI) reached `contentrain` since the developer last pulled. A plan is a set\n * of whole files, so writing it as-is replaced every file it touched with a\n * copy built from the stale tree — silently deleting whatever the other\n * writer had added (#226).\n *\n * Each change is a three-way merge instead:\n *   basis   — the file as the planner read it (working tree, `null` if absent)\n *   planned — the change's content (`null` for a delete)\n *   current — the file in the worktree the commit is built on\n *\n * `current === basis` is the common case and writes the plan verbatim. When\n * they differ, JSON object files (collection / dictionary / singleton content,\n * meta, model definitions) are merged key by key: what the plan changed\n * relative to its basis is applied on top of `current`, recursively through\n * nested objects. Anything that cannot be merged that way — both sides\n * changed the same value, a markdown document, a delete of a file that\n * gained entries — is a conflict. Conflicts are never resolved by guessing:\n * the caller refuses the write.\n *\n * One exception, in meta files only: the write stamp (`updated_at`,\n * `updated_by`, `source`). Every write re-stamps the entries it touches\n * (`mergeEntryMeta`, `applyStatusChange`), so two writes to the same entry\n * always disagree there. The stamp describes the latest write, which is this\n * one — so when this write re-stamped an entry, its whole stamp wins, as a\n * unit (never this write's `updated_at` with the other writer's\n * `updated_by`). `status` and scheduling still merge or conflict normally.\n */\nexport type RebaseResult =\n  | { ok: true, change: FileChange }\n  | { ok: false, path: string, reason: string }\n\nexport function rebaseChange(change: FileChange, basis: string | null, current: string | null): RebaseResult {\n  if (current === basis || current === change.content) return { ok: true, change }\n\n  const reject = (reason: string): RebaseResult => ({ ok: false, path: change.path, reason })\n\n  if (basis !== null && current === null) {\n    return reject('the file was deleted on the contentrain branch since it was read')\n  }\n  if (!change.path.endsWith('.json')) {\n    return reject('the file changed on the contentrain branch since it was read, and only JSON files can be merged')\n  }\n\n  const base = basis === null ? {} : parseObject(basis)\n  const theirs = current === null ? {} : parseObject(current)\n  const ours = change.content === null ? {} : parseObject(change.content)\n  if (!base || !theirs || !ours) {\n    return reject('the file changed on the contentrain branch since it was read, and is not a JSON object')\n  }\n\n  const stampWins = change.path.startsWith('.contentrain/meta/')\n  const merged = merge3(base, ours, theirs, [], stampWins)\n  if (!merged.ok) {\n    return reject(`${describeKey(merged.at)} was changed both by this write and on the contentrain branch`)\n  }\n  const value = merged.value === ABSENT ? {} : merged.value as Record<string, unknown>\n\n  if (change.content === null) {\n    // A delete merges to \"the keys only the other writer has\". Writing those\n    // back would keep a file this operation meant to remove (a deleted model's\n    // content, say) — refuse instead and let the caller decide after a pull.\n    return Object.keys(value).length === 0\n      ? { ok: true, change }\n      : reject('the file gained entries on the contentrain branch since it was read, so deleting it would drop them')\n  }\n\n  const fieldOrder = change.path.startsWith('.contentrain/models/') ? MODEL_FIELD_ORDER : undefined\n  return { ok: true, change: { path: change.path, content: canonicalStringify(value, fieldOrder) } }\n}\n\nconst ABSENT = Symbol('absent')\ntype Value = unknown | typeof ABSENT\n\ntype MergeResult = { ok: true, value: Value } | { ok: false, at: string[] }\n\n/** Meta keys that record who wrote last and when — see the module comment. */\nconst WRITE_STAMP = new Set(['updated_at', 'updated_by', 'source'])\n\nfunction merge3(base: Value, ours: Value, theirs: Value, at: string[], stampWins: boolean): MergeResult {\n  if (same(ours, base)) return { ok: true, value: theirs }\n  if (same(theirs, base)) return { ok: true, value: ours }\n  if (same(ours, theirs)) return { ok: true, value: ours }\n  if (!isPlainObject(base) || !isPlainObject(ours) || !isPlainObject(theirs)) {\n    return { ok: false, at }\n  }\n\n  const restamped = stampWins\n    && [...WRITE_STAMP].some(key => !same(field(ours, key), field(base, key)))\n  const out: Record<string, unknown> = {}\n  const keys = new Set([...Object.keys(base), ...Object.keys(ours), ...Object.keys(theirs)])\n  for (const key of keys) {\n    if (restamped && WRITE_STAMP.has(key)) {\n      const value = field(ours, key)\n      if (value !== ABSENT) out[key] = value\n      continue\n    }\n    const result = merge3(field(base, key), field(ours, key), field(theirs, key), [...at, key], stampWins)\n    if (!result.ok) return result\n    if (result.value !== ABSENT) out[key] = result.value\n  }\n  return { ok: true, value: out }\n}\n\nfunction field(obj: Record<string, unknown>, key: string): Value {\n  return Object.hasOwn(obj, key) && obj[key] !== null && obj[key] !== undefined ? obj[key] : ABSENT\n}\n\n/** Canonical equality — the same normalisation the serializer applies (sorted keys, nulls dropped). */\nfunction same(a: Value, b: Value): boolean {\n  if (a === ABSENT || b === ABSENT) return a === b\n  return JSON.stringify(sortKeys(a)) === JSON.stringify(sortKeys(b))\n}\n\nfunction isPlainObject(value: Value): value is Record<string, unknown> {\n  return typeof value === 'object' && value !== null && !Array.isArray(value)\n}\n\nfunction parseObject(raw: string): Record<string, unknown> | undefined {\n  try {\n    const parsed: unknown = JSON.parse(raw)\n    return isPlainObject(parsed) ? parsed : undefined\n  } catch {\n    return undefined\n  }\n}\n\nfunction describeKey(at: string[]): string {\n  if (at.length === 0) return 'the file'\n  if (at.length === 1) return `\"${at[0]}\"`\n  return `\"${at[0]}\" (field ${at.slice(1).map(k => `\"${k}\"`).join(' → ')})`\n}\n","import { readFile } from 'node:fs/promises'\nimport { join } from 'node:path'\nimport { tmpdir } from 'node:os'\nimport { randomUUID } from 'node:crypto'\nimport { CONTENTRAIN_BRANCH } from '@contentrain/types'\nimport type {\n  Branch,\n  Commit,\n  CommitAuthor,\n  ContentReadSource,\n  FileChange,\n  FileDiff,\n  MergeResult,\n  ProviderCapabilities,\n  RepoProvider,\n  WriteReadiness,\n} from '../../core/contracts/index.js'\nimport { LOCAL_CAPABILITIES } from '../../core/contracts/index.js'\nimport { applyChangesToWorktree } from '../../core/ops/index.js'\nimport { checkBranchHealth } from '../../git/branch-lifecycle.js'\nimport { createGit } from '../../git/identity.js'\nimport { createTransaction } from '../../git/transaction.js'\nimport {\n  createBranch as createBranchOp,\n  deleteBranch as deleteBranchOp,\n  getBranchDiff as getBranchDiffOp,\n  getDefaultBranch as getDefaultBranchOp,\n  isMerged as isMergedOp,\n  listBranches as listBranchesOp,\n  mergeBranch as mergeBranchOp,\n} from './branch-ops.js'\nimport { contentView, describeSource, refPath, type ContentView } from './content-view.js'\nimport { LocalReader } from './reader.js'\nimport { rebaseChange } from './rebase-changes.js'\nimport type { LocalApplyPlanInput, LocalApplyResult } from './types.js'\n\nconst DEFAULT_AUTHOR_NAME = 'Contentrain'\nconst DEFAULT_AUTHOR_EMAIL = 'ai@contentrain.io'\n\n/**\n * LocalProvider — the local-filesystem, worktree-backed content provider.\n *\n * Implements the full `RepoProvider` surface:\n * - Reader methods delegate to `LocalReader`.\n * - `applyPlan` wraps `createTransaction` and returns `LocalApplyResult`\n *   (a superset of `Commit` carrying workflow action + selective sync).\n * - Branch ops mirror `GitHubProvider` — thin wrappers over the local\n *   simple-git helpers in `./branch-ops.ts`.\n *\n * `mergeBranch` only supports merging into the singleton\n * `CONTENTRAIN_BRANCH`; the local flow advances the base branch via\n * `update-ref` in `transaction.mergeBranch`, so arbitrary merge targets\n * would bypass that invariant.\n */\nexport class LocalProvider implements RepoProvider {\n  readonly capabilities: ProviderCapabilities = LOCAL_CAPABILITIES\n  private readonly reader: LocalReader\n\n  constructor(public readonly projectRoot: string) {\n    this.reader = new LocalReader(projectRoot)\n  }\n\n  // Reads: `.contentrain/**` from the content view (the `contentrain` ref\n  // while a feature branch is checked out — #229), everything else from the\n  // working tree. See content-view.ts.\n\n  async readFile(path: string, ref?: string): Promise<string> {\n    const at = await this.routed(path)\n    return at ? at.view.reader.readFile(at.path) : this.reader.readFile(path, ref)\n  }\n\n  async listDirectory(path: string, ref?: string): Promise<string[]> {\n    const at = await this.routed(path)\n    return at ? at.view.reader.listDirectory(at.path) : this.reader.listDirectory(path, ref)\n  }\n\n  async fileExists(path: string, ref?: string): Promise<boolean> {\n    const at = await this.routed(path)\n    return at ? at.view.reader.fileExists(at.path) : this.reader.fileExists(path, ref)\n  }\n\n  async contentSource(): Promise<ContentReadSource> {\n    return describeSource(await contentView(this.projectRoot))\n  }\n\n  private async routed(path: string): Promise<{ view: ContentView & { source: 'ref' }, path: string } | null> {\n    const view = await contentView(this.projectRoot)\n    if (view.source !== 'ref') return null\n    const inRef = refPath(view, this.projectRoot, path)\n    return inRef === null ? null : { view, path: inRef }\n  }\n\n  /**\n   * Branch pressure gate. Unmerged `cr/*` branches accumulate in a local repo\n   * and eventually have to stop new writes; hosted providers have no such\n   * limit, so they omit this method entirely.\n   */\n  async checkWriteReadiness(): Promise<WriteReadiness> {\n    const health = await checkBranchHealth(this.projectRoot)\n    return health.blocked\n      ? { blocked: true, message: health.message ?? 'Too many active contentrain branches.' }\n      : { blocked: false }\n  }\n\n  async applyPlan(input: LocalApplyPlanInput): Promise<LocalApplyResult> {\n    // What the planner read: the content view — the working tree, or the\n    // `contentrain` snapshot on a feature branch (#229). Captured before the\n    // transaction fetches, so it is the tree the plan was computed from — not\n    // whatever the remote says now.\n    const view = await contentView(this.projectRoot)\n    const basis = await Promise.all(input.changes.map(c => this.readBasis(view, c.path)))\n    const tx = await createTransaction(this.projectRoot, input.branch, {\n      workflowOverride: input.workflowOverride,\n    })\n    try {\n      await tx.write(async (wt) => {\n        // The worktree is the contentrain tip after fetch + merge — the tree\n        // this commit is built on. Carry the plan over to it instead of\n        // overwriting it with files built from a possibly stale working tree\n        // (#226). See rebaseChange.\n        const current = await Promise.all(input.changes.map(c => readOrNull(join(wt, c.path))))\n        const results = input.changes.map((change, i) => rebaseChange(change, basis[i]!, current[i]!))\n        const conflicts = results.filter(r => !r.ok)\n        if (conflicts.length > 0) {\n          throw Object.assign(new Error(\n            `Nothing was written: the content branch moved since your working tree was last updated, and this change cannot be applied on top of it. `\n            + conflicts.map(c => `${c.path}: ${c.reason}.`).join(' '),\n          ), staleTreeGuidance(tx.baseBranch, tx.baseCheckedOut, view.source === 'ref'))\n        }\n        await applyChangesToWorktree(wt, results.map(r => (r as Extract<typeof r, { ok: true }>).change))\n      })\n      await tx.commit(input.message, input.context)\n      const gitResult = await tx.complete()\n      return {\n        sha: gitResult.commit,\n        message: input.message,\n        author: input.author ?? {\n          name: process.env['CONTENTRAIN_AUTHOR_NAME'] ?? DEFAULT_AUTHOR_NAME,\n          email: process.env['CONTENTRAIN_AUTHOR_EMAIL'] ?? DEFAULT_AUTHOR_EMAIL,\n        },\n        timestamp: new Date().toISOString(),\n        workflowAction: gitResult.action,\n        sync: gitResult.sync,\n        warning: gitResult.warning,\n        base_advance: gitResult.base_advance,\n        remote_push: gitResult.remote_push,\n      }\n    } finally {\n      await tx.cleanup()\n    }\n  }\n\n  private async readBasis(view: ContentView, path: string): Promise<string | null> {\n    if (view.source === 'ref') {\n      const inRef = refPath(view, this.projectRoot, path)\n      if (inRef !== null) return view.reader.readFile(inRef).catch(() => null)\n    }\n    return readOrNull(join(this.projectRoot, path))\n  }\n\n  listBranches(prefix?: string): Promise<Branch[]> {\n    return listBranchesOp(this.projectRoot, prefix)\n  }\n\n  async createBranch(name: string, fromRef?: string): Promise<void> {\n    const resolved = fromRef ?? CONTENTRAIN_BRANCH\n    await createBranchOp(this.projectRoot, name, resolved)\n  }\n\n  deleteBranch(name: string): Promise<void> {\n    return deleteBranchOp(this.projectRoot, name)\n  }\n\n  getBranchDiff(branch: string, base?: string): Promise<FileDiff[]> {\n    const resolved = base ?? CONTENTRAIN_BRANCH\n    return getBranchDiffOp(this.projectRoot, branch, resolved)\n  }\n\n  mergeBranch(branch: string, into: string): Promise<MergeResult> {\n    return mergeBranchOp(this.projectRoot, branch, into)\n  }\n\n  isMerged(branch: string, into?: string): Promise<boolean> {\n    const resolved = into ?? CONTENTRAIN_BRANCH\n    return isMergedOp(this.projectRoot, branch, resolved)\n  }\n\n  getDefaultBranch(): Promise<string> {\n    return getDefaultBranchOp(this.projectRoot)\n  }\n\n  async getMergeBase(refA: string, refB: string): Promise<string | null> {\n    const git = createGit(this.projectRoot)\n    try {\n      return (await git.raw(['merge-base', refA, refB])).trim() || null\n    } catch {\n      return null\n    }\n  }\n\n  /**\n   * Two-parent merge commit in a temp worktree. The real `git merge`\n   * resolves everything outside the plan; the plan's changes then\n   * overwrite every content-owned path (planner output is authoritative,\n   * never git's textual auto-merge). Leftover unmerged paths abort — they\n   * are outside the content planner's scope by construction.\n   */\n  async createMergeCommit(input: {\n    branch: string\n    ours: string\n    theirs: string\n    changes: FileChange[]\n    message: string\n    author: CommitAuthor\n  }): Promise<Commit> {\n    const git = createGit(this.projectRoot)\n    const tip = (await git.raw(['rev-parse', input.branch])).trim()\n    if (tip !== input.ours) {\n      throw Object.assign(new Error(\n        `createMergeCommit: \"${input.branch}\" is at ${tip.slice(0, 8)}, not the expected ${input.ours.slice(0, 8)} — the branch moved since planning.`,\n      ), {\n        code: 'RECONCILE_STALE_OURS',\n        agent_hint: 'Re-run the reconcile plan against the current tip.',\n      })\n    }\n\n    const worktreePath = join(tmpdir(), `cr-merge-commit-${randomUUID()}`)\n    await git.raw(['worktree', 'add', worktreePath, input.branch])\n    const wtGit = createGit(worktreePath, {\n      config: [\n        `user.name=${input.author.name}`,\n        `user.email=${input.author.email}`,\n      ],\n    })\n    try {\n      try {\n        await wtGit.merge([input.theirs, '--no-commit', '--no-ff'])\n      } catch {\n        // Conflicts are expected — the plan overwrites content paths next.\n      }\n      await applyChangesToWorktree(worktreePath, input.changes)\n      await wtGit.raw(['add', '-A'])\n      const unmerged = (await wtGit.raw(['ls-files', '-u'])).trim()\n      if (unmerged) {\n        const paths = [...new Set(unmerged.split('\\n').map(l => l.split('\\t')[1]).filter(Boolean))]\n        try { await wtGit.merge(['--abort']) } catch { /* not in merge state */ }\n        throw Object.assign(new Error(\n          `createMergeCommit: ${paths.length} non-content file(s) conflict: ${paths.join(', ')}.`,\n        ), { code: 'RECONCILE_SOURCE_CONFLICT' })\n      }\n      await wtGit.commit(input.message, { '--no-verify': null })\n      const sha = (await wtGit.raw(['rev-parse', 'HEAD'])).trim()\n      return {\n        sha,\n        message: input.message,\n        author: input.author,\n        timestamp: new Date().toISOString(),\n      }\n    } finally {\n      try {\n        await git.raw(['worktree', 'remove', worktreePath, '--force'])\n      } catch {\n        // worktree may already be cleaned up\n      }\n    }\n  }\n}\n\nasync function readOrNull(path: string): Promise<string | null> {\n  try {\n    return await readFile(path, 'utf-8')\n  } catch {\n    return null\n  }\n}\n\n/**\n * How to bring the planner's tree up to date. On the base branch that is a\n * pull. On a feature branch the content never reaches the working tree (the\n * advance leaves a non-base checkout alone), so a pull fetches nothing\n * useful — merging the base is what brings it in.\n */\nfunction staleTreeGuidance(baseBranch: string, baseCheckedOut: boolean, readFromRef: boolean): {\n  code: string\n  agent_hint: string\n  developer_action?: string\n} {\n  // Planned from the contentrain snapshot (#229): nothing on the developer's\n  // side is stale — another writer moved contentrain between the read and\n  // this write. Re-reading is the whole fix.\n  if (readFromRef) {\n    return {\n      code: 'CONTENT_WORKING_TREE_STALE',\n      agent_hint: `Another writer (Studio, a teammate, CI) changed the same value on the contentrain branch after this write read it. Re-read the content and retry — do not retry unchanged. No git action is needed.`,\n    }\n  }\n  const update = baseCheckedOut\n    ? 'Ask the developer to update their working tree (git pull)'\n    : `The developer is on a branch other than \"${baseBranch}\", which content writes do not update. Ask them to merge \"${baseBranch}\" into it (or rebase onto it)`\n  return {\n    code: 'CONTENT_WORKING_TREE_STALE',\n    agent_hint: `The content on the contentrain branch differs from the working tree this write was planned from — another writer (Studio, a teammate, CI) or an earlier write changed the same value. ${update}, then re-read the content and retry — do not retry unchanged.`,\n    developer_action: baseCheckedOut ? 'git pull' : `git merge ${baseBranch}`,\n  }\n}\n"],"mappings":"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"}

package/dist/reconcile-DSflMfhj.mjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"reconcile-DSflMfhj.mjs","names":[],"sources":["../src/git/ref-reader.ts","../src/git/reconcile.ts"],"sourcesContent":["import { type SimpleGit } from 'simple-git'\nimport { createGit } from './identity.js'\nimport type { RepoReader } from '../core/contracts/index.js'\n\n/**\n * GitRefReader — `RepoReader` over an arbitrary local git ref, without a\n * checkout. `git show <ref>:<path>` reads blobs, `ls-tree` lists a tree\n * level, `cat-file -e` answers existence. This is what lets a reconcile\n * planner read three trees (merge-base, contentrain, base branch) side by\n * side while the developer's working tree stays untouched.\n *\n * The ref is fixed at construction; the per-call `ref?` parameter of the\n * `RepoReader` contract is ignored — a bound reader answering for a\n * different ref than it was built for would be a lie. Bind another instance\n * instead.\n */\nexport class GitRefReader implements RepoReader {\n  private readonly git: SimpleGit\n\n  constructor(\n    public readonly projectRoot: string,\n    public readonly ref: string,\n  ) {\n    this.git = createGit(projectRoot)\n  }\n\n  async readFile(path: string, _ref?: string): Promise<string> {\n    return this.git.show([`${this.ref}:${normalize(path)}`])\n  }\n\n  async listDirectory(path: string, _ref?: string): Promise<string[]> {\n    try {\n      // Trailing slash = \"list the tree at this path\", bare names via\n      // --name-only; ls-tree is non-recursive by default, matching the\n      // contract's \"does not recurse\".\n      const dir = normalize(path)\n      const args = dir && dir !== '.'\n        ? ['ls-tree', '--name-only', this.ref, `${dir}/`]\n        : ['ls-tree', '--name-only', this.ref]\n      const raw = await this.git.raw(args)\n      return raw\n        .split('\\n')\n        .map(line => line.trim())\n        .filter(Boolean)\n        .map(entry => entry.slice(entry.lastIndexOf('/') + 1))\n    } catch {\n      return []\n    }\n  }\n\n  async fileExists(path: string, _ref?: string): Promise<boolean> {\n    try {\n      await this.git.raw(['cat-file', '-e', `${this.ref}:${normalize(path)}`])\n      return true\n    } catch {\n      return false\n    }\n  }\n}\n\n/** Strip a trailing slash — `<ref>:dir/` and `<ref>:dir` name different things to git. */\nfunction normalize(path: string): string {\n  return path.endsWith('/') ? path.slice(0, -1) : path\n}\n","import { join } from 'node:path'\nimport { tmpdir } from 'node:os'\nimport { randomUUID } from 'node:crypto'\nimport { CONTENTRAIN_BRANCH } from '@contentrain/types'\nimport type { BaseAdvance, ConflictResolution, ContextSource, RemotePush, SyncResult } from '@contentrain/types'\nimport { createGit, authorConfig } from './identity.js'\nimport { networkGit } from './branch-lifecycle.js'\nimport { GitRefReader } from './ref-reader.js'\nimport { resolveBaseBranch } from './base-branch.js'\nimport { pushPolicy } from './push-policy.js'\nimport {\n  NETWORK_TIMEOUT_MS,\n  ensureContentBranch,\n  isAncestor,\n  pushContentBranches,\n  selectiveSync,\n} from './transaction.js'\nimport { readConfig } from '../core/config.js'\nimport { planReconcile } from '../core/ops/reconcile/index.js'\nimport type { ReconcilePlan } from '../core/ops/reconcile/index.js'\nimport { applyChangesToWorktree } from '../core/ops/apply-to-worktree.js'\n\nexport interface ReconcileBranchesOptions {\n  /** Preview only — plan, never touch a ref. Default true. */\n  dryRun?: boolean\n  /** Decisions for previously reported conflicts, matched by id. */\n  resolutions?: ConflictResolution[]\n  /** Stamped into the regenerated context.json. */\n  source?: ContextSource\n}\n\nexport interface ReconcileBranchesResult {\n  /**\n   * `in_sync` — nothing to reconcile (base already contained in contentrain\n   * and no content differences; a base merely behind was fast-forwarded).\n   * `preview` — dry-run: the plan says what WOULD happen.\n   * `conflicts` — unresolved conflicts remain; nothing was written.\n   * `reconciled` — the merge commit landed and the base branch advanced.\n   */\n  action: 'in_sync' | 'preview' | 'conflicts' | 'reconciled'\n  plan: ReconcilePlan\n  base: string\n  merge_base: string | null\n  commit?: string\n  base_advance?: BaseAdvance\n  sync?: SyncResult\n  remote_push?: RemotePush\n}\n\n/**\n * Content-aware reconcile of a diverged `contentrain` ↔ base pair, local\n * executor. Plans with three `GitRefReader`s (no checkout, developer tree\n * untouched), then — when clean or fully resolved — performs a REAL\n * `git merge --no-commit` in a temp worktree and writes the ENTIRE plan\n * output over it before committing: for content-owned paths the planner is\n * authoritative, never git's textual auto-merge (its line-level result can\n * be non-canonical or wrong without ever surfacing as a conflict). Git\n * still resolves everything the planner does not own — source files, lock\n * files — exactly as a manual merge would. The commit joins both parents,\n * so afterwards the base branch is an ancestor again and the ordinary\n * fast-forward advance works.\n *\n * Reconcile never runs inside a write path: it is an explicit, separate\n * step (tool, CLI, or Studio background job).\n */\nexport async function reconcileBranches(\n  projectRoot: string,\n  options: ReconcileBranchesOptions = {},\n): Promise<ReconcileBranchesResult> {\n  const dryRun = options.dryRun ?? true\n  const git = createGit(projectRoot)\n  const config = await readConfig(projectRoot)\n  const remoteName = process.env['CONTENTRAIN_REMOTE'] ?? 'origin'\n\n  const currentBranch = (await git.raw(['branch', '--show-current']).catch(() => '')).trim()\n  const baseBranch = await resolveBaseBranch(git, config, { remoteName, currentBranch })\n  if (currentBranch === CONTENTRAIN_BRANCH) {\n    throw Object.assign(new Error(\n      `The '${CONTENTRAIN_BRANCH}' branch is checked out in your working directory. `\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, then retry.',\n      developer_action: `git checkout ${baseBranch}`,\n    })\n  }\n\n  await ensureContentBranch(projectRoot)\n\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  if (hasRemote) {\n    const net = networkGit(projectRoot, NETWORK_TIMEOUT_MS)\n    await Promise.all([\n      net.fetch(remoteName, baseBranch).catch(() => {}),\n      net.fetch(remoteName, CONTENTRAIN_BRANCH).catch(() => {}),\n    ])\n  }\n\n  const [contentrainTip, baseTip] = await Promise.all([\n    git.raw(['rev-parse', CONTENTRAIN_BRANCH]).then(s => s.trim()),\n    git.raw(['rev-parse', baseBranch]).then(s => s.trim()),\n  ])\n\n  let mergeBase: string | null = null\n  try {\n    mergeBase = (await git.raw(['merge-base', CONTENTRAIN_BRANCH, baseBranch])).trim() || null\n  } catch {\n    mergeBase = null\n  }\n  if (!mergeBase) {\n    throw Object.assign(new Error(\n      `\"${CONTENTRAIN_BRANCH}\" and \"${baseBranch}\" share no history — reconcile needs a common ancestor.`,\n    ), {\n      code: 'RECONCILE_NO_MERGE_BASE',\n      agent_hint: 'The branches are unrelated. This needs a human decision about which history is canonical.',\n    })\n  }\n\n  const plan = await planReconcile({\n    base: new GitRefReader(projectRoot, mergeBase),\n    ours: new GitRefReader(projectRoot, CONTENTRAIN_BRANCH),\n    theirs: new GitRefReader(projectRoot, baseBranch),\n    resolutions: options.resolutions,\n    source: options.source ?? 'mcp-local',\n  })\n\n  // Base already contained in contentrain: there is no divergence. A base\n  // merely BEHIND is fast-forwarded on the spot (that is what the ordinary\n  // write path would do next anyway).\n  if (await isAncestor(git, baseTip, contentrainTip)) {\n    if (!dryRun && baseTip !== contentrainTip) {\n      await git.raw(['update-ref', `refs/heads/${baseBranch}`, contentrainTip])\n      try {\n        await git.raw(['read-tree', 'HEAD'])\n      } catch {\n        try { await git.raw(['reset', 'HEAD']) } catch { /* ignore */ }\n      }\n      return { action: 'reconciled', plan, base: baseBranch, merge_base: mergeBase, commit: contentrainTip, base_advance: 'advanced' }\n    }\n    return { action: 'in_sync', plan, base: baseBranch, merge_base: mergeBase }\n  }\n\n  if (dryRun) {\n    return { action: 'preview', plan, base: baseBranch, merge_base: mergeBase }\n  }\n  if (plan.conflicts.length > 0) {\n    return { action: 'conflicts', plan, base: baseBranch, merge_base: mergeBase }\n  }\n\n  // Execute: real merge in a temp worktree, planner output written on top.\n  const worktreePath = join(tmpdir(), `cr-reconcile-${randomUUID()}`)\n  await git.raw(['worktree', 'add', worktreePath, CONTENTRAIN_BRANCH])\n  const wtGit = createGit(worktreePath, { config: authorConfig() })\n\n  try {\n    try {\n      await wtGit.merge([baseBranch, '--no-commit', '--no-ff'])\n    } catch {\n      // Conflicts inside the worktree are expected — the planner's output\n      // overwrites every content-owned path next. Anything left unmerged\n      // after that is genuinely outside the planner's scope.\n    }\n\n    await applyChangesToWorktree(worktreePath, plan.changes)\n    await wtGit.raw(['add', '-A'])\n\n    const unmerged = (await wtGit.raw(['ls-files', '-u'])).trim()\n    if (unmerged) {\n      const paths = [...new Set(unmerged.split('\\n').map(l => l.split('\\t')[1]).filter(Boolean))]\n      try { await wtGit.merge(['--abort']) } catch { /* not in merge state */ }\n      throw Object.assign(new Error(\n        `Reconcile stopped: ${paths.length} non-content file(s) conflict between \"${CONTENTRAIN_BRANCH}\" and \"${baseBranch}\": ${paths.join(', ')}. `\n        + `These are outside the content planner's scope and need a manual merge.`,\n      ), {\n        code: 'RECONCILE_SOURCE_CONFLICT',\n        agent_hint: 'Non-content files conflict. Ask the developer to merge the branches manually for those paths.',\n        developer_action: `git checkout ${CONTENTRAIN_BRANCH} && git merge ${baseBranch}`,\n      })\n    }\n\n    await wtGit.commit(\n      `[contentrain] reconcile: merge ${baseBranch} into ${CONTENTRAIN_BRANCH}`,\n      { '--no-verify': null },\n    )\n\n    const [newTip, 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    // The merge commit has baseBranch as a parent, so this is a true\n    // fast-forward again — the whole point of the exercise.\n    await git.raw(['update-ref', `refs/heads/${baseBranch}`, newTip])\n    try {\n      await git.raw(['read-tree', 'HEAD'])\n    } catch {\n      try { await git.raw(['reset', 'HEAD']) } catch { /* ignore */ }\n    }\n    const sync = await selectiveSync(projectRoot, worktreePath, newTip, previousBaseRef, dirtyFilesBeforeUpdate)\n\n    const push = pushPolicy(config).push\n    let remotePush: RemotePush = push ? 'no-remote' : 'disabled'\n    if (hasRemote && push) {\n      remotePush = await pushContentBranches(projectRoot, worktreePath, wtGit, remoteName, baseBranch, true)\n    }\n\n    return {\n      action: 'reconciled',\n      plan,\n      base: baseBranch,\n      merge_base: mergeBase,\n      commit: newTip,\n      base_advance: 'advanced',\n      sync,\n      remote_push: remotePush,\n    }\n  } finally {\n    try {\n      await git.raw(['worktree', 'remove', worktreePath, '--force'])\n    } catch {\n      // worktree may already be cleaned up\n    }\n  }\n}\n"],"mappings":"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"}