@vibecook/ice 0.7.0 → 0.8.0

package/dist/{chunk-5OU3OWDH.js → chunk-3SUDKHUF.js}

@@ -12,7 +12,7 @@ import {
   keyboardClaimOf,
   startRafLoop,
   wireMeasurement
-} from "./chunk-55QCOE74.js";
+} from "./chunk-CBCSIEXW.js";
 import {
   ActiveTool,
   DurableUndoStatus,
@@ -33,7 +33,7 @@ import {
   tools,
   widgets,
   writeRuntimeResource
-} from "./chunk-LATXYFMO.js";
+} from "./chunk-BE4F4X3Q.js";
 
 // ../react/src/hooks.ts
 import { createContext, useCallback, useContext, useMemo, useRef, useSyncExternalStore } from "react";
@@ -673,4 +673,4 @@ export {
   InfiniteCanvas,
   REACT_VERSION
 };
-//# sourceMappingURL=chunk-5OU3OWDH.js.map
+//# sourceMappingURL=chunk-3SUDKHUF.js.map

package/dist/{chunk-LATXYFMO.js → chunk-BE4F4X3Q.js}

@@ -7594,6 +7594,15 @@ function createBehaviorRuntime(opts) {
     peersQuery;
     /** Ephemeral only: the local peer this node last published a facet on. */
     facetPeer;
+    /**
+     * The entity whose HOOK is currently executing (review finding 2, 0.8.0).
+     * `writeFacet` consults it so a hook writes only the peer whose instance
+     * it runs for — a same-gap presence swap otherwise lets the OLD peer's
+     * dispose resolve `localPeer` LIVE and land a corpse's farewell on the
+     * fresh peer. Unset outside hooks (captured `ctx.write` closures keep the
+     * blessed behavior: they publish the CURRENT peer).
+     */
+    hookEntity;
     /** The ephemeral singleton was quarantined THIS generation (I17). */
     singletonQuarantined = false;
     /** Uninstalled — a captured ctx.write closure must go inert (I17). */
@@ -7878,6 +7887,10 @@ function createBehaviorRuntime(opts) {
         this.facetPeer = void 0;
         return;
       }
+      if (this.instances.size > 0 && !this.instances.has(peer)) {
+        this.facetPeer = void 0;
+        return;
+      }
       if (peer === this.facetPeer && world.has(peer, this.own)) return;
       this.facetPeer = peer;
       if (!world.has(peer, this.own)) {
@@ -8264,6 +8277,7 @@ function createBehaviorRuntime(opts) {
       }
       if (on.dispose !== void 0) {
         for (const inst of departed) {
+          this.hookEntity = inst.e;
           try {
             invokeHook(
               this.b.name,
@@ -8272,6 +8286,8 @@ function createBehaviorRuntime(opts) {
             );
           } catch (err) {
             onFault(this.b.name, "dispose", inst.e, err);
+          } finally {
+            this.hookEntity = void 0;
           }
         }
       }
@@ -8310,6 +8326,7 @@ function createBehaviorRuntime(opts) {
      * kill a 1000-node layout.
      */
     callHook(hook, inst, faulted, body) {
+      this.hookEntity = inst.e;
       try {
         invokeHook(this.b.name, hook, body);
         inst.consecutiveThrows = 0;
@@ -8339,6 +8356,8 @@ function createBehaviorRuntime(opts) {
           this.guest.fault(err);
         }
         return false;
+      } finally {
+        this.hookEntity = void 0;
       }
     }
     // --- generation --------------------------------------------------------
@@ -8346,6 +8365,7 @@ function createBehaviorRuntime(opts) {
       const on = this.b.on;
       if (on.dispose !== void 0) {
         for (const inst of this.instances.values()) {
+          this.hookEntity = inst.e;
           try {
             invokeHook(
               this.b.name,
@@ -8354,6 +8374,8 @@ function createBehaviorRuntime(opts) {
             );
           } catch (err) {
             onFault(this.b.name, "dispose", inst.e, err);
+          } finally {
+            this.hookEntity = void 0;
           }
         }
       }
@@ -8462,6 +8484,7 @@ function createBehaviorRuntime(opts) {
       if (presence === void 0) return;
       const peer = presence.localPeer;
       if (!world.isAlive(peer)) return;
+      if (this.hookEntity !== void 0 && this.hookEntity !== peer) return;
       const cell = cellForBehavior(world, this.b, peer, patch);
       if (world.has(peer, this.own)) presence.eph.edit(peer).set(this.own, cell);
       else presence.eph.addComponent(peer, this.own, cell);
@@ -9707,6 +9730,10 @@ var DEFAULT_PRESENCE_TTL_MS = 5e3;
 function attachPresence(world, opts) {
   const peerId = opts.peerId ?? crypto.randomUUID();
   const ttlMs = opts.ttlMs ?? DEFAULT_PRESENCE_TTL_MS;
+  const onFault = opts.onFault ?? ((where, error) => {
+    const detail = where === "outbound" ? "presence outbound subscriber threw \u2014 bytes dropped for that subscriber (transport handlers must not throw)" : where === "leave" ? "presence leave failed \u2014 tearing the binding down anyway (remote peers drop us at TTL instead of immediately)" : "presence reset-heal leave failed \u2014 rebinding anyway (stale keys age out at TTL)";
+    console.error(`[ice] ${detail}`, error);
+  });
   const loro = new LoroEphemeralStore(ttlMs);
   const source = new LoroEphemeralSnapshot(loro);
   const outbound = /* @__PURE__ */ new Set();
@@ -9714,7 +9741,13 @@ function attachPresence(world, opts) {
     peerId,
     ttlMs,
     send: (bytes) => {
-      for (const fn of [...outbound]) fn(bytes);
+      for (const fn of [...outbound]) {
+        try {
+          fn(bytes);
+        } catch (err) {
+          onFault("outbound", err);
+        }
+      }
     }
   });
   let attachment = attachEphemeral(world, eph);
@@ -9732,7 +9765,11 @@ function attachPresence(world, opts) {
       queueMicrotask(() => {
         healQueued = false;
         if (detached) return;
-        eph.leave();
+        try {
+          eph.leave();
+        } catch (err) {
+          onFault("heal", err);
+        }
         attachment.detach();
         attachment = attachEphemeral(world, eph);
         localPeer = spawnLocalPeer();
@@ -9758,7 +9795,11 @@ function attachPresence(world, opts) {
       if (detached) return;
       detached = true;
       stopResetHeal();
-      eph.leave();
+      try {
+        eph.leave();
+      } catch (err) {
+        onFault("leave", err);
+      }
       attachment.detach();
       outbound.clear();
       loro.destroy();
@@ -9867,9 +9908,9 @@ function summaryEquals(a, b) {
 import { Not as Not9, defineQuery as defineQuery38, defineTickSystem as defineTickSystem15 } from "@vibecook/strata-ecs";
 import { Local as Local2 } from "@vibecook/strata-ecs";
 var remotePeerCursorsQ = defineQuery38([PresenceCursor, PresencePeer, Not9(Local2)]);
-function createRemoteCursorsSystem(_world) {
+function createRemoteCursorsRig(world) {
   const pool = /* @__PURE__ */ new Map();
-  return defineTickSystem15(
+  const system = defineTickSystem15(
     (ctx) => {
       const live = /* @__PURE__ */ new Set();
       ctx.query(remotePeerCursorsQ).each((b) => {
@@ -9903,16 +9944,38 @@ function createRemoteCursorsSystem(_world) {
     },
     {
       name: "remoteCursors",
-      access: { write: [Position, CursorVisual] }
+      // orderIndependent: every row this system writes is its OWN pool's
+      // cursor entity (one per remote peer) — row-disjoint from any other
+      // Position writer by construction. The attestation is what lets a
+      // userland `present`-phase behavior that co-writes Position silence
+      // strata's double-writer advisory from its own side: suppression is
+      // conjunctive over ALL co-writers, so an un-attested engine system
+      // would make the warning unsilenceable for authors doing it right
+      // (0.8.0 review finding).
+      access: { write: [Position, CursorVisual], orderIndependent: [Position] }
     }
   );
+  return {
+    system,
+    reap() {
+      for (const [, entry] of pool) {
+        if (world.isAlive(entry.cursor)) world.destroy(entry.cursor);
+      }
+      pool.clear();
+    }
+  };
+}
+function createRemoteCursorsSystem(world) {
+  return createRemoteCursorsRig(world).system;
 }
 function installPresence(engine, session, opts = {}) {
   const removePublish = engine.onPublish(createPresencePublish(engine.world, session, opts));
-  const removeSystem = engine.addSystems("derive", createRemoteCursorsSystem(engine.world));
+  const rig = createRemoteCursorsRig(engine.world);
+  const removeSystem = engine.addSystems("present", rig.system);
   return () => {
     removePublish();
     removeSystem();
+    rig.reap();
   };
 }
 
@@ -10381,15 +10444,36 @@ function createCanvasEngine(opts = {}) {
     sink.target = next.sink;
     return next;
   };
+  const acquirePresence = (o) => {
+    const p2 = attachPresence(world, o);
+    presence = p2;
+    uninstallPresence = installPresence(engine, p2, {
+      keyOf: (e) => session?.store.keyOf(e)
+    });
+    return p2;
+  };
+  const releasePresence = () => {
+    const uninstall = uninstallPresence;
+    const p2 = presence;
+    uninstallPresence = void 0;
+    presence = void 0;
+    try {
+      uninstall?.();
+    } catch (err) {
+      console.error("[ice] presence uninstall threw \u2014 teardown continues", err);
+    }
+    try {
+      p2?.detach();
+    } catch (err) {
+      console.error("[ice] presence detach threw \u2014 teardown continues", err);
+    }
+  };
   const closeDoc = () => {
     joinAbort?.abort(new Error("ice: docs.join superseded \u2014 another document was opened while joining."));
     joinAbort = void 0;
     for (const a of [...liveAutosaves]) a.stop();
     liveAutosaves.clear();
-    uninstallPresence?.();
-    uninstallPresence = void 0;
-    presence?.detach();
-    presence = void 0;
+    releasePresence();
     joined?.leave();
     joined = void 0;
     session?.close();
@@ -10434,29 +10518,35 @@ function createCanvasEngine(opts = {}) {
       joinAbort = ac;
       const { presence: presenceOpts, ...joinOpts } = o;
       if (presenceOpts !== void 0) {
-        presence = attachPresence(world, { name: presenceOpts.name, color: presenceOpts.color });
-        uninstallPresence = installPresence(engine, presence, {
-          keyOf: (e) => session?.store.keyOf(e)
-        });
+        acquirePresence({ name: presenceOpts.name, color: presenceOpts.color });
       }
-      const result = await joinDoc(world, channel, {
-        ...gatePolicy !== void 0 ? { docOpts: { onGate: gatePolicy } } : {},
-        ...presence !== void 0 ? { presence } : {},
-        ...joinOpts,
-        signal: ac.signal,
-        // Re-bootstrap swaps the session inside joinDoc (PendingImportError
-        // recovery) — re-target the forwarding sink or ops keep committing
-        // into the quarantined session.
-        onSession: (s) => {
-          if (joinAbort !== ac) return;
-          if (s !== void 0) {
-            adoptSession(s);
-          } else {
-            session = void 0;
-            sink.target = void 0;
+      let result;
+      try {
+        result = await joinDoc(world, channel, {
+          ...gatePolicy !== void 0 ? { docOpts: { onGate: gatePolicy } } : {},
+          ...presence !== void 0 ? { presence } : {},
+          ...joinOpts,
+          signal: ac.signal,
+          // Re-bootstrap swaps the session inside joinDoc (PendingImportError
+          // recovery) — re-target the forwarding sink or ops keep committing
+          // into the quarantined session.
+          onSession: (s) => {
+            if (joinAbort !== ac) return;
+            if (s !== void 0) {
+              adoptSession(s);
+            } else {
+              session = void 0;
+              sink.target = void 0;
+            }
           }
+        });
+      } catch (err) {
+        if (joinAbort === ac) {
+          joinAbort = void 0;
+          releasePresence();
         }
-      });
+        throw err;
+      }
       if (joinAbort !== ac) {
         result.leave();
         throw new Error("ice: docs.join superseded \u2014 another document was opened while joining.");
@@ -10466,6 +10556,26 @@ function createCanvasEngine(opts = {}) {
       return result;
     },
     current: () => session,
+    attachPresence(o) {
+      if (session === void 0) {
+        throw new Error(
+          "ice: docs.attachPresence needs a live document \u2014 call docs.create()/open()/join() first."
+        );
+      }
+      if (presence !== void 0) {
+        throw new Error(
+          "ice: docs.attachPresence \u2014 a presence session is already live (join({presence}) or a prior attach); detach it (its inverse, or docs.close()) before attaching another."
+        );
+      }
+      const mine = acquirePresence(o);
+      let done = false;
+      return () => {
+        if (done) return;
+        done = true;
+        if (presence !== mine) return;
+        releasePresence();
+      };
+    },
     presence: () => presence,
     close: closeDoc,
     // Read-only documents must not mutate through history either — undo/redo
@@ -10495,10 +10605,11 @@ function createCanvasEngine(opts = {}) {
     world,
     engine,
     session: () => session,
-    // Presence attaches with `docs.join({presence})` and detaches with the
-    // document, so this reads through per publish: an ephemeral behavior
-    // installed before anyone joins simply lies dormant until there is a peer
-    // for it to be.
+    // Presence attaches with `docs.join({presence})` OR `docs.attachPresence`
+    // (petition I18) and detaches with the document / the attach inverse, so
+    // this reads through per publish: an ephemeral behavior installed before
+    // there is a presence session simply lies dormant until there is a peer
+    // for it to be — and goes dormant again if the session detaches under it.
     presence: () => presence,
     ...opts.onBehaviorFault === void 0 ? {} : { onFault: opts.onBehaviorFault },
     ...opts.onBehaviorLog === void 0 ? {} : { onLog: opts.onBehaviorLog }
@@ -10733,7 +10844,7 @@ import {
   Local as Local3
 } from "@vibecook/strata-ecs";
 import { DurableUndoStatus } from "@vibecook/strata-ecs/durable";
-var CORE_VERSION = "0.7.0";
+var CORE_VERSION = "0.8.0";
 
 export {
   defineSchemaOnce,
@@ -11018,4 +11129,4 @@ export {
   Local3 as Local,
   DurableUndoStatus
 };
-//# sourceMappingURL=chunk-LATXYFMO.js.map
+//# sourceMappingURL=chunk-BE4F4X3Q.js.map