@contentrain/mcp 3.1.7 → 3.1.8

package/dist/{reconcile-M7KBZtdn.mjs.map → reconcile-MiURoMUx.mjs.map}

@@ -1 +1 @@
-{"version":3,"file":"reconcile-M7KBZtdn.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 {\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 baseBranch = process.env['CONTENTRAIN_BRANCH']\n    ?? config?.repository?.default_branch\n    ?? ((await git.raw(['branch', '--show-current'])).trim() || 'main')\n\n  const currentBranch = (await git.raw(['branch', '--show-current']).catch(() => '')).trim()\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    let remotePush: RemotePush = 'no-remote'\n    if (hasRemote) {\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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"}
+{"version":3,"file":"reconcile-MiURoMUx.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 {\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 baseBranch = process.env['CONTENTRAIN_BRANCH']\n    ?? config?.repository?.default_branch\n    ?? ((await git.raw(['branch', '--show-current'])).trim() || 'main')\n\n  const currentBranch = (await git.raw(['branch', '--show-current']).catch(() => '')).trim()\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    let remotePush: RemotePush = 'no-remote'\n    if (hasRemote) {\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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"}

package/dist/server/http/index.mjs

@@ -1,28 +1,28 @@
 import "../../contracts-DfL0BfrD.mjs";
-import "../../reconcile-D5FTVW5z.mjs";
-import "../../context-CxpTATh4.mjs";
-import "../../model-manager-DqwL8ptm.mjs";
-import "../../ops-BfrdZ6GK.mjs";
+import "../../reconcile-B8qhwneb.mjs";
+import "../../context-BHfO4WBv.mjs";
+import "../../model-manager-CfwJWvz7.mjs";
+import "../../ops-B2P11b8v.mjs";
 import "../../fs-DJv5G8uL.mjs";
-import "../../meta-manager-g3shoZES.mjs";
+import "../../meta-manager-Cd6AfuGS.mjs";
 import "../../config-B8a4JBT1.mjs";
-import "../../validator-B2GhPM3L.mjs";
+import "../../validator-CLugFhHw.mjs";
 import "../../identity-CxAB9Qb8.mjs";
 import "../../branch-lifecycle-DUOoyNWn.mjs";
 import "../../id-CjGMPP1k.mjs";
-import "../../transaction-BxDiiakv.mjs";
-import "../../local-bnn6yrG7.mjs";
+import "../../transaction-BR2jg4uj.mjs";
+import "../../local-BVww7ArO.mjs";
 import "../../detect-CI32ynpq.mjs";
 import "../../annotations-CXHPnS-M.mjs";
-import { n as createServer } from "../../server-BRkKIO3r.mjs";
+import { n as createServer } from "../../server-CXfGWDd4.mjs";
 import "../../errors-BmLE-JSC.mjs";
-import "../../reconcile-M7KBZtdn.mjs";
+import "../../reconcile-MiURoMUx.mjs";
 import "../../scan-config-C5zzygeH.mjs";
 import "../../graph-builder-C9NS7y-a.mjs";
 import "../../scanner-CEiT8Tgx.mjs";
 import "../../tsx-parser-go5V9zoc.mjs";
-import "../../apply-manager-DsNq7Zhm.mjs";
-import "../../doctor-B7G0oFxO.mjs";
+import "../../apply-manager-eZ6zA99Y.mjs";
+import "../../doctor-VnOzDTbk.mjs";
 import { randomUUID } from "node:crypto";
 import http from "node:http";
 import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";

package/dist/{server-BRkKIO3r.mjs → server-CXfGWDd4.mjs}

