@contentrain/mcp 3.7.0 → 3.8.0

package/README.md

@@ -64,6 +64,7 @@ All write operations are designed around git-backed safety:
 - auto-merge: feature merges into `contentrain`, baseBranch advanced via update-ref, `.contentrain/` files selectively synced to developer's working tree when the base branch is the one checked out
 - baseBranch = `CONTENTRAIN_BRANCH` env → `repository.default_branch` → remote HEAD → `main` → `master` → checked-out branch (last resort). A write made on a feature branch never merges, moves or pushes that branch
 - plans are read from the working tree but committed on the fetched `contentrain` tip: JSON changes are carried over key by key, so entries another writer pushed are kept; a same-value conflict writes nothing and returns `CONTENT_WORKING_TREE_STALE`
+- on a checked-out feature branch, which writes do not update, `.contentrain/**` is read from the `contentrain` ref instead (source files still from the working tree); read tools report it as `content_source`
 - review: feature branch pushed to remote for team review; once merged (or deleted), its remote copy is removed too — best-effort, opt out with `remoteBranchCleanup: false` in config.json
 - merged-branch detection survives base-history rewrites (ancestry check with a patch-id fallback), so rebases/squashes don't strand stale branches
 - developer's working tree is never mutated during MCP git operations (no stash, no checkout, no merge)

package/dist/{content-manager-wKsAkhly.d.mts → content-manager-2g0pkLFh.d.mts}

@@ -1,4 +1,4 @@
-import { _ as RepoReader } from "./index-PCQQBpIH.mjs";
+import { v as RepoReader } from "./index-v0N9d4GT.mjs";
 import { ContentrainConfig, LocaleStrategy, ModelDefinition, Vocabulary, parseMarkdownFrontmatter as parseFrontmatter, serializeMarkdownFrontmatter as serializeFrontmatter, validateEntryId as validateEntryId$1, validateLocale as validateLocale$1, validateSlug as validateSlug$1 } from "@contentrain/types";
 
 //#region src/core/content-manager.d.ts
@@ -73,4 +73,4 @@ declare function readContent(projectRoot: string, model: ModelDefinition, opts:
 }): Promise<unknown>;
 //#endregion
 export { validateEntryId$1 as _, ListOpts as a, writeContent as b, deleteContent as c, readContent as d, resolveContentDir as f, serializeFrontmatter as g, resolveMdFilePath as h, DeleteOpts as i, listContent as l, resolveLocaleStrategy as m, ContentFileModel as n, LocaleStrategyModel as o, resolveJsonFilePath as p, ContentPathModel as r, WriteResult as s, ContentEntry as t, parseFrontmatter as u, validateLocale$1 as v, validateSlug$1 as y };
-//# sourceMappingURL=content-manager-wKsAkhly.d.mts.map
+//# sourceMappingURL=content-manager-2g0pkLFh.d.mts.map

package/dist/{content-manager-wKsAkhly.d.mts.map → content-manager-2g0pkLFh.d.mts.map}

