samagotchi 0.20.0 → 0.22.0

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

@@ -45,7 +45,7 @@ import {
   appendAboveLiveTiming, cancelLineText, elapsedSince, formatDuration, mergeTiming, normalizeTiming, turnTimingText,
 } from "./timing.js";
 import { DONE_MS, applyInitEvent, dropDone, initRowHtml, newInitTasks, seedInitTasks } from "./init_row.js";
-import { clientLabel, commandView, displayWait, dropEarlyRestores, emptyAnswerLine, emptyRetryLine, hookNoticeLabel, initWaitLine, isOwn, sessionCommandLine, keepEarlyRestore, newClientId, noticeLine, promptOps, reminderText, restoreAction, composerAfterAck, restoreOnAck, retryStatusLine, snapshotEvents, startPageReplyOrHint, turnOutput, unknownCommandHint, webLocalReply, workerGoneText } from "./turn_events.js";
+import { clientLabel, commandView, displayWait, dropEarlyRestores, emptyAnswerLine, emptyRetryLine, hookNoticeLabel, initWaitLine, isOwn, sessionCommandLine, keepEarlyRestore, newClientId, noticeLine, promptOps, reminderText, restoreAction, composerAfterAck, restoreOnAck, replaysDrawnTurn, retryStatusLine, snapshotEvents, startPageReplyOrHint, turnOutput, unknownCommandHint, webLocalReply, workerGoneText } from "./turn_events.js";
 
 const $ = (s) => document.querySelector(s);
 const topStripEl = $("#topStrip");