@@ -1,25 +1,25 @@
-import { n as readContext } from "./context-CxpTATh4.mjs";
-import { D as contentDirPath, O as contentFilePath, T as writeContent, _ as resolveContentDir, b as resolveMdFilePath, c as listModels, d as validateModelDefinition, f as writeModel, i as countEntries, l as readModel, m as listContent, o as fieldDefZodSchema, p as deleteContent, r as checkReferences, v as resolveJsonFilePath, y as resolveLocaleStrategy } from "./model-manager-DqwL8ptm.mjs";
-import { a as planModelDelete, i as planModelSave, n as planVocabularySave, o as planContentSave, s as planContentDelete, t as planVocabularyDelete } from "./ops-BfrdZ6GK.mjs";
+import { n as readContext } from "./context-BHfO4WBv.mjs";
+import { A as contentDirPath, C as resolveMdFilePath, O as writeContent, S as resolveLocaleStrategy, _ as listContent, a as countEntries, b as resolveContentDir, d as readModel, g as deleteContent, h as writeModel, i as collectFieldPaths, j as contentFilePath, m as validateModelDefinition, r as checkReferences, s as fieldDefZodSchema, u as listModels, x as resolveJsonFilePath } from "./model-manager-CfwJWvz7.mjs";
+import { a as planModelDelete, i as planModelSave, n as planVocabularySave, o as planContentSave, s as planContentDelete, t as planVocabularyDelete } from "./ops-B2P11b8v.mjs";
 import { a as readJson, n as ensureDir, r as pathExists, s as writeJson, t as contentrainDir } from "./fs-DJv5G8uL.mjs";
-import { a as writeMeta, i as readMeta, o as writeMetaEntries, r as mergeEntryMeta, t as applyStatusChange } from "./meta-manager-g3shoZES.mjs";
+import { a as writeMeta, i as readMeta, o as writeMetaEntries, r as mergeEntryMeta, t as applyStatusChange } from "./meta-manager-Cd6AfuGS.mjs";
 import { t as OverlayReader } from "./overlay-reader-Bx1YxGXq.mjs";
 import { n as readVocabulary, t as readConfig } from "./config-B8a4JBT1.mjs";
-import { t as validateProject } from "./validator-B2GhPM3L.mjs";
+import { t as validateProject } from "./validator-CLugFhHw.mjs";
 import { r as createGit } from "./identity-CxAB9Qb8.mjs";
 import { a as contentBranchRelation, c as listRemoteCrBranches, i as cleanupMergedBranches, n as checkBranchHealth, o as deleteRemoteBranch, u as pruneMergedRemoteBranches } from "./branch-lifecycle-DUOoyNWn.mjs";
-import { i as ensureContentBranch, n as buildBranchName, o as mergeBranch, r as createTransaction } from "./transaction-BxDiiakv.mjs";
-import { n as isMerged, t as LocalProvider } from "./local-bnn6yrG7.mjs";
+import { i as ensureContentBranch, n as buildBranchName, o as mergeBranch, r as createTransaction } from "./transaction-BR2jg4uj.mjs";
+import { n as isMerged, t as LocalProvider } from "./local-BVww7ArO.mjs";
 import { n as isToolAvailable, t as TOOL_REQUIREMENTS } from "./availability-DYHNoP0_.mjs";
 import { t as detectStack } from "./detect-CI32ynpq.mjs";
 import { t as TOOL_ANNOTATIONS } from "./annotations-CXHPnS-M.mjs";
 import { n as listTemplates, t as getTemplate } from "./templates-BZbohJc8.mjs";
 import { t as normalizeOperationError } from "./errors-BmLE-JSC.mjs";
-import { t as reconcileBranches } from "./reconcile-M7KBZtdn.mjs";
+import { t as reconcileBranches } from "./reconcile-MiURoMUx.mjs";
 import { t as buildGraph } from "./graph-builder-C9NS7y-a.mjs";
 import { n as scanSummary, t as scanCandidates } from "./scanner-CEiT8Tgx.mjs";
-import { n as applyExtract, r as applyReuse } from "./apply-manager-DsNq7Zhm.mjs";
-import { t as runDoctor } from "./doctor-B7G0oFxO.mjs";
+import { n as applyExtract, r as applyReuse } from "./apply-manager-eZ6zA99Y.mjs";
+import { t as runDoctor } from "./doctor-VnOzDTbk.mjs";
 import { join } from "node:path";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { CONTENTRAIN_BRANCH } from "@contentrain/types";
@@ -243,8 +243,8 @@ function registerContextTools(server, provider, projectRoot) {
 						updated_by: "Author identifier string",
 						approved_by: "Optional: approver identifier",
 						version: "Optional: version string",
-						publish_at: "Optional: ISO 8601 date for scheduled publishing",
-						expire_at: "Optional: ISO 8601 date for scheduled expiry (must be after publish_at)"
+						publish_at: "Optional: ISO 8601 date for scheduled publishing. A delivery gate on top of status \"published\" — it never changes status, so a draft with a past publish_at stays a draft. Meta only; never written to the content file.",
+						expire_at: "Optional: ISO 8601 date for scheduled expiry (must be after publish_at). Same gate semantics as publish_at."
 					}
 				},
 				locale_strategies: {
@@ -902,7 +902,7 @@ function registerModelTools(server, provider, projectRoot) {
 			}],
 			isError: true
 		};