@@ -1 +1 @@
-{"version":3,"file":"content-manager-wKsAkhly.d.mts","names":[],"sources":["../src/core/content-manager.ts"],"mappings":";;;;KAyBY,gBAAA,GAAmB,IAAA,CAAK,eAAA;AAAA,KACxB,mBAAA,GAAsB,IAAA,CAAK,eAAA;AAAA,KAC3B,gBAAA,GAAmB,IAAA,CAAK,eAAA;AAAA,iBAEpB,iBAAA,CAAkB,WAAA,UAAqB,KAAA,EAAO,gBAAA;AAAA,iBAO9C,qBAAA,CAAsB,KAAA,EAAO,mBAAA,GAAsB,cAAA;;iBAKnD,mBAAA,CAAoB,GAAA,UAAa,KAAA,EAAO,gBAAA,EAAkB,MAAA;;iBAc1D,iBAAA,CAAkB,GAAA,UAAa,KAAA,EAAO,IAAA,CAAK,eAAA,+BAA8C,MAAA,UAAgB,IAAA;AAAA,UAexG,YAAA;EACf,EAAA;EACA,IAAA;EACA,MAAA;EACA,IAAA,EAAM,MAAA;EA7CQ;;;;;EAmDd,UAAA;EAnDqD;EAqDrD,SAAA;AAAA;AAAA,UAGe,WAAA;EACf,MAAA;EACA,EAAA;EACA,IAAA;EACA,MAAA;EACA,UAAA;AAAA;AAAA,UAGe,UAAA;EACf,EAAA;EACA,IAAA;EACA,MAAA;EACA,IAAA;EAxDsE;EA0DtE,aAAA;AAAA;AAAA,UAGe,QAAA;EACf,MAAA;EACA,MAAA,GAAS,MAAA;EACT,OAAA;EACA,KAAA;EACA,MAAA;AAAA;AAAA,iBAKoB,YAAA,CACpB,WAAA,UACA,KAAA,EAAO,eAAA,EACP,OAAA,EAAS,YAAA,IACT,MAAA,EAAQ,iBAAA,EACR,UAAA,GAAa,UAAA,UACZ,OAAA,CAAQ,WAAA;AAAA,iBAuJW,aAAA,CACpB,WAAA,UACA,KAAA,EAAO,eAAA,EACP,IAAA,EAAM,UAAA,GACL,OAAA;;;;;;;;AA3MH;;;;;;;;iBAwVgB,WAAA,CACd,WAAA,UACA,KAAA,EAAO,eAAA,EACP,IAAA,EAAM,QAAA,EACN,MAAA,EAAQ,iBAAA,GACP,OAAA;AAAA,iBACa,WAAA,CACd,MAAA,EAAQ,UAAA,EACR,KAAA,EAAO,eAAA,EACP,IAAA,EAAM,QAAA,EACN,MAAA,EAAQ,iBAAA,GACP,OAAA;AAAA,iBA0QmB,WAAA,CACpB,WAAA,UACA,KAAA,EAAO,eAAA,EACP,IAAA;EAAQ,MAAA;EAAgB,OAAA;EAAkB,IAAA;AAAA,IACzC,OAAA"}
+{"version":3,"file":"content-manager-2g0pkLFh.d.mts","names":[],"sources":["../src/core/content-manager.ts"],"mappings":";;;;KAyBY,gBAAA,GAAmB,IAAA,CAAK,eAAA;AAAA,KACxB,mBAAA,GAAsB,IAAA,CAAK,eAAA;AAAA,KAC3B,gBAAA,GAAmB,IAAA,CAAK,eAAA;AAAA,iBAEpB,iBAAA,CAAkB,WAAA,UAAqB,KAAA,EAAO,gBAAA;AAAA,iBAO9C,qBAAA,CAAsB,KAAA,EAAO,mBAAA,GAAsB,cAAA;;iBAKnD,mBAAA,CAAoB,GAAA,UAAa,KAAA,EAAO,gBAAA,EAAkB,MAAA;;iBAc1D,iBAAA,CAAkB,GAAA,UAAa,KAAA,EAAO,IAAA,CAAK,eAAA,+BAA8C,MAAA,UAAgB,IAAA;AAAA,UAexG,YAAA;EACf,EAAA;EACA,IAAA;EACA,MAAA;EACA,IAAA,EAAM,MAAA;EA7CQ;;;;;EAmDd,UAAA;EAnDqD;EAqDrD,SAAA;AAAA;AAAA,UAGe,WAAA;EACf,MAAA;EACA,EAAA;EACA,IAAA;EACA,MAAA;EACA,UAAA;AAAA;AAAA,UAGe,UAAA;EACf,EAAA;EACA,IAAA;EACA,MAAA;EACA,IAAA;EAxDsE;EA0DtE,aAAA;AAAA;AAAA,UAGe,QAAA;EACf,MAAA;EACA,MAAA,GAAS,MAAA;EACT,OAAA;EACA,KAAA;EACA,MAAA;AAAA;AAAA,iBAKoB,YAAA,CACpB,WAAA,UACA,KAAA,EAAO,eAAA,EACP,OAAA,EAAS,YAAA,IACT,MAAA,EAAQ,iBAAA,EACR,UAAA,GAAa,UAAA,UACZ,OAAA,CAAQ,WAAA;AAAA,iBAuJW,aAAA,CACpB,WAAA,UACA,KAAA,EAAO,eAAA,EACP,IAAA,EAAM,UAAA,GACL,OAAA;;;;;;;;AA3MH;;;;;;;;iBAwVgB,WAAA,CACd,WAAA,UACA,KAAA,EAAO,eAAA,EACP,IAAA,EAAM,QAAA,EACN,MAAA,EAAQ,iBAAA,GACP,OAAA;AAAA,iBACa,WAAA,CACd,MAAA,EAAQ,UAAA,EACR,KAAA,EAAO,eAAA,EACP,IAAA,EAAM,QAAA,EACN,MAAA,EAAQ,iBAAA,GACP,OAAA;AAAA,iBA0QmB,WAAA,CACpB,WAAA,UACA,KAAA,EAAO,eAAA,EACP,IAAA;EAAQ,MAAA;EAAgB,OAAA;EAAkB,IAAA;AAAA,IACzC,OAAA"}

package/dist/core/config.d.mts

@@ -1,4 +1,4 @@
-import { _ as RepoReader } from "../index-PCQQBpIH.mjs";
+import { v as RepoReader } from "../index-v0N9d4GT.mjs";
 import { ContentrainConfig, Vocabulary } from "@contentrain/types";
 
 //#region src/core/config.d.ts

package/dist/core/content-manager.d.mts

