@stelstone/server 0.26.0 → 0.26.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stelstone/server",
-  "version": "0.26.0",
+  "version": "0.26.2",
   "description": "Runtime-agnostic CMS server built on the Web Fetch API, with pluggable adapters for content, media, auth, and build.",
   "license": "MIT",
   "repository": {

package/src/adapters/github-content.mjs

@@ -73,13 +73,41 @@ export function createGitHubContent({ token, owner, repo, branch, draftBranch, p
   // Lazily create the draft branch off the published branch. Checked once per
   // process; a 404 on the ref is the "first ever use" case, not an error.
   let draftBranchReady = !draftMode;
+  let indexesStaleAfterSync = false;
+  const refreshedAfterSync = new Set();
   async function ensureDraftBranch() {
     if (draftBranchReady) return;
     const ref = await apiGet(`/git/ref/heads/${draftBranch}`);
     if (!ref) {
       const base = await apiGet(`/git/ref/heads/${branch}`);
-      if (!base) throw new Error(`Published branch "${branch}" does not exist`);
+      if (!base) throw new Error(`Published branch \"${branch}\" does not exist`);
       await apiPost(`/git/refs`, { ref: `refs/heads/${draftBranch}`, sha: base.object.sha });
+    } else {
+      // The draft branch was a snapshot of `branch` at creation — content
+      // pushed to the published branch OUTSIDE the CMS (a code deploy adding
+      // records) never reached it, so the admin could not even see those
+      // files. Found by dogfooding: stelstone.com's landing records landed
+      // on main from code and the admin listed an empty collection. Keep the
+      // draft current by merging the published branch in once per process.
+      try {
+        const merged = await apiPost(`/merges`, { base: draftBranch, head: branch });
+        // A real merge means files changed under us — the per-collection
+        // _index.json manifests may now be stale (the empty-index variant of
+        // this bit stelstone.com: an index bootstrapped before content
+        // existed served an empty list forever). Mark them suspect; the
+        // lazy strategy rebuilds on next list.
+        if (merged?.sha) indexesStaleAfterSync = true;
+      } catch (err) {
+        if (err?.upstreamStatus === 409) {
+          // Same record edited on both branches: the draft (the editor's
+          // in-progress work) wins by default. Say so; don't fail reads.
+          console.warn(
+            `[github-content] draft branch \"${draftBranch}\" conflicts with \"${branch}\" — keeping draft state`,
+          );
+        }
+        // 204 \"nothing to merge\" parses as empty JSON and lands here too —
+        // in every case reads must proceed.
+      }
     }
     draftBranchReady = true;
   }
@@ -206,8 +234,16 @@ export function createGitHubContent({ token, owner, repo, branch, draftBranch, p
       }
 
       // 2. strategy "index": try the pre-built manifest first (1 subrequest).
+      // After a draft-branch sync merged changes in, an existing manifest is
+      // suspect: skip it once per collection so the lazy path rebuilds it
+      // from the merged tree. ("build" sites rebuild via the CLI instead.)
+      const skipIndex =
+        indexesStaleAfterSync &&
+        listConfig.rebuild === "lazy" &&
+        !refreshedAfterSync.has(safeCollection);
       const idxPath = indexFilePath(safeCollection);
       try {
+        if (skipIndex) throw new Error("index suspect after sync");
         const data = await apiGet(`/contents/${idxPath}?ref=${workBranch}`);
         if (data && !Array.isArray(data)) {
           shaCache.set(idxPath, data.sha);
@@ -242,6 +278,7 @@ export function createGitHubContent({ token, owner, repo, branch, draftBranch, p
         // Persist for all future calls.
         try {
           await writeIndex(safeCollection, { entries: pages });
+          refreshedAfterSync.add(safeCollection);
         } catch (err) {
           console.warn(`[listPages] Could not write ${listConfig.indexFile}:`, err?.message);
         }

package/src/version.mjs

@@ -5,4 +5,4 @@
  * require() and no import.meta.url, so reading the manifest at runtime yields
  * "unknown" there.
  */
-export const SERVER_VERSION = "0.26.0";
+export const SERVER_VERSION = "0.26.2";