@glw907/cairn-cms 0.62.1 → 0.62.2

package/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to this project are recorded here, most recent first.
 
+## 0.62.2
+
+The edit-load address-collision advisory now checks the published corpus only. It fires when an entry
+you are editing collides with an entry already published on `main`, and it no longer reads sibling
+`cairn/<concept>/<id>` branches when an editor opens an entry, so opening the editor adds no GitHub
+reads. The publish-time re-check is unchanged: it stays full cross-branch and still emits the
+`publish.address_collision` log event when a publish overrides another entry's address. No consumer
+action is required.
+
 ## 0.62.1
 
 The entry editor gains an advisory channel and its first notice: a cross-branch address-collision

package/dist/content/advisories.d.ts

@@ -32,6 +32,11 @@ export interface AddressEntry {
 }
 /** Permalink to the distinct entries that resolve to it, across main and every open branch. */
 export type AddressIndex = Map<string, AddressEntry[]>;
+/**
+ * The address index over main only: a synchronous reverse map of each manifest entry's resolved
+ * permalink. No backend read, so an edit-load can build it for free from the manifest it already holds.
+ */
+export declare function mainAddressIndex(manifest: Manifest): AddressIndex;
 /**
  * Build the permalink-keyed address index over main (from each manifest entry's resolved permalink)
  * plus every open cairn/* branch (resolved from its edited markdown).

package/dist/content/advisories.js

@@ -14,17 +14,11 @@ function push(index, permalink, entry) {
         index.set(permalink, [entry]);
 }
 /**
- * Build the permalink-keyed address index over main (from each manifest entry's resolved permalink)
- * plus every open cairn/* branch (resolved from its edited markdown).
- *
- * The build fails open: a branch read that throws and a permalink that cannot resolve are both caught
- * and skipped, so a transient failure degrades to a thinner index, never a thrown editor or a blocked
- * publish. The branches are read in one Promise.all, the way buildUsageIndex reads them.
+ * The address index over main only: a synchronous reverse map of each manifest entry's resolved
+ * permalink. No backend read, so an edit-load can build it for free from the manifest it already holds.
  */
-export async function buildAddressIndex(repo, token, concepts, manifest) {
+export function mainAddressIndex(manifest) {
     const index = new Map();
-    // The main arm: the manifest already carries each entry's resolved permalink, so this is a pure
-    // reverse map with no per-file read.
     for (const entry of manifest.entries) {
         push(index, entry.permalink, {
             concept: entry.concept,
@@ -33,6 +27,20 @@ export async function buildAddressIndex(repo, token, concepts, manifest) {
             source: 'main',
         });
     }
+    return index;
+}
+/**
+ * Build the permalink-keyed address index over main (from each manifest entry's resolved permalink)
+ * plus every open cairn/* branch (resolved from its edited markdown).
+ *
+ * The build fails open: a branch read that throws and a permalink that cannot resolve are both caught
+ * and skipped, so a transient failure degrades to a thinner index, never a thrown editor or a blocked
+ * publish. The branches are read in one Promise.all, the way buildUsageIndex reads them.
+ */
+export async function buildAddressIndex(repo, token, concepts, manifest) {
+    // The main arm: the manifest already carries each entry's resolved permalink, so seed from the
+    // synchronous main-only index and union the branch arm on top.
+    const index = mainAddressIndex(manifest);
     // The branch arm: read each open cairn/* branch's one edited file and resolve its permalink. The
     // path is derivable from the branch name, so no tree-listing is needed.
     const names = await listBranches(repo, PENDING_PREFIX, token);

package/dist/sveltekit/content-routes.js

@@ -8,7 +8,7 @@ import { extractCairnLinks, formatCairnToken, rewriteCairnLink } from '../conten
 import { frontmatterFromForm, parseMarkdown, dateInputValue, serializeMarkdown } from '../content/frontmatter.js';
 import { deriveExcerpt } from '../content/excerpt.js';
 import { asString, entryIdentity } from '../content/identity.js';
-import { buildAddressIndex, addressCollision } from '../content/advisories.js';
+import { buildAddressIndex, mainAddressIndex, addressCollision } from '../content/advisories.js';
 import { isValidId, slugify, filenameFromId, composeDatedId, slugFromId, renameId } from '../content/ids.js';
 import { appCredentials } from '../github/credentials.js';
 import { listMarkdown, readRaw, commitFile, commitFiles } from '../github/repo.js';
@@ -502,14 +502,16 @@ export function createContentRoutes(runtime, deps = {}) {
             }));
             inbound = inboundLinks(manifest, concept.id, id);
         }