@@ -1,2 +1,2 @@
-import { _ as validateEntryId, a as ListOpts, b as writeContent, c as deleteContent, d as readContent, f as resolveContentDir, g as serializeFrontmatter, h as resolveMdFilePath, i as DeleteOpts, l as listContent, m as resolveLocaleStrategy, n as ContentFileModel, o as LocaleStrategyModel, p as resolveJsonFilePath, r as ContentPathModel, s as WriteResult, t as ContentEntry, u as parseFrontmatter, v as validateLocale, y as validateSlug } from "../content-manager-wKsAkhly.mjs";
+import { _ as validateEntryId, a as ListOpts, b as writeContent, c as deleteContent, d as readContent, f as resolveContentDir, g as serializeFrontmatter, h as resolveMdFilePath, i as DeleteOpts, l as listContent, m as resolveLocaleStrategy, n as ContentFileModel, o as LocaleStrategyModel, p as resolveJsonFilePath, r as ContentPathModel, s as WriteResult, t as ContentEntry, u as parseFrontmatter, v as validateLocale, y as validateSlug } from "../content-manager-2g0pkLFh.mjs";
 export { ContentEntry, ContentFileModel, ContentPathModel, DeleteOpts, ListOpts, LocaleStrategyModel, WriteResult, deleteContent, listContent, parseFrontmatter, readContent, resolveContentDir, resolveJsonFilePath, resolveLocaleStrategy, resolveMdFilePath, serializeFrontmatter, validateEntryId, validateLocale, validateSlug, writeContent };

package/dist/core/context.d.mts

@@ -1,4 +1,4 @@
-import { _ as RepoReader, a as FileChange } from "../index-PCQQBpIH.mjs";
+import { o as FileChange, v as RepoReader } from "../index-v0N9d4GT.mjs";
 import { ContextJson, ContextSource } from "@contentrain/types";
 
 //#region src/core/context.d.ts

package/dist/core/contracts/index.d.mts

@@ -1,2 +1,2 @@
-import { _ as RepoReader, a as FileChange, c as MediaAsset, d as MediaListResult, f as MediaProvider, g as RepoProvider, h as ProviderCapabilities, i as CommitAuthor, l as MediaIngestInput, m as MergeResult, n as Branch, o as FileDiff, p as MediaUpdateInput, r as Commit, s as LOCAL_CAPABILITIES, t as ApplyPlanInput, u as MediaListOptions, v as RepoWriter, y as WriteReadiness } from "../../index-PCQQBpIH.mjs";
-export { ApplyPlanInput, Branch, Commit, CommitAuthor, FileChange, FileDiff, LOCAL_CAPABILITIES, MediaAsset, MediaIngestInput, MediaListOptions, MediaListResult, MediaProvider, MediaUpdateInput, MergeResult, ProviderCapabilities, RepoProvider, RepoReader, RepoWriter, WriteReadiness };
+import { _ as RepoProvider, a as ContentReadSource, b as WriteReadiness, c as LOCAL_CAPABILITIES, d as MediaListOptions, f as MediaListResult, g as ProviderCapabilities, h as MergeResult, i as CommitAuthor, l as MediaAsset, m as MediaUpdateInput, n as Branch, o as FileChange, p as MediaProvider, r as Commit, s as FileDiff, t as ApplyPlanInput, u as MediaIngestInput, v as RepoReader, y as RepoWriter } from "../../index-v0N9d4GT.mjs";
+export { ApplyPlanInput, Branch, Commit, CommitAuthor, ContentReadSource, FileChange, FileDiff, LOCAL_CAPABILITIES, MediaAsset, MediaIngestInput, MediaListOptions, MediaListResult, MediaProvider, MediaUpdateInput, MergeResult, ProviderCapabilities, RepoProvider, RepoReader, RepoWriter, WriteReadiness };

package/dist/core/model-manager.d.mts

@@ -1,4 +1,4 @@
-import { _ as RepoReader } from "../index-PCQQBpIH.mjs";
+import { v as RepoReader } from "../index-v0N9d4GT.mjs";
 import { MODEL_FIELD_ORDER, ModelDefinition, ModelSummary, ModelSummary as ModelSummary$1 } from "@contentrain/types";
 import { z } from "zod";
 

package/dist/core/ops/index.d.mts

@@ -1,6 +1,6 @@
-import { _ as RepoReader, a as FileChange } from "../../index-PCQQBpIH.mjs";
-import { t as ContentEntry } from "../../content-manager-wKsAkhly.mjs";
-import { a as ContentSaveEntryResult, i as ReconcileResult, n as ReconcileInput, o as ContentSavePlan, r as ReconcilePlan, s as OpPlan, t as planReconcile } from "../../index-CkhXTFdk.mjs";
+import { o as FileChange, v as RepoReader } from "../../index-v0N9d4GT.mjs";
+import { t as ContentEntry } from "../../content-manager-2g0pkLFh.mjs";
+import { a as ContentSaveEntryResult, i as ReconcileResult, n as ReconcileInput, o as ContentSavePlan, r as ReconcilePlan, s as OpPlan, t as planReconcile } from "../../index-BHpAYYFF.mjs";
 import { ContentrainConfig, ModelDefinition, Vocabulary } from "@contentrain/types";
 
 //#region src/core/ops/apply-to-worktree.d.ts

package/dist/core/overlay-reader.d.mts

