@drawnagency/primitives 0.1.116 → 0.1.117

package/dist/components/shell/EditorShell.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EditorShell.d.ts","sourceRoot":"","sources":["../../../src/components/shell/EditorShell.tsx"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAejD,OAAO,EAAoC,KAAK,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAuDtF,OAAO,KAAK,EAAE,eAAe,EAA2D,MAAM,oBAAoB,CAAC;AA6DnH,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AA8BxD,UAAU,KAAK;IACb,OAAO,EAAE,MAAM,CAAC;IAIhB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,QAAQ,EAAE,CAAC;IACtB,YAAY,EAAE;QACZ,KAAK,EAAE,OAAO,CAAC;QACf,aAAa,EAAE,OAAO,CAAC;QACvB,YAAY,EAAE,OAAO,CAAC;QACtB,cAAc,EAAE,OAAO,CAAC;QACxB,kBAAkB,EAAE,OAAO,CAAC;QAC5B,cAAc,EAAE,OAAO,CAAC;KACzB,CAAC;IACF,WAAW,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,GAAG,QAAQ,CAAA;KAAE,GAAG,IAAI,CAAC;IAIhE,sBAAsB,CAAC,EAAE,OAAO,CAAC;IAKjC,eAAe,CAAC,EAAE,eAAe,GAAG,IAAI,CAAC;CAC1C;AAQD,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAClC,OAAO,EACP,YAAY,EACZ,MAAM,EACN,SAAS,EAAE,gBAAgB,EAC3B,YAAY,EACZ,WAAW,EACX,sBAA8B,EAC9B,eAAe,GAChB,EAAE,KAAK,2CAiuEP;AA8ED;6EAC6E;AAC7E,wBAAgB,kBAAkB,CAChC,YAAY,EAAE,WAAW,CAAC,YAAY,CAAC,EACvC,aAAa,EAAE,MAAM,GAAG,IAAI,EAC5B,eAAe,EAAE,MAAM,GAAG,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAK/B"}
+{"version":3,"file":"EditorShell.d.ts","sourceRoot":"","sources":["../../../src/components/shell/EditorShell.tsx"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAejD,OAAO,EAAoC,KAAK,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAuDtF,OAAO,KAAK,EAAE,eAAe,EAA2D,MAAM,oBAAoB,CAAC;AA6DnH,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AA8BxD,UAAU,KAAK;IACb,OAAO,EAAE,MAAM,CAAC;IAIhB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,QAAQ,EAAE,CAAC;IACtB,YAAY,EAAE;QACZ,KAAK,EAAE,OAAO,CAAC;QACf,aAAa,EAAE,OAAO,CAAC;QACvB,YAAY,EAAE,OAAO,CAAC;QACtB,cAAc,EAAE,OAAO,CAAC;QACxB,kBAAkB,EAAE,OAAO,CAAC;QAC5B,cAAc,EAAE,OAAO,CAAC;KACzB,CAAC;IACF,WAAW,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,GAAG,QAAQ,CAAA;KAAE,GAAG,IAAI,CAAC;IAIhE,sBAAsB,CAAC,EAAE,OAAO,CAAC;IAKjC,eAAe,CAAC,EAAE,eAAe,GAAG,IAAI,CAAC;CAC1C;AAQD,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAClC,OAAO,EACP,YAAY,EACZ,MAAM,EACN,SAAS,EAAE,gBAAgB,EAC3B,YAAY,EACZ,WAAW,EACX,sBAA8B,EAC9B,eAAe,GAChB,EAAE,KAAK,2CAsvEP;AA8ED;6EAC6E;AAC7E,wBAAgB,kBAAkB,CAChC,YAAY,EAAE,WAAW,CAAC,YAAY,CAAC,EACvC,aAAa,EAAE,MAAM,GAAG,IAAI,EAC5B,eAAe,EAAE,MAAM,GAAG,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAK/B"}

package/dist/hooks/useEditorPublish.d.ts

@@ -38,6 +38,10 @@ interface PublishDeps {
     onShasUpdated: (savedSha: string | null, mainSha: string | null) => void;
     onPublishComplete?: (sha: string) => void;
     getBaseVersion: () => string | null;
+    /** The main commit this editor's content was read at. Sent as `mainVersion`
+     *  with a no-draft save, so a publish landed by someone else since this tab
+     *  loaded 409s into recoverConflict instead of committing a stale view. */
+    getMainVersion?: () => string | null;
     /** Injected by EditorShell. On a 409 (concurrent edit) the save calls this to
      *  re-fetch the fresh draft, rebase local unsaved work on top, and refresh the
      *  optimistic-concurrency base (savedShaRef). Returns true when recovery
@@ -77,6 +81,10 @@ interface PublishDeps {
     /** Committed document manifest, merged with the staged entries this save
      *  commits. Optional so pre-documents callers keep compiling. */
     documentManifest?: DocumentManifest;
+    /** Optional ref mirror of `documentManifest`, read at save time — same
+     *  contract as mediaManifestRef: the 409 retry sees recoverConflict's
+     *  refreshed sidecar instead of this render's pre-conflict copy. */
+    documentManifestRef?: React.RefObject<DocumentManifest | null>;
     pendingDocuments?: {
         id: string;
         entry: DocumentManifestEntry;
@@ -92,7 +100,7 @@ interface PublishDeps {
     onDocumentsDeleted?: (ids: string[]) => void;
 }
 export type PublishAction = "idle" | "saving" | "publishing";
-export declare function useEditorPublish({ flushNow, cancelPendingFlush, isConfigDirty, clearConfigDirty, siteIndexRef, siteConfig, tagsDegraded, sections, deletedSectionIds, onSuccess, mediaManifest, mediaManifestRef, manifestDirty, clearManifestDirty, pendingMediaItems, pendingMediaDeletions, onMediaPublished, onShasUpdated, onPublishComplete, getBaseVersion, recoverConflict, onBaselineCommitted, onSaveWarnings, saveChunkBudget, savingRef, getEditGeneration, documentManifest, pendingDocuments, pendingDocumentDeletions, onDocumentsPublished, onDocumentsDeleted, }: PublishDeps): {
+export declare function useEditorPublish({ flushNow, cancelPendingFlush, isConfigDirty, clearConfigDirty, siteIndexRef, siteConfig, tagsDegraded, sections, deletedSectionIds, onSuccess, mediaManifest, mediaManifestRef, manifestDirty, clearManifestDirty, pendingMediaItems, pendingMediaDeletions, onMediaPublished, onShasUpdated, onPublishComplete, getBaseVersion, getMainVersion, recoverConflict, onBaselineCommitted, onSaveWarnings, saveChunkBudget, savingRef, getEditGeneration, documentManifest, documentManifestRef, pendingDocuments, pendingDocumentDeletions, onDocumentsPublished, onDocumentsDeleted, }: PublishDeps): {
     publishAction: PublishAction;
     publishFeedback: import("./useNotice").NoticeState | null;
     saveProgress: string | null;

package/dist/hooks/useEditorPublish.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useEditorPublish.d.ts","sourceRoot":"","sources":["../../src/hooks/useEditorPublish.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useEditorPublish.d.ts","sourceRoot":"","sources":["../../src/hooks/useEditorPublish.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drawnagency/primitives",
-  "version": "0.1.116",
+  "version": "0.1.117",
   "description": "Browser-safe foundation of the Brand Portal framework: Zod schemas, section components, editor shell, hooks, pure libs, collab contract, document engine.",
   "type": "module",
   "exports": {

package/src/components/shell/EditorShell.tsx

@@ -274,6 +274,11 @@ export default function EditorShell({
   useEffect(() => {
     savedShaRef.current = savedSha;
   }, [savedSha]);
+  // Same for main: a no-draft save sends it as `mainVersion`.
+  const mainShaRef = useRef<string | null>(null);
+  useEffect(() => {
+    mainShaRef.current = mainSha;
+  }, [mainSha]);
   const [changedSectionIds, setChangedSectionIds] = useState<Set<string>>(new Set());
   const [mainIndex, setMainIndex] = useState<SiteIndex | null>(null);
   // Ref mirrors of the diff state, so save-time callbacks (which run inside a
@@ -652,6 +657,13 @@ export default function EditorShell({
         : null;
       if (rebasedManifest) setMediaManifest(rebasedManifest);
       if (remote.mediaManifest) baseMediaManifestRef.current = remote.mediaManifest;
+      // The document sidecar only ever holds committed entries (staged uploads
+      // and pending deletions live in the pipeline), so the remote one replaces
+      // it outright — no rebase. Skipping it left a peer's documents missing
+      // from this tab and, via the retry's cache write, from every reload.
+      if (remote.documentManifest) setDocumentManifest(remote.documentManifest);
+      // No draft: the fetch read main, which is now what this view is based on.
+      if (remote.savedBranchSha === null) setMainSha(remote.sha);
 
       setSections(mergedSections);
       setSiteIndex(mergedIndex);
@@ -663,7 +675,9 @@ export default function EditorShell({
       // (and onBaselineCommitted reads the diff refs right after it), before
       // React flushes the setState calls above into their mirror effects.
       savedShaRef.current = remote.savedBranchSha;
+      if (remote.savedBranchSha === null) mainShaRef.current = remote.sha;
       if (rebasedManifest) mediaManifestRef.current = rebasedManifest;
+      if (remote.documentManifest) documentManifestRef.current = remote.documentManifest;
       sectionsRef.current = mergedSections;
       siteIndexRef.current = mergedIndex;
       changedSectionIdsRef.current = new Set(remote.changedSectionIds);
@@ -774,6 +788,11 @@ export default function EditorShell({
         mediaManifestRef.current = rebasedManifest;
         baseMediaManifestRef.current = remote.mediaManifest;
       }
+      // Committed-only, so replaced outright — see recoverConflict.
+      if (remote.documentManifest) {
+        setDocumentManifest(remote.documentManifest);
+        documentManifestRef.current = remote.documentManifest;
+      }
       setSections(result.sections);
       setSiteIndex(result.index);
       setTagsDegraded(remote.tagsDegraded);
@@ -999,6 +1018,7 @@ export default function EditorShell({
     mediaManifest,
     mediaManifestRef,
     documentManifest: documentManifest ?? {},
+    documentManifestRef,
     pendingDocuments: mediaPipeline.pendingDocuments,
     onDocumentsPublished: (ids) => { void mediaPipeline.publishDocuments(ids); },
     pendingDocumentDeletions: mediaPipeline.pendingDocumentDeletions,
@@ -1054,6 +1074,7 @@ export default function EditorShell({
     },
     onPublishComplete: buildStatus.startTracking,
     getBaseVersion: () => savedShaRef.current,
+    getMainVersion: () => mainShaRef.current,
     recoverConflict,
     // C1: re-prime the clean content-cache baseline after every successful plain
     // save (discardSavedChanges just cleared it). The hook hands us the COMMITTED

package/src/hooks/useEditorPublish.ts

@@ -93,6 +93,10 @@ interface PublishDeps {
   // no draft exists yet). Sent with saves so the server can 409 on a concurrent
   // edit instead of silently overwriting it. Read at save time (latest value).
   getBaseVersion: () => string | null;
+  /** The main commit this editor's content was read at. Sent as `mainVersion`
+   *  with a no-draft save, so a publish landed by someone else since this tab
+   *  loaded 409s into recoverConflict instead of committing a stale view. */
+  getMainVersion?: () => string | null;
   /** Injected by EditorShell. On a 409 (concurrent edit) the save calls this to
    *  re-fetch the fresh draft, rebase local unsaved work on top, and refresh the
    *  optimistic-concurrency base (savedShaRef). Returns true when recovery
@@ -125,6 +129,10 @@ interface PublishDeps {
   /** Committed document manifest, merged with the staged entries this save
    *  commits. Optional so pre-documents callers keep compiling. */
   documentManifest?: DocumentManifest;
+  /** Optional ref mirror of `documentManifest`, read at save time — same
+   *  contract as mediaManifestRef: the 409 retry sees recoverConflict's
+   *  refreshed sidecar instead of this render's pre-conflict copy. */
+  documentManifestRef?: React.RefObject<DocumentManifest | null>;
   pendingDocuments?: { id: string; entry: DocumentManifestEntry }[];
   /** Ids of COMMITTED documents the editor has deleted but not yet saved. They
    *  ride the final request as `deletedDocumentIds`; a staged-but-uncommitted
@@ -166,6 +174,7 @@ export function useEditorPublish({
   onShasUpdated,
   onPublishComplete,
   getBaseVersion,
+  getMainVersion,
   recoverConflict,
   onBaselineCommitted,
   onSaveWarnings,
@@ -173,6 +182,7 @@ export function useEditorPublish({
   savingRef,
   getEditGeneration,
   documentManifest = {},
+  documentManifestRef,
   pendingDocuments = [],
   pendingDocumentDeletions = [],
   onDocumentsPublished,
@@ -358,6 +368,9 @@ export function useEditorPublish({
     }
 
     let baseVersion = getBaseVersion();
+    const mainVersion = getMainVersion?.() ?? null;
+    // Only the request that forks the draft carries it; later chunks have a base.
+    const pinMain = () => (baseVersion === null && mainVersion !== null ? { mainVersion } : {});
     const uploadedItems: MediaItem[] = [];
     const totalUploads = gathered.mediaUploads.length;
 
@@ -413,6 +426,7 @@ export function useEditorPublish({
         }
         const data = await postSave({
           baseVersion,
+          ...pinMain(),
           media: {
             uploads: chunk.map(({ id, path, base64 }) => ({
               // content-ops ignores `item` for blob emission; the folder segment
@@ -441,6 +455,7 @@ export function useEditorPublish({
         for (const { id, entry } of manifestOnly) committedDocuments[id] = entry;
         const data = await postSave({
           baseVersion,
+          ...pinMain(),
           documentManifest: documentManifestToSend(),
         });
         baseVersion = data.sha;
@@ -461,6 +476,7 @@ export function useEditorPublish({
         };
         const data = await postSave({
           baseVersion,
+          ...pinMain(),
           media: { uploads: chunk, deletions: [], manifest },
         });
         baseVersion = data.sha;
@@ -486,6 +502,7 @@ export function useEditorPublish({
         sections: dirty.map(({ sectionId, content }) => ({ id: sectionId, content })),
         siteIndex,
         baseVersion,
+        ...pinMain(),
         ...(args.deletedSectionIds?.length ? { deletedSectionIds: args.deletedSectionIds } : {}),
         ...(args.isConfigDirty() ? { siteConfig: args.siteConfig } : {}),
         ...(gathered.hasMediaChanges ? {
@@ -607,7 +624,7 @@ export function useEditorPublish({
       // Read through the ref (when the shell supplies one) so the 409 retry
       // below sees recoverConflict's rebased manifest, not this render's copy.
       mediaManifest: mediaManifestRef?.current ?? mediaManifest,
-      documentManifest,
+      documentManifest: documentManifestRef?.current ?? documentManifest,
       pendingDocuments,
       pendingDocumentDeletions,
       saveChunkBudget,