samagotchi 0.66.0 → 0.67.0

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

@@ -36,7 +36,7 @@ import { createShownTexts } from "./shown_texts.js";
 import { MODEL_KEY } from "./model_pick.js";
 import { emptySessionState, sessionStateFrom } from "./session_state.js";
 import { createModelPicker } from "./model_picker.js";
-import { chipName, chipsTemplate, imageFiles, restoredChips, thumbsTemplate, turnRefs, turnText } from "./images.js";
+import { chipName, chipsTemplate, imageFiles, restoredChips, thumbsTemplate, turnRefs, turnText, uploadChips } from "./images.js";
 import { normalize, firstPreview, failedTurnText, modelLabel, deleteConfirmText, recapLabel, canStopSession, goneSessionNotice, withLiveStatus, withoutWorker, recapPlace, delegatedBy, childrenSummary, promptNotesChip } from "./format.js";
 import { createTurnView, stepText, turnHistoryNodes } from "./turn_view.js";
 import { BADGES, elementOf, emptyAnswerTemplate, noteBubbleTemplate, stateBadgeTemplate, steerRowTemplate, userBubbleTemplate } from "./turn_html.js";
@@ -291,13 +291,6 @@ const questionCards = createQuestionCards({
   removeHintIfEmpty: () => removeHintIfEmpty(),
   askingText: () => turnDom.askingText(),
 });
-// The event id (or, from an older worker, the event_seq) the selected session
-// 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 enqueued_ids this page sent (from the /turn acks): only these come back
 // into the composer when their turn fails.
 const sentIds = new Set();