@@ -1,4 +1,4 @@
-import { _ as RepoReader, a as FileChange } from "../index-PCQQBpIH.mjs";
+import { o as FileChange, v as RepoReader } from "../index-v0N9d4GT.mjs";
 
 //#region src/core/overlay-reader.d.ts
 /**

package/dist/core/validator/index.d.mts

@@ -1,4 +1,4 @@
-import { _ as RepoReader } from "../../index-PCQQBpIH.mjs";
+import { v as RepoReader } from "../../index-v0N9d4GT.mjs";
 import { EntryMeta, FieldDef, ModelDefinition, ValidationError, ValidationResult } from "@contentrain/types";
 
 //#region src/core/validator/entry.d.ts

package/dist/git/reconcile.d.mts

@@ -1,4 +1,4 @@
-import { r as ReconcilePlan } from "../index-CkhXTFdk.mjs";
+import { r as ReconcilePlan } from "../index-BHpAYYFF.mjs";
 import { BaseAdvance, ConflictResolution, ContextSource, RemotePush, SyncResult } from "@contentrain/types";
 
 //#region src/git/reconcile.d.ts

package/dist/{index-CkhXTFdk.d.mts → index-BHpAYYFF.d.mts}

@@ -1,4 +1,4 @@
-import { _ as RepoReader, a as FileChange } from "./index-PCQQBpIH.mjs";
+import { o as FileChange, v as RepoReader } from "./index-v0N9d4GT.mjs";
 import { ConflictItem, ConflictResolution, ContextSource } from "@contentrain/types";
 
 //#region src/core/ops/types.d.ts
@@ -82,4 +82,4 @@ interface ReconcilePlan extends OpPlan<ReconcileResult> {
 declare function planReconcile(input: ReconcileInput): Promise<ReconcilePlan>;
 //#endregion
 export { ContentSaveEntryResult as a, ReconcileResult as i, ReconcileInput as n, ContentSavePlan as o, ReconcilePlan as r, OpPlan as s, planReconcile as t };
-//# sourceMappingURL=index-CkhXTFdk.d.mts.map
+//# sourceMappingURL=index-BHpAYYFF.d.mts.map

package/dist/{index-CkhXTFdk.d.mts.map → index-BHpAYYFF.d.mts.map}

@@ -1 +1 @@
-{"version":3,"file":"index-CkhXTFdk.d.mts","names":[],"sources":["../src/core/ops/types.ts","../src/core/ops/reconcile/types.ts","../src/core/ops/reconcile/plan.ts"],"mappings":";;;;;;;AAUA;;;;;UAAiB,MAAA;EAEN;EAAT,OAAA,EAAS,UAAA;EAED;EAAR,MAAA,EAAQ,OAAA;EAEE;EAAV,UAAA;AAAA;AAAA,UAGe,sBAAA;EACf,MAAA;EACA,EAAA;EACA,IAAA;EACA,MAAA;EACA,UAAA;AAAA;AAAA,KAGU,eAAA,GAAkB,MAAA,CAAO,sBAAA;;;AAjBrC;;;;;;;;AAAA,UCGiB,cAAA;EACf,IAAA,EAAM,UAAA;EACN,IAAA,EAAM,UAAA;EACN,MAAA,EAAQ,UAAA;EDGO;ECDf,WAAA,GAAc,kBAAA;;EAEd,MAAA,GAAS,aAAA;AAAA;AAAA,UAGM,eAAA;EDDf;ECGA,YAAA;EDDA;ECGA,kBAAA;EACA,oBAAA;EDDU;ECGV,oBAAA;;EAEA,WAAA;AAAA;;;;AAnBF;;;UA4BiB,aAAA,SAAsB,MAAA,CAAO,eAAA;EAC5C,SAAA,EAAW,YAAA;AAAA;;;;;;ADhCb;;;;;;;;;iBEkDsB,aAAA,CAAc,KAAA,EAAO,cAAA,GAAiB,OAAA,CAAQ,aAAA"}
+{"version":3,"file":"index-BHpAYYFF.d.mts","names":[],"sources":["../src/core/ops/types.ts","../src/core/ops/reconcile/types.ts","../src/core/ops/reconcile/plan.ts"],"mappings":";;;;;;;AAUA;;;;;UAAiB,MAAA;EAEN;EAAT,OAAA,EAAS,UAAA;EAED;EAAR,MAAA,EAAQ,OAAA;EAEE;EAAV,UAAA;AAAA;AAAA,UAGe,sBAAA;EACf,MAAA;EACA,EAAA;EACA,IAAA;EACA,MAAA;EACA,UAAA;AAAA;AAAA,KAGU,eAAA,GAAkB,MAAA,CAAO,sBAAA;;;AAjBrC;;;;;;;;AAAA,UCGiB,cAAA;EACf,IAAA,EAAM,UAAA;EACN,IAAA,EAAM,UAAA;EACN,MAAA,EAAQ,UAAA;EDGO;ECDf,WAAA,GAAc,kBAAA;;EAEd,MAAA,GAAS,aAAA;AAAA;AAAA,UAGM,eAAA;EDDf;ECGA,YAAA;EDDA;ECGA,kBAAA;EACA,oBAAA;EDDU;ECGV,oBAAA;;EAEA,WAAA;AAAA;;;;AAnBF;;;UA4BiB,aAAA,SAAsB,MAAA,CAAO,eAAA;EAC5C,SAAA,EAAW,YAAA;AAAA;;;;;;ADhCb;;;;;;;;;iBEkDsB,aAAA,CAAc,KAAA,EAAO,cAAA,GAAiB,OAAA,CAAQ,aAAA"}

package/dist/index-v0N9d4GT.d.mts

@@ -0,0 +1,2 @@
+import { ApplyPlanInput as ApplyPlanInput$1, Branch, Commit as Commit$1, CommitAuthor, ContentReadSource, 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";
+export { RepoProvider$1 as _, ContentReadSource as a, WriteReadiness as b, LOCAL_CAPABILITIES as c, MediaListOptions as d, MediaListResult as f, ProviderCapabilities$1 as g, MergeResult as h, CommitAuthor as i, MediaAsset as l, MediaUpdateInput as m, Branch as n, FileChange as o, MediaProvider as p, Commit$1 as r, FileDiff as s, ApplyPlanInput$1 as t, MediaIngestInput as u, RepoReader as v, RepoWriter$1 as y };

package/dist/index.mjs

@@ -13,10 +13,10 @@ import "./base-branch-Cw9DWvCC.mjs";
 import "./branch-lifecycle-CcsSyfSw.mjs";
 import "./id-jrHWdtqn.mjs";
 import "./transaction-DfrvGIfk.mjs";
-import "./local-BySg4Ib-.mjs";
+import "./local-BXTVAAr-.mjs";
 import "./detect-B1QHYA0u.mjs";
 import "./annotations-BYkjoj2d.mjs";
-import { n as createServer } from "./server-BdGsBjPT.mjs";
+import { n as createServer } from "./server-Cl3LMiU3.mjs";
 import "./errors-De8Noahk.mjs";
 import "./reconcile-BWbckvbv.mjs";
 import "./scan-config-S5fkzNhL.mjs";

package/dist/{local-BySg4Ib-.mjs → local-BXTVAAr-.mjs}

@@ -3,15 +3,17 @@ import { n as applyChangesToWorktree } from "./reconcile-CPDGFQ8H.mjs";
 import { o as canonicalStringify$1, s as sortKeys$1 } from "./context-fJCKH_qv.mjs";
 import { k as LocalReader } from "./model-manager-DPXulg7z.mjs";
 import { t as readConfig } from "./config-BLwZtwlI.mjs";
-import { r as createGit } from "./identity-CxAB9Qb8.mjs";
+import { i as gitBinary, r as createGit } from "./identity-CxAB9Qb8.mjs";
 import { t as resolveBaseBranch } from "./base-branch-Cw9DWvCC.mjs";
 import { n as checkBranchHealth, o as deleteRemoteBranch, r as classifyMergedBranches } from "./branch-lifecycle-CcsSyfSw.mjs";
 import { o as mergeBranch$1, r as createTransaction } from "./transaction-DfrvGIfk.mjs";
-import { join } from "node:path";
-import { readFile } from "node:fs/promises";
+import { join, resolve } from "node:path";
+import { readFile, stat } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { randomUUID } from "node:crypto";
 import { CONTENTRAIN_BRANCH, MODEL_FIELD_ORDER } from "@contentrain/types";
+import { AsyncLocalStorage } from "node:async_hooks";
+import { spawn } from "node:child_process";
 //#region src/providers/local/branch-ops.ts
 /**
 * Branch/merge/diff helpers backed by the local simple-git worktree flow.
@@ -92,6 +94,274 @@ async function isMerged(projectRoot, branch, into) {
 	}
 }
 //#endregion
+//#region src/git/ref-snapshot.ts
+/**
+* RefSnapshotReader — a `RepoReader` over one subtree of one commit, read
+* with two git spawns in total however many files the caller touches.
+*
+* `GitRefReader` spawns `git show` per file, which is right for a planner
+* reading a handful of paths and wrong for a tool that walks every model and
+* every locale file (`content_list`, `status`, validation): a few hundred
+* spawns per call (#229). Here one `ls-tree -r` lists the subtree — which
+* answers `listDirectory` and `fileExists` from memory — and the first
+* `readFile` pulls every content blob under it through a single
+* `cat-file --batch`. Only content is batched ({@link batched}): media under
+* `assets_path`, and any large or non-text file, is read on demand, one
+* `cat-file blob` each, so a list or a save never loads the project's images.
+*
+* Bound to a commit sha, not a branch name, so a snapshot never changes
+* under its reader; {@link loadRefSnapshot} caches one per (repo, sha).
+*
+* Paths are repo-relative with `/` separators; the caller maps its own paths
+* (see LocalProvider). Only paths under `root` are in the snapshot — anything
+* else reads as missing.
+*/
+var RefSnapshotReader = class {
+	blobs = null;
+	single = /* @__PURE__ */ new Map();
+	constructor(repoDir, commit, root, files, dirs) {
+		this.repoDir = repoDir;
+		this.commit = commit;
+		this.root = root;
+		this.files = files;
+		this.dirs = dirs;
+	}
+	async readFile(path, _ref) {
+		const p = trim(path);
+		const file = this.files.get(p);
+		if (!file) throw Object.assign(/* @__PURE__ */ new Error(`ENOENT: ${path} is not in ${this.commit.slice(0, 8)}:${this.root}`), { code: "ENOENT" });
+		if (!batched(p, file.size)) {
+			let text = this.single.get(file.oid);
+			if (!text) {
+				text = runGit(this.repoDir, [
+					"cat-file",
+					"blob",
+					file.oid
+				]).then((buf) => buf.toString("utf-8"));
+				text.catch(() => this.single.delete(file.oid));
+				this.single.set(file.oid, text);
+			}
+			return text;
+		}
+		this.blobs ??= readBlobs(this.repoDir, [...new Set([...this.files].filter(([f, { size }]) => batched(f, size)).map(([, { oid }]) => oid))]);
+		const text = (await this.blobs).get(file.oid);
+		if (text === void 0) throw new Error(`blob ${file.oid} for ${path} could not be read`);
+		return text;
+	}
+	async listDirectory(path, _ref) {
+		return [...this.dirs.get(trim(path)) ?? []];
+	}
+	async fileExists(path, _ref) {
+		const p = trim(path);
+		return this.files.has(p) || this.dirs.has(p);
+	}
+};
+/** Largest blob the batch loads; a content file is far smaller. */
+const BATCH_MAX_BYTES = 1024 * 1024;
+/**
+* Whether the first `readFile` loads this file with the rest: a content file —
+* JSON (config, models, content, meta) or Markdown (documents) — no larger
+* than {@link BATCH_MAX_BYTES}. Media never matches by extension, wherever
+* `assets_path` points.
+*/
+function batched(path, size) {
+	return size <= BATCH_MAX_BYTES && /\.(?:json|md|mdx)$/i.test(path);
+}
+const snapshots = /* @__PURE__ */ new Map();
+const MAX_SNAPSHOTS = 8;
+/**
+* The snapshot of `root` at `commit`, listed once per (repo, commit) for the
+* life of the process: a commit's tree never changes, so a later tool call on
+* an unmoved branch costs no spawn at all.
+*/
+function loadRefSnapshot(repoDir, commit, root) {
+	const key = `${repoDir}\0${commit}\0${root}`;
+	let hit = snapshots.get(key);
+	if (!hit) {
+		hit = listTree(repoDir, commit, root);
+		hit.catch(() => snapshots.delete(key));
+		snapshots.set(key, hit);
+		if (snapshots.size > MAX_SNAPSHOTS) snapshots.delete(snapshots.keys().next().value);
+	}
+	return hit;
+}
+async function listTree(repoDir, commit, root) {
+	const raw = await runGit(repoDir, [
+		"ls-tree",
+		"-r",
+		"-l",
+		"-z",
+		"--full-tree",
+		commit,
+		"--",
+		root
+	]);
+	const files = /* @__PURE__ */ new Map();
+	const children = /* @__PURE__ */ new Map();
+	for (const record of raw.toString("utf-8").split("\0")) {
+		if (!record) continue;
+		const tab = record.indexOf("	");
+		const [, type, oid, size] = record.slice(0, tab).split(/ +/);
+		if (type !== "blob" || !oid) continue;
+		const path = record.slice(tab + 1);
+		files.set(path, {
+			oid,
+			size: Number(size)
+		});
+		const parts = path.split("/");
+		for (let i = 0; i < parts.length; i++) {
+			const dir = parts.slice(0, i).join("/");
+			let set = children.get(dir);
+			if (!set) children.set(dir, set = /* @__PURE__ */ new Set());
+			set.add(parts[i]);
+		}
+	}
+	return new RefSnapshotReader(repoDir, commit, root, files, new Map([...children].map(([dir, names]) => [dir, [...names].toSorted()])));
+}
+/** The given blobs in one `cat-file --batch` process. */
+async function readBlobs(repoDir, oids) {
+	const out = /* @__PURE__ */ new Map();
+	if (oids.length === 0) return out;
+	const buf = await runGit(repoDir, ["cat-file", "--batch"], `${oids.join("\n")}\n`);
+	let at = 0;
+	while (at < buf.length) {
+		const eol = buf.indexOf(10, at);
+		if (eol < 0) break;
+		const [oid, , size] = buf.subarray(at, eol).toString("utf-8").split(" ");
+		const bytes = Number(size);
+		if (!oid || !Number.isFinite(bytes)) break;
+		out.set(oid, buf.subarray(eol + 1, eol + 1 + bytes).toString("utf-8"));
+		at = eol + 1 + bytes + 1;
+	}
+	return out;
+}
+function runGit(cwd, args, stdin) {
+	return new Promise((resolve, reject) => {
+		const child = spawn(gitBinary(), args, {
+			cwd,
+			stdio: [
+				"pipe",
+				"pipe",
+				"pipe"
+			]
+		});
+		const chunks = [];
+		let stderr = "";
+		child.stdout.on("data", (c) => chunks.push(c));
+		child.stderr.on("data", (c) => {
+			stderr += c.toString();
+		});
+		child.on("error", reject);
+		child.stdin.on("error", () => {});
+		child.on("close", (code) => {
+			if (code === 0) resolve(Buffer.concat(chunks));
+			else reject(/* @__PURE__ */ new Error(`git ${args[0]} exited ${code}: ${stderr.trim()}`));
+		});
+		child.stdin.end(stdin ?? "");
+	});
+}
+function trim(path) {
+	let p = path.replaceAll("\\", "/");
+	while (p.startsWith("./")) p = p.slice(2);
+	while (p.endsWith("/")) p = p.slice(0, -1);
+	return p === "." ? "" : p;
+}
+//#endregion
+//#region src/providers/local/content-view.ts
+/** The `.contentrain` paths that are never committed: always the working tree. */
+const UNTRACKED = [".contentrain/.cache", ".contentrain/client"];
+const scope = new AsyncLocalStorage();
+/**
+* Run `fn` with one content view per project for its whole duration: every
+* read inside answers from the same snapshot, resolved once. The MCP server
+* wraps each tool call in this, so a call costs a fixed handful of spawns
+* however many files it reads.
+*/
+function withReadScope(fn) {
+	return scope.run(/* @__PURE__ */ new Map(), fn);
+}
+function contentView(projectRoot) {
+	const memo = scope.getStore();
+	if (!memo) return resolveView(projectRoot);
+	let view = memo.get(projectRoot);
+	if (!view) {
+		view = resolveView(projectRoot);
+		memo.set(projectRoot, view);
+	}
+	return view;
+}
+function describeSource(view) {
+	return view.source === "working_tree" ? { source: "working_tree" } : {
+		source: "ref",
+		ref: view.ref,
+		commit: view.commit,
+		checked_out: view.branch
+	};
+}
+/**
+* The repo-relative path a snapshot answers for, or null when `path` must come
+* from the working tree (outside `.contentrain/`, or never committed).
+*/
+function refPath(view, projectRoot, path) {
+	const abs = resolve(projectRoot, path);
+	const root = resolve(projectRoot);
+	if (abs !== root && !abs.startsWith(`${root}/`) && !abs.startsWith(`${root}\\`)) return null;
+	const rel = abs.slice(root.length + 1).replaceAll("\\", "/");
+	if (rel !== ".contentrain" && !rel.startsWith(".contentrain/")) return null;
+	if (UNTRACKED.some((p) => rel === p || rel.startsWith(`${p}/`))) return null;
+	return view.prefix + rel;
+}
+async function resolveView(projectRoot) {
+	try {
+		const head = await headBranch(projectRoot);
+		if (!head || head === CONTENTRAIN_BRANCH || head.startsWith("cr/")) return { source: "working_tree" };
+		const git = createGit(projectRoot);
+		if (head === await resolveBaseBranch(git, await readConfig(projectRoot), { currentBranch: head })) return { source: "working_tree" };
+		const [prefix, commit] = (await git.raw([
+			"rev-parse",
+			"--show-prefix",
+			`refs/heads/${CONTENTRAIN_BRANCH}^{commit}`
+		])).split("\n").map((line) => line.trim());
+		if (!commit) return { source: "working_tree" };
+		return {
+			source: "ref",
+			ref: CONTENTRAIN_BRANCH,
+			commit,
+			branch: head,
+			reader: await loadRefSnapshot(projectRoot, commit, `${prefix ?? ""}.contentrain`),
+			prefix: prefix ?? ""
+		};
+	} catch {
+		return { source: "working_tree" };
+	}
+}
+/**
+* The checked-out branch, or null when HEAD is detached. Read from the HEAD
+* file when `.git` sits at the project root (no spawn — this runs once per
+* tool call on every local project); asked of git otherwise (a linked
+* worktree, or a project in a monorepo subdirectory).
+*/
+async function headBranch(projectRoot) {
+	const dotGit = join(projectRoot, ".git");
+	try {
+		let gitDir = dotGit;
+		if ((await stat(dotGit)).isFile()) {
+			const pointer = (await readFile(dotGit, "utf-8")).match(/^gitdir:\s*(.+)$/m)?.[1]?.trim();
+			if (!pointer) throw new Error("unreadable .git file");
+			gitDir = resolve(projectRoot, pointer);
+		}
+		const head = (await readFile(join(gitDir, "HEAD"), "utf-8")).trim();
+		return head.startsWith("ref: refs/heads/") ? head.slice(16) : null;
+	} catch {
+		return (await createGit(projectRoot).raw([
+			"symbolic-ref",
+			"-q",
+			"--short",
+			"HEAD"
+		]).catch(() => "")).trim() || null;
+	}
+}
+//#endregion
 //#region src/providers/local/rebase-changes.ts
 function rebaseChange(change, basis, current) {
 	if (current === basis || current === change.content) return {
@@ -221,14 +491,29 @@ var LocalProvider = class {
 		this.projectRoot = projectRoot;
 		this.reader = new LocalReader(projectRoot);
 	}
-	readFile(path, ref) {
-		return this.reader.readFile(path, ref);
+	async readFile(path, ref) {
+		const at = await this.routed(path);
+		return at ? at.view.reader.readFile(at.path) : this.reader.readFile(path, ref);
+	}
+	async listDirectory(path, ref) {
+		const at = await this.routed(path);
+		return at ? at.view.reader.listDirectory(at.path) : this.reader.listDirectory(path, ref);
 	}
-	listDirectory(path, ref) {
-		return this.reader.listDirectory(path, ref);
+	async fileExists(path, ref) {
+		const at = await this.routed(path);
+		return at ? at.view.reader.fileExists(at.path) : this.reader.fileExists(path, ref);
 	}
-	fileExists(path, ref) {
-		return this.reader.fileExists(path, ref);
+	async contentSource() {
+		return describeSource(await contentView(this.projectRoot));
+	}
+	async routed(path) {
+		const view = await contentView(this.projectRoot);
+		if (view.source !== "ref") return null;
+		const inRef = refPath(view, this.projectRoot, path);
+		return inRef === null ? null : {
+			view,
+			path: inRef
+		};
 	}
 	/**
 	* Branch pressure gate. Unmerged `cr/*` branches accumulate in a local repo
@@ -243,14 +528,15 @@ var LocalProvider = class {
 		} : { blocked: false };
 	}
 	async applyPlan(input) {
-		const basis = await Promise.all(input.changes.map((c) => readOrNull(join(this.projectRoot, c.path))));
+		const view = await contentView(this.projectRoot);
+		const basis = await Promise.all(input.changes.map((c) => this.readBasis(view, c.path)));
 		const tx = await createTransaction(this.projectRoot, input.branch, { workflowOverride: input.workflowOverride });
 		try {
 			await tx.write(async (wt) => {
 				const current = await Promise.all(input.changes.map((c) => readOrNull(join(wt, c.path))));
 				const results = input.changes.map((change, i) => rebaseChange(change, basis[i], current[i]));
 				const conflicts = results.filter((r) => !r.ok);
-				if (conflicts.length > 0) throw Object.assign(/* @__PURE__ */ new Error(`Nothing was written: the content branch moved since your working tree was last updated, and this change cannot be applied on top of it. ` + conflicts.map((c) => `${c.path}: ${c.reason}.`).join(" ")), staleTreeGuidance(tx.baseBranch, tx.baseCheckedOut));
+				if (conflicts.length > 0) throw Object.assign(/* @__PURE__ */ new Error(`Nothing was written: the content branch moved since your working tree was last updated, and this change cannot be applied on top of it. ` + conflicts.map((c) => `${c.path}: ${c.reason}.`).join(" ")), staleTreeGuidance(tx.baseBranch, tx.baseCheckedOut, view.source === "ref"));
 				await applyChangesToWorktree(wt, results.map((r) => r.change));
 			});
 			await tx.commit(input.message, input.context);
@@ -273,6 +559,13 @@ var LocalProvider = class {
 			await tx.cleanup();
 		}
 	}
+	async readBasis(view, path) {
+		if (view.source === "ref") {
+			const inRef = refPath(view, this.projectRoot, path);
+			if (inRef !== null) return view.reader.readFile(inRef).catch(() => null);
+		}
+		return readOrNull(join(this.projectRoot, path));
+	}
 	listBranches(prefix) {
 		return listBranches(this.projectRoot, prefix);
 	}
@@ -381,7 +674,11 @@ async function readOrNull(path) {
 * advance leaves a non-base checkout alone), so a pull fetches nothing
 * useful — merging the base is what brings it in.
 */
-function staleTreeGuidance(baseBranch, baseCheckedOut) {
+function staleTreeGuidance(baseBranch, baseCheckedOut, readFromRef) {
+	if (readFromRef) return {
+		code: "CONTENT_WORKING_TREE_STALE",
+		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.`
+	};
 	return {
 		code: "CONTENT_WORKING_TREE_STALE",
 		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. ${baseCheckedOut ? "Ask the developer to update their working tree (git pull)" : `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)`}, then re-read the content and retry — do not retry unchanged.`,
@@ -389,6 +686,6 @@ function staleTreeGuidance(baseBranch, baseCheckedOut) {
 	};
 }
 //#endregion
-export { isMerged as n, LocalProvider as t };
+export { withReadScope as n, isMerged as r, LocalProvider as t };
 
-//# sourceMappingURL=local-BySg4Ib-.mjs.map
+//# sourceMappingURL=local-BXTVAAr-.mjs.map