@contentrain/mcp 3.7.0 → 3.8.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (37) hide show
  1. package/README.md +1 -0
  2. package/dist/{content-manager-wKsAkhly.d.mts → content-manager-2g0pkLFh.d.mts} +2 -2
  3. package/dist/{content-manager-wKsAkhly.d.mts.map → content-manager-2g0pkLFh.d.mts.map} +1 -1
  4. package/dist/core/config.d.mts +1 -1
  5. package/dist/core/content-manager.d.mts +1 -1
  6. package/dist/core/context.d.mts +1 -1
  7. package/dist/core/contracts/index.d.mts +2 -2
  8. package/dist/core/model-manager.d.mts +1 -1
  9. package/dist/core/ops/index.d.mts +3 -3
  10. package/dist/core/overlay-reader.d.mts +1 -1
  11. package/dist/core/validator/index.d.mts +1 -1
  12. package/dist/git/reconcile.d.mts +1 -1
  13. package/dist/{index-CkhXTFdk.d.mts → index-BHpAYYFF.d.mts} +2 -2
  14. package/dist/{index-CkhXTFdk.d.mts.map → index-BHpAYYFF.d.mts.map} +1 -1
  15. package/dist/index-v0N9d4GT.d.mts +2 -0
  16. package/dist/index.mjs +2 -2
  17. package/dist/{local-BySg4Ib-.mjs → local-BXTVAAr-.mjs} +311 -14
  18. package/dist/local-BXTVAAr-.mjs.map +1 -0
  19. package/dist/providers/github/index.d.mts +1 -1
  20. package/dist/providers/gitlab/index.d.mts +1 -1
  21. package/dist/providers/local/index.d.mts +4 -1
  22. package/dist/providers/local/index.d.mts.map +1 -1
  23. package/dist/providers/local/index.mjs +1 -1
  24. package/dist/server/http/index.d.mts +1 -1
  25. package/dist/server/http/index.mjs +2 -2
  26. package/dist/{server-D1c-79hA.d.mts → server-24UHN9Ll.d.mts} +2 -2
  27. package/dist/server-24UHN9Ll.d.mts.map +1 -0
  28. package/dist/{server-BdGsBjPT.mjs → server-Cl3LMiU3.mjs} +54 -31
  29. package/dist/server-Cl3LMiU3.mjs.map +1 -0
  30. package/dist/server.d.mts +1 -1
  31. package/dist/server.mjs +2 -2
  32. package/dist/testing/memory-provider.d.mts +1 -1
  33. package/package.json +2 -2
  34. package/dist/index-PCQQBpIH.d.mts +0 -2
  35. package/dist/local-BySg4Ib-.mjs.map +0 -1
  36. package/dist/server-BdGsBjPT.mjs.map +0 -1
  37. package/dist/server-D1c-79hA.d.mts.map +0 -1
package/dist/server.d.mts CHANGED
@@ -1,2 +1,2 @@
1
- import { i as createServer, n as DEFAULT_INSTRUCTIONS, r as ToolProvider, t as CreateServerOptions } from "./server-D1c-79hA.mjs";
1
+ import { i as createServer, n as DEFAULT_INSTRUCTIONS, r as ToolProvider, t as CreateServerOptions } from "./server-24UHN9Ll.mjs";
2
2
  export { CreateServerOptions, DEFAULT_INSTRUCTIONS, ToolProvider, createServer };
package/dist/server.mjs CHANGED
@@ -12,10 +12,10 @@ import "./base-branch-Cw9DWvCC.mjs";
12
12
  import "./branch-lifecycle-CcsSyfSw.mjs";
13
13
  import "./id-jrHWdtqn.mjs";
14
14
  import "./transaction-DfrvGIfk.mjs";
15
- import "./local-BySg4Ib-.mjs";
15
+ import "./local-BXTVAAr-.mjs";
16
16
  import "./detect-B1QHYA0u.mjs";
17
17
  import "./annotations-BYkjoj2d.mjs";
