@panphora/clayjs 1.5.2 → 1.5.3

package/dist/clay.standalone.js

@@ -1,4 +1,4 @@
-/* clayjs 1.5.2 standalone build: every clayjs module in one file. https://clayjs.com/offline
+/* clayjs 1.5.3 standalone build: every clayjs module in one file. https://clayjs.com/offline
    Third-party code inside keeps its own license (Sortable MIT, Squire MIT, DOMPurify Apache-2.0 OR MPL-2.0, MicroModal MIT, parse5 MIT): https://clayjs.com/THIRD-PARTY-NOTICES.md */
 (() => {
   var __create = Object.create;
@@ -541,6 +541,7 @@
     return typeof performance !== "undefined" && performance.now ? performance.now() : Date.now();
   }
   function markGestureTurn() {
+    anyGesture = true;
     gestureTaskActive = true;
     lastTrustedGestureTs = now();
     setTimeout(() => {
@@ -565,6 +566,9 @@
   function markUserDriven() {
     userDrivenSinceLastSave = true;
   }
+  function gestureSeen() {
+    return anyGesture;
+  }
   function consumeUserDriven() {
     const v2 = userDrivenSinceLastSave;
     userDrivenSinceLastSave = false;
@@ -581,13 +585,14 @@
   function clearExplicitSave() {
     explicitSaveIntent = false;
   }
-  var GESTURE_EVENTS, RECENT_GESTURE_MS, gestureTaskActive, lastTrustedGestureTs, userDrivenSinceLastSave, explicitSaveIntent, installed;
+  var GESTURE_EVENTS, RECENT_GESTURE_MS, gestureTaskActive, lastTrustedGestureTs, anyGesture, userDrivenSinceLastSave, explicitSaveIntent, installed;
   var init_user_gesture = __esm({
     "src/lib/user-gesture.js"() {
       GESTURE_EVENTS = ["pointerdown", "pointerup", "click", "keydown", "beforeinput", "change", "submit", "paste", "drop", "cut"];
       RECENT_GESTURE_MS = 500;
       gestureTaskActive = false;
       lastTrustedGestureTs = -Infinity;
+      anyGesture = false;
       userDrivenSinceLastSave = false;
       explicitSaveIntent = false;
       installed = false;
@@ -2497,6 +2502,7 @@
   var save_exports = {};
   __export(save_exports, {
     addDocumentTransform: () => addDocumentTransform,
+    baselineSettled: () => baselineSettled,
     conflictResolvedBySync: () => conflictResolvedBySync,
     default: () => save_default,
     getLastSavedBytes: () => getLastSavedBytes,
@@ -2754,6 +2760,9 @@
       }
     });
   }
+  function baselineSettled() {
+    return baselineSettledAt;
+  }
   function initBaselineCapture() {
     if (!isEditMode) return;
     let userEdited = false;
@@ -2789,6 +2798,8 @@
       }
       baselineActive = false;
       document.documentElement.setAttribute("savestatus", "saved");
+      baselineSettledAt = true;
+      document.dispatchEvent(new CustomEvent("clay:baseline-settled"));
     };
     unsubscribeMutation = mutation_default.onAnyChange(
       { debounce: SETTLE_MS, omitChangeDetails: true, require: "autosave" },
@@ -2856,7 +2867,7 @@
     initSaveKeyboardShortcut();
     initHyperclaySaveButton();
   }
-  var savingTimeout, unsavedChanges, lastSavedContents, lastSavedDirty, pendingSave, autosaveSuspended, autosaveMissed, conflictHold, conflictEtag, lastSavedBytes, throttledSave, baselineContents, baselineActive, SETTLE_MS, MAX_SETTLE_MS, save_default;
+  var savingTimeout, unsavedChanges, lastSavedContents, lastSavedDirty, pendingSave, autosaveSuspended, autosaveMissed, conflictHold, conflictEtag, lastSavedBytes, throttledSave, baselineContents, baselineActive, baselineSettledAt, SETTLE_MS, MAX_SETTLE_MS, save_default;
   var init_save = __esm({
     "src/core/save.js"() {
       init_throttle();
@@ -2900,6 +2911,7 @@
       throttledSave = throttle_default(savePage, 1200);
       baselineContents = "";
       baselineActive = true;
+      baselineSettledAt = false;
       SETTLE_MS = 500;
       MAX_SETTLE_MS = 3e3;
       if (document.readyState === "loading") {
@@ -12183,6 +12195,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
       init_host_meta();
       init_etag();
       init_dirty_gate();
+      init_user_gesture();
       init_stream();
       init_save();
       ({ createIdentityStore } = HyperMorph);
@@ -12274,6 +12287,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
           this._saveEpoch = 0;
           this._saveSavedHandler = null;
           this._saveConflictHandler = null;
+          this._settledHandler = null;
           this._lastIdentityMap = null;
           this._applyGen = 0;
           this._holdRetryPeer = null;
@@ -12321,6 +12335,18 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
             return Math.random().toString(36).slice(2) + Date.now().toString(36);
           }
         }
+        /**
+         * Seed both merge bases (the peer lane's and the disk lane's) with the page as
+         * it stands, so a first frame that arrives after local edits merges instead of
+         * holding. A page already dirty has no trustworthy base; it keeps null and holds.
+         */
+        _seedBases() {
+          if (pageMaybeDirty()) return;
+          const clone = captureSnapshot({ flushUndo: false });
+          this.lastHtml = serializeForSync(clone);
+          this._lastIdentityMap = this.identity.exportMap(clone, originalSnapshotNode);
+          this._setDiskBase(captureForSaveAndComparison({ emitForSync: false }).forSave, this._ticket());
+        }
         /**
          * Start the LiveSync system
          * Can be called after stop() to restart with a new file
@@ -12347,14 +12373,32 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
           this._lastExternalSeq = 0;
           this._pendingExternal = null;
           this.resumeId = this.generateResumeId();
-          if (this.lane === "live" && !pageMaybeDirty()) {
-            const clone = captureSnapshot({ flushUndo: false });
-            this.lastHtml = serializeForSync(clone);
-            this._lastIdentityMap = this.identity.exportMap(clone, originalSnapshotNode);
-            this._setDiskBase(captureForSaveAndComparison({ emitForSync: false }).forSave, this._ticket());
-          }
+          if (this.lane === "live") this._seedBases();
           console.log(`[LiveSync] Starting for: ${this.currentFile} (lane=${this.lane})`);
           const gen = ++this._startGen;
+          if (this.lane === "live" && !baselineSettled()) {
+            const applyGen = this._applyGen;
+            const saveEpoch = this._saveEpoch;
+            const startHtml = this.lastHtml;
+            const startDiskTicket = this._diskBaseTicket;
+            const startDiskSeeded = this._diskBase !== null;
+            this._settledHandler = () => {
+              this._settledHandler = null;
+              if (this.isDestroyed || this._startGen !== gen) return;
+              if (gestureSeen()) return;
+              if (pageMaybeDirty()) return;
+              if (this._saveTicket !== 0) return;
+              if (startHtml !== null && this._applyGen === applyGen && this._saveEpoch === saveEpoch && this.lastHtml === startHtml) {
+                const clone = captureSnapshot({ flushUndo: false });
+                this.lastHtml = serializeForSync(clone);
+                this._lastIdentityMap = this.identity.exportMap(clone, originalSnapshotNode);
+              }
+              if (startDiskSeeded && this._diskBaseTicket === startDiskTicket) {
+                this._setDiskBase(captureForSaveAndComparison({ emitForSync: false }).forSave, this._ticket());
+              }
+            };
+            document.addEventListener("clay:baseline-settled", this._settledHandler, { once: true });
+          }
           this._ready = this._resolveProfile().then(() => {
             if (this.isDestroyed || this._startGen !== gen) return;
             this.connect();
@@ -12410,6 +12454,10 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
             document.removeEventListener("clay:save-conflict", this._saveConflictHandler);
             this._saveConflictHandler = null;
           }
+          if (this._settledHandler) {
+            document.removeEventListener("clay:baseline-settled", this._settledHandler);
+            this._settledHandler = null;
+          }
           this._queuedSend = null;
           if (this._rafHandle != null) {
             this._cancelFrame(this._rafHandle);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@panphora/clayjs",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "type": "module",
   "description": "clayjs: malleable HTML files. Save lifecycle for self-saving HTML.",
   "license": "MIT-0",

package/src/core/save.js

@@ -572,6 +572,11 @@ let baselineContents = '';
 // The baseline veto only guards the load-time settle window; captureBaseline
 // disarms it. See the comment there.
 let baselineActive = true;
+// True once the load-time settle has run. Live sync refreshes an untouched tab's
+// merge bases at this moment: modules that build DOM at boot (an editor mounting
+// from an editmode:resource script) are in the page by now.
+let baselineSettledAt = false;
+export function baselineSettled() { return baselineSettledAt; }
 
 // ============================================
 // BASELINE CAPTURE (Settled Signal)
@@ -658,6 +663,8 @@ function initBaselineCapture() {
     baselineActive = false;
 
     document.documentElement.setAttribute('savestatus', 'saved');
+    baselineSettledAt = true;
+    document.dispatchEvent(new CustomEvent('clay:baseline-settled'));
   };
 
   // Start settle observer - fires when no mutations for SETTLE_MS.

package/src/lib/user-gesture.js

@@ -44,6 +44,9 @@ const RECENT_GESTURE_MS = 500;
 
 let gestureTaskActive = false;
 let lastTrustedGestureTs = -Infinity;
+// Set by the first trusted gesture and never cleared. Live sync reads it at the
+// load-time settle: a page nobody has touched yet holds no one's edit.
+let anyGesture = false;
 let userDrivenSinceLastSave = false;
 let explicitSaveIntent = false;
 let installed = false;
@@ -55,6 +58,7 @@ function now() {
 }
 
 function markGestureTurn() {
+  anyGesture = true;
   gestureTaskActive = true;
   lastTrustedGestureTs = now();
   // Clear the same-turn flag on the next macrotask. The MutationObserver
@@ -100,6 +104,11 @@ export function markUserDriven() {
   userDrivenSinceLastSave = true;
 }
 
+/** True once any trusted gesture has reached the page. */
+export function gestureSeen() {
+  return anyGesture;
+}
+
 /**
  * Read-and-reset the accumulated bit. Called at the ACTUAL save send (not on a
  * save that never ships), so it survives the autosave debounce and coalescing.
@@ -144,6 +153,7 @@ export function _resetUserGesture() {
   gestureTaskActive = false;
   lastTrustedGestureTs = -Infinity;
   userDrivenSinceLastSave = false;
+  anyGesture = false;
   explicitSaveIntent = false;
 }
 

package/src/sync/live-sync.js

@@ -57,6 +57,7 @@ import './section-notice.js';
 import { hostMeta } from '../core/host-meta.js';
 import { recordEtag, seedEtag, lastSeenEtag, conditionalSaves } from '../core/etag.js';
 import { pageMaybeDirty, pauseGate, resumeGate, gateCaptureToken, gateClearIfUnchanged, gateMarkDirty } from '../lib/dirty-gate.js';
+import { gestureSeen } from '../lib/user-gesture.js';
 import { SyncStream } from './stream.js';
 
 // What a live-sync merge never reads or touches on any side: editor chrome,
@@ -144,7 +145,7 @@ function pairedBaseline() {
   const { forComparison, forDirty } = captureForComparisonAndDirty({ flushUndo: false });
   return [forComparison, forDirty];
 }
-import { savePageThrottled, setLastSavedBaselines, setUnsavedChanges, getLastSavedBytes, conflictResolvedBySync, isSaveConflicted } from '../core/save.js';
+import { savePageThrottled, setLastSavedBaselines, setUnsavedChanges, getLastSavedBytes, conflictResolvedBySync, isSaveConflicted, baselineSettled } from '../core/save.js';
 
 /**
  * The two live-sync wires, and the rule for choosing between them.
@@ -303,6 +304,7 @@ class LiveSync {
     this._saveEpoch = 0;
     this._saveSavedHandler = null;
     this._saveConflictHandler = null;
+    this._settledHandler = null;
 
     // The identityMap that came with lastHtml, so the peer-lane dirty diff
     // can resolve synthetic identities on its base tree.
@@ -380,6 +382,19 @@ class LiveSync {
     }
   }
 
+  /**
+   * Seed both merge bases (the peer lane's and the disk lane's) with the page as
+   * it stands, so a first frame that arrives after local edits merges instead of
+   * holding. A page already dirty has no trustworthy base; it keeps null and holds.
+   */
+  _seedBases() {
+    if (pageMaybeDirty()) return;
+    const clone = captureSnapshot({ flushUndo: false });
+    this.lastHtml = serializeForSync(clone);
+    this._lastIdentityMap = this.identity.exportMap(clone, originalSnapshotNode);
+    this._setDiskBase(captureForSaveAndComparison({ emitForSync: false }).forSave, this._ticket());
+  }
+
   /**
    * Start the LiveSync system
    * Can be called after stop() to restart with a new file
@@ -417,22 +432,53 @@ class LiveSync {
     this._pendingExternal = null;
     this.resumeId = this.generateResumeId();
 
-    // Seed both merge bases (the peer lane's and the disk lane's) with the page
-    // as served, so a first frame that arrives after local edits merges instead
-    // of holding. A page already dirty at start has no trustworthy base; it
-    // keeps null and holds.
-    if (this.lane === 'live' && !pageMaybeDirty()) {
-      const clone = captureSnapshot({ flushUndo: false });
-      this.lastHtml = serializeForSync(clone);
-      this._lastIdentityMap = this.identity.exportMap(clone, originalSnapshotNode);
-      this._setDiskBase(captureForSaveAndComparison({ emitForSync: false }).forSave, this._ticket());
-    }
+    // Seed both merge bases now, so a first frame that arrives after local edits
+    // merges instead of holding. A page still booting is refreshed at the settle
+    // below: a base taken before a module built its DOM makes the first dirty merge
+    // see both sides add that DOM, and keep it twice.
+    if (this.lane === 'live') this._seedBases();
 
     console.log(`[LiveSync] Starting for: ${this.currentFile} (lane=${this.lane})`);
     // One discovery request stands between here and the stream. It is memoized and
     // bounded, and it does not gate ordinary saves — /_/save is a separate lane that
     // never moved. Snapshots produced during the window are queued, not dropped.
     const gen = ++this._startGen;
+    if (this.lane === 'live' && !baselineSettled()) {
+      const applyGen = this._applyGen;
+      const saveEpoch = this._saveEpoch;
+      const startHtml = this.lastHtml;
+      const startDiskTicket = this._diskBaseTicket;
+      const startDiskSeeded = this._diskBase !== null;
+      this._settledHandler = () => {
+        this._settledHandler = null;
+        if (this.isDestroyed || this._startGen !== gen) return;
+        // A person has touched the page: whatever they did (a drag, a button whose
+        // handler edits a turn later) may be in it and not yet saved. Keep the start
+        // seed, as 1.5.2 did; only an untouched tab gets the settled page as its base.
+        if (gestureSeen()) return;
+        // The settle clears the gate only when it saw no user edit, so a dirty page
+        // here holds work the base must not absorb: keep the start seed.
+        if (pageMaybeDirty()) return;
+        // A save this tab sent is still unconfirmed: what it carries is not yet
+        // common history, and a refused save must merge against the older base.
+        if (this._saveTicket !== 0) return;
+        // Refresh each lane only while it still holds what start left. A frame, a
+        // landed relay, an own save or a disk frame since then gave it a newer base
+        // (an own save counts even when its relay failed and lastHtml never moved).
+        // Only replace a seed start took, never fill a base start left empty: a page
+        // dirty at start held its frames in 1.5.2, and its own scripts may still be
+        // rewriting content the merge cannot reach.
+        if (startHtml !== null && this._applyGen === applyGen && this._saveEpoch === saveEpoch && this.lastHtml === startHtml) {
+          const clone = captureSnapshot({ flushUndo: false });
+          this.lastHtml = serializeForSync(clone);
+          this._lastIdentityMap = this.identity.exportMap(clone, originalSnapshotNode);
+        }
+        if (startDiskSeeded && this._diskBaseTicket === startDiskTicket) {
+          this._setDiskBase(captureForSaveAndComparison({ emitForSync: false }).forSave, this._ticket());
+        }
+      };
+      document.addEventListener('clay:baseline-settled', this._settledHandler, { once: true });
+    }
     // Exposed so a caller (and the tests) can await the point where the stream is
     // actually open, rather than counting microtasks behind the discovery request.
     this._ready = this._resolveProfile().then(() => {
@@ -514,6 +560,11 @@ class LiveSync {
       this._saveConflictHandler = null;
     }
 
+    if (this._settledHandler) {
+      document.removeEventListener('clay:baseline-settled', this._settledHandler);
+      this._settledHandler = null;
+    }
+
     this._queuedSend = null;
 
     // Cancel any pending frame and clear the queue. A morph already in