@@ -134,6 +134,9 @@ const questionCards = createQuestionCards({
 // was rendered at (null: no live worker then), where a stream opened later
 // has to start.
 let selectSeq = null;
+// The stream was opened from 0 (a wake with no cursor to go on) and no
+// new turn has started on it yet: see followWokenWorker.
+let streamFromGuess = false;
 // The last input_merged had an origin with no bubble: its merged text
 // (pending_input_merged) gets one.
 let unmatchedMerge = false;
@@ -165,6 +168,7 @@ let scopeError = null;
 async function refresh() {
   try {
     allSessions = await listSessions("updated_at", "desc", { dir: scope.dir });
+    notifications.noticeList(allSessions);
   } catch (e) {
     if (e.status !== 400 || !scope.dir) throw e;
     scopeError = e.message;
@@ -1341,7 +1345,7 @@ function onCardAction(e) {
   sendCommand(selected, button.dataset.command, { clientId, card: true })
     .then(() => {
       // The command woke the worker: follow its stream if none is open.
-      if (!streamControl?.live) startStream(selected, selectSeq ?? 0);
+      followWokenWorker();
     })
     .catch((error) => {
       err.textContent = error.message;
@@ -1416,6 +1420,7 @@ function updateInfoBar() {
     archiveBtn.style.display = selected ? "" : "none";
     const archived = selectedArchived();
     archiveBtn.textContent = archived ? "unarchive" : "archive";
+    archiveBtn.classList.toggle("archived", archived);
     archiveBtn.title = archived ? "Unarchive: back to the lists" : "Archive: hide from the lists, keep for good";
   }
   if (!selected) {
@@ -1593,7 +1598,18 @@ function setUsedMemories(names) {
   }
 }
 
+// A turn or command just woke the session's worker: follow its stream if
+// none is open, from the render's cursor. A render with none (no worker
+// then) streams from 0, the start of a new worker's events; should that
+// worker have been up already, turn_started says so (replaysDrawnTurn).
+function followWokenWorker() {
+  if (streamControl?.live) return;
+  startStream(selected, selectSeq ?? 0);
+  streamFromGuess = selectSeq === null;
+}
+
 function startStream(id, fromSeq) {
+  streamFromGuess = false;
   if (streamControl) {
     streamControl.close();
     streamControl = null;
@@ -1675,7 +1691,8 @@ const streamHandlers = {
   // Prompts sent while a turn ran merge into it at an iteration boundary:
   // input_merged names them (their bubbles turn "steered"), then
   // pending_input_merged carries the merged text, shown only for prompts
-  // this tab has no bubble for.
+  // this tab has no bubble for. Its `answer` (the answer the merge
+  // superseded) is the TUI's line: here it streamed as that step's text.
   input_merged: (data) => applyPromptOps(data),
   pending_input_merged: (data) => {
     applyPromptOps(data);
@@ -1683,6 +1700,16 @@ const streamHandlers = {
   },
   turn_enqueued: (data) => applyPromptOps(data),
   turn_started: (data) => keepFollowing(historyEl, () => {
+    if (streamFromGuess) {
+      streamFromGuess = false;
+      // A replay of a turn the render drew: re-read and stream from there.
+      if (replaysDrawnTurn(data, current.timing.turnRecords)) {
+        streamControl?.close();
+        streamControl = null;
+        resync();
+        return;
+      }
+    }
     // A finished turn still in the stage goes first: the start op looks
     // for a queued prompt among its rows.
     turnDom.handOff?.({ immediate: true });
@@ -1729,7 +1756,7 @@ const streamHandlers = {
     }
   },
   turn_canceled: (data) => {
-    endTurnView("canceled", cancelLineText(data.cancellation_reason || ""));
+    endTurnView("canceled", cancelLineText(data.cancellation_reason || "", data.cancelled_by));
     setLiveStatus("idle");
     refreshTimingFromSession();
   },
@@ -1965,7 +1992,7 @@ async function handleSendTurn() {
       echo.remove();
       promptEl.value = "";
       fitPrompt();
-      if (!streamControl?.live) startStream(selected, selectSeq ?? 0);
+      followWokenWorker();
       return;
     }
     if (ack?.enqueued_id) sentIds.add(ack.enqueued_id);
@@ -1987,7 +2014,7 @@ async function handleSendTurn() {
     // events in between. Without one, POST /turn just woke a worker: its
     // events start after the seq the session was rendered at (0 for a new
     // worker process).
-    if (!streamControl?.live) startStream(selected, selectSeq ?? 0);
+    followWokenWorker();
   } catch (e) {
     echo.remove();
     // The turn never reached the worker's queue: an early restore waiting
@@ -2028,7 +2055,7 @@ async function handleSendCommand(line) {
     fitPrompt();
     refreshHistory();
     // The command woke the worker: follow its stream if none is open.
-    if (!streamControl?.live) startStream(selected, selectSeq ?? 0);
+    followWokenWorker();
   } catch (e) {
     if (/owned_by_tui|409/.test(e.message)) {
       current.owner = "tui";

data/lib/samagotchi/web/public/index.html

@@ -606,6 +606,13 @@ body.stage-view #dock,body.stage-view #dock:focus-within{background:transparent;
   #infoBar .meta .mem-chip{display:inline;order:-1}
   #infoBar .meta .dir{word-break:normal}
   #infoBar button{padding:4px 8px}
+  /* Icon-only buttons (the words stay as the accessible name, the title says more): the meta gets the width. */
+  #infoBar>button{font-size:0;line-height:0;padding:5px 7px}
+  #infoBar>button::before{content:"";display:block;width:14px;height:14px;background:currentColor;-webkit-mask:var(--icon) center/contain no-repeat;mask:var(--icon) center/contain no-repeat}
+  #infoBar #infoArchiveBtn{--icon:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='none' stroke='black' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='2' y='2.75' width='12' height='3.5' rx='1'/%3E%3Cpath d='M3.25 6.25v6a1 1 0 0 0 1 1h7.5a1 1 0 0 0 1-1v-6M6.5 9h3'/%3E%3C/svg%3E")}
+  #infoBar #infoArchiveBtn.archived{--icon:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='none' stroke='black' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='2' y='2.75' width='12' height='3.5' rx='1'/%3E%3Cpath d='M3.25 6.25v6a1 1 0 0 0 1 1h7.5a1 1 0 0 0 1-1v-6M8 11.5V8.25M6.5 9.75 8 8.25l1.5 1.5'/%3E%3C/svg%3E")}
+  #infoBar #infoStopBtn{--icon:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='none' stroke='black' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M8 2v5.5M4.6 4.4a5 5 0 1 0 6.8 0'/%3E%3C/svg%3E")}
+  #infoBar #infoDeleteBtn{--icon:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='none' stroke='black' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M2.5 4.5h11M6 4.5V2.75h4V4.5M4 4.5l.7 8.6a1 1 0 0 0 1 .9h4.6a1 1 0 0 0 1-.9l.7-8.6M6.75 7.25v4.5M9.25 7.25v4.5'/%3E%3C/svg%3E")}
 }
 #empty{position:absolute;inset:0;display:grid;place-items:center;color:var(--text-muted);padding:24px;text-align:center;background:color-mix(in srgb,var(--bg) 35%,transparent);z-index:1}
 #empty.hidden{display:none !important}

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

@@ -35,7 +35,7 @@ function defaultChannel() {
 // @param storage () => localStorage (it can throw)
 // @param channel the BroadcastChannel to the other chi tabs, or null
 // @param gateOptions passed to createNotifyGate (specs: schedule, now)
-// @return {noticeSessions(type, data), setBaseTitle(title), clearBadge()}
+// @return {noticeSessions(type, data), noticeList(sessions), setBaseTitle(title), clearBadge()}
 export function createNotifications({
   button,
   doc = globalThis.document,
@@ -125,11 +125,12 @@ export function createNotifications({
       notifyGate.seenInFront(next.attentions.map((a) => a.key));
     } else {
       for (const a of next.attentions) {
-        notifyGate.offer(a, () => {
+        // Every tab behind badges; one of them notifies (notify.js).
+        notifyGate.offer(a, (notify) => {
           if (tabInFront()) return;
           badgeKeys.add(a.key);
           setTitle();
-          showNotification(attention.byId[a.sessionId], a);
+          if (notify) showNotification(attention.byId[a.sessionId], a);
         });
       }
     }
@@ -159,6 +160,10 @@ export function createNotifications({
 
   return {
     noticeSessions,
+    // The list fetched without a hub (app.js refresh): a snapshot.
+    noticeList(sessions) {
+      noticeSessions("snapshot", { sessions });
+    },
     // The title without the badge ("Chi · <project>").
     setBaseTitle(title) {
       baseTitle = title;

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.22.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -270,6 +270,7 @@ files:
 - lib/samagotchi/llm/native_backend.rb
 - lib/samagotchi/llm/native_tool_normalizer.rb
 - lib/samagotchi/llm/openai_chat.rb
+- lib/samagotchi/llm/prompt_cache.rb
 - lib/samagotchi/llm/turn_settings.rb
 - lib/samagotchi/llm/usage.rb
 - lib/samagotchi/llm/utf8_scrub.rb