18
- import { n as createServer, t as DEFAULT_INSTRUCTIONS } from "./server-BdGsBjPT.mjs";
18
+ import { n as createServer, t as DEFAULT_INSTRUCTIONS } from "./server-Cl3LMiU3.mjs";
19
19
  import "./errors-De8Noahk.mjs";
20
20
  import "./reconcile-BWbckvbv.mjs";
21
21
  import "./scan-config-S5fkzNhL.mjs";
@@ -1,4 +1,4 @@
1
- import { a as FileChange, g as RepoProvider, h as ProviderCapabilities, i as CommitAuthor, m as MergeResult, n as Branch, o as FileDiff, r as Commit, t as ApplyPlanInput, y as WriteReadiness } from "../index-PCQQBpIH.mjs";
1
+ import { _ as RepoProvider, b as WriteReadiness, g as ProviderCapabilities, h as MergeResult, i as CommitAuthor, n as Branch, o as FileChange, r as Commit, s as FileDiff, t as ApplyPlanInput } from "../index-v0N9d4GT.mjs";
2
2
 
3
3
  //#region src/testing/memory-provider.d.ts
4
4
  interface MemoryProviderOptions {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@contentrain/mcp",
3
- "version": "3.7.0",
3
+ "version": "3.8.0",
4
4
  "mcpName": "io.github.Contentrain/contentrain",
5
5
  "license": "MIT",
6
6
  "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 @@
182
182
  "simple-git": "^3.36.0",
183
183
  "typescript": "^5.7.0",
184
184
  "zod": "^3.24.0",
185
- "@contentrain/types": "1.26.0"
185
+ "@contentrain/types": "1.27.0"
186
186
  },
187
187
  "optionalDependencies": {
188
188
  "@astrojs/compiler": "^2.10.0",
@@ -1,2 +0,0 @@
1
- import { ApplyPlanInput as ApplyPlanInput$1, Branch, Commit as Commit$1, CommitAuthor, FileChange, FileDiff, LOCAL_CAPABILITIES, MediaAsset, MediaIngestInput, MediaListOptions, MediaListResult, MediaProvider, MediaUpdateInput, MergeResult, ProviderCapabilities as ProviderCapabilities$1, RepoProvider as RepoProvider$1, RepoReader, RepoWriter as RepoWriter$1, WriteReadiness } from "@contentrain/types";
2
- export { RepoReader as _, FileChange as a, MediaAsset as c, MediaListResult as d, MediaProvider as f, RepoProvider$1 as g, ProviderCapabilities$1 as h, CommitAuthor as i, MediaIngestInput as l, MergeResult as m, Branch as n, FileDiff as o, MediaUpdateInput as p, Commit$1 as r, LOCAL_CAPABILITIES as s, ApplyPlanInput$1 as t, MediaListOptions as u, RepoWriter$1 as v, WriteReadiness as y };
@@ -1 +0,0 @@
1
- {"version":3,"file":"local-BySg4Ib-.mjs","names":["mergeBranchOp","canonicalStringify","sortKeys","listBranchesOp","createBranchOp","deleteBranchOp","getBranchDiffOp","mergeBranchOp","isMergedOp","getDefaultBranchOp"],"sources":["../src/providers/local/branch-ops.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 { 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 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 { 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 readFile(path: string, ref?: string): Promise<string> {\n return this.reader.readFile(path, ref)\n }\n\n listDirectory(path: string, ref?: string): Promise<string[]> {\n return this.reader.listDirectory(path, ref)\n }\n\n fileExists(path: string, ref?: string): Promise<boolean> {\n return this.reader.fileExists(path, ref)\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: every read goes through LocalReader, i.e. the\n // working tree. Captured before the transaction fetches, so it is the\n // tree the plan was computed from — not whatever the remote says now.\n const basis = await Promise.all(input.changes.map(c => readOrNull(join(this.projectRoot, 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))\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 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): {\n code: string\n agent_hint: string\n developer_action: string\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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"}