-        // The cross-branch address-collision advisory: warn-and-allow, never a gate. Build it from the
-        // same manifest read above (no second read) and degrade to no notice on any read failure, so a
-        // transient GitHub error never blocks the editor. Skip the build with no manifest to index.
+        // The address-collision advisory: warn-and-allow, never a gate. At edit-load it checks the
+        // published corpus only, built synchronously from the same manifest read above (no extra GitHub
+        // read per editor open); publishAction re-checks the full cross-branch index before it lands. The
+        // try/catch degrades to no notice if entryIdentity throws on a malformed-date entry. Skip the build
+        // with no manifest to index.
         let advisories = [];
         if (manifest !== null) {
             try {
                 const identity = entryIdentity(concept, path, parsed.frontmatter);
-                const addressIndex = await buildAddressIndex(runtime.backend, token, runtime.concepts, manifest);
+                const addressIndex = mainAddressIndex(manifest);
                 const other = addressCollision(addressIndex, { concept: concept.id, id }, identity.permalink);
                 if (other) {
                     const otherConcept = findConcept(runtime.concepts, other.concept);
@@ -524,8 +526,8 @@ export function createContentRoutes(runtime, deps = {}) {
                     ];
                 }
             }
-            catch (err) {
-                log.warn('github.unreachable', { scope: 'edit-advisories', error: String(err) });
+            catch {
+                // A malformed-date entry that cannot resolve its permalink degrades to no advisory, fail open.
             }
         }
         // Project the one committed media manifest read two ways: the minimal resolver triple the preview

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glw907/cairn-cms",
-  "version": "0.62.1",
+  "version": "0.62.2",
   "description": "Embedded, magic-link, GitHub-committing CMS for SvelteKit/Cloudflare sites.",
   "type": "module",
   "sideEffects": [

package/src/lib/content/advisories.ts

@@ -1,7 +1,7 @@
 // cairn-cms: the entry editor's internal advisory channel (editor-help pass 3). An advisory is a
 // non-blocking, serializable notice that rides EditData across the SSR boundary, so it carries data
-// only and never a callback. Today's one notice is the cross-branch address collision: a warning,
-// not a gate, that another entry already resolves to the same public address (last-write-wins).
+// only and never a callback. Today's one notice is the address collision: a warning, not a gate,
+// that another entry already resolves to the same public address (last-write-wins).
 //
 // The address index mirrors buildUsageIndex (src/lib/media/usage.ts): a main arm that reads each
 // manifest entry's resolved permalink with no per-file read, and a branch arm that lists every open
@@ -9,7 +9,8 @@
 // and resolves its permalink. The map is keyed by permalink, so every entry that resolves to a given
 // address shares one bucket. The build fails open: a branch read that throws, or a dated entry whose
 // permalink cannot resolve, is skipped rather than thrown, so a transient failure degrades to no
-// notice and never blocks the editor or the publish.
+// notice and never blocks the editor or the publish. The scope splits by call site: the main arm at
+// edit-load (synchronous, no extra GitHub read per open) and the full cross-branch check at publish.
 import type { ConceptDescriptor } from './types.js';
 import type { RepoRef } from '../github/types.js';
 import type { Manifest } from './manifest.js';
@@ -63,6 +64,23 @@ function push(index: AddressIndex, permalink: string, entry: AddressEntry): void
   else index.set(permalink, [entry]);
 }
 
+/**
+ * The address index over main only: a synchronous reverse map of each manifest entry's resolved
+ * permalink. No backend read, so an edit-load can build it for free from the manifest it already holds.
+ */
+export function mainAddressIndex(manifest: Manifest): AddressIndex {
+  const index: AddressIndex = new Map();
+  for (const entry of manifest.entries) {
+    push(index, entry.permalink, {
+      concept: entry.concept,
+      id: entry.id,
+      title: entry.title,
+      source: 'main',
+    });
+  }
+  return index;
+}
+
 /**
  * Build the permalink-keyed address index over main (from each manifest entry's resolved permalink)
  * plus every open cairn/* branch (resolved from its edited markdown).
@@ -77,18 +95,9 @@ export async function buildAddressIndex(
   concepts: ConceptDescriptor[],
   manifest: Manifest,
 ): Promise<AddressIndex> {
-  const index: AddressIndex = new Map();
-
-  // The main arm: the manifest already carries each entry's resolved permalink, so this is a pure
-  // reverse map with no per-file read.
-  for (const entry of manifest.entries) {
-    push(index, entry.permalink, {
-      concept: entry.concept,
-      id: entry.id,
-      title: entry.title,
-      source: 'main',
-    });
-  }
+  // The main arm: the manifest already carries each entry's resolved permalink, so seed from the
+  // synchronous main-only index and union the branch arm on top.
+  const index = mainAddressIndex(manifest);
 
   // The branch arm: read each open cairn/* branch's one edited file and resolve its permalink. The
   // path is derivable from the branch name, so no tree-listing is needed.

package/src/lib/sveltekit/content-routes.ts

@@ -8,7 +8,7 @@ import { extractCairnLinks, formatCairnToken, rewriteCairnLink } from '../conten
 import { frontmatterFromForm, parseMarkdown, dateInputValue, serializeMarkdown } from '../content/frontmatter.js';
 import { deriveExcerpt } from '../content/excerpt.js';
 import { asString, entryIdentity } from '../content/identity.js';
-import { buildAddressIndex, addressCollision, type AdvisoryNotice, type AddressEntry } from '../content/advisories.js';
+import { buildAddressIndex, mainAddressIndex, addressCollision, type AdvisoryNotice, type AddressEntry } from '../content/advisories.js';
 import { isValidId, slugify, filenameFromId, composeDatedId, slugFromId, renameId } from '../content/ids.js';
 import { appCredentials, type GithubKeyEnv } from '../github/credentials.js';
 import { listMarkdown, readRaw, commitFile, commitFiles, type FileChange } from '../github/repo.js';
@@ -1072,14 +1072,16 @@ export function createContentRoutes(runtime: CairnRuntime, deps: ContentRoutesDe
       inbound = inboundLinks(manifest, concept.id, id);
     }
 
-    // The cross-branch address-collision advisory: warn-and-allow, never a gate. Build it from the
-    // same manifest read above (no second read) and degrade to no notice on any read failure, so a
-    // transient GitHub error never blocks the editor. Skip the build with no manifest to index.
+    // The address-collision advisory: warn-and-allow, never a gate. At edit-load it checks the
+    // published corpus only, built synchronously from the same manifest read above (no extra GitHub
+    // read per editor open); publishAction re-checks the full cross-branch index before it lands. The
+    // try/catch degrades to no notice if entryIdentity throws on a malformed-date entry. Skip the build
+    // with no manifest to index.
     let advisories: AdvisoryNotice[] = [];
     if (manifest !== null) {
       try {
         const identity = entryIdentity(concept, path, parsed.frontmatter);
-        const addressIndex = await buildAddressIndex(runtime.backend, token, runtime.concepts, manifest);
+        const addressIndex = mainAddressIndex(manifest);
         const other = addressCollision(addressIndex, { concept: concept.id, id }, identity.permalink);
         if (other) {
           const otherConcept = findConcept(runtime.concepts, other.concept);
@@ -1093,8 +1095,8 @@ export function createContentRoutes(runtime: CairnRuntime, deps: ContentRoutesDe
             },
           ];
         }
-      } catch (err) {
-        log.warn('github.unreachable', { scope: 'edit-advisories', error: String(err) });
+      } catch {
+        // A malformed-date entry that cannot resolve its permalink degrades to no advisory, fail open.
       }
     }