samagotchi 0.65.0 → 0.67.0

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

@@ -0,0 +1,109 @@
+// Annotation actions: a bundle's pills in the Annotate bar (chi.annotation,
+// docs/plugins.md). Each prepares a command line of its plugin with the
+// selection filled into its template under it:
+//
+//   /claude validate
+//   From your thinking:
+//   > the quoted line
+//
+// and fills the composer with it (the note goes under), or sends it at once
+// (send: true). The pills ride on the session's command listing (the
+// worker's snapshot), so a muted bundle's go with its command. Pure: no DOM.
+// A module of its own: static JS is cached at unversioned URLs, and a new
+// export on an old module would blank the page.
+
+import { quoteBlock } from "./annotations.js";
+
+// How many plugin pills the bar shows; the rest go behind "⋯".
+const INLINE_ACTIONS = 3;
+
+// The session's commands' annotations, flattened in listing order: {label,
+// line, template, send, command, anytime, source}. anytime: the command
+// runs mid-turn (a send pill needs it while a turn runs).
+export function annotationActions(commands) {
+  const out = [];
+  for (const c of Array.isArray(commands) ? commands : []) {
+    if (!c || typeof c.name !== "string" || !Array.isArray(c.annotations)) continue;
+    for (const a of c.annotations) {
+      if (!a || typeof a.label !== "string" || !a.label || typeof a.line !== "string" || !a.line) continue;
+      out.push({
+        label: a.label,
+        line: a.line,
+        template: typeof a.template === "string" && a.template ? a.template : "{quote}",
+        send: a.send === true,
+        command: c.name,
+        anytime: c.mid_turn === "anytime" || c.anytime === true,
+        source: typeof c.source === "string" ? c.source : "",
+      });
+    }
+  }
+  return out;
+}
+
+// Whether two action lists draw the same pills (the bar redraws only on a
+// change).
+export function sameActions(a, b) {
+  return JSON.stringify(a) === JSON.stringify(b);
+}
+
+// The selection as templates read it: {quote} the labelled block Annotate
+// makes (annotations.js quoteBlock), {text} the selection alone with the
+// same trimming (CRLF → LF, each line's trailing blanks, blank lines at
+// either end; indentation kept), {source} where it came from (answer,
+// thinking, step, tool, user). null when it holds no text.
+export function selectionFields(raw, source = {}) {
+  const quote = quoteBlock(raw, source);
+  if (!quote) return null;
+  const lines = String(raw ?? "").replace(/\r\n?/g, "\n").split("\n").map((l) => l.replace(/\s+$/, ""));
+  while (lines.length && !lines[0]) lines.shift();
+  while (lines.length && !lines[lines.length - 1]) lines.pop();
+  return { quote, text: lines.join("\n"), source: source.kind || "answer" };
+}
+
+// +template+ with {quote}, {text} and {source} filled from +fields+; any
+// other {x} stays as written.
+export function fillTemplate(template, fields) {
+  return String(template ?? "").replace(/\{(quote|text|source)\}/g, (_, key) => String(fields?.[key] ?? ""));
+}
+
+// The line the pill prepares: its command line, the filled template under it.
+export function actionLine(action, fields) {
+  return `${action.line}\n${fillTemplate(action.template, fields)}`;
+}
+
+// The composer's text after a fill pill (+line+: actionLine's):
+//   - empty: the line;
+//   - it already starts with the same command line: the filled part is
+//     appended (several selections collect under one command);
+//   - another draft: the line on top, the draft under it, after a blank line
+//     (nothing leaves chi without a click on Send).
+export function composerWithAction(value, action, line) {
+  const draft = String(value ?? "");
+  if (!draft.trim()) return line;
+  const filled = line.slice(action.line.length + 1);
+  if (draft.trimStart().split("\n")[0].trim() === action.line) {
+    const before = draft.replace(/\s+$/, "");
+    return `${before}\n\n${filled}`;
+  }
+  return `${line.replace(/\s+$/, "")}\n\n${draft.replace(/^\s*\n/, "")}`;
+}
+
+// Whether a pill can be clicked: a fill pill always; a send pill while a
+// turn runs only when its command runs mid-turn (anytime), else it would come
+// back busy.
+export function actionEnabled(action, running) {
+  return !action.send || !running || action.anytime;
+}
+
+// A pill's tooltip: its label and bundle, that a send pill sends at once,
+// and why it is disabled.
+export function actionTitle(action, running) {
+  const base = action.source ? `${action.label} (${action.source})` : action.label;
+  if (!actionEnabled(action, running)) return `${base}: ${action.command} waits for the turn to end`;
+  return action.send ? `${base}: sends at once` : base;
+}
+
+// The pills shown inline and the ones behind "⋯".
+export function splitInline(actions, max = INLINE_ACTIONS) {
+  return { inline: actions.slice(0, max), more: actions.slice(max) };
+}

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

