samagotchi 0.20.0 → 0.21.0

data/lib/samagotchi/web/public/notify.js

@@ -119,7 +119,16 @@ export function trackAttention(state, type, data = {}) {
     byId[s.id] = s;
   };
   if (type === "snapshot") {
-    (Array.isArray(data.sessions) ? data.sessions : []).forEach(see);
+    const sessions = Array.isArray(data.sessions) ? data.sessions : [];
+    sessions.forEach(see);
+    // The whole list: a session missing from it went while no frame said so
+    // (the hub away, or between two fetches), as if session_gone came.
+    const present = new Set(sessions.map((s) => s?.id));
+    for (const id of Object.keys(byId)) {
+      if (present.has(id)) continue;
+      close(byId[id], null);
+      delete byId[id];
+    }
     return { state: { seeded: true, byId }, attentions, closed };
   }
   if (type === "session") see(data.session);
@@ -152,7 +161,10 @@ export function attentionText(session, attention) {
 // (BroadcastChannel "chi-notify") which attention keys it has in front, and
 // a tab behind neither notifies nor badges those: it holds a new attention
 // for +holdMs+ in case the front tab's word is on its way, and drops a key
-// from its badge when the word comes later. Without BroadcastChannel every
+// from its badge when the word comes later. Every tab behind badges its
+// title, but only one shows the OS notification: each tab behind claims
+// the key on the channel as it holds it, and at the end of the hold the
+// lowest claim (a tab id) shows it (4.11). Without BroadcastChannel every
 // tab goes on alone, at once.
 export const NOTIFY_CHANNEL = "chi-notify";
 export const NOTIFY_HOLD_MS = 300;
@@ -162,16 +174,31 @@ const SEEN_TTL_MS = 10 * 60 * 1000;
 // @param channel a BroadcastChannel (postMessage, onmessage), or null
 // @param onSeen(keys) another tab has these keys in front (drop them from
 //   the badge)
+// @param id this tab's claim (random by default)
 // @return {seenInFront(keys), offer(attention, deliver), drop(keys)}
 export function createNotifyGate({ channel = null, holdMs = NOTIFY_HOLD_MS, onSeen = () => {},
-  schedule = setTimeout, cancel = clearTimeout, now = Date.now } = {}) {
+  schedule = setTimeout, cancel = clearTimeout, now = Date.now, id = randomTabId() } = {}) {
   const seen = new Map(); // key → when
   const pending = new Map(); // key → timer
+  const claims = new Map(); // key → {ids: the other tabs' claims, at}
   const mark = (keys) => {
     const at = now();
     for (const [key, when] of seen) if (at - when > SEEN_TTL_MS) seen.delete(key);
     for (const key of keys) seen.set(key, at);
   };
+  const claimed = (key, tab) => {
+    const at = now();
+    for (const [k, claim] of claims) if (at - claim.at > SEEN_TTL_MS) claims.delete(k);
+    const claim = claims.get(key) || { ids: new Set(), at };
+    claim.ids.add(tab);
+    claims.set(key, claim);
+  };
+  // This tab's claim is the lowest: it shows the OS notification.
+  const won = (key) => {
+    const others = claims.get(key)?.ids || new Set();
+    claims.delete(key);
+    return [...others].every((other) => id < other);
+  };
   const drop = (keys) => {
     for (const key of keys) {
       if (!pending.has(key)) continue;
@@ -181,6 +208,10 @@ export function createNotifyGate({ channel = null, holdMs = NOTIFY_HOLD_MS, onSe
   };
   if (channel) {
     channel.onmessage = (e) => {
+      if (e?.data?.type === "claim" && typeof e.data.key === "string" && typeof e.data.id === "string") {
+        claimed(e.data.key, e.data.id);
+        return;
+      }
       const keys = e?.data?.type === "seen" && Array.isArray(e.data.keys) ? e.data.keys.map(String) : [];
       if (keys.length === 0) return;
       mark(keys);
@@ -194,21 +225,25 @@ export function createNotifyGate({ channel = null, holdMs = NOTIFY_HOLD_MS, onSe
       if (!channel || keys.length === 0) return;
       try { channel.postMessage({ type: "seen", keys }); } catch (_) {}
     },
-    // A new attention in a tab behind: +deliver+ (notify, badge) unless
-    // another tab has it in front. @return whether it may still be delivered
+    // A new attention in a tab behind: +deliver(notify)+ (badge; the OS
+    // notification when +notify+) unless another tab has it in front.
+    // @return whether it may still be delivered
     // An attention's own holdMs (a delegated child's approval) holds it
     // longer, alone too.
     offer(attention, deliver) {
       const key = attention.key;
       if (seen.has(key)) return false;
       if (!channel && !attention.holdMs) {
-        deliver();
+        deliver(true);
         return true;
       }
       drop([key]);
+      if (channel) {
+        try { channel.postMessage({ type: "claim", key, id }); } catch (_) {}
+      }
       pending.set(key, schedule(() => {
         pending.delete(key);
-        if (!seen.has(key)) deliver();
+        if (!seen.has(key)) deliver(won(key));
       }, Math.max(holdMs, attention.holdMs || 0)));
       return true;
     },
@@ -216,3 +251,10 @@ export function createNotifyGate({ channel = null, holdMs = NOTIFY_HOLD_MS, onSe
     drop,
   };
 }
+
+function randomTabId() {
+  try {
+    if (typeof globalThis.crypto?.randomUUID === "function") return globalThis.crypto.randomUUID();
+  } catch (_) {}
+  return `${Date.now().toString(36)}-${Math.random().toString(36).slice(2)}`;
+}

data/lib/samagotchi/web/public/timing.js

@@ -26,8 +26,10 @@ const CANCEL_REASONS = { ctrl_c: "Ctrl-C", user: "stopped", hook: "by a hook" };
 
 // The line a canceled turn ends with: "✕ canceled (stopped)", live from
 // turn_canceled's reason and after a re-render from the turn record's
-// cancellation_reason (records saved before it existed: no reason).
-export function cancelLineText(reason) {
+// cancellation_reason (records saved before it existed: no reason). A
+// hook's stop that names who (+by+, cancelled_by): "✕ stopped by loop-guard".
+export function cancelLineText(reason, by) {
+  if (reason === "hook" && by) return `\u2715 stopped by ${by}`;
   return "\u2715 canceled" + (reason ? ` (${CANCEL_REASONS[reason] || reason})` : "");
 }
 
@@ -35,7 +37,7 @@ export function cancelLineText(reason) {
 // record is not a canceled one.
 export function cancelLineHtml(record, escape) {
   if (record?.status !== "canceled") return "";
-  return `<div class="bubble cancel">${escape(cancelLineText(record.cancellation_reason))}</div>`;
+  return `<div class="bubble cancel">${escape(cancelLineText(record.cancellation_reason, record.cancelled_by))}</div>`;
 }
 
 export function elapsedSince(startedAt, now = Date.now()) {

data/lib/samagotchi/web/public/turn_events.js

@@ -401,6 +401,16 @@ export function promptOps(event, { myId, known, unmatchedMerge = false }) {
   }
 }
 
+// A stream opened with no cursor (a worker woken after a render that had
+// none) replays the worker's events from its start: a turn_started for a
+// turn the page drew already (+turnRecords+, the render's timing) means
+// that replay overlaps the render, and the page re-reads the session
+// rather than drawing the turn twice (4.01).
+export function replaysDrawnTurn(event, turnRecords = []) {
+  if (event?.type !== "turn_started" || !event.turn_id) return false;
+  return turnRecords.some((record) => record.id === event.turn_id);
+}
+
 // A session view from the server (GET /api/sessions/:id on a live worker)
 // as the live events that would have drawn it: the turn in progress (its
 // parts in order), then the prompts queued behind it. app.js feeds these to
@@ -420,6 +430,12 @@ export function snapshotEvents({ current_turn: turn = null, queued = [], started
     };
     for (const part of turn.parts || []) {
       switch (part.kind) {
+        // A generation the model is on: a join during a hold (no chunk yet)
+        // shows its live step.
+        case "generation":
+          closeText();
+          events.push({ type: "generation_started", iteration: part.iteration ?? null });
+          break;
         // The chunks carry the part's iteration, so the turn view groups a
         // join like the live stream (turn_model.js).
         case "thinking":

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.21.0
 platform: ruby
 authors:
 - Dmitry Dedov