octocms 0.4.17 → 0.4.19

package/README.md

@@ -47,7 +47,7 @@ Visit `http://localhost:3000/cms` to open the editor.
 ```bash
 GITHUB_ID=              # GitHub App client ID
 GITHUB_SECRET=          # GitHub App client secret
-NEXTAUTH_SECRET=        # Random string: openssl rand -base64 32
+NEXTAUTH_SECRET=     # Random string: openssl rand -base64 32
 NEXTAUTH_URL=http://localhost:3000
 
 # Required in production

package/dist/admin/actions/agent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../../admin/actions/agent.ts"],"names":[],"mappings":"AAEA,OAAO,kBAAkB,CAAC;AAS1B,MAAM,MAAM,iBAAiB,GACzB;IAAE,OAAO,EAAE,KAAK,CAAA;CAAE,GAClB;IACE,OAAO,EAAE,IAAI,CAAC;IACd,QAAQ,EAAE,WAAW,GAAG,QAAQ,GAAG,OAAO,CAAC;IAC3C,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEN;;;;;;GAMG;AACH,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,iBAAiB,CAAC,CAOvE;AAED,MAAM,MAAM,0BAA0B,GAClC;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAC/B;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,CAAC;AAEvE;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,oBAAoB,CAAC,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAsBjG;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,oBAAoB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,CAAC,CAYzF"}
+{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../../admin/actions/agent.ts"],"names":[],"mappings":"AAEA,OAAO,kBAAkB,CAAC;AAO1B,MAAM,MAAM,iBAAiB,GACzB;IAAE,OAAO,EAAE,KAAK,CAAA;CAAE,GAClB;IACE,OAAO,EAAE,IAAI,CAAC;IACd,QAAQ,EAAE,WAAW,GAAG,QAAQ,GAAG,OAAO,CAAC;IAC3C,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEN;;;;;;GAMG;AACH,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,iBAAiB,CAAC,CAOvE;AAED,MAAM,MAAM,0BAA0B,GAClC;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAC/B;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,CAAC;AAEvE;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,oBAAoB,CAAC,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAsBjG;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,oBAAoB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,CAAC,CAYzF"}

package/dist/admin/actions/agent.js

@@ -1,11 +1,10 @@
 "use server";
 import "../../chunk-B5LE2OEC.js";
 import "./registerConfig";
-import { getServerSession } from "next-auth/next";
 import { getAgentConfig } from "../../agent/configStore";
 import { getAgentStatus, isAgentEnabled } from "../../agent/featureFlag";
 import { acceptProposal, isProposal } from "../../agent/proposals";
-import { authOptions } from "../auth";
+import { getCmsSession } from "../auth/session";
 async function getAgentClientStatus() {
   const cfg = getAgentConfig();
   if (!cfg || !isAgentEnabled(cfg)) return { enabled: false };
@@ -18,7 +17,7 @@ async function acceptProposalAction(proposal) {
   if (!cfg || !isAgentEnabled(cfg)) {
     throw new Error("Chat agent is disabled.");
   }
-  const session = await getServerSession(authOptions);
+  const session = await getCmsSession();
   if (!session) {
     throw new Error("Unauthorized.");
   }
@@ -36,7 +35,7 @@ async function rejectProposalAction(_reason) {
   if (!cfg || !isAgentEnabled(cfg)) {
     throw new Error("Chat agent is disabled.");
   }
-  const session = await getServerSession(authOptions);
+  const session = await getCmsSession();
   if (!session) {
     throw new Error("Unauthorized.");
   }

package/dist/admin/actions/agent.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../admin/actions/agent.ts"],"sourcesContent":["'use server';\n\nimport './registerConfig';\n\nimport { getServerSession } from 'next-auth/next';\n\nimport { getAgentConfig } from '../../agent/configStore';\nimport { getAgentStatus, isAgentEnabled } from '../../agent/featureFlag';\nimport { acceptProposal, isProposal, type AcceptResult } from '../../agent/proposals';\nimport { authOptions } from '../auth';\n\nexport type AgentClientStatus =\n  | { enabled: false }\n  | {\n      enabled: true;\n      provider: 'anthropic' | 'openai' | 'local';\n      model: string;\n    };\n\n/**\n * Server-side check exposed to the admin client (Header nav link).\n *\n * Never returns the API key. Returns `{ enabled: false }` when the chat API is\n * disabled (missing config, key, or budget). The `/cms/chat` page still renders\n * a setup guide; this action is for optional client UI that needs a boolean gate.\n */\nexport async function getAgentClientStatus(): Promise<AgentClientStatus> {\n  const cfg = getAgentConfig();\n  if (!cfg || !isAgentEnabled(cfg)) return { enabled: false };\n  // Recompute via getAgentStatus so we exercise the same code path the route uses.\n  const status = getAgentStatus(cfg);\n  if (!status.enabled) return { enabled: false };\n  return { enabled: true, provider: cfg.provider.type, model: cfg.provider.model };\n}\n\nexport type AcceptProposalActionResult =\n  | { ok: true; entryPath: string }\n  | { ok: false; error: string; fieldErrors?: Record<string, string> };\n\n/**\n * Server action — apply a chat-agent edit/create proposal.\n *\n * Replaces the previous `POST /api/agent/proposals/accept` Route Handler. The\n * client (`useChatStream`) calls this directly via the Server Action transport\n * — no public endpoint, no thin re-export file.\n *\n * Stateless by design: the entire proposal payload arrives over the wire and\n * is re-validated here (and again inside `acceptProposal` via the schema\n * validator + `saveFile`).\n *\n * Returns `{ ok: false, error }` on validation / write failures so the client\n * can render an inline error without try/catch around the action call.\n * Throws only when the agent is disabled or the caller is unauthenticated —\n * those are caller-bug shapes, not user-facing flow.\n */\nexport async function acceptProposalAction(proposal: unknown): Promise<AcceptProposalActionResult> {\n  const cfg = getAgentConfig();\n  if (!cfg || !isAgentEnabled(cfg)) {\n    throw new Error('Chat agent is disabled.');\n  }\n\n  const session = await getServerSession(authOptions);\n  if (!session) {\n    throw new Error('Unauthorized.');\n  }\n\n  if (!isProposal(proposal)) {\n    return { ok: false, error: 'Invalid proposal payload.' };\n  }\n\n  const result: AcceptResult = await acceptProposal(proposal);\n  if (!result.ok) {\n    return result.fieldErrors\n      ? { ok: false, error: result.error, fieldErrors: result.fieldErrors }\n      : { ok: false, error: result.error };\n  }\n  return { ok: true, entryPath: result.entryPath };\n}\n\n/**\n * Server action — record that the user dismissed a proposal.\n *\n * Replaces the previous `POST /api/agent/proposals/reject` Route Handler.\n * There's no server-side proposal record to mark rejected; this just\n * acknowledges the click. The client reflects rejection in its own state and\n * feeds the rejection back to the model on the next chat turn as a synthetic\n * system note. The `reason` argument is currently ignored — kept for forward\n * compatibility (e.g. analytics / per-rejection telemetry).\n *\n * Auth-gated to keep the surface consistent with `acceptProposalAction`.\n */\nexport async function rejectProposalAction(_reason?: string | null): Promise<{ ok: true }> {\n  const cfg = getAgentConfig();\n  if (!cfg || !isAgentEnabled(cfg)) {\n    throw new Error('Chat agent is disabled.');\n  }\n\n  const session = await getServerSession(authOptions);\n  if (!session) {\n    throw new Error('Unauthorized.');\n  }\n\n  return { ok: true };\n}\n"],"mappings":";;AAEA,OAAO;AAEP,SAAS,wBAAwB;AAEjC,SAAS,sBAAsB;AAC/B,SAAS,gBAAgB,sBAAsB;AAC/C,SAAS,gBAAgB,kBAAqC;AAC9D,SAAS,mBAAmB;AAiB5B,eAAsB,uBAAmD;AACvE,QAAM,MAAM,eAAe;AAC3B,MAAI,CAAC,OAAO,CAAC,eAAe,GAAG,EAAG,QAAO,EAAE,SAAS,MAAM;AAE1D,QAAM,SAAS,eAAe,GAAG;AACjC,MAAI,CAAC,OAAO,QAAS,QAAO,EAAE,SAAS,MAAM;AAC7C,SAAO,EAAE,SAAS,MAAM,UAAU,IAAI,SAAS,MAAM,OAAO,IAAI,SAAS,MAAM;AACjF;AAsBA,eAAsB,qBAAqB,UAAwD;AACjG,QAAM,MAAM,eAAe;AAC3B,MAAI,CAAC,OAAO,CAAC,eAAe,GAAG,GAAG;AAChC,UAAM,IAAI,MAAM,yBAAyB;AAAA,EAC3C;AAEA,QAAM,UAAU,MAAM,iBAAiB,WAAW;AAClD,MAAI,CAAC,SAAS;AACZ,UAAM,IAAI,MAAM,eAAe;AAAA,EACjC;AAEA,MAAI,CAAC,WAAW,QAAQ,GAAG;AACzB,WAAO,EAAE,IAAI,OAAO,OAAO,4BAA4B;AAAA,EACzD;AAEA,QAAM,SAAuB,MAAM,eAAe,QAAQ;AAC1D,MAAI,CAAC,OAAO,IAAI;AACd,WAAO,OAAO,cACV,EAAE,IAAI,OAAO,OAAO,OAAO,OAAO,aAAa,OAAO,YAAY,IAClE,EAAE,IAAI,OAAO,OAAO,OAAO,MAAM;AAAA,EACvC;AACA,SAAO,EAAE,IAAI,MAAM,WAAW,OAAO,UAAU;AACjD;AAcA,eAAsB,qBAAqB,SAAgD;AACzF,QAAM,MAAM,eAAe;AAC3B,MAAI,CAAC,OAAO,CAAC,eAAe,GAAG,GAAG;AAChC,UAAM,IAAI,MAAM,yBAAyB;AAAA,EAC3C;AAEA,QAAM,UAAU,MAAM,iBAAiB,WAAW;AAClD,MAAI,CAAC,SAAS;AACZ,UAAM,IAAI,MAAM,eAAe;AAAA,EACjC;AAEA,SAAO,EAAE,IAAI,KAAK;AACpB;","names":[]}
+{"version":3,"sources":["../../../admin/actions/agent.ts"],"sourcesContent":["'use server';\n\nimport './registerConfig';\n\nimport { getAgentConfig } from '../../agent/configStore';\nimport { getAgentStatus, isAgentEnabled } from '../../agent/featureFlag';\nimport { acceptProposal, isProposal, type AcceptResult } from '../../agent/proposals';\nimport { getCmsSession } from '../auth/session';\n\nexport type AgentClientStatus =\n  | { enabled: false }\n  | {\n      enabled: true;\n      provider: 'anthropic' | 'openai' | 'local';\n      model: string;\n    };\n\n/**\n * Server-side check exposed to the admin client (Header nav link).\n *\n * Never returns the API key. Returns `{ enabled: false }` when the chat API is\n * disabled (missing config, key, or budget). The `/cms/chat` page still renders\n * a setup guide; this action is for optional client UI that needs a boolean gate.\n */\nexport async function getAgentClientStatus(): Promise<AgentClientStatus> {\n  const cfg = getAgentConfig();\n  if (!cfg || !isAgentEnabled(cfg)) return { enabled: false };\n  // Recompute via getAgentStatus so we exercise the same code path the route uses.\n  const status = getAgentStatus(cfg);\n  if (!status.enabled) return { enabled: false };\n  return { enabled: true, provider: cfg.provider.type, model: cfg.provider.model };\n}\n\nexport type AcceptProposalActionResult =\n  | { ok: true; entryPath: string }\n  | { ok: false; error: string; fieldErrors?: Record<string, string> };\n\n/**\n * Server action — apply a chat-agent edit/create proposal.\n *\n * Replaces the previous `POST /api/agent/proposals/accept` Route Handler. The\n * client (`useChatStream`) calls this directly via the Server Action transport\n * — no public endpoint, no thin re-export file.\n *\n * Stateless by design: the entire proposal payload arrives over the wire and\n * is re-validated here (and again inside `acceptProposal` via the schema\n * validator + `saveFile`).\n *\n * Returns `{ ok: false, error }` on validation / write failures so the client\n * can render an inline error without try/catch around the action call.\n * Throws only when the agent is disabled or the caller is unauthenticated —\n * those are caller-bug shapes, not user-facing flow.\n */\nexport async function acceptProposalAction(proposal: unknown): Promise<AcceptProposalActionResult> {\n  const cfg = getAgentConfig();\n  if (!cfg || !isAgentEnabled(cfg)) {\n    throw new Error('Chat agent is disabled.');\n  }\n\n  const session = await getCmsSession();\n  if (!session) {\n    throw new Error('Unauthorized.');\n  }\n\n  if (!isProposal(proposal)) {\n    return { ok: false, error: 'Invalid proposal payload.' };\n  }\n\n  const result: AcceptResult = await acceptProposal(proposal);\n  if (!result.ok) {\n    return result.fieldErrors\n      ? { ok: false, error: result.error, fieldErrors: result.fieldErrors }\n      : { ok: false, error: result.error };\n  }\n  return { ok: true, entryPath: result.entryPath };\n}\n\n/**\n * Server action — record that the user dismissed a proposal.\n *\n * Replaces the previous `POST /api/agent/proposals/reject` Route Handler.\n * There's no server-side proposal record to mark rejected; this just\n * acknowledges the click. The client reflects rejection in its own state and\n * feeds the rejection back to the model on the next chat turn as a synthetic\n * system note. The `reason` argument is currently ignored — kept for forward\n * compatibility (e.g. analytics / per-rejection telemetry).\n *\n * Auth-gated to keep the surface consistent with `acceptProposalAction`.\n */\nexport async function rejectProposalAction(_reason?: string | null): Promise<{ ok: true }> {\n  const cfg = getAgentConfig();\n  if (!cfg || !isAgentEnabled(cfg)) {\n    throw new Error('Chat agent is disabled.');\n  }\n\n  const session = await getCmsSession();\n  if (!session) {\n    throw new Error('Unauthorized.');\n  }\n\n  return { ok: true };\n}\n"],"mappings":";;AAEA,OAAO;AAEP,SAAS,sBAAsB;AAC/B,SAAS,gBAAgB,sBAAsB;AAC/C,SAAS,gBAAgB,kBAAqC;AAC9D,SAAS,qBAAqB;AAiB9B,eAAsB,uBAAmD;AACvE,QAAM,MAAM,eAAe;AAC3B,MAAI,CAAC,OAAO,CAAC,eAAe,GAAG,EAAG,QAAO,EAAE,SAAS,MAAM;AAE1D,QAAM,SAAS,eAAe,GAAG;AACjC,MAAI,CAAC,OAAO,QAAS,QAAO,EAAE,SAAS,MAAM;AAC7C,SAAO,EAAE,SAAS,MAAM,UAAU,IAAI,SAAS,MAAM,OAAO,IAAI,SAAS,MAAM;AACjF;AAsBA,eAAsB,qBAAqB,UAAwD;AACjG,QAAM,MAAM,eAAe;AAC3B,MAAI,CAAC,OAAO,CAAC,eAAe,GAAG,GAAG;AAChC,UAAM,IAAI,MAAM,yBAAyB;AAAA,EAC3C;AAEA,QAAM,UAAU,MAAM,cAAc;AACpC,MAAI,CAAC,SAAS;AACZ,UAAM,IAAI,MAAM,eAAe;AAAA,EACjC;AAEA,MAAI,CAAC,WAAW,QAAQ,GAAG;AACzB,WAAO,EAAE,IAAI,OAAO,OAAO,4BAA4B;AAAA,EACzD;AAEA,QAAM,SAAuB,MAAM,eAAe,QAAQ;AAC1D,MAAI,CAAC,OAAO,IAAI;AACd,WAAO,OAAO,cACV,EAAE,IAAI,OAAO,OAAO,OAAO,OAAO,aAAa,OAAO,YAAY,IAClE,EAAE,IAAI,OAAO,OAAO,OAAO,MAAM;AAAA,EACvC;AACA,SAAO,EAAE,IAAI,MAAM,WAAW,OAAO,UAAU;AACjD;AAcA,eAAsB,qBAAqB,SAAgD;AACzF,QAAM,MAAM,eAAe;AAC3B,MAAI,CAAC,OAAO,CAAC,eAAe,GAAG,GAAG;AAChC,UAAM,IAAI,MAAM,yBAAyB;AAAA,EAC3C;AAEA,QAAM,UAAU,MAAM,cAAc;AACpC,MAAI,CAAC,SAAS;AACZ,UAAM,IAAI,MAAM,eAAe;AAAA,EACjC;AAEA,SAAO,EAAE,IAAI,KAAK;AACpB;","names":[]}

package/dist/admin/actions/entries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"entries.d.ts","sourceRoot":"","sources":["../../../admin/actions/entries.ts"],"names":[],"mappings":"AAEA,OAAO,kBAAkB,CAAC;AAO1B,OAAO,KAAK,EAAE,aAAa,EAAe,MAAM,aAAa,CAAC;AAO9D,eAAO,MAAM,YAAY,GAAU,aAAY,MAAa,KAAG,OAAO,CAAC,aAAa,EAAE,CAyErF,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,iBAAiB,GAAU,oBAAoB,MAAM,KAAG,OAAO,CAAC,aAAa,EAAE,CA6D3F,CAAC"}
+{"version":3,"file":"entries.d.ts","sourceRoot":"","sources":["../../../admin/actions/entries.ts"],"names":[],"mappings":"AAEA,OAAO,kBAAkB,CAAC;AAS1B,OAAO,KAAK,EAAE,aAAa,EAAe,MAAM,aAAa,CAAC;AAQ9D,eAAO,MAAM,YAAY,GAAU,aAAY,MAAa,KAAG,OAAO,CAAC,aAAa,EAAE,CAiGrF,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,iBAAiB,GAAU,oBAAoB,MAAM,KAAG,OAAO,CAAC,aAAa,EAAE,CAuE3F,CAAC"}

package/dist/admin/actions/entries.js

@@ -3,23 +3,46 @@ import "../../chunk-B5LE2OEC.js";
 import "./registerConfig";
 import fsPromises from "fs/promises";
 import path from "path";
+import { cookies } from "next/headers";
 import { getConfig } from "../../lib/configStore";
 import { getContentFiles, getFile, getFileJson } from "./files";
 import { isProductionMode } from "../github";
 import { getMediaEntries } from "./media";
 import { getEntryTitleField } from "./utils";
+import { getStoredEntryListSnapshot, getStoredEntryReferencePaths } from "../store/contentStore";
 const getEntryList = async (collection = "**") => {
+  var _a;
   const config = getConfig();
-  const files = await getContentFiles(collection);
-  const mediaList = await getMediaEntries().catch(() => []);
+  const isProd = isProductionMode();
+  let storedSnapshot = null;
+  if (isProd) {
+    try {
+      const activeBranch = (_a = (await cookies()).get("cms-active-branch")) == null ? void 0 : _a.value;
+      storedSnapshot = await getStoredEntryListSnapshot(collection, activeBranch);
+    } catch (e) {
+    }
+  }
+  const files = storedSnapshot ? storedSnapshot.entries.map((entry) => entry.path) : await getContentFiles(collection);
+  const storedContentByPath = storedSnapshot ? new Map(storedSnapshot.entries.map((entry) => [entry.path, entry.content])) : null;
   const mediaById = /* @__PURE__ */ new Map();
-  for (const m of mediaList) {
-    mediaById.set(m.id, { ext: m.extension, publicUrl: m.publicUrl });
+  if (storedSnapshot) {
+    for (const entry of storedSnapshot.mediaEntries) {
+      const sys = entry.content.sys;
+      const fields = entry.content.fields;
+      if (typeof (sys == null ? void 0 : sys.id) === "string" && typeof (fields == null ? void 0 : fields.extension) === "string") {
+        mediaById.set(sys.id, { publicUrl: `/media/${sys.id}.${fields.extension}` });
+      }
+    }
+  } else {
+    const mediaList = await getMediaEntries().catch(() => []);
+    for (const media of mediaList) {
+      mediaById.set(media.id, { publicUrl: media.publicUrl });
+    }
   }
   const imageFieldKeyByType = /* @__PURE__ */ new Map();
   function firstImageFieldKey(type) {
-    var _a, _b;
-    if (imageFieldKeyByType.has(type)) return (_a = imageFieldKeyByType.get(type)) != null ? _a : null;
+    var _a2, _b;
+    if (imageFieldKeyByType.has(type)) return (_a2 = imageFieldKeyByType.get(type)) != null ? _a2 : null;
     const collection2 = config.collections[type];
     if (!collection2) {
       imageFieldKeyByType.set(type, null);
@@ -29,10 +52,9 @@ const getEntryList = async (collection = "**") => {
     imageFieldKeyByType.set(type, key);
     return key;
   }
-  const isProd = isProductionMode();
   const items = await Promise.all(
     files.map(async (file) => {
-      var _a, _b, _c;
+      var _a2, _b, _c, _d;
       const nameWithoutFolder = file.replace(`${config.contentFolder}/`, "").replace(".json", "");
       const parts = nameWithoutFolder.split("/");
       const type = parts[0];
@@ -43,7 +65,7 @@ const getEntryList = async (collection = "**") => {
       let updatedAt;
       let thumbnailUrl;
       const [contentResult, statResult] = await Promise.allSettled([
-        getFileJson(file),
+        storedContentByPath ? Promise.resolve((_a2 = storedContentByPath.get(file)) != null ? _a2 : null) : getFileJson(file),
         isProd ? Promise.resolve(null) : fsPromises.stat(path.join(
           /*turbopackIgnore: true*/
           process.cwd(),
@@ -52,18 +74,18 @@ const getEntryList = async (collection = "**") => {
       ]);
       if (contentResult.status === "fulfilled" && contentResult.value) {
         const content = contentResult.value;
-        if (titleField && ((_a = content == null ? void 0 : content.fields) == null ? void 0 : _a[titleField])) {
+        if (titleField && ((_b = content == null ? void 0 : content.fields) == null ? void 0 : _b[titleField])) {
           title = content.fields[titleField];
         }
         const imgKey = firstImageFieldKey(type);
         if (imgKey) {
-          const value = (_b = content == null ? void 0 : content.fields) == null ? void 0 : _b[imgKey];
+          const value = (_c = content == null ? void 0 : content.fields) == null ? void 0 : _c[imgKey];
           if (typeof value === "string" && value.trim()) {
             const hit = mediaById.get(value.trim());
             if (hit) thumbnailUrl = hit.publicUrl;
           }
         }
-        if ((_c = content == null ? void 0 : content.sys) == null ? void 0 : _c.status) {
+        if ((_d = content == null ? void 0 : content.sys) == null ? void 0 : _d.status) {
           status = content.sys.status;
         }
       }
@@ -77,54 +99,63 @@ const getEntryList = async (collection = "**") => {
   return items;
 };
 const getEntryBacklinks = async (targetReferenceKey) => {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e;
   const config = getConfig();
-  const allFiles = await getContentFiles("**");
+  let indexedFiles = null;
+  if (isProductionMode()) {
+    try {
+      const activeBranch = (_a = (await cookies()).get("cms-active-branch")) == null ? void 0 : _a.value;
+      indexedFiles = await getStoredEntryReferencePaths(targetReferenceKey, activeBranch);
+    } catch (e) {
+    }
+  }
+  const allFiles = indexedFiles != null ? indexedFiles : await getContentFiles("**");
   const backlinks = [];
   for (const file of allFiles) {
     try {
       const content = await getFile(file);
-      const type = (_a = content == null ? void 0 : content.sys) == null ? void 0 : _a.type;
+      const type = (_b = content == null ? void 0 : content.sys) == null ? void 0 : _b.type;
       if (!type) continue;
       const collection = config.collections[type];
       if (!collection) continue;
-      const referenceFieldKeys = Object.keys(collection.fields).filter(
-        (k) => collection.fields[k].format === "reference"
-      );
-      if (referenceFieldKeys.length === 0) continue;
-      let found = false;
-      for (const fieldKey of referenceFieldKeys) {
-        const fieldValue = (_b = content == null ? void 0 : content.fields) == null ? void 0 : _b[fieldKey];
-        if (!fieldValue) continue;
-        let keys = [];
-        if (typeof fieldValue === "string") {
-          try {
-            const parsed = JSON.parse(fieldValue);
-            keys = Array.isArray(parsed) ? parsed : [fieldValue];
-          } catch (e) {
-            keys = [fieldValue];
+      if (indexedFiles === null) {
+        const referenceFieldKeys = Object.keys(collection.fields).filter(
+          (k) => collection.fields[k].format === "reference"
+        );
+        if (referenceFieldKeys.length === 0) continue;
+        let found = false;
+        for (const fieldKey of referenceFieldKeys) {
+          const fieldValue = (_c = content == null ? void 0 : content.fields) == null ? void 0 : _c[fieldKey];
+          if (!fieldValue) continue;
+          let keys = [];
+          if (typeof fieldValue === "string") {
+            try {
+              const parsed = JSON.parse(fieldValue);
+              keys = Array.isArray(parsed) ? parsed : [fieldValue];
+            } catch (e) {
+              keys = [fieldValue];
+            }
+          } else if (Array.isArray(fieldValue)) {
+            keys = fieldValue;
+          }
+          if (keys.includes(targetReferenceKey)) {
+            found = true;
+            break;
           }
-        } else if (Array.isArray(fieldValue)) {
-          keys = fieldValue;
-        }
-        if (keys.includes(targetReferenceKey)) {
-          found = true;
-          break;
         }
+        if (!found) continue;
       }
-      if (found) {
-        const nameWithoutFolder = file.replace(`${config.contentFolder}/`, "").replace(".json", "");
-        const parts = nameWithoutFolder.split("/");
-        const id = parts[parts.length - 1];
-        const titleField = getEntryTitleField(type);
-        let title = id;
-        if (titleField && ((_c = content == null ? void 0 : content.fields) == null ? void 0 : _c[titleField])) {
-          title = content.fields[titleField];
-        }
-        const status = ((_d = content == null ? void 0 : content.sys) == null ? void 0 : _d.status) || "merged";
-        backlinks.push({ type, id, path: file, title, status });
+      const nameWithoutFolder = file.replace(`${config.contentFolder}/`, "").replace(".json", "");
+      const parts = nameWithoutFolder.split("/");
+      const id = parts[parts.length - 1];
+      const titleField = getEntryTitleField(type);
+      let title = id;
+      if (titleField && ((_d = content == null ? void 0 : content.fields) == null ? void 0 : _d[titleField])) {
+        title = content.fields[titleField];
       }
-    } catch (_e) {
+      const status = ((_e = content == null ? void 0 : content.sys) == null ? void 0 : _e.status) || "merged";
+      backlinks.push({ type, id, path: file, title, status });
+    } catch (_e2) {
     }
   }
   return backlinks;

package/dist/admin/actions/entries.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../admin/actions/entries.ts"],"sourcesContent":["'use server';\n\nimport './registerConfig';\n\nimport fsPromises from 'fs/promises';\nimport path from 'path';\n\nimport { getConfig } from '../../lib/configStore';\nimport type { Config } from '../types';\nimport type { EntryListItem, EntryStatus } from '../../types';\n\nimport { getContentFiles, getFile, getFileJson } from './files';\nimport { isProductionMode } from '../github';\nimport { getMediaEntries } from './media';\nimport { getEntryTitleField } from './utils';\n\nexport const getEntryList = async (collection: string = '**'): Promise<EntryListItem[]> => {\n  const config = getConfig();\n  const files = await getContentFiles(collection);\n  // Build a media lookup so we can resolve thumbnail URLs for any entry that\n  // has an `image` field. One batched call regardless of entry count.\n  const mediaList = await getMediaEntries().catch(() => []);\n  const mediaById = new Map<string, { ext: string; publicUrl: string }>();\n  for (const m of mediaList) {\n    mediaById.set(m.id, { ext: m.extension, publicUrl: m.publicUrl });\n  }\n\n  const imageFieldKeyByType = new Map<string, string | null>();\n  function firstImageFieldKey(type: string): string | null {\n    if (imageFieldKeyByType.has(type)) return imageFieldKeyByType.get(type) ?? null;\n    const collection = (config as Config).collections[type as keyof Config['collections']];\n    if (!collection) {\n      imageFieldKeyByType.set(type, null);\n      return null;\n    }\n    const key = Object.keys(collection.fields).find((k) => collection.fields[k].format === 'image') ?? null;\n    imageFieldKeyByType.set(type, key);\n    return key;\n  }\n\n  const isProd = isProductionMode();\n\n  const items = await Promise.all(\n    files.map(async (file) => {\n      const nameWithoutFolder = file.replace(`${config.contentFolder}/`, '').replace('.json', '');\n      const parts = nameWithoutFolder.split('/');\n      const type = parts[0];\n      const id = parts[parts.length - 1];\n      const titleField = getEntryTitleField(type);\n\n      let title = id;\n      let status: EntryStatus = 'merged';\n      let updatedAt: string | undefined;\n      let thumbnailUrl: string | undefined;\n\n      const [contentResult, statResult] = await Promise.allSettled([\n        getFileJson(file),\n        isProd ? Promise.resolve(null) : fsPromises.stat(path.join(/*turbopackIgnore: true*/ process.cwd(), file)),\n      ]);\n\n      if (contentResult.status === 'fulfilled' && contentResult.value) {\n        // eslint-disable-next-line @typescript-eslint/no-explicit-any\n        const content = contentResult.value as any;\n        if (titleField && content?.fields?.[titleField]) {\n          title = content.fields[titleField];\n        }\n        const imgKey = firstImageFieldKey(type);\n        if (imgKey) {\n          const value = content?.fields?.[imgKey];\n          if (typeof value === 'string' && value.trim()) {\n            const hit = mediaById.get(value.trim());\n            if (hit) thumbnailUrl = hit.publicUrl;\n          }\n        }\n        if (content?.sys?.status) {\n          status = content.sys.status;\n        }\n      }\n\n      if (!isProd && statResult.status === 'fulfilled' && statResult.value) {\n        updatedAt = (statResult.value as { mtime: Date }).mtime.toISOString();\n      }\n\n      return { type, id, path: file, title, status, updatedAt, thumbnailUrl };\n    }),\n  );\n\n  items.sort((a, b) => a.title.localeCompare(b.title));\n  return items;\n};\n\n/**\n * Find all content entries that reference the given entry via reference fields.\n * Returns entries that contain `targetReferenceKey` in any reference field value.\n */\nexport const getEntryBacklinks = async (targetReferenceKey: string): Promise<EntryListItem[]> => {\n  const config = getConfig();\n  const allFiles = await getContentFiles('**');\n  const backlinks: EntryListItem[] = [];\n\n  for (const file of allFiles) {\n    try {\n      const content = await getFile(file);\n      const type = content?.sys?.type;\n      if (!type) continue;\n\n      const collection = config.collections[type as keyof Config['collections']];\n      if (!collection) continue;\n\n      const referenceFieldKeys = Object.keys(collection.fields).filter(\n        (k) => collection.fields[k].format === 'reference',\n      );\n      if (referenceFieldKeys.length === 0) continue;\n\n      let found = false;\n      for (const fieldKey of referenceFieldKeys) {\n        const fieldValue = content?.fields?.[fieldKey];\n        if (!fieldValue) continue;\n\n        // Reference values can be a single string (cardinality 'one') or a JSON array string (cardinality 'many')\n        let keys: string[] = [];\n        if (typeof fieldValue === 'string') {\n          try {\n            const parsed = JSON.parse(fieldValue);\n            keys = Array.isArray(parsed) ? parsed : [fieldValue];\n          } catch {\n            keys = [fieldValue];\n          }\n        } else if (Array.isArray(fieldValue)) {\n          keys = fieldValue;\n        }\n\n        if (keys.includes(targetReferenceKey)) {\n          found = true;\n          break;\n        }\n      }\n\n      if (found) {\n        const nameWithoutFolder = file.replace(`${config.contentFolder}/`, '').replace('.json', '');\n        const parts = nameWithoutFolder.split('/');\n        const id = parts[parts.length - 1];\n        const titleField = getEntryTitleField(type);\n        let title = id;\n        if (titleField && content?.fields?.[titleField]) {\n          title = content.fields[titleField];\n        }\n        const status: EntryStatus = content?.sys?.status || 'merged';\n        backlinks.push({ type, id, path: file, title, status });\n      }\n    } catch (_e) {\n      // Skip files that can't be read\n    }\n  }\n\n  return backlinks;\n};\n"],"mappings":"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","names":["collection"]}
+{"version":3,"sources":["../../../admin/actions/entries.ts"],"sourcesContent":["'use server';\n\nimport './registerConfig';\n\nimport fsPromises from 'fs/promises';\nimport path from 'path';\n\nimport { cookies } from 'next/headers';\n\nimport { getConfig } from '../../lib/configStore';\nimport type { Config } from '../types';\nimport type { EntryListItem, EntryStatus } from '../../types';\n\nimport { getContentFiles, getFile, getFileJson } from './files';\nimport { isProductionMode } from '../github';\nimport { getMediaEntries } from './media';\nimport { getEntryTitleField } from './utils';\nimport { getStoredEntryListSnapshot, getStoredEntryReferencePaths } from '../store/contentStore';\n\nexport const getEntryList = async (collection: string = '**'): Promise<EntryListItem[]> => {\n  const config = getConfig();\n  const isProd = isProductionMode();\n  let storedSnapshot: Awaited<ReturnType<typeof getStoredEntryListSnapshot>> = null;\n\n  if (isProd) {\n    try {\n      const activeBranch = (await cookies()).get('cms-active-branch')?.value;\n      storedSnapshot = await getStoredEntryListSnapshot(collection, activeBranch);\n    } catch {\n      // Store unavailable; retain the direct-read recovery path below.\n    }\n  }\n\n  const files = storedSnapshot ? storedSnapshot.entries.map((entry) => entry.path) : await getContentFiles(collection);\n  const storedContentByPath = storedSnapshot\n    ? new Map(storedSnapshot.entries.map((entry) => [entry.path, entry.content]))\n    : null;\n\n  const mediaById = new Map<string, { publicUrl: string }>();\n  if (storedSnapshot) {\n    for (const entry of storedSnapshot.mediaEntries) {\n      const sys = entry.content.sys as { id?: unknown } | undefined;\n      const fields = entry.content.fields as { extension?: unknown } | undefined;\n      if (typeof sys?.id === 'string' && typeof fields?.extension === 'string') {\n        mediaById.set(sys.id, { publicUrl: `/media/${sys.id}.${fields.extension}` });\n      }\n    }\n  } else {\n    // Direct-read recovery and local development still use the existing media\n    // action, with one batched call regardless of entry count.\n    const mediaList = await getMediaEntries().catch(() => []);\n    for (const media of mediaList) {\n      mediaById.set(media.id, { publicUrl: media.publicUrl });\n    }\n  }\n\n  const imageFieldKeyByType = new Map<string, string | null>();\n  function firstImageFieldKey(type: string): string | null {\n    if (imageFieldKeyByType.has(type)) return imageFieldKeyByType.get(type) ?? null;\n    const collection = (config as Config).collections[type as keyof Config['collections']];\n    if (!collection) {\n      imageFieldKeyByType.set(type, null);\n      return null;\n    }\n    const key = Object.keys(collection.fields).find((k) => collection.fields[k].format === 'image') ?? null;\n    imageFieldKeyByType.set(type, key);\n    return key;\n  }\n\n  const items = await Promise.all(\n    files.map(async (file) => {\n      const nameWithoutFolder = file.replace(`${config.contentFolder}/`, '').replace('.json', '');\n      const parts = nameWithoutFolder.split('/');\n      const type = parts[0];\n      const id = parts[parts.length - 1];\n      const titleField = getEntryTitleField(type);\n\n      let title = id;\n      let status: EntryStatus = 'merged';\n      let updatedAt: string | undefined;\n      let thumbnailUrl: string | undefined;\n\n      const [contentResult, statResult] = await Promise.allSettled([\n        storedContentByPath ? Promise.resolve(storedContentByPath.get(file) ?? null) : getFileJson(file),\n        isProd ? Promise.resolve(null) : fsPromises.stat(path.join(/*turbopackIgnore: true*/ process.cwd(), file)),\n      ]);\n\n      if (contentResult.status === 'fulfilled' && contentResult.value) {\n        // eslint-disable-next-line @typescript-eslint/no-explicit-any\n        const content = contentResult.value as any;\n        if (titleField && content?.fields?.[titleField]) {\n          title = content.fields[titleField];\n        }\n        const imgKey = firstImageFieldKey(type);\n        if (imgKey) {\n          const value = content?.fields?.[imgKey];\n          if (typeof value === 'string' && value.trim()) {\n            const hit = mediaById.get(value.trim());\n            if (hit) thumbnailUrl = hit.publicUrl;\n          }\n        }\n        if (content?.sys?.status) {\n          status = content.sys.status;\n        }\n      }\n\n      if (!isProd && statResult.status === 'fulfilled' && statResult.value) {\n        updatedAt = (statResult.value as { mtime: Date }).mtime.toISOString();\n      }\n\n      return { type, id, path: file, title, status, updatedAt, thumbnailUrl };\n    }),\n  );\n\n  items.sort((a, b) => a.title.localeCompare(b.title));\n  return items;\n};\n\n/**\n * Find all content entries that reference the given entry via reference fields.\n * Returns entries that contain `targetReferenceKey` in any reference field value.\n */\nexport const getEntryBacklinks = async (targetReferenceKey: string): Promise<EntryListItem[]> => {\n  const config = getConfig();\n  let indexedFiles: string[] | null = null;\n  if (isProductionMode()) {\n    try {\n      const activeBranch = (await cookies()).get('cms-active-branch')?.value;\n      indexedFiles = await getStoredEntryReferencePaths(targetReferenceKey, activeBranch);\n    } catch {\n      // Store unavailable; retain the direct-read recovery path below.\n    }\n  }\n\n  const allFiles = indexedFiles ?? (await getContentFiles('**'));\n  const backlinks: EntryListItem[] = [];\n\n  for (const file of allFiles) {\n    try {\n      const content = await getFile(file);\n      const type = content?.sys?.type;\n      if (!type) continue;\n\n      const collection = config.collections[type as keyof Config['collections']];\n      if (!collection) continue;\n\n      if (indexedFiles === null) {\n        const referenceFieldKeys = Object.keys(collection.fields).filter(\n          (k) => collection.fields[k].format === 'reference',\n        );\n        if (referenceFieldKeys.length === 0) continue;\n\n        let found = false;\n        for (const fieldKey of referenceFieldKeys) {\n          const fieldValue = content?.fields?.[fieldKey];\n          if (!fieldValue) continue;\n\n          let keys: string[] = [];\n          if (typeof fieldValue === 'string') {\n            try {\n              const parsed = JSON.parse(fieldValue);\n              keys = Array.isArray(parsed) ? parsed : [fieldValue];\n            } catch {\n              keys = [fieldValue];\n            }\n          } else if (Array.isArray(fieldValue)) {\n            keys = fieldValue;\n          }\n\n          if (keys.includes(targetReferenceKey)) {\n            found = true;\n            break;\n          }\n        }\n        if (!found) continue;\n      }\n\n      const nameWithoutFolder = file.replace(`${config.contentFolder}/`, '').replace('.json', '');\n      const parts = nameWithoutFolder.split('/');\n      const id = parts[parts.length - 1];\n      const titleField = getEntryTitleField(type);\n      let title = id;\n      if (titleField && content?.fields?.[titleField]) {\n        title = content.fields[titleField];\n      }\n      const status: EntryStatus = content?.sys?.status || 'merged';\n      backlinks.push({ type, id, path: file, title, status });\n    } catch (_e) {\n      // Skip files that can't be read\n    }\n  }\n\n  return backlinks;\n};\n"],"mappings":"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","names":["_a","collection","_e"]}

package/dist/admin/actions/files.d.ts

@@ -5,7 +5,6 @@ export type { SaveFileResult } from './utils';
  * In production, reject writes that would target `config.git.baseBranch` (no feature branch cookie).
  */
 export declare const assertFeatureBranchForWritesIfRequired: () => Promise<void>;
-export declare const waitForPublicReadConsistency: (fileName: string, expectedContent: string, readRef?: string) => Promise<void>;
 export declare const getContentFiles: (collection?: string) => Promise<string[]>;
 /**
  * List media-entry JSON files (e.g. `cms/media/media-<uuid>.json`).

package/dist/admin/actions/files.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"files.d.ts","sourceRoot":"","sources":["../../../admin/actions/files.ts"],"names":[],"mappings":"AAEA,OAAO,kBAAkB,CAAC;AA+B1B,OAAO,EAIL,KAAK,YAAY,EACjB,KAAK,aAAa,EAClB,KAAK,cAAc,EACpB,MAAM,SAAS,CAAC;AAEjB,YAAY,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAgM9C;;GAEG;AACH,eAAO,MAAM,sCAAsC,QAAa,OAAO,CAAC,IAAI,CAQ3E,CAAC;AAEF,eAAO,MAAM,4BAA4B,GAAU,UAAU,MAAM,EAAE,iBAAiB,MAAM,EAAE,UAAU,MAAM,kBAyB7G,CAAC;AAEF,eAAO,MAAM,eAAe,GAAU,aAAY,MAAa,sBAkC9D,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,oBAAoB,QAAa,OAAO,CAAC,MAAM,EAAE,CAiB7D,CAAC;AAEF,eAAO,MAAM,aAAa,GAAU,SAAQ,MAAa,sBAqBxD,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,WAAW,GAAU,UAAU,MAAM,KAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAgC1F,CAAC;AAEF,eAAO,MAAM,OAAO,GAAU,UAAU,MAAM,iBAkF7C,CAAC;AAuBF,eAAO,MAAM,QAAQ,GACnB,UAAU,GAAG,EACb,UAAU,MAAM,EAChB,UAAU;IAAE,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAAE,KAC3C,OAAO,CAAC,cAAc,CAoJxB,CAAC;AAEF,eAAO,MAAM,OAAO,GAAU,MAAM,MAAM,KAAG,OAAO,CAAC,aAAa,CAoDjE,CAAC;AAEF,eAAO,MAAM,UAAU,GAAU,UAAU,MAAM,KAAG,OAAO,CAAC,YAAY,CA2DvE,CAAC"}
+{"version":3,"file":"files.d.ts","sourceRoot":"","sources":["../../../admin/actions/files.ts"],"names":[],"mappings":"AAEA,OAAO,kBAAkB,CAAC;AAsC1B,OAAO,EAIL,KAAK,YAAY,EACjB,KAAK,aAAa,EAClB,KAAK,cAAc,EACpB,MAAM,SAAS,CAAC;AAEjB,YAAY,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAiM9C;;GAEG;AACH,eAAO,MAAM,sCAAsC,QAAa,OAAO,CAAC,IAAI,CAqB3E,CAAC;AAEF,eAAO,MAAM,eAAe,GAAU,aAAY,MAAa,sBAkC9D,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,oBAAoB,QAAa,OAAO,CAAC,MAAM,EAAE,CAiB7D,CAAC;AAEF,eAAO,MAAM,aAAa,GAAU,SAAQ,MAAa,sBAqBxD,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,WAAW,GAAU,UAAU,MAAM,KAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAgC1F,CAAC;AAEF,eAAO,MAAM,OAAO,GAAU,UAAU,MAAM,iBAkF7C,CAAC;AAuBF,eAAO,MAAM,QAAQ,GACnB,UAAU,GAAG,EACb,UAAU,MAAM,EAChB,UAAU;IAAE,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAAE,KAC3C,OAAO,CAAC,cAAc,CAqJxB,CAAC;AAEF,eAAO,MAAM,OAAO,GAAU,MAAM,MAAM,KAAG,OAAO,CAAC,aAAa,CAwDjE,CAAC;AAEF,eAAO,MAAM,UAAU,GAAU,UAAU,MAAM,KAAG,OAAO,CAAC,YAAY,CA0DvE,CAAC"}

package/dist/admin/actions/files.js

@@ -18,15 +18,21 @@ import { persistedFieldsFromFormStrings } from "../../lib/persistedFormFields";
 import { normalizeStoredSlug } from "../../lib/slugField";
 import { validateEntryFields } from "../../lib/validateEntryFields";
 import {
-  deleteGitHubFile,
+  commitMultipleFilesToGitHub,
+  GitHubBranchConflictError,
   getGitHubFile,
   isProductionMode,
   listGitHubFiles,
   listGitHubFilesRecursive,
-  readGitHubFilePublic,
-  saveGitHubFile
+  readGitHubFilePublic
 } from "../github";
-import { applyMutation, getStoredContentFiles, getStoredFile, getStoredFileSha } from "../store/contentStore";
+import {
+  applyCommittedMutations,
+  getContentStoreStatus,
+  getStoredContentFiles,
+  getStoredFile,
+  getStoredFileSha
+} from "../store/contentStore";
 import { mediaContentFolder, mediaEntryPath } from "../../lib/mediaPath";
 import { buildJsons } from "./build";
 import {
@@ -49,24 +55,25 @@ async function syncEmbeddingsForRemoveIfEnabled(entryPath, branch, isProduction)
   if (!agentConfig) return;
   await syncEmbeddingsAfterRemove({ agentConfig, entryPath, branch, isProduction });
 }
-async function persistBranchHistoryEntryIfNeeded(activeBranch, entryPath) {
+async function getBranchHistoryBatchChange(activeBranch, entryPath) {
   var _a;
+  try {
+    const historyFile = await getGitHubFile(BRANCH_HISTORY_FILE_PATH, activeBranch);
+    const next = mergeHistoryContentWithAppendedEntry(
+      (_a = historyFile == null ? void 0 : historyFile.content) != null ? _a : "",
+      activeBranch,
+      normalizeContentPath(entryPath)
+    );
+    return next === null ? null : { kind: "upsert-text", path: BRANCH_HISTORY_FILE_PATH, content: next };
+  } catch (e) {
+    return null;
+  }
+}
+async function persistLocalBranchHistoryEntryIfNeeded(activeBranch, entryPath) {
   if (!activeBranch) {
     return;
   }
   const normalized = normalizeContentPath(entryPath);
-  if (isProductionMode()) {
-    try {
-      const historyFile = await getGitHubFile(BRANCH_HISTORY_FILE_PATH, activeBranch);
-      const next = mergeHistoryContentWithAppendedEntry((_a = historyFile == null ? void 0 : historyFile.content) != null ? _a : "", activeBranch, normalized);
-      if (next == null) {
-        return;
-      }
-      await saveGitHubFile(BRANCH_HISTORY_FILE_PATH, next, "CMS: track entry in branch history", activeBranch);
-    } catch (e) {
-    }
-    return;
-  }
   try {
     const abs = path.join(
       /*turbopackIgnore: true*/
@@ -190,28 +197,18 @@ const assertFeatureBranchForWritesIfRequired = async () => {
   if (!isProductionMode()) {
     return;
   }
-  if (!((_a = (await cookies()).get(CMS_ACTIVE_BRANCH_COOKIE)) == null ? void 0 : _a.value)) {
+  const activeBranch = (_a = (await cookies()).get(CMS_ACTIVE_BRANCH_COOKIE)) == null ? void 0 : _a.value;
+  if (!activeBranch) {
     throw new Error("Create or select a branch before editing.");
   }
-};
-const waitForPublicReadConsistency = async (fileName, expectedContent, readRef) => {
-  if (!isProductionMode()) {
-    return;
-  }
-  const parsedAttempts = Number.parseInt(process.env.CMS_GITHUB_CONSISTENCY_ATTEMPTS || "8", 10);
-  const parsedDelayMs = Number.parseInt(process.env.CMS_GITHUB_CONSISTENCY_DELAY_MS || "250", 10);
-  const maxAttempts = Number.isFinite(parsedAttempts) && parsedAttempts > 0 ? parsedAttempts : 1;
-  const delayMs = Number.isFinite(parsedDelayMs) && parsedDelayMs >= 0 ? parsedDelayMs : 250;
-  for (let attempt = 1; attempt <= maxAttempts; attempt++) {
-    try {
-      const visibleContent = await readGitHubFilePublic(fileName, readRef);
-      if (visibleContent === expectedContent) {
-        return;
-      }
-    } catch (_e) {
+  try {
+    const cache = await getContentStoreStatus(activeBranch);
+    if (cache.status === "stale") {
+      throw new Error("Editing is temporarily disabled because GitHub could not confirm the current branch HEAD.");
     }
-    if (attempt < maxAttempts && delayMs > 0) {
-      await new Promise((resolve) => setTimeout(resolve, delayMs));
+  } catch (error) {
+    if (error instanceof Error && error.message.includes("temporarily disabled")) {
+      throw error;
     }
   }
 };
@@ -485,30 +482,31 @@ const saveFile = async (formData, fileName, options) => {
       const entryId = ((_h = payload == null ? void 0 : payload.sys) == null ? void 0 : _h.id) || "";
       const message = `Update ${entryTypeLabel} ${entryId}`;
       const activeBranch = (_i = (await cookies()).get(CMS_ACTIVE_BRANCH_COOKIE)) == null ? void 0 : _i.value;
-      const cachedSha = await getStoredFileSha(fileName, activeBranch) || void 0;
-      await saveGitHubFile(fileName, normalizedData, message, activeBranch, cachedSha);
+      if (!activeBranch) throw new Error("Create or select a branch before editing.");
+      const changes = [{ kind: "upsert-text", path: fileName, content: normalizedData }];
       const mdPaths2 = typeof entryType === "string" ? companionMarkdownPathsForEntry(fileName, entryType, config.collections) : {};
       for (const [fieldName, mdPath] of Object.entries(mdPaths2)) {
         const mdContent = (_j = markdownContents[fieldName]) != null ? _j : "";
-        await saveGitHubFile(mdPath, mdContent, `Update ${fieldName} for ${entryType} ${entryId}`, activeBranch);
+        changes.push({ kind: "upsert-text", path: mdPath, content: mdContent });
       }
       const rtPaths = typeof entryType === "string" ? companionRichTextPathsForEntry(fileName, entryType, config.collections) : {};
       for (const [fieldName, rtPath] of Object.entries(rtPaths)) {
         const rtContent = (_k = markdownContents[fieldName]) != null ? _k : "";
-        await saveGitHubFile(rtPath, rtContent, `Update ${fieldName} for ${entryType} ${entryId}`, activeBranch);
+        changes.push({ kind: "upsert-text", path: rtPath, content: rtContent });
       }
-      await waitForPublicReadConsistency(fileName, normalizedData);
-      if (activeBranch) {
-        applyMutation(activeBranch, {
+      const historyChange = await getBranchHistoryBatchChange(activeBranch, fileName);
+      if (historyChange) changes.push(historyChange);
+      const commit = await commitMultipleFilesToGitHub(changes, message, activeBranch);
+      applyCommittedMutations(activeBranch, commit.sha, [
+        {
           type: "upsert",
           path: fileName,
           content: payload,
           sha: "",
-          // SHA unknown after single-file commit; next tree fetch will correct it
+          // Blob SHA is corrected by the next manifest refresh.
           companions: markdownContents
-        });
-      }
-      await persistBranchHistoryEntryIfNeeded(activeBranch, fileName);
+        }
+      ]);
       await syncEmbeddingsForUpsertIfEnabled(fileName, payload, markdownContents, activeBranch, true);
       const built2 = await buildJsons(fileName);
       return built2.success ? actionOk() : built2;
@@ -539,11 +537,12 @@ const saveFile = async (formData, fileName, options) => {
         rtPath
       ), rtContent, "utf8");
     }
-    await persistBranchHistoryEntryIfNeeded(activeBranchDev, fileName);
+    await persistLocalBranchHistoryEntryIfNeeded(activeBranchDev, fileName);
     await syncEmbeddingsForUpsertIfEnabled(fileName, payload, markdownContents, activeBranchDev, false);
     const built = await buildJsons(fileName);
     return built.success ? actionOk() : built;
   } catch (e) {
+    if (e instanceof GitHubBranchConflictError) return actionErr(e);
     return actionErr(new Error(`Failed to save file: ${getErrorMessage(e)}`));
   }
 };
@@ -567,17 +566,19 @@ const newFile = async (type) => {
     if (isProductionMode()) {
       await assertFeatureBranchForWritesIfRequired();
       const activeBranch = (_a = (await cookies()).get(CMS_ACTIVE_BRANCH_COOKIE)) == null ? void 0 : _a.value;
-      await saveGitHubFile(file, normalizedData, `Create new ${type} ${id}`, activeBranch);
-      await waitForPublicReadConsistency(file, normalizedData);
-      if (activeBranch) {
-        applyMutation(activeBranch, {
+      if (!activeBranch) throw new Error("Create or select a branch before editing.");
+      const changes = [{ kind: "upsert-text", path: file, content: normalizedData }];
+      const historyChange = await getBranchHistoryBatchChange(activeBranch, file);
+      if (historyChange) changes.push(historyChange);
+      const commit = await commitMultipleFilesToGitHub(changes, `Create new ${type} ${id}`, activeBranch);
+      applyCommittedMutations(activeBranch, commit.sha, [
+        {
           type: "upsert",
           path: file,
           content: values,
           sha: ""
-        });
-      }
-      await persistBranchHistoryEntryIfNeeded(activeBranch, file);
+        }
+      ]);
       await syncEmbeddingsForUpsertIfEnabled(file, values, {}, activeBranch, true);
       const built2 = await buildJsons(file);
       return built2.success ? { success: true, path: file } : { success: false, error: built2.error };
@@ -591,12 +592,12 @@ const newFile = async (type) => {
     );
     await fsPromises.mkdir(path.dirname(filePath), { recursive: true });
     await fsPromises.writeFile(filePath, normalizedData, "utf8");
-    await persistBranchHistoryEntryIfNeeded(activeBranchDev, file);
+    await persistLocalBranchHistoryEntryIfNeeded(activeBranchDev, file);
     await syncEmbeddingsForUpsertIfEnabled(file, values, {}, activeBranchDev, false);
     const built = await buildJsons(file);
     return built.success ? { success: true, path: file } : { success: false, error: built.error };
   } catch (e) {
-    return { success: false, error: getErrorMessage(e) };
+    return e instanceof GitHubBranchConflictError ? actionErr(e) : { success: false, error: getErrorMessage(e) };
   }
 };
 const removeFile = async (fileName) => {
@@ -616,16 +617,16 @@ const removeFile = async (fileName) => {
     if (isProductionMode()) {
       await assertFeatureBranchForWritesIfRequired();
       const activeBranch = (_b = (await cookies()).get(CMS_ACTIVE_BRANCH_COOKIE)) == null ? void 0 : _b.value;
-      await deleteGitHubFile(fileName, `Remove ${fileName}`, activeBranch);
+      if (!activeBranch) throw new Error("Create or select a branch before editing.");
+      const changes = [{ kind: "delete", path: fileName }];
       for (const mdPath of companionPaths) {
-        try {
-          await deleteGitHubFile(mdPath, `Remove companion ${mdPath}`, activeBranch);
-        } catch (e) {
+        const cachedSha = await getStoredFileSha(mdPath, activeBranch);
+        if (cachedSha !== null || await getGitHubFile(mdPath, activeBranch)) {
+          changes.push({ kind: "delete", path: mdPath });
         }
       }
-      if (activeBranch) {
-        applyMutation(activeBranch, { type: "delete", path: fileName });
-      }
+      const commit = await commitMultipleFilesToGitHub(changes, `Remove ${fileName}`, activeBranch);
+      applyCommittedMutations(activeBranch, commit.sha, [{ type: "delete", path: fileName }]);
       await syncEmbeddingsForRemoveIfEnabled(fileName, activeBranch, true);
       const built2 = await buildJsons(fileName);
       return built2.success ? actionOk() : built2;
@@ -662,7 +663,6 @@ export {
   getMediaFiles,
   newFile,
   removeFile,
-  saveFile,
-  waitForPublicReadConsistency
+  saveFile
 };
 //# sourceMappingURL=files.js.map