samagotchi 0.91.0 → 0.92.0

data/lib/samagotchi/turn_checkpoint.rb

@@ -91,16 +91,25 @@ module Samagotchi
     end
     private_class_method :settled_record
 
+    # A command's status (its command_ran's) as a settled outcome; any
+    # other status (busy, dropped) is a cancel for that reason.
+    COMMAND_OUTCOMES = { "ok" => "completed", "error" => "failed" }.freeze
+    # Its record's origin: no turn ran (ParentReport says "the command").
+    COMMAND_ORIGIN = "command"
+
     # A file-delivered command ends its sender's wait without running a
-    # turn. Keep a terminal outcome under the same per-input settled path.
-    def self.record_command_outcome(session_dir, enqueued_id)
+    # turn. Keep a terminal outcome under the same per-input settled path:
+    # +status+ is its command_ran's ("ok", "error", "busy", "dropped" at a
+    # teardown), so the wait reads completed, failed, or canceled with that
+    # reason.
+    def self.record_command_outcome(session_dir, enqueued_id, status:)
       id = enqueued_id.to_s
       return if id.empty? || !SessionInbox::ENQUEUED_ID_NAME.match?(id)
 
-      dir = File.join(session_dir, SessionInbox::INPUT_DIR, SETTLED_DIR)
-      FileUtils.mkdir_p(dir)
-      record = LastTurn.new(outcome: "completed", ended_at: Time.now.iso8601(3), enqueued_id: id)
-      AtomicFile.write(File.join(dir, id), JSON.generate(record.to_file))
+      outcome = COMMAND_OUTCOMES.fetch(status.to_s, "canceled")
+      record = LastTurn.new(outcome: outcome, cancel_reason: (status.to_s if outcome == "canceled"),
+                            ended_at: Time.now.iso8601(3), origin: COMMAND_ORIGIN, enqueued_id: id)
+      write_settled(session_dir, id, record)
     rescue SystemCallError, IOError => e
       Log.warn(:worker, "command_outcome_write_failed", error: e.class.name, msg: e.message, enqueued_id: id)
     end
@@ -109,14 +118,18 @@ module Samagotchi
       id = mark.enqueued_id.to_s
       return unless SessionInbox::ENQUEUED_ID_NAME.match?(id)
 
-      dir = File.join(session_dir, SessionInbox::INPUT_DIR, SETTLED_DIR)
-      FileUtils.mkdir_p(dir)
-      record = settled_record(id, ended_at: Time.now.iso8601(3), seconds: seconds)
-      AtomicFile.write(File.join(dir, id), JSON.generate(record.to_file))
+      write_settled(session_dir, id, settled_record(id, ended_at: Time.now.iso8601(3), seconds: seconds))
     rescue SystemCallError => e
       # The settle goes on; a wait for that turn runs to its timeout.
       Log.warn(:worker, "settled_turn_write_failed", error: e.class.name, msg: e.message)
     end
+
+    def self.write_settled(session_dir, id, record)
+      dir = File.join(session_dir, SessionInbox::INPUT_DIR, SETTLED_DIR)
+      FileUtils.mkdir_p(dir)
+      AtomicFile.write(File.join(dir, id), JSON.generate(record.to_file))
+    end
+    private_class_method :write_settled
     private_class_method :record_settled
 
     # @param session [Session] the worker's session (saved as a whole)

data/lib/samagotchi/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Samagotchi
-  VERSION = "0.91.0"
+  VERSION = "0.92.0"
   # Sent as the User-Agent of every HTTP request chi makes.
   USER_AGENT = "chi/#{VERSION}"
 end

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

@@ -35,10 +35,10 @@ import { createReasoningHistoryControl } from "./reasoning_history_chip.js";
 import { renderInfoBar } from "./info_bar.js";
 import { sessionBar, workerBadgeFor } from "./info_bar_model.js";
 import { createShownTexts } from "./shown_texts.js";
-import { MODEL_KEY } from "./model_pick.js";
+import { MODEL_KEY, modelsFailedText } from "./model_pick.js";
 import { emptySessionState, sessionStateFrom } from "./session_state.js";
 import { createModelPicker } from "./model_picker.js";
-import { admitImages, chipName, chipsTemplate, imageFiles, restoredChips, thumbsTemplate, turnRefs, turnText, uploadChips } from "./images.js";
+import { admitImages, chipName, chipsAfterSend, chipsTemplate, imageFiles, restoredChips, thumbsTemplate, turnRefs, turnText, uploadChips } from "./images.js";
 import { normalize, firstPreview, failedTurnText, deleteConfirmText, goneSessionNotice, cantText, withLiveStatus, withoutWorker } from "./format.js";
 import { createTurnView, turnHistoryNodes } from "./turn_view.js";
 import { elementOf, emptyAnswerTemplate } from "./turn_html.js";
@@ -992,7 +992,10 @@ async function readTurnEnd() {
       lists.render();
       lists.paintActive();
     }