-		const { errors, warnings: schemaWarnings } = validateModel(input);
+		const { errors, warnings: schemaWarnings } = validateModel(input, { existingFieldPaths: collectFieldPaths((await readModel(provider, input.id))?.fields) });
 		if (errors.length > 0) return {
 			content: [{
 				type: "text",
@@ -1110,8 +1110,8 @@ function registerContentTools(server, provider, projectRoot) {
 			slug: z.string().optional().describe("Slug (document only)"),
 			locale: z.string().optional().describe("Locale code (defaults to config default)"),
 			data: z.record(z.string(), z.unknown()).describe("Content data. For documents, include \"body\" key for markdown content."),
-			publish_at: z.string().optional().describe("ISO 8601 date for scheduled publishing (stored in meta)"),
-			expire_at: z.string().optional().describe("ISO 8601 date for scheduled expiry (stored in meta, must be after publish_at)")
+			publish_at: z.string().nullable().optional().describe("Scheduled publish date, ISO 8601. Stored in meta only — never in the content file — and it does NOT change status: a draft stays a draft, and a published entry is delivered only once this date has passed. Publish with contentrain_bulk update_status. Pass null to clear a previously set date; omit to leave it unchanged."),
+			expire_at: z.string().nullable().optional().describe("Scheduled expiry, ISO 8601, must be after publish_at. Same rules as publish_at: meta only, never changes status, null clears, omit leaves unchanged.")
 		})).describe("Content entries to save")
 	}, TOOL_ANNOTATIONS["contentrain_content_save"], async (input) => {
 		const config = await readConfig(provider);
@@ -1138,7 +1138,7 @@ function registerContentTools(server, provider, projectRoot) {
 				}],
 				isError: true
 			};