@@ -383,8 +376,9 @@ function openSessionEvents() {
 // never forcing it) or when a newer chi is installed than chi web runs.
 // Once per notice per tab: every reconnect's snapshot says it again.
 const versions = { served: null, installed: null };
-// The session whose Restart is under way (its button says so).
-let restartingId = null;
+// The sessions whose Restart is under way (their button says so): one
+// session's restart never blocks another's.
+const restartingIds = new Set();
 const versionNoticesShown = new Set();
 function noticeVersions(data) {
   if (typeof data.version === "string") versions.served = data.version;
@@ -767,8 +761,8 @@ async function resync({ endText = null } = {}) {
     renderSessionView(data, { kept });
     // Preview is read-only: a worker is woken only by POST /turn, so attach
     // only when a live bridge exists.
-    selectSeq = typeof data.last_event_seq === "number" ? (data.last_event_id || data.last_event_seq) : null;
-    if (selectSeq !== null) startStream(id, selectSeq);
+    current.streamSeq = typeof data.last_event_seq === "number" ? (data.last_event_id || data.last_event_seq) : null;
+    if (current.streamSeq !== null) startStream(id, current.streamSeq);
     else if (endText) addEndBubble(endText);
   } finally {
     resyncsInFlight -= 1;
@@ -1375,8 +1369,7 @@ function removeRecap() {
 }
 
 // The info bar's "copy chi --attach": the full id, which the page shows
-// only short; "copied ✓" for 2 s.
-let attachCopiedAt = 0;
+// only short; "copied ✓" for 2 s (current.attachCopiedAt: that session's).
 infoTextEl.addEventListener("click", (e) => {
   if (e.target.closest(".worker-restart")) restartWorker();
   // Pushed as openAllView does, so the view's back returns here.
@@ -1387,8 +1380,9 @@ infoTextEl.addEventListener("click", (e) => {
 });
 infoTextEl.addEventListener("click", async (e) => {
   if (!e.target.closest(".copy-attach") || !selected) return;
-  if (!(await copyText(`chi --attach ${selected}`))) return;
-  attachCopiedAt = Date.now();
+  const id = selected;
+  if (!(await copyText(`chi --attach ${id}`)) || id !== selected) return;
+  current.attachCopiedAt = Date.now();
   updateInfoBar();
   setTimeout(updateInfoBar, 2000);
 });
@@ -1405,10 +1399,10 @@ function currentWorkerBadge() {
 // follows it (its bridge_up), the composer's draft stays as it is.
 async function restartWorker() {
   const badge = currentWorkerBadge();
-  if (!badge || !badge.restart || restartingId) return;
+  if (!badge || !badge.restart || restartingIds.has(selected)) return;
   if (!confirm(restartConfirmText(current.workerVersion, badge.newest))) return;
   const id = selected;
-  restartingId = id;
+  restartingIds.add(id);
   updateInfoBar();
   try {
     const result = await restartSession(id);
@@ -1416,7 +1410,7 @@ async function restartWorker() {
   } catch (e) {
     showToast(`Can't restart: ${String(e.message).replace(/ \(\d+\)$/, "")}`, null, { sticky: true });
   } finally {
-    restartingId = null;
+    restartingIds.delete(id);
     updateInfoBar();
   }
 }
@@ -1465,7 +1459,7 @@ function updateInfoBar() {
   // text alone, the bar's other nodes (a tooltip, a button mid-press) stay.
   renderInfoBar(infoTextEl, {
     id: selected,
-    copied: Date.now() - attachCopiedAt < 2000,
+    copied: Date.now() - current.attachCopiedAt < 2000,
     status: current.status,
     model: modelLabel(current.model, ...(current.served || [])),
     // A link of a session chain: ← the previous link, → the next one (each
@@ -1488,7 +1482,7 @@ function updateInfoBar() {
     ctx: { text: ctxBarText(current.ctxPct, current.ctxWindowSource), tip: ctxTip },
     speed: speedTextNow ? { text: speedTextNow, tip: `Decode speed of the last generation${avgSpeed ? `; session average ${avgSpeed}` : ""}` } : null,
     clock: sessionDuration === null ? "" : `session ${formatDuration(sessionDuration)}`,
-    worker: badge ? { badge, busy: restartingId === selected } : null,
+    worker: badge ? { badge, busy: restartingIds.has(selected) } : null,
   });
   updateSessionTitle();
 }
@@ -1577,12 +1571,12 @@ function setUsedMemories(names) {
 // worker have been up already, turn_started says so (replaysDrawnTurn).
 function followWokenWorker() {
   if (streamControl?.live) return;
-  startStream(selected, selectSeq ?? 0);
-  streamFromGuess = selectSeq === null;
+  startStream(selected, current.streamSeq ?? 0);
+  current.streamFromGuess = current.streamSeq === null;
 }
 
 function startStream(id, fromSeq) {
-  streamFromGuess = false;
+  current.streamFromGuess = false;
   if (streamControl) {
     streamControl.close();
     streamControl = null;
@@ -1652,8 +1646,8 @@ const streamHandlers = createStreamHandlers({
   earlyRestores,
   stream: {
     takeGuess: () => {
-      const guess = streamFromGuess;
-      streamFromGuess = false;
+      const guess = current.streamFromGuess;
+      current.streamFromGuess = false;
       return guess;
     },
     restart: () => {
@@ -1806,18 +1800,18 @@ async function handleSendTurn({ delivery: chosen = null } = {}) {
     updateInfoBar();
   }
   actionBtn.disabled = true;
+  // The session the line goes to: the page may switch to another while an
+  // image uploads or the turn is sent, and what follows stays with this one.
   const sentTo = selected;
   try {
-    for (const chip of sending) {
-      if (!chip.ref) chip.ref = await uploadImage(selected, chip.file, chip.name);
-    }
-    const ack = await sendTurn(selected, prompt, { clientId, images: turnRefs(sending), history: typed, delivery });
+    await uploadChips(sending, sentTo, { upload: uploadImage });
+    const ack = await sendTurn(sentTo, prompt, { clientId, images: turnRefs(sending), history: typed, delivery });
     if (ack?.command_id) {
       // The worker knew it as a command (its list was newer than ours):
       // its command_ran shows it, not a prompt bubble.
       echo.remove();
       clearComposer();
-      followWokenWorker();
+      if (sentTo === selected) followWokenWorker();
       return;
     }
     if (ack?.enqueued_id) sentIds.add(ack.enqueued_id);
@@ -1834,7 +1828,7 @@ async function handleSendTurn({ delivery: chosen = null } = {}) {
     promptEl.value = composerAfterAck({ sent: line, current: promptEl.value, refill: restored?.refill || "" });
     fitPrompt();
     clearChips();
-    if (restored?.images?.length) setChips(restoredChips(selected, restored.images));
+    if (restored?.images?.length) setChips(restoredChips(sentTo, restored.images));
     // Its turn_enqueued usually tagged the echo already; the ack covers a
     // worker that wasn't live (no turn_enqueued then).
     if (ack?.enqueued_id && !echo.dataset.enqueuedId && !bubbleById(ack.enqueued_id)) {
@@ -1843,17 +1837,18 @@ async function handleSendTurn({ delivery: chosen = null } = {}) {
     // A live stream carries this turn already; restarting it would drop the
     // 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).
-    followWokenWorker();
+    // worker process). A switch since then opened the other session's own.
+    if (sentTo === selected) followWokenWorker();
   } catch (e) {
     echo.remove();
     // The turn never reached the worker's queue: an early restore waiting
     // for its ack is never taken back (4.13), so drop it here. The prompt
     // is still in the composer, as the echo was removed.
     dropEarlyRestores(earlyRestores);
-    // The chips stay (uploaded ones keep their ref) for another try: an
+    // The chips stay (uploaded ones keep their ref, to sentTo) for another try: an
     // image refused (bad_image, too_large, bad_images) says why below.
     if (e.code === "owned_by_tui") {
+      if (sentTo !== selected) return alert(e.message);
       current.owner = "tui";
       updateComposerMode();
       return;
@@ -1862,7 +1857,7 @@ async function handleSendTurn({ delivery: chosen = null } = {}) {
     // says so, and the line stays in the composer.
     if (e.code === "not_found") return leaveGoneSession(sentTo, "not_found");
     // A /queue to a worker that can't queue (it would steer): its words, the text kept.
-    if (e.code === "delivery_unavailable") return addCommandBubble({ label: null, line, text: e.body?.detail || e.message, failed: true });
+    if (e.code === "delivery_unavailable" && sentTo === selected) return addCommandBubble({ label: null, line, text: e.body?.detail || e.message, failed: true });
     alert(e.message);
   } finally {
     actionBtn.disabled = current.owner === "tui";

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

@@ -141,7 +141,7 @@ export function allViewChains(fams, all, { query = "", includeArchived = false }
 
 // The links a family's chain list shows: the chain but its head, newest
 // first, each {session, day} (day: its 1-based place in the chain).
-export function chainOthers(f) {
+function chainOthers(f) {
   const links = f?.chain?.links || [];
   return links.map((session, i) => ({ session, day: i + 1 }))
     .filter(({ session }) => session.id !== f.head.id)

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

@@ -153,8 +153,8 @@ export function continueLine(choice, reason = "") {
 // dropped (styled as failed). A change that restarts the prompt cache asks
 // first (CacheConfirm): `confirm` is the line that applies it, and this
 // tab's own bubble (`own`) gets an Apply button that sends it.
-export const QUEUED_TEXT = "queued: runs after this turn";
-export const APPLY_TEXT = "Apply (restarts the cache)";
+const QUEUED_TEXT = "queued: runs after this turn";
+const APPLY_TEXT = "Apply (restarts the cache)";
 
 export function commandView(event, myId) {
   const own = isOwn(event.client_id, myId);

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

@@ -2,8 +2,8 @@
 // its top edge sets a taller floor (the cap then is at least that floor).
 export const PROMPT_MIN_PX = 72; // about three lines of the 15 px field: the start page
 export const PROMPT_LINE_PX = 26; // one line (15 px × 1.45 + 4 padding): in a session
-export const PROMPT_CAP_SHARE = 0.35; // of the window's height, for growing with text
-export const PROMPT_GRIP_SHARE = 0.5; // of the window's height, for the grip
+const PROMPT_CAP_SHARE = 0.35; // of the window's height, for growing with text
+const PROMPT_GRIP_SHARE = 0.5; // of the window's height, for the grip
 
 // contentPx: the text's height (scrollHeight plus borders); floorPx: the
 // grip's height, or null; minPx: the empty box's height.

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

@@ -99,7 +99,7 @@ function makeButton(doc, kind) {
 
 // Buttons on every bubble and code block in +root+ (and on +root+ itself)
 // that has none yet.
-export function decorate(root) {
+function decorate(root) {
   const doc = root.ownerDocument;
   const bubbles = [...root.querySelectorAll(BUBBLES)];
   if (root.matches(BUBBLES)) bubbles.push(root);

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

@@ -13,7 +13,7 @@ function num(v) {
 
 // What a fill counts against: the window, or the budget when one is set
 // and smaller; null without a window.
-export function countedTokens(windowTokens, budgetTokens = null) {
+function countedTokens(windowTokens, budgetTokens = null) {
   const window = num(windowTokens);
   if (!window || window <= 0) return null;
   const budget = num(budgetTokens);

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

@@ -21,8 +21,8 @@ import { html, nothing, render } from "./vendor/lit-html.js";
 export const QUEUE_LABEL = "queue for after the turn";
 export const CUT_LABEL = "cut in now";
 // A phone's row (≤ 600 px) is short: its text and chips.
-export const QUEUE_SHORT = "queue";
-export const CUT_SHORT = "cut in";
+const QUEUE_SHORT = "queue";
+const CUT_SHORT = "cut in";
 // Alt+Enter to a worker without the delivery feature: not sent (a queue
 // would steer it), the text kept, this said.
 export const QUEUE_NEEDS_WORKER = "Not sent: queueing needs a newer worker (it would steer the running turn). "
@@ -144,7 +144,7 @@ export function deliveryLineTemplate(line, { onCut, onQueue } = {}) {
 }
 
 // The idle row: the key hint (none on a phone: no keyboard keys there).
-export function idleTemplate() {
+function idleTemplate() {
   return html`<span class="delivery-where idle"><span class="long">${IDLE_HINT}</span><span class="short"></span></span>`;
 }
 
@@ -155,7 +155,7 @@ export function idleTemplate() {
 //                    phase, gen, tool, cutAfter, serverGen, canQueue, model)
 //   composerEmpty()  nothing typed and no image chips: a link arms
 //   send(delivery)   send the composer's line with +delivery+ ("cut", "queue")
-export const TICK_MS = 500;
+const TICK_MS = 500;
 
 export function createDeliveryControl({ el, read, composerEmpty, send, now = () => Date.now(),
   setTimer = (fn, ms) => setInterval(fn, ms), clearTimer = (t) => clearInterval(t) }) {

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

@@ -71,7 +71,7 @@ export function familyRowsTemplate(f, { activeId = null, matchIds = null, archiv
 }
 
 // The widest window index.html lays out as a phone (@media (max-width:600px)).
-export const PHONE_MAX_PX = 600;
+const PHONE_MAX_PX = 600;
 
 // The strip's family popover: one #familyPop in body (position: fixed, so
 // the strip's sideways scroll on a phone doesn't clip it), under the chip

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

@@ -1,7 +1,7 @@
 import { waitingOn } from "./notify.js";
 
 export const PREVIEW_CHARS = 40;
-export const FIRST_PREVIEW_CHARS = 80;
+const FIRST_PREVIEW_CHARS = 80;
 
 export function escapeHtml(value) {
   return String(value).replace(
@@ -37,20 +37,24 @@ export function normalize(s) {
   return String(s || "").replace(/\s+/g, " ").trim();
 }
 
+// +text+ in at most +n+ characters: whole when it fits, else cut with "…"
+// as its last (the kept part's trailing spaces dropped).
+export function clip(text, n) {
+  const s = String(text ?? "");
+  return s.length > n ? `${s.slice(0, n - 1).trimEnd()}\u2026` : s;
+}
+
 export function previewOf(lastPrompt) {
   const normalized = normalize(lastPrompt);
   if (!normalized) return "\u2014";
-  if (normalized.length > PREVIEW_CHARS) {
-    return `${normalized.slice(0, PREVIEW_CHARS)}\u2026`;
-  }
-  return normalized;
+  return clip(normalized, PREVIEW_CHARS + 1);
 }
 
 // A session's first message as the info bar's title: whitespace collapsed,
 // cut at FIRST_PREVIEW_CHARS with an ellipsis ("" for none).
 export function firstPreview(text) {
   const n = normalize(text);
-  return n.length > FIRST_PREVIEW_CHARS ? `${n.slice(0, FIRST_PREVIEW_CHARS)}\u2026` : n;
+  return clip(n, FIRST_PREVIEW_CHARS + 1);
 }
 
 export function previewForCard(session) {
@@ -66,7 +70,7 @@ const DELETE_PREVIEW_CHARS = 40;
 // "stopped if it's still running", never promised.
 export function deleteConfirmText(session) {
   const n = normalize(session.first_preview || session.last_prompt || "");
-  const preview = n.length > DELETE_PREVIEW_CHARS ? `${n.slice(0, DELETE_PREVIEW_CHARS)}\u2026` : n;
+  const preview = clip(n, DELETE_PREVIEW_CHARS + 1);
   const shortId = session.short_id || String(session.id).slice(0, 8);
   const lines = [
     `Delete session ${shortId}${preview ? ` \u2014 "${preview}"` : ""}?`,

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

@@ -67,7 +67,30 @@ export function turnRefs(chips) {
 }
 
 // Chips again for a prompt the worker handed back (its images are stored
-// already, so they need no upload).
+// already, so they need no upload: to that session).
 export function restoredChips(sessionId, images) {
-  return (images || []).filter((i) => i && i.file).map((ref) => ({ name: ref.name || "image", ref, src: imageUrl(sessionId, ref) }));
+  return (images || []).filter((i) => i && i.file)
+    .map((ref) => ({ name: ref.name || "image", ref, session: sessionId, src: imageUrl(sessionId, ref) }));
+}
+
+// A restored chip has no file of its own: its image, read back from where
+// its session stores it.
+async function fetchChipFile(src, name) {
+  const res = await fetch(src);
+  if (!res.ok) throw new Error(`Can't read ${name} again (${res.status})`);
+  const blob = await res.blob();
+  return new File([blob], name, { type: blob.type });
+}
+
+// Uploads the chips a turn to +sessionId+ needs: a ref is into one session's
+// image store (chip.session), so a chip uploaded to another one (a failed
+// send there, then a switch) goes up again, to this one. Sets each chip's
+// ref and session in place: a failed send keeps them for another try.
+export async function uploadChips(chips, sessionId, { upload, fetchFile = fetchChipFile }) {
+  for (const chip of chips || []) {
+    if (chip.ref && chip.session === sessionId) continue;
+    const file = chip.file || await fetchFile(chip.src, chip.name);
+    chip.ref = await upload(sessionId, file, chip.name);
+    chip.session = sessionId;
+  }
 }

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

@@ -14,7 +14,7 @@
 
 import { html, nothing, render } from "./vendor/lit-html.js";
 
-export const STRATEGIES = [
+const STRATEGIES = [
   { value: "none", label: "none" },
   { value: "stale", label: "stale" },
   { value: "stale,forget", label: "stale + forget (experimental)" },
@@ -144,7 +144,7 @@ export function choiceWords(choice) {
 
 // The strategy list, with the session's own value when it isn't one of them
 // (forget alone, a newer chi's layer).
-export function strategyOptions(chosen) {
+function strategyOptions(chosen) {
   if (chosen === DEFAULT || STRATEGIES.some((s) => s.value === chosen)) return STRATEGIES;
   return [...STRATEGIES, { value: chosen, label: chosen }];
 }

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

@@ -2,6 +2,8 @@
 // summaries (GET /api/events). The page shows an OS notification and a
 // title badge for what it returns, while the tab is not in front.
 
+import { clip } from "./format.js";
+
 // The bell's state. OS notifications need a secure context: on chi web
 // over http at a LAN address the API is missing or always denied, so the
 // bell is hidden there (the title badge still counts).
@@ -16,7 +18,7 @@ export function notifyState({ hasNotification, secureContext, permission, wanted
 // chi ran for a delegate child's report (last_turn origin delegate_report)
 // or an attached context change (context): nobody started it, so nobody
 // watched it.
-export const DONE_MIN_SECONDS = 10;
+const DONE_MIN_SECONDS = 10;
 const UNWATCHED_ORIGINS = ["delegate_report", "context"];
 
 // The step-limit question (kind "continue": a turn ran out of iterations
@@ -90,7 +92,7 @@ const cardKey = (sessionId, cardId) => `${sessionId}:card:${cardId}`;
 // @param prev the summary held before (null for a session not seen yet)
 // @param next the new summary (null when the session is gone)
 // @return [String] keys, maybe none
-export function closedKeys(prev, next) {
+function closedKeys(prev, next) {
   const keys = [];
   const q = prev?.pending_question;
   const nq = next?.pending_question;
@@ -147,7 +149,7 @@ export function trackAttention(state, type, data = {}) {
 // No question or answer text (it would show on a lock screen).
 export function attentionText(session, attention) {
   const name = String(session?.title || session?.first_preview || session?.last_prompt || "chi session").trim();
-  const title = name.length > 60 ? `${name.slice(0, 60)}…` : name;
+  const title = clip(name, 61);
   const seconds = Math.round(Number(session?.last_turn?.seconds) || 0);
   const body = {
     question: "needs an answer",
@@ -171,7 +173,7 @@ export function attentionText(session, attention) {
 // 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;
+const NOTIFY_HOLD_MS = 300;
 // How long a key seen in front is remembered (its frame may come late).
 const SEEN_TTL_MS = 10 * 60 * 1000;
 

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

@@ -70,7 +70,7 @@ export function approvalView(pq) {
   const reason = a.reason ? String(a.reason) : "(no reason given)";
   return {
     // A plugin tool's label ("chrome: screenshot"), as its row shows it;
-    // else the tool the call acts as (an MCP tool behind mcp_call).
+    // else the tool the call acts as (an MCP tool behind call_tool).
     tool: a.label || a.acts_as || a.tool || "",
     // A tool without a command or path (an MCP tool): its compact args.
     what: command || paths.join("\n") || a.args || "",

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

@@ -30,7 +30,7 @@ const SKIP = "pre, a, [data-ref-kind]";
 // The ref a match names: { path, line, endLine } or null. A path has a `/`
 // or an extension (`10:30` is a time, `host:8080` a port); line 0 is never
 // a ref; an end line not after the line is dropped.
-export function refOf(groups) {
+function refOf(groups) {
   const path = groups?.path || "";
   if (!path.includes("/") && !/\.[A-Za-z0-9]+$/.test(path)) return null;
   if (groups.from === undefined) return { path, line: null, endLine: null };

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

@@ -50,6 +50,15 @@ export function emptySessionState() {
     reasoningHistory: null,
     toolkit: null,
     timing: normalizeTiming(),
+    // The event id (or, from an older worker, the event_seq) the session was
+    // rendered at (null: no live worker then), where a stream opened later
+    // has to start; set by the page's resync, not by the payload.
+    streamSeq: null,
+    // The stream was opened from 0 (a wake with no cursor to go on) and no
+    // new turn has started on it yet (app.js followWokenWorker).
+    streamFromGuess: false,
+    // When the info bar's "copy chi --attach" copied (its "copied ✓").
+    attachCopiedAt: 0,
   };
 }
 
@@ -65,6 +74,11 @@ export function sessionStateFrom(data) {
     served: s.served_model ? [s.served_model, s.served_model_for, s.served_expected_by || null] : null,
     dir: s.working_directory,
     owner: s.owner || null,
+    // Its live worker's chi and features (null and [] without one): a
+    // switch shows its stale-worker badge, task stop and queue at once,
+    // not at the session's next hub event (followSelectedSession).
+    workerVersion: s.worker_version || null,
+    workerFeatures: Array.isArray(s.worker_features) ? s.worker_features : [],
     timing: normalizeTiming(data.timing),
   };
   // The saved fill, so a reloaded or stopped session shows it before its

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

@@ -1,4 +1,4 @@
-import { normalize } from "./format.js";
+import { clip, normalize } from "./format.js";
 
 // Where the open session's title shows: once on screen. Its strip card says
 // it when the strip is shown and has an `.active` card for it; otherwise
@@ -21,6 +21,5 @@ export function topBarTitle({ title, cardShown, stripHidden, allView }) {
 export function tabTitle({ title, base }) {
   const text = normalize(title);
   if (!text) return base;
-  const cut = text.length > TAB_TITLE_CHARS ? `${text.slice(0, TAB_TITLE_CHARS)}…` : text;
-  return `${cut} · ${base}`;
+  return `${clip(text, TAB_TITLE_CHARS + 1)} · ${base}`;
 }

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

@@ -188,14 +188,6 @@ export function familySummary(f) {
   return delegatesSummary(f.members.map((m) => m.session));
 }
 
-// The chip's words: "▸ 3 delegates · 1 live · 1 waiting".
-export function familyChipText(sum) {
-  if (!sum) return "";
-  const waiting = sum.counts?.waiting || 0;
-  return [`\u25B8 ${sum.total} ${sum.total === 1 ? "delegate" : "delegates"}`,
-    sum.live ? `${sum.live} live` : "", waiting ? `${waiting} waiting` : ""].filter(Boolean).join(" \u00b7 ");
-}
-
 // Whether a family's list is open: the user's toggle (+toggles+, head id →
 // bool) wins; else open when a member waits on the user (the head's own
 // wait is on its card already) or a search matched a member.

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

@@ -15,9 +15,9 @@ const FILE_TOOLS = new Set(["read", "edit", "write"]);
 const TASK_TOOLS = new Set(["task_wait", "task_get", "task_stop"]);
 const TRAIL = 3;
 // The hand-off waits this long after the stage was last in use.
-export const QUIET_MS = 1500;
+const QUIET_MS = 1500;
 // A touch, wheel or scroll counts as use this long (phones have no hover).
-export const TOUCH_MS = 4000;
+const TOUCH_MS = 4000;
 
 // One headline sentence as plain text: the markdown a streaming answer
 // carries (headings, quotes, bullets, table pipes, emphasis, code ticks,

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

@@ -3,9 +3,9 @@ import { waitingOn } from "./notify.js";
 // How many session cards the top strip shows for its width in px: a card
 // needs about 360 px plus a 12 px gap next to the 150 px "All sessions" tile;
 // never fewer than 3 (narrow screens scroll them), never more than 6.
-export const STRIP_TILE_PX = 150;
-export const STRIP_GAP_PX = 12;
-export const STRIP_CARD_PX = 360;
+const STRIP_TILE_PX = 150;
+const STRIP_GAP_PX = 12;
+const STRIP_CARD_PX = 360;
 
 export function stripColumns(width) {
   const fit = Math.floor(((width || 0) - STRIP_TILE_PX - STRIP_GAP_PX) / (STRIP_CARD_PX + STRIP_GAP_PX));

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

@@ -6,9 +6,10 @@
 // button disabled. Pure but for the injected calls, so `node --test`
 // covers it; turn_view.js and stage_view.js draw the button.
 import { stopTask as postStopTask } from "./data.js";
+import { clip } from "./format.js";
 
 // What a worker that has the route names in its sidecar features.
-export const TASK_STOP_FEATURE = "task_stop";
+const TASK_STOP_FEATURE = "task_stop";
 const COMMAND_SHOWN = 120;
 
 // The task a row's button would stop: a running task_wait's (its server
@@ -61,7 +62,7 @@ export function taskCommand(gens, taskId) {
 
 export function confirmText(taskId, command) {
   const line = String(command || "").replace(/\s+/g, " ").trim();
-  const what = !line ? taskId : line.length > COMMAND_SHOWN ? `${line.slice(0, COMMAND_SHOWN - 1)}…` : line;
+  const what = line ? clip(line, COMMAND_SHOWN) : taskId;
   return `Stop task ${what}?`;
 }
 

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

@@ -26,7 +26,7 @@ export function workerGoneText({ turnRunning, stopped = false }) {
 
 // How long a turn's answer waits for the after_turn hooks' answer_display
 // before the page stops waiting and pops what it has (4.14).
-export const DISPLAY_WAIT_MS = 20000;
+const DISPLAY_WAIT_MS = 20000;
 
 // The wait between a turn_completed with display_pending and its
 // answer_display. The worker can die in between (a crash, a stop, an idle

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

@@ -8,7 +8,7 @@ import { html, nothing, render } from "./vendor/lit-html.js";
 import { commandBlockTemplate, rowHover } from "./command_view.js";
 import { copySource } from "./copy.js";
 import { activityDiffTemplate } from "./diff_view.js";
-import { steerSender } from "./format.js";
+import { clip, steerSender } from "./format.js";
 import { rowTitleRef } from "./refs.js";
 import { readLinesTemplate } from "./read_view.js";
 import { STOPPED_LINE_CLASS, cancelLineText, formatDuration } from "./timing.js";
@@ -105,7 +105,7 @@ export function toolRowInnerTemplate(row, { thumbs = () => nothing, stop = nothi
   const duration = formatDuration(row.duration_ms);
   const full = row.status === "running" ? "" : String(row.output || "").replace(/^\[[^\]]*\]\s*/, "");
   const output = full
-    ? html`<div class="activity-output" title=${full}>${full.length > 300 ? `${full.slice(0, 300)}…` : full}</div>`
+    ? html`<div class="activity-output" title=${full}>${clip(full, 301)}</div>`
     : nothing;
   const status = statusParts(row.status, { noMatch: !!row.no_match });
   return html`${statusMarkTemplate(status)}<span class="activity-tool">${toolName(row)}</span>${params}${stop}${alias}${statusWordTemplate(status)}${duration ? html`<span class="activity-duration">${duration}</span>` : nothing}${commandBlockTemplate(row.view, row.title)}${llmEditTemplate(row)}${output}${full ? readLinesTemplate(row) : nothing}${row.images?.length ? thumbs(row.images) : nothing}${row.diff ? activityDiffTemplate(row.diff) : nothing}`;

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

@@ -25,7 +25,7 @@
 // - the turn's end closes the current gen.
 import { addCompleted, addStarted, newActivity, toolName } from "./activity.js";
 import { tallyText } from "./tally.js";
-import { leadTrimmed } from "./format.js";
+import { clip, leadTrimmed } from "./format.js";
 
 const LABEL_MAX = 80;
 const LABEL_TOOLS = 3;
@@ -194,7 +194,7 @@ function isStep(gen) {
 }
 
 function cut(line) {
-  return line.length > LABEL_MAX ? `${line.slice(0, LABEL_MAX).trimEnd()}…` : line;
+  return clip(line, LABEL_MAX + 1);
 }
 
 // "3 tool calls (1 failed)": failed = status error, the tally's predicate

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

@@ -58,7 +58,7 @@ function closedLabel(gen) {
 // that would repeat "thinking"). +body+ is the text: a string, or the live
 // step's Text node (appended by delta: a selection in it survives).
 // +cls+ "bubble thinking" is a plain answer's collapsed thinking block.
-export function thinkingTemplate({ body, wrapped = true, line = null, cls = "thinking", on = {} }) {
+function thinkingTemplate({ body, wrapped = true, line = null, cls = "thinking", on = {} }) {
   const inner = html`<div class="thinking-body">${body}</div>`;
   if (!wrapped) return inner;
   const summary = line === null ? "thinking" : html`<span class="thinking-tag">thinking · </span>${line}`;

data/lib/samagotchi/web/server.rb

@@ -241,10 +241,6 @@ module Samagotchi
         knows_dir(InfoProbe.call(host, port, timeout: timeout))
       end
 
-      def self.probe_verdict(status, body)
-        knows_dir(InfoProbe.verdict(status, body))
-      end
-
       def self.knows_dir(info)
         info.is_a?(Hash) && !Array(info["features"]).include?("dir") ? :other : info
       end