-  } catch(_){}
+  } catch (_) {
+    // A failed read (the server or worker gone a moment) leaves the answer
+    // as the stream drew it, plain text: the session's next load renders it.
+  }
 }
 
 function seedSeenFromDom() {
@@ -1452,8 +1455,9 @@ async function handleSendTurn({ delivery: chosen = null } = {}) {
     if (restored?.refill && sentTo === selected) openForVisit();
     promptEl.value = composerAfterAck({ sent: line, current: promptEl.value, refill: restored?.refill || "" });
     fitPrompt();
-    clearChips();
-    if (restored?.images?.length) setChips(restoredChips(sentTo, restored.images));
+    // Only the sent chips go: images added since stay (they go up at their own send).
+    const kept = chipsAfterSend(chips, sending);
+    setChips(restored?.images?.length ? kept.concat(restoredChips(sentTo, restored.images)) : kept);
     // 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)) {
@@ -1548,7 +1552,7 @@ async function handleCancel() {
 $("#newBtn").addEventListener("click", () => {
   if (allViewOpen()) leaveAllView("");
   clearSelection();
-  loadModels();
+  loadModels({ asked: true });
 });
 
 // ── The start page's model picker ──────────────────────────────────────────
@@ -1641,11 +1645,19 @@ function restoreStartPick() {
   renderNewChatLlmContext();
   renderNewChatThinking();
 }
-async function loadModels() {
+// A reload cuts the fetch: its error is no news (modelsFailedText).
+let pageLeaving = false;
+addEventListener("beforeunload", () => { pageLeaving = true; });
+addEventListener("pagehide", () => { pageLeaving = true; });
+addEventListener("pageshow", () => { pageLeaving = false; }); // back from the bfcache
+// +asked+: + new session's load, for the start page it opens.
+async function loadModels({ asked = false } = {}) {
   let payload;
   try {
     payload = await listModels();
-  } catch (_) {
+  } catch (e) {
+    const text = modelsFailedText(e, { startPage: !selected, asked, leaving: pageLeaving });
+    if (text) showToast(text);
     return;
   }
   const stored = readStored(MODEL_KEY);
@@ -1678,16 +1690,13 @@ function renderChips() {
   drawFoldControls();
 }
 
+// A chip that goes frees its preview; one kept in +list+ keeps it.
 function setChips(list) {
-  for (const c of chips) if (c.file && c.src) URL.revokeObjectURL(c.src);
+  for (const c of chips) if (c.file && c.src && !list.includes(c)) URL.revokeObjectURL(c.src);
   chips = list;
   renderChips();
 }
 
-function clearChips() {
-  setChips([]);
-}
-
 // A paste's, a drop's or the image button's files: the images the message
 // may still take become chips (images.js admitImages); a toast says why the
 // rest stayed out. Whether any went in.
@@ -1806,7 +1815,8 @@ composerEl.addEventListener("drop", (e) => {
 const unqueue = createUnqueue({
   sessionId: () => selected,
   clientId,
-  toast: (text) => showToast(text),
+  toast: (text, action, options) => showToast(text, action, options),
+  copy: (text) => copyText(text),
   // Edit: the removed text back into an empty composer (never over a draft).
   putBack: (text) => {
     if (promptEl.value.trim() || chips.length) return false;

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

@@ -150,7 +150,10 @@ export function createCardsPlace({
           const el = card.type === "card" && cardElement(card.id);
           if (el) refreshCardBody(el, card);
         }
-      } catch (_) {}
+      } catch (_) {
+        // The live text stays (a failed re-read is only a lost render);
+        // the next card or load renders it.
+      }
     }, 150);
   }
 

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

@@ -94,6 +94,12 @@ export function chipsTemplate(chips) {
     html`<span class="chip" data-index=${i}><img src=${c.src} alt=""><span class="chip-name">${c.name}</span><button type="button" class="chip-remove" data-index=${i} aria-label=${`remove ${c.name}`}>×</button></span>`);
 }
 
+// The chips left once a send is acked: those added while it was in flight
+// (an upload can take seconds) stay for the next message.
+export function chipsAfterSend(chips, sent) {
+  return (chips || []).filter((c) => !sent.includes(c));
+}
+
 // The {file, name} refs a turn names.
 export function turnRefs(chips) {
   return (chips || []).filter((c) => c.ref).map((c) => ({ file: c.ref.file, name: c.name }));

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

@@ -1,7 +1,17 @@
 // The start page's model picker: pure helpers over GET /api/models' payload.
+import { cantText } from "./format.js";
 
 export const MODEL_KEY = "chi_model";
 
+// A failed GET /api/models' toast: the picker stays hidden, so it says why
+// and what a new session gets (+ new session asks again). "" (no toast) in
+// a session, where no picker shows (+asked+: + new session's own load),
+// and for a fetch aborted or cut by the page unloading.
+export function modelsFailedText(error, { startPage = true, asked = false, leaving = false } = {}) {
+  if (leaving || error?.name === "AbortError" || !(startPage || asked)) return "";
+  return `${cantText("list the models", error)}. A new session starts on the default model.`;
+}
+
 // The name to preselect from the rows (modelRows): the remembered one when
 // it is still offered (any case), else the server's default, both even
 // when their host is down; else the first row whose host answered, else

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

@@ -36,19 +36,26 @@ export function createToasts({ el, onChange = () => {}, doc = globalThis.documen
     entry.el);
   }
 
+  function item(text, action, sticky) {
+    const entry = { el: doc.createElement("div"), timer: null, sticky, action, key: null };
+    entry.el.className = "toast-item";
+    draw(entry, text, action, sticky);
+    entry.key = entry.el.querySelector(".toast-message").textContent;
+    return entry;
+  }
+
   function show(text, action = null, { sticky = false } = {}) {
-    const candidate = { el: doc.createElement("div"), timer: null, sticky, action, key: null };
-    candidate.el.className = "toast-item";
-    draw(candidate, text, action, sticky);
-    candidate.key = candidate.el.querySelector(".toast-message").textContent;
+    // Words are their own key; a template's key is its drawn text, so only
+    // a template is drawn before the look-up.
+    const candidate = typeof text === "string" ? null : item(text, action, sticky);
+    const key = candidate ? candidate.key : text;
 
-    const duplicate = entries.find((entry) => entry.key === candidate.key);
+    const duplicate = entries.find((entry) => entry.key === key);
     if (duplicate) {
       if (duplicate.timer !== null) clearTimeout(duplicate.timer);
       duplicate.timer = null;
       duplicate.sticky = sticky || duplicate.sticky;
       duplicate.action = action || duplicate.action;
-      duplicate.key = candidate.key;
       draw(duplicate, text, duplicate.action, duplicate.sticky);
       entries.push(...entries.splice(entries.indexOf(duplicate), 1));
       el.appendChild(duplicate.el);
@@ -60,9 +67,10 @@ export function createToasts({ el, onChange = () => {}, doc = globalThis.documen
     if (entries.length === MAX_TOASTS) {
       remove(entries.find((entry) => !entry.sticky) || entries[0], false);
     }
-    entries.push(candidate);
-    el.appendChild(candidate.el);
-    if (!sticky) candidate.timer = setTimeout(() => remove(candidate), TOAST_MS);
+    const entry = candidate || item(text, action, sticky);
+    entries.push(entry);
+    el.appendChild(entry.el);
+    if (!sticky) entry.timer = setTimeout(() => remove(entry), TOAST_MS);
     sync();
   }
 

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

@@ -4,8 +4,9 @@
 // goes with the turn_dequeued every tab gets (bubbles.js op "remove"), and
 // here at the 200 already. Its text comes back (edit): into an empty
 // composer, to change and send again; over a draft only in a toast (the
-// draft stays). Its images don't come back. A refusal keeps it and says why
-// in a toast. No confirm: nothing is lost. Pure but for the
+// draft stays), and after a switch to another session meanwhile only in a
+// sticky toast naming its session, with Copy. Its images don't come back. A refusal keeps it
+// and says why in a toast. No confirm: nothing is lost. Pure but for the
 // injected calls, so `node --test` covers it; app.js binds onClick to the
 // turn roots.
 import { dequeueTurn as postDequeue } from "./data.js";
@@ -28,8 +29,9 @@ function clipped(text) {
 
 // +sessionId+ is read at each click (the open session); +clientId+ is this
 // tab's (the turn_dequeued names who removed it); +putBack(text)+ fills the
-// composer when it is empty and says whether it did.
-export function createUnqueue({ sessionId, clientId = null, dequeue = postDequeue, toast = () => {}, putBack = () => false }) {
+// composer when it is empty and says whether it did; +copy(text)+ says
+// whether the clipboard took it; +toast(text, action, options)+ as showToast.
+export function createUnqueue({ sessionId, clientId = null, dequeue = postDequeue, toast = () => {}, putBack = () => false, copy = null }) {
   // A click on a queued bubble's ×; any other click is left alone.
   async function onClick(e) {
     const button = e.target?.closest?.("button.unqueue");
@@ -44,6 +46,12 @@ export function createUnqueue({ sessionId, clientId = null, dequeue = postDequeu
       const result = await dequeue(id, enqueuedId, { clientId });
       removeQueuedBubble(bubble);
       const text = String(result?.prompt || "");
+      // Another session opened meanwhile: its composer isn't where this
+      // text goes, so only the toast has it.
+      if (text.trim() && sessionId() !== id) {
+        movedOn(id, text);
+        return result;
+      }
       if (text.trim() && !putBack(text)) toast(`Removed (your draft stays): ${clipped(text)}`);
       return result;
     } catch (error) {
@@ -52,5 +60,13 @@ export function createUnqueue({ sessionId, clientId = null, dequeue = postDequeu
       return null;
     }
   }
+  // The removed text after a switch: in a sticky toast, its Copy takes the
+  // whole text (the toast clips it); a failed copy shows the toast again.
+  function movedOn(id, text) {
+    const line = `Removed from ${id.slice(0, 8)}: ${clipped(text)}`;
+    const show = () => toast(line, copy ? action : null, { sticky: true });
+    const action = { label: "Copy", run: async () => { if (await copy(text)) toast("Copied"); else show(); } };
+    show();
+  }
   return { onClick };
 }