@stelstone/server 0.26.0 → 0.26.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stelstone/server",
-  "version": "0.26.0",
+  "version": "0.26.1",
   "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

@@ -78,8 +78,28 @@ export function createGitHubContent({ token, owner, repo, branch, draftBranch, p
     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 {
+        await apiPost(`/merges`, { base: draftBranch, head: branch });
+      } 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;
   }

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.1";