@vibecook/ice 0.15.0-desk.5 → 0.15.0-desk.6

package/dist/{chunk-OHEHS2EM.js → chunk-7XSZRL74.js}

@@ -12,7 +12,7 @@ import {
   defineQuery,
   field,
   init
-} from "./chunk-HSIFKQNP.js";
+} from "./chunk-CAJ64OD6.js";
 
 // ../desk/src/lattice/lod.ts
 var BASE_SPACING = 20;
@@ -2399,4 +2399,4 @@ export {
   writeChanged,
   lineWeight
 };
-//# sourceMappingURL=chunk-OHEHS2EM.js.map
+//# sourceMappingURL=chunk-7XSZRL74.js.map

package/dist/{chunk-HSIFKQNP.js → chunk-CAJ64OD6.js}

@@ -571,6 +571,9 @@ function createFrameControl(world) {
   const listeners = /* @__PURE__ */ new Set();
   let settleLeft = 0;
   let parked = false;
+  const parkListeners = /* @__PURE__ */ new Set();
+  let heardParked = false;
+  let parkOwed = false;
   const sources = /* @__PURE__ */ new Map();
   const wakeListeners = /* @__PURE__ */ new Set();
   const wakeCounts = {};
@@ -593,6 +596,41 @@ function createFrameControl(world) {
     for (const r of reporters.values()) if (r.busy()) names.push(r.name);
     return names;
   };
+  const announcePark = (on) => {
+    if (heardParked === on) return;
+    heardParked = on;
+    for (const fn of [...parkListeners]) {
+      if (heardParked !== on) return;
+      try {
+        fn(on);
+      } catch (err) {
+        console.error("[ice] frame.onParked \u2014 a listener threw; the gate stands", err);
+      }
+    }
+  };
+  const claim = () => {
+    if (freezes.size === 0) return true;
+    if (!parked && settleLeft <= 0) {
+      parked = true;
+      if (devGuardsEnabled()) {
+        console.warn(
+          `ice: frame.freeze \u2014 settle cap (${SETTLE_CAP} frames) reached with reporters still busy: ${busyNames().join(", ")}. Parking on a possibly unsettled frame.`
+        );
+      }
+    }
+    if (parked) {
+      if (heardParked) return false;
+      parkOwed = false;
+      announcePark(true);
+      return parked ? false : claim();
+    }
+    settleLeft -= 1;
+    if (busyNames().length === 0) {
+      parked = true;
+      parkOwed = true;
+    }
+    return true;
+  };
   return {
     freeze(name) {
       const token = Symbol(name);
@@ -609,12 +647,15 @@ function createFrameControl(world) {
         if (released) return;
         released = true;
         freezes.delete(token);
-        if (freezes.size === 0) {
+        const open = freezes.size === 0;
+        if (open) {
           settleLeft = 0;
           parked = false;
+          parkOwed = false;
         }
         sync();
         announce();
+        if (open) announcePark(false);
       };
     },
     isFrozen: () => freezes.size > 0,
@@ -631,28 +672,19 @@ function createFrameControl(world) {
       };
     },
     settling: () => busyNames(),
-    claimStep() {
-      if (freezes.size === 0) return true;
-      if (parked) return false;
-      if (settleLeft <= 0) {
-        parked = true;
-        if (devGuardsEnabled()) {
-          console.warn(
-            `ice: frame.freeze \u2014 settle cap (${SETTLE_CAP} frames) reached with reporters still busy: ${busyNames().join(", ")}. Parking on a possibly unsettled frame.`
-          );
-        }
-        return false;
-      }
-      settleLeft -= 1;
-      if (busyNames().length === 0) parked = true;
-      return true;
-    },
+    claimStep: claim,
     onChange(fn) {
       listeners.add(fn);
       return () => {
         listeners.delete(fn);
       };
     },
+    onParked(fn) {
+      parkListeners.add(fn);
+      return () => {
+        parkListeners.delete(fn);
+      };
+    },
     wake(reason) {
       if (inStep) return;
       wakeCounts[reason] = (wakeCounts[reason] ?? 0) + 1;
@@ -722,6 +754,10 @@ function createFrameControl(world) {
     },
     leaveStep() {
       inStep = false;
+      if (parkOwed) {
+        parkOwed = false;
+        announcePark(true);
+      }
     },
     stepping: () => inStep,
     sleepStats: () => ({ asleep, sleeps, wakes: { ...wakeCounts }, timed, steps })
@@ -1371,7 +1407,14 @@ var Tray = defineComponent("Tray", {
    * `setTrayCategory` (the bar's chips, the desk handle's door) and `trayLay` — which lays only that category's entries, zeroes the
    * scroll and the band when it moves, and falls back to all ("") when the frame hangs none of it.
    */
-  category: field3("string", { default: "" })
+  category: field3("string", { default: "" }),
+  /**
+   * Petition I37 — THE KEYBOARD FOCUS on the board: the type of the specimen it is on ("" — none), a fact of the view like `hover`.
+   * Its writer is the op `focusTray` (next/prev/first/last along the lay's order, or a type by its id); `trayLay` scrolls the
+   * specimen it moves to into the board's face, and lets it go when what it was on is laid no more (a category, a frame). The
+   * renderer draws no ring for it: a host does, from the desk handle's `TrayAnchor.focused`.
+   */
+  focus: field3("string", { default: "" })
 });
 var TrayIntent = defineResource(
   "TrayIntent",
@@ -1394,7 +1437,8 @@ var TrayContent = defineComponent("TrayContent", {
   width: field3("f64", { default: 0 }),
   bottom: field3("f64", { default: 0 }),
   laid: field3("u32", { default: 0 }),
-  present: field3("string", { default: "[]" })
+  present: field3("string", { default: "[]" }),
+  order: field3("string", { default: "[]" })
 });
 var Specimen = defineTag("Specimen");
 var TrayPress = defineComponent("TrayPress", {
@@ -1646,6 +1690,7 @@ var PointerPart = defineComponent("PointerPart", { part: field7("string", { defa
 var PartTap = defineResource("PartTap", { seq: "u32", target: "eid", part: "string" });
 var WheelHandled = defineTag("WheelHandled");
 var OverInteractive = defineTag("OverInteractive");
+var PointerOutside = defineTag("PointerOutside");
 var LocalPointer = defineTag("LocalPointer");
 var PointerWorld = defineComponent("PointerWorld", {
   x: field7("f64", { default: 0 }),
@@ -1691,7 +1736,9 @@ var PresenceInfo = defineComponent("PresenceInfo", { name: "string", color: "str
 var PresenceCursor = defineComponent("PresenceCursor", {
   x: field9("f64", { default: 0 }),
   y: field9("f64", { default: 0 }),
-  device: enumOf6(["mouse", "touch", "pen"])
+  device: enumOf6(["mouse", "touch", "pen"]),
+  away: field9("bool", { default: false }),
+  canvas: field9("string", { default: "" })
 });
 var SelectionSummary = defineComponent("SelectionSummary", {
   count: field9("u16", { default: 0 }),
@@ -8953,6 +9000,8 @@ function createTrayLay(world, opts) {
   let rangeKey = "";
   let laidTray;
   let laidCategory = "";
+  let focusedFor = "";
+  let laidTypes = [];
   const clampToRange = (ctx, tray, frame2, bottom) => {
     if (frame2.face === void 0) return;
     const range = trayScrollMax(bottom, frame2.face - (frame2.foot ?? 0), frame2.pitch);
@@ -8963,6 +9012,34 @@ function createTrayLay(world, opts) {
     rangeKey = key;
     if (t.scroll > range) ctx.edit(tray).set(Tray, { ...t, scroll: range });
   };
+  const focusInView = (ctx, tray, frame2, bottom) => {
+    const t = ctx.read(tray, Tray);
+    const focus = t.focus ?? "";
+    if (focus !== "" && !laidTypes.includes(focus)) {
+      focusedFor = "";
+      ctx.edit(tray).set(Tray, { ...t, focus: "" });
+      return;
+    }
+    if (focus === focusedFor) return;
+    if (focus === "") {
+      focusedFor = "";
+      return;
+    }
+    const hung = specimensOf(world, tray).find((e) => world.get(e, PrefabId)?.id === focus);
+    if (hung === void 0) return;
+    const at = ctx.get(hung, Position);
+    const size = ctx.get(hung, Size);
+    if (at === void 0 || size === void 0) return;
+    focusedFor = focus;
+    if (frame2.face === void 0) return;
+    const top = frame2.head ?? 0;
+    const showing = frame2.face - (frame2.foot ?? 0) - top;
+    let scroll = t.scroll;
+    if (at.y < scroll + top || size.h > showing) scroll = at.y - top;
+    else if (at.y + size.h > scroll + top + showing) scroll = at.y + size.h - top - showing;
+    scroll = Math.min(Math.max(scroll, 0), trayScrollMax(bottom, frame2.face - (frame2.foot ?? 0), frame2.pitch));
+    if (scroll !== t.scroll || t.stretch !== 0) ctx.edit(tray).set(Tray, { ...t, scroll, stretch: 0 });
+  };
   return defineTickSystem9(
     (ctx) => {
       const tray = world.firstOf(trayQ2);
@@ -8985,6 +9062,7 @@ function createTrayLay(world, opts) {
       const key = `${tray}|${content?.laid ?? 0}|${frame2.w}|${frame2.pitch}|${types.map((q) => q.type).join(",")}|${category}`;
       if (key === laidKey) {
         clampToRange(ctx, tray, frame2, content?.bottom ?? 0);
+        focusInView(ctx, tray, frame2, content?.bottom ?? 0);
         return;
       }
       const shown = category === "" ? types : types.filter((q) => categoryOf(q) === category);
@@ -9014,13 +9092,15 @@ function createTrayLay(world, opts) {
         ctx.setRelation(spawned, ChildOf, tray, "last");
       }
       for (const e of have.values()) ctx.destroy(e);
-      const next2 = { width: frame2.w, bottom: layout.bottom, laid: (content?.laid ?? 0) + 1, present: JSON.stringify(presentOf(types)) };
+      const next2 = { width: frame2.w, bottom: layout.bottom, laid: (content?.laid ?? 0) + 1, present: JSON.stringify(presentOf(types)), order: JSON.stringify(layout.placed.map((q) => q.type)) };
       if (content === void 0) ctx.addComponent(tray, TrayContent, next2);
       else ctx.edit(tray).set(TrayContent, next2);
       laidKey = `${tray}|${next2.laid}|${frame2.w}|${frame2.pitch}|${types.map((q) => q.type).join(",")}|${category}`;
       laidTray = tray;
       laidCategory = category;
+      laidTypes = layout.placed.map((q) => q.type);
       clampToRange(ctx, tray, frame2, layout.bottom);
+      focusInView(ctx, tray, frame2, layout.bottom);
     },
     // Petition I34: in derive, after `trayInput` (react) by the phase — the lay reads back what the input wrote this tick, so the two
     // `Tray` writers are ORDERED, never attested. `Position`/`Size` it writes on the tray's specimens alone, rows disjoint from the
@@ -9051,7 +9131,7 @@ var write = (world, patch) => {
   const e = ensureTray(world);
   const cur = world.read(e, Tray);
   const next2 = { ...cur, ...patch };
-  if (next2.open !== cur.open || next2.scroll !== cur.scroll || next2.stretch !== cur.stretch || next2.hover !== cur.hover || next2.category !== cur.category) world.edit(e).set(Tray, next2);
+  if (next2.open !== cur.open || next2.scroll !== cur.scroll || next2.stretch !== cur.stretch || next2.hover !== cur.hover || next2.category !== cur.category || next2.focus !== cur.focus) world.edit(e).set(Tray, next2);
 };
 function openTray(world) {
   if (heldEntity(world) !== void 0) return false;
@@ -9072,6 +9152,31 @@ function toggleTray(world) {
 function scrollTray(world, scroll) {
   write(world, { scroll, stretch: 0 });
 }
+function trayHung(world) {
+  const e = world.firstOf(trayQ3);
+  const raw = e === void 0 ? void 0 : world.get(e, TrayContent)?.order;
+  if (raw === void 0 || raw === null || raw === "") return [];
+  const list = JSON.parse(raw);
+  return Array.isArray(list) ? list.filter((q) => typeof q === "string") : [];
+}
+function trayFocus(world) {
+  const e = world.firstOf(trayQ3);
+  return e === void 0 ? "" : world.get(e, Tray)?.focus ?? "";
+}
+function focusTray(world, to) {
+  const order = trayHung(world);
+  const cur = trayFocus(world);
+  const i = order.indexOf(cur);
+  const last = order.length - 1;
+  let next2;
+  if (to === "first") next2 = order[0] ?? "";
+  else if (to === "last") next2 = order[last] ?? "";
+  else if (to === "next") next2 = order[i < 0 ? 0 : Math.min(i + 1, last)] ?? "";
+  else if (to === "prev") next2 = order[i < 0 ? last : Math.max(i - 1, 0)] ?? "";
+  else next2 = order.includes(to) ? to : cur;
+  write(world, { focus: next2 });
+  return next2;
+}
 function trayCategory(world) {
   const e = world.firstOf(trayQ3);
   return e === void 0 ? "" : world.get(e, Tray)?.category ?? "";
@@ -9339,6 +9444,7 @@ function createL0Systems(world, queue) {
             wentCancelled: false,
             handled: false,
             overInteractive: void 0,
+            outside: false,
             mods: { shift: ev.mods.shift, ctrl: ev.mods.ctrl, alt: ev.mods.alt, meta: ev.mods.meta },
             wheelDx: 0,
             wheelDy: 0,
@@ -9368,6 +9474,7 @@ function createL0Systems(world, queue) {
           s.hasWheel = true;
           if (ev.wheelHandled === true) s.wheelHandled = true;
         }
+        s.outside = ev.kind === "leave";
         if (ev.surfaceHandled === true) s.handled = true;
         if (ev.overInteractive !== void 0) s.overInteractive = ev.overInteractive;
       }
@@ -9393,6 +9500,7 @@ function createL0Systems(world, queue) {
           if (s.handled) ctx.addTag(spawned, HandledByWidget);
           if (s.wheelHandled) ctx.addTag(spawned, WheelHandled);
           if (s.overInteractive === true) ctx.addTag(spawned, OverInteractive);
+          if (s.outside) ctx.addTag(spawned, PointerOutside);
           byId.set(id, spawned);
           continue;
         }
@@ -9422,6 +9530,10 @@ function createL0Systems(world, queue) {
           if (s.overInteractive) ctx.addTag(existing, OverInteractive);
           else ctx.removeTag(existing, OverInteractive);
         }
+        if (s.outside !== ctx.hasTag(existing, PointerOutside)) {
+          if (s.outside) ctx.addTag(existing, PointerOutside);
+          else ctx.removeTag(existing, PointerOutside);
+        }
       }
       bumpVersion(world, PointerVersion);
     },
@@ -14127,7 +14239,7 @@ function attachPresence(world, opts) {
   const source = new LoroEphemeralSnapshot(loro);
   const onRemote = opts.onRemote;
   const stopRemote = onRemote === void 0 ? void 0 : loro.subscribe((ev) => {
-    if (ev.by !== "local") onRemote();
+    if (ev.by !== "local" && (ev.added.length > 0 || ev.updated.length > 0 || ev.removed.length > 0)) onRemote();
   });
   const outbound = /* @__PURE__ */ new Set();
   const eph = createEphemeralStore(source, {
@@ -14150,6 +14262,8 @@ function attachPresence(world, opts) {
   });
   let localPeer = spawnLocalPeer();
   let detached = false;
+  let awayReason = null;
+  const awayHeard = /* @__PURE__ */ new Set();
   let healQueued = false;
   const stopResetHeal = world.observe({
     onReset: () => {
@@ -14184,6 +14298,19 @@ function attachPresence(world, opts) {
         outbound.delete(fn);
       };
     },
+    setAway(reason) {
+      if (reason !== null && typeof reason !== "string") throw new Error(`ice: presence setAway \u2014 the reason is a string or null (got ${String(reason)})`);
+      if (detached || reason === awayReason) return;
+      awayReason = reason;
+      for (const fn of [...awayHeard]) fn(reason);
+    },
+    away: () => awayReason,
+    onAway(fn) {
+      awayHeard.add(fn);
+      return () => {
+        awayHeard.delete(fn);
+      };
+    },
     detach() {
       if (detached) return;
       detached = true;
@@ -14195,6 +14322,7 @@ function attachPresence(world, opts) {
       }
       attachment.detach();
       outbound.clear();
+      awayHeard.clear();
       stopRemote?.();
       loro.destroy();
     }
@@ -14206,6 +14334,11 @@ import { defineQuery as defineQuery47 } from "@vibecook/strata-ecs";
 var SELECTION_KEY_CAP = 32;
 var COUNT_MAX = 65535;
 var localMouseQ = defineQuery47([Pointer, LocalPointer, PointerWorld]);
+function presenceCanvasOf(world, peerId, keyOf) {
+  const frame2 = currentNavFrame(world);
+  if (frame2 === void 0 || frame2 === world.getResource(BoardRoot)?.root) return "";
+  return keyOf?.(frame2) ?? `~${peerId}/${frame2}`;
+}
 function createPresencePublish(world, session, opts = {}) {
   const { eph } = session;
   const keyOf = opts.keyOf;
@@ -14227,18 +14360,26 @@ function createPresencePublish(world, session, opts = {}) {
     publishSelection(world);
   };
   function publishCursor(w) {
-    let cursor;
+    let mouse;
     w.query(localMouseQ).each((b) => {
       for (const r of b) {
-        if (cursor !== void 0) break;
+        if (mouse !== void 0) break;
         const e = b.entity(r);
         if (w.read(e, Pointer).device !== "mouse") continue;
         const pw = w.read(e, PointerWorld);
-        cursor = { x: pw.x, y: pw.y, device: "mouse" };
+        mouse = { x: pw.x, y: pw.y, outside: w.hasTag(e, PointerOutside) };
       }
     });
-    if (cursor === void 0) return;
-    if (cursorPresent && lastCursor !== void 0 && lastCursor.x === cursor.x && lastCursor.y === cursor.y && lastCursor.device === cursor.device) {
+    const at = mouse ?? (cursorPresent ? lastCursor : void 0);
+    if (at === void 0) return;
+    const cursor = {
+      x: at.x,
+      y: at.y,
+      device: "mouse",
+      away: mouse?.outside === true || session.away() !== null,
+      canvas: presenceCanvasOf(w, session.peerId, keyOf)
+    };
+    if (cursorPresent && lastCursor !== void 0 && cursorEquals(lastCursor, cursor)) {
       return;
     }
     if (cursorPresent) eph.edit(localPeer).set(PresenceCursor, cursor);
@@ -14293,6 +14434,9 @@ function createPresencePublish(world, session, opts = {}) {
     lastSummary = summary;
   }
 }
+function cursorEquals(a, b) {
+  return a.x === b.x && a.y === b.y && a.device === b.device && a.away === b.away && a.canvas === b.canvas;
+}
 function summaryEquals(a, b) {
   return a.count === b.count && a.x === b.x && a.y === b.y && a.w === b.w && a.h === b.h && a.keys === b.keys;
 }
@@ -14301,16 +14445,18 @@ function summaryEquals(a, b) {
 import { Not as Not8, defineQuery as defineQuery48, defineTickSystem as defineTickSystem17 } from "@vibecook/strata-ecs";
 import { Local as Local2 } from "@vibecook/strata-ecs";
 var remotePeerCursorsQ = defineQuery48([PresenceCursor, PresencePeer, Not8(Local2)]);
-function createRemoteCursorsRig(world) {
+function createRemoteCursorsRig(world, opts = {}) {
   const pool = /* @__PURE__ */ new Map();
   const system = defineTickSystem17(
     (ctx) => {
       const live = /* @__PURE__ */ new Set();
+      const here = presenceCanvasOf(world, opts.peerId ?? "", opts.keyOf);
       ctx.query(remotePeerCursorsQ).each((b) => {
         for (const r of b) {
           const peer = b.entity(r);
-          live.add(peer);
           const pc = ctx.read(peer, PresenceCursor);
+          if (pc.away || (pc.canvas ?? "") !== here) continue;
+          live.add(peer);
           const entry = pool.get(peer);
           if (entry === void 0) {
             const cursor = ctx.spawn({
@@ -14358,14 +14504,23 @@ function createRemoteCursorsRig(world) {
     }
   };
 }
-function createRemoteCursorsSystem(world) {
-  return createRemoteCursorsRig(world).system;
+function createRemoteCursorsSystem(world, opts = {}) {
+  return createRemoteCursorsRig(world, opts).system;
 }
 function installPresence(engine, session, opts = {}) {
-  const removePublish = engine.onPublish(createPresencePublish(engine.world, session, opts));
-  const rig = createRemoteCursorsRig(engine.world);
+  const publish = createPresencePublish(engine.world, session, opts);
+  const removePublish = engine.onPublish(publish);
+  let installed = true;
+  const stopAway = session.onAway(() => {
+    queueMicrotask(() => {
+      if (installed && !engine.frame.stepping()) publish(engine.world);
+    });
+  });
+  const rig = createRemoteCursorsRig(engine.world, { peerId: session.peerId, ...opts.keyOf !== void 0 ? { keyOf: opts.keyOf } : {} });
   const removeSystem = engine.addSystems("present", rig.system);
   return () => {
+    installed = false;
+    stopAway();
     removePublish();
     removeSystem();
     rig.reap();
@@ -16260,6 +16415,21 @@ function createCanvasEngine(opts = {}) {
       }
       return spawned;
     },
+    layFromTray(type, at) {
+      if (typeof at?.x !== "number" || typeof at.y !== "number" || !Number.isFinite(at.x) || !Number.isFinite(at.y)) {
+        throw new Error(`ice: ops.layFromTray \u2014 the point is ${JSON.stringify(at) ?? String(at)}: { x, y }, a world point of the current frame, two finite numbers.`);
+      }
+      if (heldNow() !== void 0 || !trayHung(world).includes(type)) return void 0;
+      const widget = catalog.widget(type);
+      const entry = widget?.tray;
+      if (widget === void 0 || entry === void 0) return void 0;
+      const { w, h } = widget.defaultSize;
+      const props = trayTakeProps(entry);
+      const laid = ops.spawnWidget(type, { x: at.x - w / 2, y: at.y - h / 2, w, h, ...props !== void 0 ? { props } : {} });
+      ops.setSelection([laid]);
+      closeTray(world);
+      return laid;
+    },
     insertByDrag(type, o) {
       requireWritable("insertByDrag");
       const targetFrame = requireCurrentFrame("insertByDrag");
@@ -16825,6 +16995,7 @@ export {
   PartTap,
   WheelHandled,
   OverInteractive,
+  PointerOutside,
   LocalPointer,
   PointerWorld,
   Keyboard,
@@ -16987,6 +17158,9 @@ export {
   closeTray,
   toggleTray,
   scrollTray,
+  trayHung,
+  trayFocus,
+  focusTray,
   trayCategory,
   setTrayCategory,
   trayCategories,
@@ -17036,6 +17210,7 @@ export {
   attachBroadcastRelay,
   DEFAULT_PRESENCE_TTL_MS,
   attachPresence,
+  presenceCanvasOf,
   createPresencePublish,
   createRemoteCursorsSystem,
   installPresence,
@@ -17060,4 +17235,4 @@ export {
   Local3 as Local,
   DurableUndoStatus
 };
-//# sourceMappingURL=chunk-HSIFKQNP.js.map
+//# sourceMappingURL=chunk-CAJ64OD6.js.map