canopycms 0.0.61 → 0.0.63

package/dist/editor/hooks/useBranchManager.js

@@ -12,30 +12,93 @@ import { BRANCHES_KEY, fetchBranches, useBranchesData } from './useBranchesData.
 // which breaks adopters' production `next build` of the editor bundle.
 // paths/branch-name.ts is the dependency-free home of sanitizeBranchName.
 import { sanitizeBranchName } from '../../paths/branch-name.js';
+/**
+ * Wire a confirm modal's exits so exactly ONE of {confirmed, dismissed} runs,
+ * whichever happens first.
+ *
+ * Neither Mantine callback is the "user declined" signal on its own, in
+ * opposite directions: `onCancel` does NOT fire for an Escape or overlay
+ * dismissal (so a caller waiting on it alone waits forever), while `onClose`
+ * fires for EVERY exit including a confirm -- Mantine closes the modal right
+ * after calling `onConfirm`, and does not await it, so a bare `onClose`
+ * handler would settle the caller's promise before the confirmed work had
+ * even run. Claiming the first exit resolves both.
+ */
+const confirmModalHandlers = (onConfirm, onDismiss) => {
+    let settled = false;
+    const claim = () => {
+        if (settled)
+            return false;
+        settled = true;
+        return true;
+    };
+    return {
+        onConfirm: () => {
+            // Not awaited by Mantine either way; the handlers below own their own
+            // error reporting, so nothing here can reject.
+            if (claim())
+                void onConfirm();
+        },
+        onCancel: () => {
+            if (claim())
+                onDismiss();
+        },
+        onClose: () => {
+            if (claim())
+                onDismiss();
+        },
+    };
+};
 /**
  * Helper function to show confirmation modal for branch submit action.
  */