@@ -7,10 +7,15 @@
 // bubble rewrites its text every frame, which would collapse it by the time
 // a button is clicked.
 //
+// A bundle's pills (chi.annotation) come after the presets: each prepares
+// its command line with the selection (annotate_actions.js), at most 3
+// inline, the rest behind "⋯".
+//
 // The quoting rules are annotations.js'; this is the bar.
 
 import { annotateBarLeft, annotationSource, quoteBlock } from "./annotations.js";
 import { presetNote } from "./annotate_presets.js";
+import { actionEnabled, actionTitle, sameActions, selectionFields, splitInline } from "./annotate_actions.js";
 
 // @param presets the preset texts (annotate_presets.js parsePresets)
 // @param canAnnotate () => whether the open session takes annotations (one
@@ -21,11 +26,18 @@ import { presetNote } from "./annotate_presets.js";
 //   until its step closes)
 // @param onQuote (text) runs with the quote (and a preset's note) to append
 //   to the composer; the selection is cleared and the bar hidden first
+// @param actions () => the open session's annotation actions
+//   (annotate_actions.js annotationActions), read on every selection
+// @param running () => whether a turn runs (a send pill may wait for it)
+// @param onAction (action, fields) runs with a clicked pill's action and the
+//   selection's {quote, text, source}; the selection is cleared and the bar
+//   hidden first
 // @param doc, win the page's document and window
 // @return {schedule(), hide(), el}; schedule() re-reads the selection on the
 //   next frame (call it on scroll)
 export function createAnnotateBar({
-  presets, canAnnotate, roots, isLive, onQuote, doc = globalThis.document, win = globalThis.window,
+  presets, canAnnotate, roots, isLive, onQuote, actions = () => [], running = () => false, onAction = () => {},
+  doc = globalThis.document, win = globalThis.window,
 }) {
   const bar = doc.createElement("div");
   bar.id = "annotateBar";
@@ -46,11 +58,63 @@ export function createAnnotateBar({
     btn.title = text;
     bar.appendChild(btn);
   });
+  // The plugin pills: a separator, the inline ones, then ⋯ and the list
+  // it opens. Redrawn only when the session's actions change.
+  const group = doc.createElement("span");
+  group.className = "annotate-actions";
+  group.hidden = true;
+  bar.appendChild(group);
   doc.body.appendChild(bar);
   let pendingQuote = null;
+  let pendingFields = null;
+  let drawn = [];
+  let moreList = null;
+
+  function drawActions(list) {
+    drawn = list;
+    moreList = null;
+    group.hidden = !list.length;
+    if (!list.length) return group.replaceChildren();
+    const sep = doc.createElement("span");
+    sep.className = "annotate-sep";
+    sep.setAttribute("aria-hidden", "true");
+    const pill = (action, i) => {
+      const btn = button(action.label, "annotate-action");
+      btn.dataset.action = String(i);
+      if (action.send) btn.dataset.sends = "";
+      return btn;
+    };
+    const { inline, more } = splitInline(list);
+    const nodes = [sep, ...inline.map(pill)];
+    if (more.length) {
+      const toggle = button("⋯", "annotate-more");
+      toggle.title = "More actions";
+      toggle.setAttribute("aria-label", "More actions");
+      moreList = doc.createElement("div");
+      moreList.className = "annotate-more-list";
+      moreList.hidden = true;
+      more.forEach((action, j) => moreList.appendChild(pill(action, inline.length + j)));
+      nodes.push(toggle, moreList);
+    }
+    group.replaceChildren(...nodes);
+  }
+
+  // Each pill's state for whether a turn runs (a send pill may wait).
+  function markActions() {
+    const now = running();
+    const all = [...group.children, ...(moreList ? moreList.children : [])];
+    for (const btn of all) {
+      if (btn.dataset?.action === undefined) continue;
+      const action = drawn[Number(btn.dataset.action)];
+      btn.disabled = !actionEnabled(action, now);
+      btn.title = actionTitle(action, now);
+    }
+  }
 
   function hide() {
     pendingQuote = null;
+    pendingFields = null;
+    if (moreList) moreList.hidden = true;
     bar.hidden = true;
   }
 
@@ -67,9 +131,14 @@ export function createAnnotateBar({
     // Clip to where the selection starts: one tool row, one bubble.
     const clipped = range.cloneRange();
     if (!source.root.contains(range.endContainer)) clipped.setEnd(source.root, source.root.childNodes.length);
-    const block = quoteBlock(clipped.toString(), source);
+    const raw = clipped.toString();
+    const block = quoteBlock(raw, source);
     if (!block) return hide();
     pendingQuote = block;
+    pendingFields = selectionFields(raw, source);
+    const list = actions() || [];
+    if (!sameActions(list, drawn)) drawActions(list);
+    markActions();
     const rects = clipped.getClientRects();
     const rect = rects.length ? rects[rects.length - 1] : clipped.getBoundingClientRect();
     bar.hidden = false;
@@ -109,6 +178,19 @@ export function createAnnotateBar({
   bar.addEventListener("click", (e) => {
     const btn = e.target.closest("button");
     if (!btn || !pendingQuote) return;
+    if (btn.className === "annotate-more") {
+      moreList.hidden = !moreList.hidden;
+      return;
+    }
+    if (btn.dataset.action !== undefined) {
+      const action = drawn[Number(btn.dataset.action)];
+      if (!action || btn.disabled) return;
+      const fields = pendingFields;
+      win.getSelection()?.removeAllRanges();
+      hide();
+      onAction(action, fields);
+      return;
+    }
     const preset = btn.dataset.index === undefined ? null : presets[Number(btn.dataset.index)];
     const text = preset ? presetNote(pendingQuote, preset) : pendingQuote;
     win.getSelection()?.removeAllRanges();

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";
@@ -46,6 +46,7 @@ import { createTaskStopper } from "./task_stop.js";
 import { appendQuote } from "./annotations.js";
 import { parsePresets } from "./annotate_presets.js";
 import { createAnnotateBar } from "./annotate_bar.js";
+import { actionLine, annotationActions, composerWithAction } from "./annotate_actions.js";
 import { copyText, installCopy } from "./copy.js";
 import { ctxBarText, ctxBarTip, lastSpeedText, speedText } from "./ctx.js";
 import { createQuestionCards } from "./question_cards.js";
@@ -290,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();
@@ -382,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;
@@ -766,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;
@@ -1374,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.
@@ -1386,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);
 });
@@ -1404,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);
@@ -1415,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();
   }
 }
@@ -1464,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
@@ -1476,6 +1471,8 @@ function updateInfoBar() {
     llmContext: current.llmContext,
     thinking: current.thinking,
     reasoningHistory: current.reasoningHistory,
+    // The tools chip (toolkit_chip.js): null on full.
+    toolkit: current.toolkit,
     // The model notes the session's prompt carried.
     notes: promptNotesChip(current.promptNotes),
     memories: current.usedMemories,
@@ -1485,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();
 }
@@ -1574,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;
@@ -1649,8 +1646,8 @@ const streamHandlers = createStreamHandlers({
   earlyRestores,
   stream: {
     takeGuess: () => {
-      const guess = streamFromGuess;
-      streamFromGuess = false;
+      const guess = current.streamFromGuess;
+      current.streamFromGuess = false;
       return guess;
     },
     restart: () => {
@@ -1803,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);
@@ -1831,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)) {
@@ -1840,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;
@@ -1859,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";
@@ -2379,18 +2377,29 @@ function showToast(text, action = null, { sticky = false } = {}) {
 }
 
 // Annotate (annotate_bar.js): a selection in the conversation offers
-// "Annotate" and the presets, which append a quote to the composer.
+// "Annotate" and the presets, which append a quote to the composer, and the
+// session's plugins' pills (chi.annotation, annotate_actions.js), which fill
+// the composer with their command line and the quote, or send it at once.
+function fillComposer(text) {
+  promptEl.value = text;
+  fitPrompt();
+  promptEl.focus();
+  promptEl.setSelectionRange(promptEl.value.length, promptEl.value.length);
+  promptEl.scrollTop = promptEl.scrollHeight;
+}
+
 const annotateBar = createAnnotateBar({
   presets: parsePresets(document.body.dataset.annotatePresets),
   canAnnotate: () => !!selected && current.owner !== "tui",
   roots: turnRoots,
   isLive: (root) => liveTurn.running && turnDom.containsLive(root),
-  onQuote: (text) => {
-    promptEl.value = appendQuote(promptEl.value, text);
-    fitPrompt();
-    promptEl.focus();
-    promptEl.setSelectionRange(promptEl.value.length, promptEl.value.length);
-    promptEl.scrollTop = promptEl.scrollHeight;
+  onQuote: (text) => fillComposer(appendQuote(promptEl.value, text)),
+  actions: () => annotationActions(current.commands),
+  running: () => liveTurn.running,
+  onAction: (action, fields) => {
+    const line = actionLine(action, fields);
+    if (action.send) runSessionCommand(line);
+    else fillComposer(composerWithAction(promptEl.value, action, line));
   },
 });
 historyEl.addEventListener("scroll", annotateBar.schedule);

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

@@ -10,7 +10,8 @@ import { anchorInsertIndex, commandAnchor, isShellCommandLine, keepsCommandBubbl
 // Whether a composer line in an open session is one of its commands
 // (+commands+: the session GET's listing), as the terminals decide
 // (Commands::Registry#lookup): a "!" line with something after the "!", or
-// a listed name alone or followed by a space; a terminal's own (/stats,
+// a listed name alone or followed by whitespace (a newline too: an
+// annotation action's line puts the quote under the name); a terminal's own (/stats,
 // /exit) too, which the page answers itself (webLocalReply). An unknown
 // "/word" (a path, a typo) goes to the model as a prompt, as in a terminal.
 export function sessionCommandLine(text, commands) {
@@ -19,7 +20,8 @@ export function sessionCommandLine(text, commands) {
   if (!line.startsWith("/")) return false;
   if (webLocalReply(line)) return true;
   return (Array.isArray(commands) ? commands : [])
-    .some((c) => c && typeof c.name === "string" && (line === c.name || line.startsWith(`${c.name} `)));
+    .some((c) => c && typeof c.name === "string"
+      && (line === c.name || (line.startsWith(c.name) && /\s/.test(line[c.name.length]))));
 }
 
 // /cut TEXT and /queue TEXT: the UIs' own words for a delivery (listed
@@ -151,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}"` : ""}?`,