-			if (entry.publish_at !== void 0) {
+			if (typeof entry.publish_at === "string") {
 				const d = new Date(entry.publish_at);
 				if (Number.isNaN(d.getTime())) return {
 					content: [{
@@ -1148,7 +1148,7 @@ function registerContentTools(server, provider, projectRoot) {
 					isError: true
 				};
 			}
-			if (entry.expire_at !== void 0) {
+			if (typeof entry.expire_at === "string") {
 				const d = new Date(entry.expire_at);
 				if (Number.isNaN(d.getTime())) return {
 					content: [{
@@ -1158,7 +1158,7 @@ function registerContentTools(server, provider, projectRoot) {
 					isError: true
 				};
 			}
-			if (entry.publish_at !== void 0 && entry.expire_at !== void 0) {
+			if (typeof entry.publish_at === "string" && typeof entry.expire_at === "string") {
 				if (new Date(entry.expire_at) <= new Date(entry.publish_at)) return {
 					content: [{
 						type: "text",
@@ -1167,9 +1167,8 @@ function registerContentTools(server, provider, projectRoot) {
 					isError: true
 				};
 			}
-			if (entry.publish_at !== void 0) entry.data["publish_at"] = entry.publish_at;
-			if (entry.expire_at !== void 0) entry.data["expire_at"] = entry.expire_at;
 		}
+		const schedulingTouched = input.entries.some((e) => e.publish_at !== void 0 || e.expire_at !== void 0);
 		const readiness = await provider.checkWriteReadiness?.();
 		if (readiness?.blocked) return {
 			content: [{
@@ -1262,6 +1261,7 @@ function registerContentTools(server, provider, projectRoot) {
 					advisory_note: "Save succeeded. Review these warnings and consider consolidating duplicate values."
 				} : {},
 				...warnings.length > 0 ? { warnings } : {},
+				...schedulingTouched ? { scheduling_note: "publish_at/expire_at were written to meta only — not to the content file — and status is unchanged: a draft is still a draft. They gate delivery of a *published* entry (served once publish_at has passed, until expire_at). To publish, call contentrain_bulk update_status." } : {},
 				validation: {
 					valid: true,
 					errors: []
@@ -1271,6 +1271,7 @@ function registerContentTools(server, provider, projectRoot) {
 					...divergenceNextSteps(commit),
 					...allAdvisories.length > 0 ? ["ADVISORY: Duplicate values detected — review advisories above"] : [],
 					...warnings.length > 0 ? ["REVIEW: see warnings above — the save was not blocked by them"] : [],
+					...schedulingTouched ? ["PUBLISH: publish_at did not change status — use contentrain_bulk update_status if this entry should go live"] : [],
 					...model.kind === "collection" ? ["Use contentrain_content_list to verify", "Add more entries or publish"] : ["Use contentrain_content_list to verify"]
 				]
 			}, null, 2)
@@ -1661,9 +1662,9 @@ async function resolveMergeBranch(git, input) {
 	}))).toSorted((left, right) => right.t - left.t)[0].b };
 }
 function registerWorkflowTools(server, provider, projectRoot) {
-	server.tool("contentrain_validate", "Validate project content against model schemas. Detects required field violations, type mismatches, broken relations, secret leaks, i18n parity issues, and more. If fix:true, auto-fixes structural issues (canonical sort, orphan meta, missing locale files, stray non-i18n meta layout) and backfills a missing model title_field — do NOT manually edit .contentrain/ files.", {
+	server.tool("contentrain_validate", "Validate project content against model schemas. Detects required field violations, type mismatches, broken relations, secret leaks, i18n parity issues, and more. If fix:true, auto-fixes structural issues (canonical sort, orphan meta, missing locale files, stray non-i18n meta layout, scheduling keys an older content_save leaked into document frontmatter) and backfills a missing model title_field — do NOT manually edit .contentrain/ files.", {
 		model: z.string().optional().describe("Model ID to validate (omit for all models)"),
-		fix: z.boolean().optional().describe("Auto-fix structural issues (canonical sort, orphan meta, missing locale files, stray non-i18n meta layout) and backfill a missing model title_field. Each backfilled title_field is reported as a notice naming the rule that chose it. Default: false")
+		fix: z.boolean().optional().describe("Auto-fix structural issues (canonical sort, orphan meta, missing locale files, stray non-i18n meta layout, publish_at/expire_at copies an older content_save left in document frontmatter when meta holds the same key) and backfill a missing model title_field. Each backfilled title_field is reported as a notice naming the rule that chose it. Default: false")
 	}, TOOL_ANNOTATIONS["contentrain_validate"], async (input) => {
 		if (input.fix && !projectRoot) return capabilityError("contentrain_validate", "localWorktree");
 		if (!await readConfig(provider)) return {
@@ -2421,6 +2422,7 @@ function registerBulkTools(server, _provider, projectRoot) {
 		source_locale: z.string().optional().describe("Source locale for copy_locale operation"),
 		target_locale: z.string().optional().describe("Target locale for copy_locale operation"),
 		entry_ids: z.array(z.string()).optional().describe("Entry IDs for update_status (collection models) or delete_entries"),
+		slugs: z.array(z.string()).optional().describe("Document slugs for update_status (document models) — a document is addressed by slug, the same identity contentrain_content_save uses, not by entry ID"),
 		locale: z.string().optional().describe("Scope update_status to a single locale (i18n models only; defaults to every supported locale)"),
 		status: z.enum([
 			"draft",
@@ -2571,22 +2573,39 @@ function registerBulkTools(server, _provider, projectRoot) {
 					}],
 					isError: true
 				};
-				if (model.kind === "document") return {
+				const keyedByEntry = model.kind === "collection";
+				const keyedBySlug = model.kind === "document";
+				const hasEntryIds = Boolean(input.entry_ids && input.entry_ids.length > 0);
+				const hasSlugs = Boolean(input.slugs && input.slugs.length > 0);
+				if (keyedBySlug && hasEntryIds) return {
 					content: [{
 						type: "text",
-						text: JSON.stringify({ error: `Model "${input.model}" is a document model. update_status does not support documents yet — their meta is keyed by slug, not entry ID.` })
+						text: JSON.stringify({ error: `Model "${input.model}" is a document model — documents are keyed by slug, not entry ID. Pass slugs instead of entry_ids.` })
 					}],
 					isError: true
 				};
-				const keyedByEntry = model.kind === "collection";
-				if (keyedByEntry && (!input.entry_ids || input.entry_ids.length === 0)) return {
+				if (keyedBySlug && !hasSlugs) return {
+					content: [{
+						type: "text",
+						text: JSON.stringify({ error: `update_status requires slugs for document model "${input.model}".` })
+					}],
+					isError: true
+				};
+				if (!keyedBySlug && hasSlugs) return {
+					content: [{
+						type: "text",
+						text: JSON.stringify({ error: `slugs only apply to document models — "${input.model}" is a ${model.kind} model. ${keyedByEntry ? "Pass entry_ids." : "Omit both entry_ids and slugs."}` })
+					}],
+					isError: true
+				};
+				if (keyedByEntry && !hasEntryIds) return {
 					content: [{
 						type: "text",
 						text: JSON.stringify({ error: `update_status requires entry_ids for collection model "${input.model}".` })
 					}],
 					isError: true
 				};
-				if (!keyedByEntry && input.entry_ids && input.entry_ids.length > 0) return {
+				if (!keyedByEntry && !keyedBySlug && hasEntryIds) return {
 					content: [{
 						type: "text",
 						text: JSON.stringify({ error: `Model "${input.model}" is a ${model.kind} model — it has one meta record per locale, so entry_ids do not apply. Omit entry_ids.` })
@@ -2624,6 +2643,24 @@ function registerBulkTools(server, _provider, projectRoot) {
 								defaultLocale: config.locales.default
 							}, updates);
 							if (written.length > 0) updatedPerLocale[locale] = written;
+						} else if (keyedBySlug) {
+							const written = [];
+							for (const slug of input.slugs) {
+								const existing = await readMeta(wt, model, {
+									locale,
+									slug,
+									defaultLocale: config.locales.default
+								});
+								if (!existing) continue;
+								await writeMeta(wt, model, {
+									locale,
+									slug,
+									defaultLocale: config.locales.default
+								}, applyStatusChange(existing, input.status));
+								written.push(slug);
+								foundIds.add(slug);
+							}
+							if (written.length > 0) updatedPerLocale[locale] = written;
 						} else {
 							const existing = await readMeta(wt, model, {
 								locale,
@@ -2638,14 +2675,15 @@ function registerBulkTools(server, _provider, projectRoot) {
 						}
 					});
 					const updatedCount = Object.values(updatedPerLocale).reduce((n, ids) => n + ids.length, 0);
-					const notFound = keyedByEntry ? input.entry_ids.filter((id) => !foundIds.has(id)) : [];
+					const requested = keyedByEntry ? input.entry_ids : keyedBySlug ? input.slugs : [];
+					const notFound = requested.filter((key) => !foundIds.has(key));
 					if (updatedCount === 0) {
 						await tx.cleanup();
 						return {
 							content: [{
 								type: "text",
 								text: JSON.stringify({
-									error: keyedByEntry ? `No meta records found for the given entry_ids in model "${input.model}" across locales [${targetLocales.join(", ")}]. Nothing was changed.` : `No meta record found for model "${input.model}" across locales [${targetLocales.join(", ")}]. Nothing was changed.`,
+									error: keyedByEntry ? `No meta records found for the given entry_ids in model "${input.model}" across locales [${targetLocales.join(", ")}]. Nothing was changed.` : keyedBySlug ? `No meta records found for the given slugs in model "${input.model}" across locales [${targetLocales.join(", ")}]. Nothing was changed. Check the slugs with contentrain_content_list.` : `No meta record found for model "${input.model}" across locales [${targetLocales.join(", ")}]. Nothing was changed.`,
 									not_found: notFound.length > 0 ? notFound : void 0
 								}, null, 2)
 							}],
@@ -2655,7 +2693,7 @@ function registerBulkTools(server, _provider, projectRoot) {
 					await tx.commit(`[contentrain] bulk: update status → ${input.status} for ${input.model}`, {
 						tool: "contentrain_bulk",
 						model: input.model,
-						...keyedByEntry ? { entries: input.entry_ids } : {}
+						...requested.length > 0 ? { entries: requested } : {}
 					});
 					const gitResult = await tx.complete();
 					return { content: [{
@@ -2921,7 +2959,7 @@ function registerMediaTools(server, provider, _projectRoot) {
 }
 //#endregion
 //#region package.json
-var version = "3.1.7";
+var version = "3.1.8";
 //#endregion
 //#region src/server.ts
 /**
@@ -2996,4 +3034,4 @@ function resolveServerContext(input) {
 //#endregion
 export { createServer as n, DEFAULT_INSTRUCTIONS as t };
 
-//# sourceMappingURL=server-BRkKIO3r.mjs.map
+//# sourceMappingURL=server-CXfGWDd4.mjs.map