-const showSubmitConfirmation = (branchName, onConfirm, onCancel) => {
+const showSubmitConfirmation = (branchName, onConfirm, onDismiss) => {
     modals.openConfirmModal({
         title: 'Submit Branch for Review',
         children: (_jsx(Text, { size: "sm", style: { whiteSpace: 'pre-line' }, children: `Are you sure you want to submit "${branchName}" for review?\n\nThis will:\n• Create a pull request for review\n• Change the branch status to "submitted"\n• Notify reviewers of pending changes` })),
         labels: { confirm: 'Submit Branch', cancel: 'Cancel' },
         confirmProps: { color: 'brand' },
-        onCancel,
-        onConfirm,
+        ...confirmModalHandlers(onConfirm, onDismiss),
     });
 };
 /**
  * Helper function to show confirmation modal for branch withdraw action.
  */
-const showWithdrawConfirmation = (branchName, onConfirm, onCancel) => {
+const showWithdrawConfirmation = (branchName, onConfirm, onDismiss) => {
     modals.openConfirmModal({
         title: 'Withdraw Branch from Review',
         children: (_jsx(Text, { size: "sm", style: { whiteSpace: 'pre-line' }, children: `Are you sure you want to withdraw "${branchName}" from review?\n\nThis will:\n• Convert the pull request to a draft\n• Change the branch status back to "editing"\n• Remove from review queue` })),
         labels: { confirm: 'Withdraw Branch', cancel: 'Cancel' },
         confirmProps: { color: 'orange' },
-        onCancel,
-        onConfirm,
+        ...confirmModalHandlers(onConfirm, onDismiss),
+    });
+};
+/**
+ * Helper function to show confirmation modal for branch delete action.
+ *
+ * Unlike submit/withdraw (both reversible), delete is irreversible -- it
+ * unlinks branch.json, removes the clone, and removes the branch head from
+ * the local git mirror. Before this, `handleDelete` below called
+ * `apiClient.branches.delete` immediately on click with no confirmation
+ * anywhere in the chain (BranchManager.tsx's delete button calls `onDelete`
+ * directly), while submit and withdraw -- both reversible -- each went
+ * through this same `modals.openConfirmModal` pattern. This closes that gap;
+ * `color: 'red'` marks it as the destructive one, matching the button's own
+ * color in BranchManager.tsx.
+ */
+const showDeleteConfirmation = (branchName, onConfirm, onDismiss) => {
+    modals.openConfirmModal({
+        title: 'Delete Branch',
+        children: (_jsx(Text, { size: "sm", style: { whiteSpace: 'pre-line' }, children: `Are you sure you want to delete "${branchName}"?\n\nThis will:\n• Permanently remove the branch and its clone\n• Discard any unsaved or unmerged changes\n\nThis cannot be undone.` })),
+        labels: { confirm: 'Delete Branch', cancel: 'Cancel' },
+        // data-testid is load-bearing, not decoration: the e2e helper
+        // (apps/test-app/e2e/fixtures/branch-page.ts's deleteBranch) already
+        // anticipated a delete confirmation and clicks
+        // [data-testid="confirm-delete-branch"] when it appears. Without this the
+        // modal opens, nothing dismisses it, and the branch never disappears --
+        // which is exactly how the e2e suite caught this confirmation being added.
+        confirmProps: { color: 'red', 'data-testid': 'confirm-delete-branch' },
+        ...confirmModalHandlers(onConfirm, onDismiss),
     });
 };
 /**
@@ -220,7 +283,13 @@ export function useBranchManager(options) {
                 finally {
                     options.setBusy(false);
                 }
-            }, () => reject(new Error('User cancelled submit')));
+            }, 
+            // Dismissal is not an error. Rejecting here meant clicking Cancel
+            // logged a console error at the only call site (Editor.tsx catches
+            // these into console.error), which is both noise and a trip hazard
+            // for the CI=1 stray-console gate. Settled once, by onCancel OR
+            // onClose, so an Escape/overlay dismissal can't leave this pending.
+            () => resolve());
         });
     };
     const handleWithdraw = async (branchNameToWithdraw) => {
@@ -246,7 +315,13 @@ export function useBranchManager(options) {
                 finally {
                     options.setBusy(false);
                 }
-            }, () => reject(new Error('User cancelled withdraw')));
+            }, 
+            // Dismissal is not an error. Rejecting here meant clicking Cancel
+            // logged a console error at the only call site (Editor.tsx catches
+            // these into console.error), which is both noise and a trip hazard
+            // for the CI=1 stray-console gate. Settled once, by onCancel OR
+            // onClose, so an Escape/overlay dismissal can't leave this pending.
+            () => resolve());
         });
     };
     const handleRequestChanges = async (branchNameForChanges) => {
@@ -268,24 +343,38 @@ export function useBranchManager(options) {
         }
     };
     const handleDelete = async (branchNameToDelete) => {
-        options.setBusy(true);
-        try {
-            const result = await apiClient.branches.delete({
-                branch: branchNameToDelete,
-            });
-            if (!result.ok) {
-                throw new Error(result.error || 'Failed to delete branch');
-            }
-            notifications.show({ message: 'Branch deleted', color: 'green' });
-            await loadBranches();
-        }
-        catch (err) {
-            const message = err instanceof Error ? err.message : 'Failed to delete branch';
-            notifications.show({ message, color: 'red' });
-        }
-        finally {
-            options.setBusy(false);
-        }
+        return new Promise((resolve) => {
+            showDeleteConfirmation(branchNameToDelete, async () => {
+                options.setBusy(true);
+                try {
+                    const result = await apiClient.branches.delete({
+                        branch: branchNameToDelete,
+                    });
+                    if (!result.ok) {
+                        throw new Error(result.error || 'Failed to delete branch');
+                    }
+                    notifications.show({ message: 'Branch deleted', color: 'green' });
+                    await loadBranches();
+                }
+                catch (err) {
+                    const message = err instanceof Error ? err.message : 'Failed to delete branch';
+                    notifications.show({ message, color: 'red' });
+                }
+                finally {
+                    options.setBusy(false);
+                    // Resolve regardless of API success/failure, matching the
+                    // pre-confirmation behavior (errors were shown as a toast, not
+                    // rethrown). Cancellation resolves too -- see below.
+                    resolve();
+                }
+            }, 
+            // Dismissal is not an error. Rejecting here meant clicking Cancel
+            // logged a console error at the only call site (Editor.tsx catches
+            // these into console.error), which is both noise and a trip hazard
+            // for the CI=1 stray-console gate. Settled once, by onCancel OR
+            // onClose, so an Escape/overlay dismissal can't leave this pending.
+            () => resolve());
+        });
     };
     const handleReloadBranchData = async () => {
         await loadBranches();

package/dist/editor/hooks/useBranchManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"useBranchManager.js","sourceRoot":"","sources":["../../../src/editor/hooks/useBranchManager.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"useBranchManager.js","sourceRoot":"","sources":["../../../src/editor/hooks/useBranchManager.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAA;;AAEZ,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,KAAK,CAAA;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AAKtD,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AACzC,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAChF,0EAA0E;AAC1E,2EAA2E;AAC3E,uEAAuE;AACvE,0EAA0E;AAC1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAE5D;;;;;;;;;;;GAWG;AACH,MAAM,oBAAoB,GAAG,CAAC,SAA8B,EAAE,SAAqB,EAAE,EAAE;IACrF,IAAI,OAAO,GAAG,KAAK,CAAA;IACnB,MAAM,KAAK,GAAG,GAAY,EAAE;QAC1B,IAAI,OAAO;YAAE,OAAO,KAAK,CAAA;QACzB,OAAO,GAAG,IAAI,CAAA;QACd,OAAO,IAAI,CAAA;IACb,CAAC,CAAA;IACD,OAAO;QACL,SAAS,EAAE,GAAG,EAAE;YACd,sEAAsE;YACtE,+CAA+C;YAC/C,IAAI,KAAK,EAAE;gBAAE,KAAK,SAAS,EAAE,CAAA;QAC/B,CAAC;QACD,QAAQ,EAAE,GAAG,EAAE;YACb,IAAI,KAAK,EAAE;gBAAE,SAAS,EAAE,CAAA;QAC1B,CAAC;QACD,OAAO,EAAE,GAAG,EAAE;YACZ,IAAI,KAAK,EAAE;gBAAE,SAAS,EAAE,CAAA;QAC1B,CAAC;KACF,CAAA;AACH,CAAC,CAAA;AAED;;GAEG;AACH,MAAM,sBAAsB,GAAG,CAC7B,UAAkB,EAClB,SAA8B,EAC9B,SAAqB,EACrB,EAAE;IACF,MAAM,CAAC,gBAAgB,CAAC;QACtB,KAAK,EAAE,0BAA0B;QACjC,QAAQ,EAAE,CACR,KAAC,IAAI,IAAC,IAAI,EAAC,IAAI,EAAC,KAAK,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,YAC9C,oCAAoC,UAAU,mJAAmJ,GAC7L,CACR;QACD,MAAM,EAAE,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,QAAQ,EAAE;QACtD,YAAY,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE;QAChC,GAAG,oBAAoB,CAAC,SAAS,EAAE,SAAS,CAAC;KAC9C,CAAC,CAAA;AACJ,CAAC,CAAA;AAED;;GAEG;AACH,MAAM,wBAAwB,GAAG,CAC/B,UAAkB,EAClB,SAA8B,EAC9B,SAAqB,EACrB,EAAE;IACF,MAAM,CAAC,gBAAgB,CAAC;QACtB,KAAK,EAAE,6BAA6B;QACpC,QAAQ,EAAE,CACR,KAAC,IAAI,IAAC,IAAI,EAAC,IAAI,EAAC,KAAK,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,YAC9C,sCAAsC,UAAU,+IAA+I,GAC3L,CACR;QACD,MAAM,EAAE,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,EAAE,QAAQ,EAAE;QACxD,YAAY,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE;QACjC,GAAG,oBAAoB,CAAC,SAAS,EAAE,SAAS,CAAC;KAC9C,CAAC,CAAA;AACJ,CAAC,CAAA;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,sBAAsB,GAAG,CAC7B,UAAkB,EAClB,SAA8B,EAC9B,SAAqB,EACrB,EAAE;IACF,MAAM,CAAC,gBAAgB,CAAC;QACtB,KAAK,EAAE,eAAe;QACtB,QAAQ,EAAE,CACR,KAAC,IAAI,IAAC,IAAI,EAAC,IAAI,EAAC,KAAK,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,YAC9C,oCAAoC,UAAU,sIAAsI,GAChL,CACR;QACD,MAAM,EAAE,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,QAAQ,EAAE;QACtD,8DAA8D;QAC9D,qEAAqE;QACrE,+CAA+C;QAC/C,0EAA0E;QAC1E,wEAAwE;QACxE,2EAA2E;QAC3E,YAAY,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,aAAa,EAAE,uBAAuB,EAAE;QACtE,GAAG,oBAAoB,CAAC,SAAS,EAAE,SAAS,CAAC;KAC9C,CAAC,CAAA;AACJ,CAAC,CAAA;AAsFD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,MAAM,UAAU,gBAAgB,CAAC,OAAgC;IAC/D,MAAM,SAAS,GAAG,YAAY,EAAE,CAAA;IAChC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,YAAY,EAAE,CAAA;IAC/C,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,QAAQ,CAAS,OAAO,CAAC,aAAa,CAAC,CAAA;IAC3E,yEAAyE;IACzE,wEAAwE;IACxE,qEAAqE;IACrE,MAAM,EACJ,IAAI,EAAE,YAAY,EAClB,KAAK,EAAE,aAAa,EACpB,YAAY,EAAE,oBAAoB,GACnC,GAAG,eAAe,CAAC,SAAS,CAAC,CAAA;IAC9B,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,YAAY,EAAE,QAAQ,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,CAAA;IAE5E,8EAA8E;IAC9E,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,UAAU,IAAI,YAAY,EAAE,aAAa,EAAE,CAAC;YAC/C,aAAa,CAAC,YAAY,CAAC,aAAa,CAAC,CAAA;QAC3C,CAAC;IACH,CAAC,EAAE,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC,CAAA;IAE9B,4EAA4E;IAC5E,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,aAAa,EAAE,CAAC;YAClB,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;YAC5B,MAAM,OAAO,GACX,aAAa,YAAY,KAAK,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,yBAAyB,CAAA;YACpF,0EAA0E;YAC1E,8DAA8D;YAC9D,aAAa,CAAC,IAAI,CAAC;gBACjB,EAAE,EAAE,6BAA6B;gBACjC,OAAO;gBACP,KAAK,EAAE,KAAK;gBACZ,SAAS,EAAE,KAAK;aACjB,CAAC,CAAA;QACJ,CAAC;aAAM,IAAI,YAAY,EAAE,CAAC;YACxB,uEAAuE;YACvE,0EAA0E;YAC1E,aAAa,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAA;QACnD,CAAC;IACH,CAAC,EAAE,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC,CAAA;IAEjC,0EAA0E;IAC1E,4EAA4E;IAC5E,SAAS,CAAC,GAAG,EAAE;QACb,OAAO,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAA;QACrC,yJAAyJ;IAC3J,CAAC,EAAE,CAAC,oBAAoB,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAA;IAE3C,wEAAwE;IACxE,2EAA2E;IAC3E,mEAAmE;IACnE,2EAA2E;IAC3E,MAAM,aAAa,GACjB,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC;QAC3C,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,kBAAkB,CAAC,UAAU,CAAC,CAAC,CAAA;IAEjE,+CAA+C;IAC/C,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,EAAE;QACnC,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACxB,MAAM,cAAc,GAAG,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAA;YACpE,MAAM,eAAe,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAA;YACxE,OAAO;gBACL,IAAI,EAAE,CAAC,CAAC,IAAI;gBACZ,MAAM,EAAE,CAAC,CAAC,MAAM;gBAChB,SAAS,EAAE,CAAC,CAAC,SAAS;gBACtB,SAAS,EAAE,CAAC,CAAC,SAAS;gBACtB,MAAM,EAAE;oBACN,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,YAAY;oBAC5B,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,aAAa;iBAC/B;gBACD,cAAc,EAAE,CAAC,CAAC,cAAc;gBAChC,iBAAiB,EAAE,CAAC,CAAC,iBAAiB;gBACtC,gBAAgB,EAAE,CAAC,CAAC,gBAAgB;gBACpC,QAAQ,EAAE,CAAC,CAAC,QAAQ;gBACpB,UAAU,EAAE,CAAC,CAAC,UAAU;gBACxB,iBAAiB,EAAE,CAAC,CAAC,iBAAiB;gBACtC,cAAc,EAAE,CAAC,CAAC,cAAc;gBAChC,aAAa,EAAE,CAAC,CAAC,aAAa;gBAC9B,YAAY,EAAE,eAAe;gBAC7B,qEAAqE;gBACrE,qEAAqE;gBACrE,sEAAsE;gBACtE,qEAAqE;gBACrE,uEAAuE;gBACvE,iEAAiE;gBACjE,oEAAoE;gBACpE,wEAAwE;gBACxE,6BAA6B;gBAC7B,WAAW,EAAE,CAAC,CAAC,WAAW,IAAI,IAAI;gBAClC,sEAAsE;gBACtE,oEAAoE;gBACpE,mEAAmE;gBACnE,uEAAuE;gBACvE,mEAAmE;gBACnE,oEAAoE;gBACpE,QAAQ,EAAE,CAAC,CAAC,QAAQ,IAAI,KAAK;gBAC7B,YAAY,EAAE,CAAC,CAAC,YAAY,IAAI,IAAI;gBACpC,aAAa,EAAE,CAAC,CAAC,aAAa,IAAI,IAAI;aACvC,CAAA;QACH,CAAC,CAAC,CAAA;IACJ,CAAC,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAA;IAE5C,2EAA2E;IAC3E,yEAAyE;IACzE,0EAA0E;IAC1E,uEAAuE;IACvE,mEAAmE;IACnE,0EAA0E;IAC1E,qEAAqE;IACrE,MAAM,YAAY,GAAG,KAAK,IAAI,EAAE;QAC9B,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QACrB,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,MAAM,aAAa,CAAC,SAAS,CAAC,CAAA;YAC5C,MAAM,YAAY,CAAC,YAAY,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAA;QAChE,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClB,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,yBAAyB,CAAA;YAC9E,0EAA0E;YAC1E,8DAA8D;YAC9D,aAAa,CAAC,IAAI,CAAC;gBACjB,EAAE,EAAE,6BAA6B;gBACjC,OAAO;gBACP,KAAK,EAAE,KAAK;gBACZ,SAAS,EAAE,KAAK;aACjB,CAAC,CAAA;QACJ,CAAC;gBAAS,CAAC;YACT,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QACxB,CAAC;IACH,CAAC,CAAA;IAED,MAAM,YAAY,GAAG,KAAK,EAAE,kBAA0B,EAAE,EAAE;QACxD,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC3C,sBAAsB,CACpB,kBAAkB,EAClB,KAAK,IAAI,EAAE;gBACT,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;gBACrB,IAAI,CAAC;oBACH,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC;wBAC7C,MAAM,EAAE,kBAAkB;qBAC3B,CAAC,CAAA;oBACF,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;wBACf,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,IAAI,yBAAyB,CAAC,CAAA;oBAC5D,CAAC;oBACD,aAAa,CAAC,IAAI,CAAC;wBACjB,OAAO,EAAE,6BAA6B;wBACtC,KAAK,EAAE,OAAO;qBACf,CAAC,CAAA;oBACF,MAAM,YAAY,EAAE,CAAA;oBACpB,OAAO,EAAE,CAAA;gBACX,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,yBAAyB,CAAA;oBAC9E,aAAa,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAA;oBAC7C,MAAM,CAAC,GAAG,CAAC,CAAA;gBACb,CAAC;wBAAS,CAAC;oBACT,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;gBACxB,CAAC;YACH,CAAC;YACD,kEAAkE;YAClE,mEAAmE;YACnE,mEAAmE;YACnE,gEAAgE;YAChE,oEAAoE;YACpE,GAAG,EAAE,CAAC,OAAO,EAAE,CAChB,CAAA;QACH,CAAC,CAAC,CAAA;IACJ,CAAC,CAAA;IAED,MAAM,cAAc,GAAG,KAAK,EAAE,oBAA4B,EAAE,EAAE;QAC5D,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC3C,wBAAwB,CACtB,oBAAoB,EACpB,KAAK,IAAI,EAAE;gBACT,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;gBACrB,IAAI,CAAC;oBACH,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC;wBAC/C,MAAM,EAAE,oBAAoB;qBAC7B,CAAC,CAAA;oBACF,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;wBACf,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,IAAI,2BAA2B,CAAC,CAAA;oBAC9D,CAAC;oBACD,aAAa,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;oBAClE,MAAM,YAAY,EAAE,CAAA;oBACpB,OAAO,EAAE,CAAA;gBACX,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,2BAA2B,CAAA;oBAChF,aAAa,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAA;oBAC7C,MAAM,CAAC,GAAG,CAAC,CAAA;gBACb,CAAC;wBAAS,CAAC;oBACT,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;gBACxB,CAAC;YACH,CAAC;YACD,kEAAkE;YAClE,mEAAmE;YACnE,mEAAmE;YACnE,gEAAgE;YAChE,oEAAoE;YACpE,GAAG,EAAE,CAAC,OAAO,EAAE,CAChB,CAAA;QACH,CAAC,CAAC,CAAA;IACJ,CAAC,CAAA;IAED,MAAM,oBAAoB,GAAG,KAAK,EAAE,oBAA4B,EAAE,EAAE;QAClE,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QACrB,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,EAAE,oBAAoB,EAAE,CAAC,CAAA;YACxF,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;gBACf,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,IAAI,2BAA2B,CAAC,CAAA;YAC9D,CAAC;YACD,aAAa,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,mBAAmB,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAA;YACrE,MAAM,YAAY,EAAE,CAAA;QACtB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,2BAA2B,CAAA;YAChF,aAAa,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAA;QAC/C,CAAC;gBAAS,CAAC;YACT,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QACxB,CAAC;IACH,CAAC,CAAA;IAED,MAAM,YAAY,GAAG,KAAK,EAAE,kBAA0B,EAAE,EAAE;QACxD,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;YACnC,sBAAsB,CACpB,kBAAkB,EAClB,KAAK,IAAI,EAAE;gBACT,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;gBACrB,IAAI,CAAC;oBACH,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC;wBAC7C,MAAM,EAAE,kBAAkB;qBAC3B,CAAC,CAAA;oBACF,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;wBACf,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,IAAI,yBAAyB,CAAC,CAAA;oBAC5D,CAAC;oBACD,aAAa,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,gBAAgB,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAA;oBACjE,MAAM,YAAY,EAAE,CAAA;gBACtB,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,yBAAyB,CAAA;oBAC9E,aAAa,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAA;gBAC/C,CAAC;wBAAS,CAAC;oBACT,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;oBACtB,0DAA0D;oBAC1D,+DAA+D;oBAC/D,qDAAqD;oBACrD,OAAO,EAAE,CAAA;gBACX,CAAC;YACH,CAAC;YACD,kEAAkE;YAClE,mEAAmE;YACnE,mEAAmE;YACnE,gEAAgE;YAChE,oEAAoE;YACpE,GAAG,EAAE,CAAC,OAAO,EAAE,CAChB,CAAA;QACH,CAAC,CAAC,CAAA;IACJ,CAAC,CAAA;IAED,MAAM,sBAAsB,GAAG,KAAK,IAAI,EAAE;QACxC,MAAM,YAAY,EAAE,CAAA;IACtB,CAAC,CAAA;IAED,+BAA+B;IAC/B,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,OAAO,MAAM,KAAK,WAAW;YAAE,OAAM;QACzC,IAAI,CAAC,UAAU;YAAE,OAAM;QACvB,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QACzC,MAAM,OAAO,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;QAC9C,IAAI,OAAO,KAAK,UAAU,EAAE,CAAC;YAC3B,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAA;YAC1C,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,EAAE,EAAE,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAA;QACrD,CAAC;IACH,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAA;IAEhB,OAAO;QACL,UAAU;QACV,aAAa;QACb,QAAQ;QACR,eAAe;QACf,aAAa;QACb,YAAY;QACZ,cAAc;QACd,oBAAoB;QACpB,YAAY;QACZ,sBAAsB;QACtB,YAAY;KACb,CAAA;AACH,CAAC"}

package/dist/editor/hooks/useDraftManager.d.ts

@@ -16,6 +16,14 @@ export interface UseDraftManagerOptions {
     initialValues?: Record<string, FormValue>;
     loadEntry: (entry: EditorEntry) => Promise<FormValue>;
     saveEntry: (entry: EditorEntry, value: FormValue) => Promise<FormValue>;
+    /**
+     * The OCC version token currently held for an entry on the branch being
+     * shown (useEntryManager's `getEntryVersion`). Used to stamp each draft with
+     * the version it was based on, and to detect at save time that the token has
+     * since moved on. Optional: without it no base versions are recorded and
+     * conflict detection falls back entirely to the server's 409.
+     */
+    getEntryVersion?: (contentId: string) => number | undefined;
     setBusy: (busy: boolean) => void;
     /**
      * Fired (fire-and-forget) after a successful save. Lets callers refresh

package/dist/editor/hooks/useDraftManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useDraftManager.d.ts","sourceRoot":"","sources":["../../../src/editor/hooks/useDraftManager.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AAC5C,OAAO,KAAK,EAAa,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAchD;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,GAC7B,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACzB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KACxB,OAQF,CAAA;AAED,MAAM,WAAW,sBAAsB;IACrC,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,EAAE,MAAM,CAAA;IACpB,YAAY,EAAE,WAAW,GAAG,SAAS,CAAA;IACrC,OAAO,EAAE,WAAW,EAAE,CAAA;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;IACzC,SAAS,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,OAAO,CAAC,SAAS,CAAC,CAAA;IACrD,SAAS,EAAE,CAAC,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,SAAS,KAAK,OAAO,CAAC,SAAS,CAAC,CAAA;IACvE,OAAO,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAA;IAChC;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,IAAI,CAAA;CACrB;AAED,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;IACjC,SAAS,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,CAAA;IAC1E,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;IACvC,eAAe,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,CAAA;IAChF,aAAa,EAAE,SAAS,GAAG,SAAS,CAAA;IACpC,WAAW,EAAE,SAAS,GAAG,SAAS,CAAA;IAClC,cAAc,EAAE,SAAS,GAAG,SAAS,CAAA;IACrC,aAAa,EAAE,MAAM,CAAA;IACrB,WAAW,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,WAAW,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IACxD,UAAU,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAC/B,mBAAmB,EAAE,MAAM,IAAI,CAAA;IAC/B,sBAAsB,EAAE,MAAM,IAAI,CAAA;IAClC,YAAY,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IACjC,eAAe,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAA;IAC/C,eAAe,EAAE,MAAM,OAAO,CAAA;IAC9B,UAAU,EAAE,MAAM,OAAO,CAAA;IACzB;;;;;;OAMG;IACH,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CACpC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,qBAAqB,CA6ZtF"}
+{"version":3,"file":"useDraftManager.d.ts","sourceRoot":"","sources":["../../../src/editor/hooks/useDraftManager.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AAC5C,OAAO,KAAK,EAAa,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAchD;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,GAC7B,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACzB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KACxB,OAQF,CAAA;AA0DD,MAAM,WAAW,sBAAsB;IACrC,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,EAAE,MAAM,CAAA;IACpB,YAAY,EAAE,WAAW,GAAG,SAAS,CAAA;IACrC,OAAO,EAAE,WAAW,EAAE,CAAA;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;IACzC,SAAS,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,OAAO,CAAC,SAAS,CAAC,CAAA;IACrD,SAAS,EAAE,CAAC,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,SAAS,KAAK,OAAO,CAAC,SAAS,CAAC,CAAA;IACvE;;;;;;OAMG;IACH,eAAe,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAA;IAC3D,OAAO,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAA;IAChC;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,IAAI,CAAA;CACrB;AAED,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;IACjC,SAAS,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,CAAA;IAC1E,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;IACvC,eAAe,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,CAAA;IAChF,aAAa,EAAE,SAAS,GAAG,SAAS,CAAA;IACpC,WAAW,EAAE,SAAS,GAAG,SAAS,CAAA;IAClC,cAAc,EAAE,SAAS,GAAG,SAAS,CAAA;IACrC,aAAa,EAAE,MAAM,CAAA;IACrB,WAAW,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,WAAW,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IACxD,UAAU,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAC/B,mBAAmB,EAAE,MAAM,IAAI,CAAA;IAC/B,sBAAsB,EAAE,MAAM,IAAI,CAAA;IAClC,YAAY,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IACjC,eAAe,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAA;IAC/C,eAAe,EAAE,MAAM,OAAO,CAAA;IAC9B,UAAU,EAAE,MAAM,OAAO,CAAA;IACzB;;;;;;OAMG;IACH,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CACpC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,qBAAqB,CA0nBtF"}

package/dist/editor/hooks/useDraftManager.js

@@ -31,6 +31,38 @@ export const shallowEqualRecord = (a, b) => {
     }
     return true;
 };
+/** Storage-format tag for the persisted draft envelope (see `parsePersistedDrafts`). */
+const DRAFTS_STORAGE_VERSION = 2;
+/**
+ * Read the persisted draft store, tolerating the legacy pre-v2 shape.
+ *
+ * LEGACY DECISION: a pre-v2 payload carries no base versions at all, and we
+ * cannot reconstruct them -- the draft may predate any number of other
+ * people's saves. Every legacy draft is therefore restored with base version
+ * `null` ("unknown"), which surfaces a confirmation on save instead of
+ * trusting it. Trusting it is the bug being fixed; silently DISCARDING it is a
+ * quieter version of the same bug, so the draft is kept and the user gets the
+ * decision. Nothing here re-stamps `null` (the reconcile effect only fills ids
+ * NOT already present), so the ONLY thing that clears it is that confirmation
+ * -- which is why blocking on it unconditionally, as an earlier version did,
+ * made a legacy draft unsaveable by any sequence of actions, forever.
+ * This only affects drafts written before this change; everything written
+ * after carries a real base version.
+ */
+const parsePersistedDrafts = (raw) => {
+    const parsed = JSON.parse(raw);
+    if (!parsed || typeof parsed !== 'object')
+        return { drafts: {}, baseVersions: {} };
+    if (parsed.v === DRAFTS_STORAGE_VERSION) {
+        const envelope = parsed;
+        return { drafts: envelope.drafts ?? {}, baseVersions: envelope.baseVersions ?? {} };
+    }
+    const drafts = parsed;
+    const baseVersions = {};
+    for (const id of Object.keys(drafts))
+        baseVersions[id] = null;
+    return { drafts, baseVersions };
+};
 /**
  * Custom hook for managing draft state (localStorage persistence, save/discard).
  *
@@ -70,6 +102,26 @@ export function useDraftManager(options) {
     // entry structurally impossible: there is no render where `errorState`
     // exists but belongs to the wrong entry.
     const [errorState, setErrorState] = useState(null);
+    // contentId -> the server version the CURRENT draft for that entry is based
+    // on. A ref rather than state: nothing renders from it, and the persist
+    // effect below must be able to read the value stamped moments earlier in the
+    // same commit. Three distinguishable states, all load-bearing:
+    //   number  - known base version
+    //   null    - draft restored from storage with no recorded base ("unknown")
+    //   absent  - draft created this session before any version was known
+    //             (adopter-supplied `initialValues`, or an edit that somehow
+    //             preceded the entry's first load); treated as safe, matching
+    //             the behavior before base versions existed.
+    const draftBaseVersionsRef = useRef({});
+    // The draft ids the reconcile effect below has already accounted for. It
+    // prunes on an observed present -> absent TRANSITION rather than on "not
+    // currently in drafts": the restore effect stamps base versions for ids
+    // whose `setDrafts` has only been QUEUED, so a prune keyed on the current
+    // `drafts` would delete every restored base version in the same commit that
+    // recorded it -- and the next pass would then re-stamp those drafts with the
+    // freshly loaded version, which is exactly the false "no conflict" this
+    // mechanism exists to prevent.
+    const reconciledDraftIdsRef = useRef(new Set());
     const storageKey = useMemo(() => `canopycms:drafts:${options.branchName}`, [options.branchName]);
     // Draft keys are now content IDs, not paths
     const currentId = options.currentEntry?.contentId;
@@ -111,6 +163,11 @@ export function useDraftManager(options) {
         if (prevBranchRef.current && prevBranchRef.current !== options.branchName) {
             setDrafts({});
             setLoadedValues({});
+            // Base versions are file mtimes, i.e. inherently per-branch -- carrying
+            // them across a switch would compare one branch's version against
+            // another's.
+            draftBaseVersionsRef.current = {};
+            reconciledDraftIdsRef.current = new Set();
         }
         prevBranchRef.current = options.branchName;
     }, [options.branchName]);
@@ -121,8 +178,15 @@ export function useDraftManager(options) {
         try {
             const raw = window.localStorage.getItem(storageKey);
             if (raw) {
-                const parsed = JSON.parse(raw);
-                setDrafts((prev) => ({ ...prev, ...parsed }));
+                const { drafts: restored, baseVersions } = parsePersistedDrafts(raw);
+                // Stamp the base versions BEFORE queueing the state update: the
+                // reconcile effect below only stamps ids it has never seen, so
+                // recording them here is what stops a restored draft from being
+                // (wrongly) stamped with the version of the load that happens next.
+                for (const id of Object.keys(restored)) {
+                    draftBaseVersionsRef.current[id] = baseVersions[id] ?? null;
+                }
+                setDrafts((prev) => ({ ...prev, ...restored }));
             }
         }
         catch (err) {
@@ -138,7 +202,15 @@ export function useDraftManager(options) {
             if (event.key !== storageKey || !event.newValue)
                 return;
             try {
-                const parsed = JSON.parse(event.newValue);
+                const { drafts: parsed, baseVersions } = parsePersistedDrafts(event.newValue);
+                // Same "only fill what's missing" rule as the merge below: an id we
+                // already have a base version for is one this tab is already drafting,
+                // so the other tab's base version must not overwrite ours.
+                for (const id of Object.keys(parsed)) {
+                    if (!(id in draftBaseVersionsRef.current)) {
+                        draftBaseVersionsRef.current[id] = baseVersions[id] ?? null;
+                    }
+                }
                 setDrafts((prev) => {
                     const missing = Object.keys(parsed).filter((id) => !(id in prev));
                     if (missing.length === 0)
@@ -164,6 +236,39 @@ export function useDraftManager(options) {
     useEffect(() => {
         draftsStorageKeyRef.current = storageKey;
     }, [drafts]);
+    // Keep the per-draft base versions in step with `drafts`.
+    //
+    // A draft key appearing here for the first time was created by the user
+    // editing an entry they had already opened, so the version currently held
+    // for that entry IS the version their edit is based on. Keys that disappear
+    // (saved, discarded, reloaded) drop their base version with them, so the
+    // next edit re-stamps against whatever the server returned most recently.
+    //
+    // Declared BEFORE the persist effect so both run in the same commit, in this
+    // order -- the persist effect reads the ref this one just updated.
+    useEffect(() => {
+        const bases = draftBaseVersionsRef.current;
+        const draftIds = new Set(Object.keys(drafts));
+        for (const id of draftIds) {
+            if (id in bases)
+                continue;
+            const version = options.getEntryVersion?.(id);
+            // Only record a base we actually know. Leaving it absent (rather than
+            // writing `null`) keeps "never loaded, so nothing to compare" distinct
+            // from "restored with no recorded base", and lets a later edit stamp a
+            // real version once one is known.
+            if (version !== undefined)
+                bases[id] = version;
+        }
+        for (const id of reconciledDraftIdsRef.current) {
+            if (!draftIds.has(id))
+                delete bases[id];
+        }
+        reconciledDraftIdsRef.current = draftIds;
+        // Deliberately keyed on `drafts` alone: `options.getEntryVersion` is a
+        // fresh closure every render, and only a drafts change can add or remove
+        // the keys this effect reconciles.
+    }, [drafts]);
     // Persist drafts to localStorage whenever they change
     useEffect(() => {
         if (typeof window === 'undefined')
@@ -171,7 +276,12 @@ export function useDraftManager(options) {
         if (draftsStorageKeyRef.current !== storageKey)
             return;
         try {
-            window.localStorage.setItem(storageKey, JSON.stringify(drafts));
+            const payload = {
+                v: DRAFTS_STORAGE_VERSION,
+                drafts,
+                baseVersions: draftBaseVersionsRef.current,
+            };
+            window.localStorage.setItem(storageKey, JSON.stringify(payload));
         }
         catch (err) {
             console.warn('Failed to persist drafts', err);
@@ -217,9 +327,98 @@ export function useDraftManager(options) {
             return shallowEqualRecord(prev.errors, next) ? prev : { entryId: prev.entryId, errors: next };
         });
     }, [effectiveValue, currentId, options.currentEntry?.schema, options.currentEntry?.format]);
+    /**
+     * The 409 presentation, in one place. The client-side stale-base check below
+     * and the server's own 409 response are the same situation from the user's
+     * point of view -- someone else's work is at risk -- so they must read
+     * identically, and "Reload" (now itself confirmed, see `handleReload`) is the
+     * recovery for both.
+     */
+    const showConflictNotification = () => {
+        notifications.show({
+            message: 'Content was modified by another editor. Reload to see the latest changes.',
+            color: 'yellow',
+            autoClose: getNotificationDuration(8000),
+            withCloseButton: true,
+        });
+    };
+    const draftBaseState = () => {
+        if (!currentId || drafts[currentId] === undefined)
+            return 'ok';
+        const currentVersion = options.getEntryVersion?.(currentId);
+        // No server version known for this entry at all -- nothing to compare
+        // against, so this check has no opinion (the server's 409 still applies).
+        if (currentVersion === undefined)
+            return 'ok';
+        const base = draftBaseVersionsRef.current[currentId];
+        if (base === undefined)
+            return 'ok';
+        if (base === null)
+            return 'unknown-base';
+        return base !== currentVersion ? 'stale' : 'ok';
+    };
+    /**
+     * One-time upgrade prompt for a draft carried across the pre-v2 -> v2
+     * storage change.
+     *
+     * `null` (unknown base) used to be treated exactly like a known-stale
+     * draft: blocked, with Reload and Discard the only exits -- both of which
+     * destroy the draft. And nothing ever re-stamped it, because the reconcile
+     * effect only fills ids NOT already in `bases` and `null` is present. So a
+     * legacy draft was visible, permanently unsaveable, and the only advice
+     * offered destroyed it: "kept" meant "kept and unusable".
+     *
+     * A bounded, one-time population deserves a decision, not a dead end. On
+     * confirm the base is re-stamped to the version currently held, so the
+     * draft rejoins the ordinary flow and this is never asked again -- and the
+     * server's own OCC check remains the backstop for the case where the
+     * answer was wrong.
+     */
+    const confirmUnknownBaseSave = () => new Promise((resolve) => {
+        let decided = false;
+        const settle = (value) => {
+            if (decided)
+                return;
+            decided = true;
+            resolve(value);
+        };
+        modals.openConfirmModal({
+            title: 'Unsaved draft from an older editor version',
+            children: 'This draft was saved by an earlier version of the editor, which did not record ' +
+                'which version of the file it was based on. Saving it will overwrite the copy ' +
+                'currently on the server, including any changes made by someone else since. ' +
+                'Reload or Discard this file instead if you would rather not risk that.',
+            labels: { confirm: 'Save anyway', cancel: 'Cancel' },
+            confirmProps: { color: 'red' },
+            onConfirm: () => settle(true),
+            // onCancel alone is not enough: Mantine does not fire it when the
+            // modal is dismissed via Escape or the overlay, which would leave
+            // this promise pending forever. onClose fires for every dismissal.
+            onCancel: () => settle(false),
+            onClose: () => settle(false),
+        });
+    });
     const handleSave = async () => {
         if (!options.currentEntry || !effectiveValue || !currentId)
             return;
+        // Conflict check first: a stale-based draft must not be schema-validated
+        // into a green "Saved" -- and nagging about field errors is noise when the
+        // save is not going out at all.
+        const baseState = draftBaseState();
+        if (baseState === 'stale') {
+            showConflictNotification();
+            return;
+        }
+        if (baseState === 'unknown-base') {
+            if (!(await confirmUnknownBaseSave()))
+                return;
+            // Re-stamp so the draft rejoins the ordinary flow: from here on its base
+            // is a real version and the normal stale check applies. Done BEFORE the
+            // write so a failed save doesn't re-prompt on every retry.
+            const currentVersion = options.getEntryVersion?.(currentId);
+            if (currentVersion !== undefined)
+                draftBaseVersionsRef.current[currentId] = currentVersion;
+        }
         // Client-side pre-save validation (ED-H1): the same pure schema rules the
         // server enforces authoritatively at the write boundary. Blocks the save
         // and surfaces per-field errors in the form instead of a green "Saved".
@@ -289,18 +488,19 @@ export function useDraftManager(options) {
                 err.fieldErrors.length > 0) {
                 setErrorState({ entryId: currentId, errors: toFieldErrorMap(err.fieldErrors) });
             }
-            notifications.show({
-                ...(isValidation ? { title: 'Save rejected' } : {}),
-                ...(isForbidden ? { title: 'Save not allowed' } : {}),
-                message: isConflict
-                    ? 'Content was modified by another editor. Reload to see the latest changes.'
-                    : isValidation || isForbidden
-                        ? err.message
-                        : 'Save failed',
-                color: isConflict ? 'yellow' : 'red',
-                autoClose: getNotificationDuration(isConflict || isValidation || isForbidden ? 8000 : 6000),
-                withCloseButton: true,
-            });
+            if (isConflict) {
+                showConflictNotification();
+            }
+            else {
+                notifications.show({
+                    ...(isValidation ? { title: 'Save rejected' } : {}),
+                    ...(isForbidden ? { title: 'Save not allowed' } : {}),
+                    message: isValidation || isForbidden ? err.message : 'Save failed',
+                    color: 'red',
+                    autoClose: getNotificationDuration(isValidation || isForbidden ? 8000 : 6000),
+                    withCloseButton: true,
+                });
+            }
         }
         finally {
             options.setBusy(false);
@@ -354,9 +554,15 @@ export function useDraftManager(options) {
             if (typeof window !== 'undefined') {
                 const raw = window.localStorage.getItem(storageKey);
                 if (raw) {
-                    const parsed = JSON.parse(raw);
-                    delete parsed[currentId];
-                    window.localStorage.setItem(storageKey, JSON.stringify(parsed));
+                    const { drafts: persisted, baseVersions } = parsePersistedDrafts(raw);
+                    delete persisted[currentId];
+                    delete baseVersions[currentId];
+                    const payload = {
+                        v: DRAFTS_STORAGE_VERSION,
+                        drafts: persisted,
+                        baseVersions,
+                    };
+                    window.localStorage.setItem(storageKey, JSON.stringify(payload));
                 }
             }
         }
@@ -390,14 +596,25 @@ export function useDraftManager(options) {
             onConfirm: performDiscardFileDraft,
         });
     };
-    const handleReload = async () => {
+    const performReload = async () => {
         if (!options.currentEntry || !currentId)
             return;
         options.setBusy(true);
         try {
             const loaded = await options.loadEntry(options.currentEntry);
             setLoadedValues((prev) => ({ ...prev, [currentId]: loaded }));
-            setDrafts((prev) => ({ ...prev, [currentId]: loaded }));
+            // Drop the draft rather than seeding it with `loaded`. `effectiveValue`
+            // falls back to `loadedValues`, so the rendered value is identical --
+            // and a draft that merely mirrors the server value is exactly the
+            // phantom-dirty snapshot this hook works to avoid (same reasoning as
+            // handleSave's drop above).
+            setDrafts((prev) => {
+                if (!(currentId in prev))
+                    return prev;
+                const next = { ...prev };
+                delete next[currentId];
+                return next;
+            });
             notifications.show({
                 message: 'Reloaded',
                 color: 'blue',
@@ -418,6 +635,29 @@ export function useDraftManager(options) {
             options.setBusy(false);
         }
     };
+    // Reloading replaces the working value with the server's copy, so over a
+    // real draft it is every bit as destructive as "Discard draft" -- and it is
+    // what the conflict notification tells the losing editor to do, i.e. the one
+    // moment their unsaved work matters most. Guarded exactly like
+    // handleDiscardFileDraft: the same `isSelectedDirty()` test (nothing to lose
+    // -> no prompt) and the same confirm-modal shape.
+    const handleReload = async () => {
+        if (!options.currentEntry || !currentId)
+            return;
+        if (!isSelectedDirty()) {
+            await performReload();
+            return;
+        }
+        modals.openConfirmModal({
+            title: 'Reload file',
+            children: 'Reload this file from the server? Unsaved changes for this file will be lost.',
+            labels: { confirm: 'Reload', cancel: 'Cancel' },
+            confirmProps: { color: 'red' },
+            onConfirm: () => {
+                void performReload();
+            },
+        });
+    };
     // Compute dirty state for a given entry
     const isDirtyForEntry = (entryPath) => {
         // Find entry by path to get its content ID