samagotchi 0.18.1 → 0.20.0

data/lib/samagotchi/web/app.rb

@@ -21,6 +21,7 @@ require_relative "../steer"
 require_relative "../host_registry"
 require_relative "../model_catalog"
 require_relative "../model_profile"
+require_relative "../sampling_settings"
 require_relative "../project_scope"
 require_relative "../prompt_history"
 require_relative "../version"
@@ -82,7 +83,7 @@ module Samagotchi
       #   lists and GET /api/events streams from (Server always builds one);
       #   without one both routes answer 503
       # @param registry [HostRegistry, nil] the hosts GET /api/models lists
-      #   (built from the config on first use)
+      #   (nil: built from config.yml's hosts:, again when they change)
       # @param models_wait_timeout [Float] bounded seconds GET /api/models
       #   waits for the hosts' lists
       # @param lan [Hash, nil] LAN mode (web.host: lan): { ip:, token: },
@@ -96,6 +97,7 @@ module Samagotchi
                      registry: nil, models_wait_timeout: MODELS_WAIT_TIMEOUT, lan: nil)
         @manager = manager || SessionManager
         @registry = registry
+        @registry_given = !registry.nil?
         @models_wait_timeout = models_wait_timeout
         @models_mutex = Mutex.new
         @models_thread = nil
@@ -138,6 +140,7 @@ module Samagotchi
         ["GET", %r{\A/api/sessions/([^/]+)/output\z}, :handle_output],
         ["POST", %r{\A/api/sessions/([^/]+)/cancel\z}, :handle_cancel],
         ["POST", %r{\A/api/sessions/([^/]+)/stop\z}, :handle_stop],
+        ["POST", %r{\A/api/sessions/([^/]+)/restart\z}, :handle_restart],
         ["POST", %r{\A/api/sessions/([^/]+)/archive\z}, :handle_archive],
         ["POST", %r{\A/api/sessions/([^/]+)/unarchive\z}, :handle_unarchive],
         ["POST", %r{\A/api/sessions/([^/]+)/turn\z}, :handle_turn],
@@ -375,10 +378,12 @@ module Samagotchi
       end
 
       # What a second `chi web` probes before starting its own server: this
-      # is chi web, and it knows ?dir (features).
+      # is chi web, and it knows ?dir (features). installed: the newest chi
+      # on this machine (nil until the hub has looked); newest_workers: the
+      # workers it starts run that one, not this chi web's version.
       def handle_info(_req)
-        json_response(200, { app: "chi-web", version: Samagotchi::VERSION, pid: Process.pid, cwd: Dir.pwd,
-                             features: ["dir"], lan: @lan && @lan[:ip] })
+        json_response(200, { app: "chi-web", version: Samagotchi::VERSION, installed: @hub&.installed, pid: Process.pid,
+                             cwd: Dir.pwd, features: %w[dir newest_workers], lan: @lan && @lan[:ip] })
       end
 
       # The models a new session can start on, spelled as chi spells them
@@ -436,13 +441,44 @@ module Samagotchi
         if default && models.none? { |m| m[:name].casecmp?(default) }
           models.unshift({ name: default, host: nil, id: default })
         end
+        add_sampling(models, registry)
         payload = { default: default, models: models }
         payload[:warning] = warnings.join("; ") unless warnings.empty?
         json_response(200, payload)
       end
 
+      # Each model's configured sampling as /model words it ("temperature=0.6
+      # (hosts.work)"), on the models that have some: the picker's tooltip.
+      # A config that can't be read leaves the list as it is.
+      def add_sampling(models, registry)
+        return if registry.nil? || models.empty?
+
+        settings = ConfigFile.model_settings
+        models.each do |model|
+          target = registry.resolve(model[:name])
+          summary = SamplingSettings.summary(target, names: registry.lookup_names(model[:name], target: target),
+                                                     models: settings)
+          model[:sampling] = summary if summary
+        end
+      rescue StandardError
+        nil
+      end
+
+      # Built again when config.yml's hosts: changed (compared as read: the
+      # YAML read is mtime-cached), so the model picker lists a host added
+      # while chi web runs. An injected registry (specs) stays.
       def host_registry
-        @models_mutex.synchronize { @registry ||= HostRegistry.new }
+        @models_mutex.synchronize do
+          next @registry if @registry_given
+
+          hosts = ConfigFile.hosts_config
+          if @registry.nil? || hosts != @registry_hosts
+            @registry = HostRegistry.new(hosts_config: hosts)
+            @registry_hosts = hosts
+            @models_thread = nil # a listing of the old hosts
+          end
+          @registry
+        end
       end
 
       # The hosts' model lists (cached ones as they are), or the last complete
@@ -785,8 +821,10 @@ module Samagotchi
       # worker_timeout (+what+ didn't happen), a 404 for a route the worker
       # doesn't have → 501 not_supported (it runs an older chi that +cant+;
       # 501, not 503: it is live, and the page reads 503 as "not running"),
-      # and no live bridge, a refused connection or anything else → 503
-      # not_live.
+      # another unmapped status → 502 bridge_error with the worker's detail
+      # (a live worker that failed the request; never 503, which the page
+      # reads as "session not running"), and only no live bridge, a refused
+      # connection or one that says it isn't this session's → 503 not_live.
       # @param request [#call] sends with the client, answers its Response
       def relay(id, client, request, what:, cant:)
         return not_live(id) unless client
@@ -801,7 +839,7 @@ module Samagotchi
           return not_live(id) if reply.json&.dig("error") == "unknown_session"
 
           error_response(501, "not_supported", BridgeClient.stale_worker_message(id, cant: cant))
-        else not_live(id)
+        else bridge_error(reply, what)
         end
       rescue Errno::ETIMEDOUT
         worker_timeout(what)
@@ -813,6 +851,15 @@ module Samagotchi
         error_response(503, "not_live", "no live bridge for session #{id}")
       end
 
+      # A live worker refused or failed the request (a 500 in its handler, a
+      # status this route doesn't know): 502, with its detail when it sent
+      # one. 503 would have the page say the session isn't running, which is
+      # untrue and sends the user to restart a healthy worker.
+      def bridge_error(reply, what)
+        detail = reply_detail(reply, "#{what}: the session's worker answered #{reply.status}")
+        error_response(502, "bridge_error", detail)
+      end
+
       # The Bridge's detail for a refusal, or +fallback+.
       def reply_detail(reply, fallback)
         reply.json&.dig("detail") || fallback
@@ -976,6 +1023,26 @@ module Samagotchi
         error_response(404, "not_found", e.message)
       end
 
+      # POST /api/sessions/:id/restart: hand the session to a new worker on
+      # the newest chi installed (SessionManager.restart_session). 200
+      # {status: "restarted", session_id, from_version, version} (version nil:
+      # the new worker is still starting; its bridge_up follows); 409
+      # {error: "held" | "not_running" | "unsupported" | "failed", reason, detail} in words; 409
+      # owned_by_tui; 404.
+      def handle_restart(_req, id)
+        result = @manager.restart_session(id, state_dir: @state_dir, client_id: "web:restart")
+        @hub&.touch(id)
+        json_response(200, { status: "restarted", session_id: id, from_version: result.from_version,
+                             version: result.version })
+      rescue SessionManager::RestartRefused => e
+        error = %i[not_running unsupported failed].include?(e.reason) ? e.reason.to_s : "held"
+        json_response(409, { error: error, reason: e.reason.to_s, detail: e.message, session_id: id })
+      rescue SessionManager::OwnedByTUI => e
+        error_response(409, "owned_by_tui", e.message)
+      rescue ArgumentError => e
+        error_response(404, "not_found", e.message)
+      end
+
       # POST /api/sessions/:id/archive: hide it (and its delegates) from the
       # lists, keep it for good. A live idle worker is stopped first; a turn
       # running in it or a delegate, a chi REPL's session and a scratch one
@@ -1062,7 +1129,8 @@ module Samagotchi
       # GET /api/events: the session list as one SSE stream per tab. The
       # first frame is the hub's snapshot (scoped by ?dir= as the list is,
       # with chi's version),
-      # then `session` for an upsert and `session_gone` for a removal, with
+      # then `session` for an upsert, `session_gone` for a removal and `chi`
+      # when the newest installed chi changed, with
       # a `: ping` while idle. Frame ids are the hub's seq, for the log's
       # sake: there is no replay, a reconnect starts with a fresh snapshot.
       def handle_events(req)
@@ -1598,11 +1666,15 @@ module Samagotchi
           @server_running = server_running
           @queue = Bridge::BoundedQueue.new(capacity: capacity)
           @handle, @snapshot = @hub.subscribe(->(event) { @queue.push(event) }, snapshot: true, project_root: project_root)
+          # Read after subscribing: a change in between is also a queued event.
+          @installed = @hub.installed
         end
 
         def each
-          # version: the page compares it with the one it was served by.
-          yield frame(nil, "snapshot", sessions: @snapshot, version: Samagotchi::VERSION)
+          # version: the page compares it with the one it was served by;
+          # installed: the newest chi on this machine (a later change is a
+          # `chi` event).
+          yield frame(nil, "snapshot", sessions: @snapshot, version: Samagotchi::VERSION, installed: @installed)
           last_write = monotonic
           loop do
             event = @queue.pop([@heartbeat, EVENTS_POLL].min)

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

@@ -4,6 +4,7 @@ import {
   sendTurn,
   cancelTurn,
   stopSession,
+  restartSession,
   deleteSession,
   archiveSession,
   unarchiveSession,
@@ -19,7 +20,7 @@ import { MODEL_KEY } from "./model_pick.js";
 import { emptySessionState } from "./session_state.js";
 import { createModelPicker } from "./model_picker.js";
 import { chipName, chipsHtml, imageFiles, restoredChips, thumbsHtml, turnRefs, turnText } from "./images.js";
-import { escapeHtml, noteHtml, normalize, steerRowHtml, userBodyHtml, ownerBadge, previewForCard, relativeTime, failedTurnText, modelLabel, deleteConfirmText, recapLabel, canStopSession, goneSessionNotice, withLiveStatus, withoutWorker, recapPlace, delegatedBy } from "./format.js";
+import { escapeHtml, memChipText, memChipTitle, noteHtml, normalize, steerRowHtml, userBodyHtml, ownerBadge, previewForCard, relativeTime, failedTurnText, modelLabel, deleteConfirmText, recapLabel, canStopSession, goneSessionNotice, withLiveStatus, withoutWorker, recapPlace, delegatedBy } from "./format.js";
 import { EMPTY_ANSWER_CLASS, createTurnView, turnHistoryHtml } from "./turn_view.js";
 import { createStageView } from "./stage_view.js";
 import { appendQuote } from "./annotations.js";
@@ -27,9 +28,9 @@ import { parsePresets } from "./annotate_presets.js";
 import { createAnnotateBar } from "./annotate_bar.js";
 import { COPY_SOURCE_ATTR, copySource, copyText, installCopy, showsAnswer } from "./copy.js";
 import { routeChunk } from "./chunk_router.js";
-import { extractCtxPct, savedCtxPct, cardCtxText } from "./ctx.js";
+import { extractCtxPct, savedCtxPct, cardCtxText, generationTokens, lastSpeedText, speedText, tokensTipText } from "./ctx.js";
 import { createQuestionCards } from "./question_cards.js";
-import { cardClass, cardInnerHtml, cardPlace, isCard, splitSnapshotCards, turnNoticePlace } from "./card.js";
+import { cardClass, cardInnerHtml, cardPlace, isCard, isNoticeCard, noticeInnerHtml, splitSnapshotCards, turnNoticePlace } from "./card.js";
 import { gripFloor, promptHeight } from "./composer_size.js";
 import { createCommandList } from "./command_list.js";
 import { createPromptHistory } from "./prompt_history.js";
@@ -39,12 +40,12 @@ import { shouldFollowScroll, keepFollowing } from "./scroll.js";
 import { SHORT_WINDOW_QUERY, stripAutoHidden, stripColumns, stripShowParts } from "./strip.js";
 import { applySessionEvent, heldOrder, listedSessions, sortedByUpdated, waitingBadge, waitingFirst, waitingSearchText, withChildrenAfterParents } from "./sessions_list.js";
 import { createNotifications } from "./notifications.js";
-import { updateNotice } from "./update_notice.js";
+import { restartConfirmText, versionNotice, workerBadge } from "./update_notice.js";
 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, emptyAnswerLine, emptyRetryLine, hookNoticeLabel, initWaitLine, isOwn, sessionCommandLine, keepEarlyRestore, newClientId, noticeLine, promptOps, reminderText, restoreAction, restoreOnAck, retryStatusLine, snapshotEvents, startPageReply, 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, retryStatusLine, snapshotEvents, startPageReplyOrHint, turnOutput, unknownCommandHint, webLocalReply, workerGoneText } from "./turn_events.js";
 
 const $ = (s) => document.querySelector(s);
 const topStripEl = $("#topStrip");
@@ -179,7 +180,7 @@ async function refresh() {
 function openSessionEvents() {
   eventsControl = openEvents({
     snapshot: (data) => {
-      noticeUpdate(data.version);
+      noticeVersions(data);
       notifications.noticeSessions("snapshot", data);
       allSessions = applySessionEvent(allSessions, "snapshot", data);
       render();
@@ -201,6 +202,7 @@ function openSessionEvents() {
       }
       leaveGoneSession(data.id, "deleted");
     },
+    chi: (data) => noticeVersions(data),
   }, {
     dir: scope.dir,
     onError: () => {
@@ -210,15 +212,24 @@ function openSessionEvents() {
   });
 }
 
-// chi web was upgraded while this tab stayed open (a snapshot on the
-// reconnect names another version than the one that served the page):
-// a toast offers the reload, never forces it.
-let updateShownFor = null;
-function noticeUpdate(served) {
-  const text = updateNotice(document.body.dataset.version, served, updateShownFor);
-  if (!text) return;
-  updateShownFor = served;
-  showToast(text, { label: "Reload", run: () => location.reload() }, { sticky: true });
+// Which chi serves this page now and which is the newest installed (the
+// events snapshot, and `chi` frames when that changes). A toast says when
+// chi web was upgraded while this tab stayed open (offering the reload,
+// 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;
+const versionNoticesShown = new Set();
+function noticeVersions(data) {
+  if (typeof data.version === "string") versions.served = data.version;
+  versions.installed = typeof data.installed === "string" ? data.installed : null;
+  const notice = versionNotice({ loaded: document.body.dataset.version, served: versions.served,
+                                 installed: versions.installed, shown: versionNoticesShown });
+  updateInfoBar(); // the worker badge compares with the newest installed
+  if (!notice) return;
+  versionNoticesShown.add(notice.key);
+  showToast(notice.text, notice.reload ? { label: "Reload", run: () => location.reload() } : null, { sticky: true });
 }
 
 // The selected session's card changed: its owner and, without a live
@@ -227,6 +238,8 @@ function noticeUpdate(served) {
 // gets the stream attached through one resync.
 function followSelectedSession(sess) {
   current.owner = sess.owner || null;
+  current.workerVersion = sess.worker_version || null;
+  current.workerFeatures = Array.isArray(sess.worker_features) ? sess.worker_features : [];
   const streaming = !!(streamControl && streamControl.live);
   if (!streaming) current.status = sess.status;
   updateInfoBar();
@@ -240,7 +253,7 @@ function followSelectedSession(sess) {
 // new chat starts on the start page.
 function renderScope() {
   const el = $("#scope");
-  const allLink = `<a class="scope-all" href="${escapeHtml(allScopeHref(location.hash, scope.dir))}" title="Sessions of every project">all</a>`;
+  const allLink = `<a class="scope-all" href="${escapeHtml(allScopeHref(location.hash, scope.dir, location.search))}" title="Sessions of every project">all</a>`;
   if (scopeError) {
     el.innerHTML = `<span class="scope-name error" title="${escapeHtml(scopeError)}">folder not found</span>${allLink}`;
   } else if (scope.projectName) {
@@ -248,7 +261,7 @@ function renderScope() {
   } else {
     const where = scope.dir || scope.serverDir;
     const backLink = scope.backName
-      ? `<a class="scope-all scope-back" href="${escapeHtml(projectScopeHref(scope.backDir, location.hash))}" title="Sessions of ${escapeHtml(scope.backName)} only">← ${escapeHtml(scope.backName)}</a>`
+      ? `<a class="scope-all scope-back" href="${escapeHtml(projectScopeHref(scope.backDir, location.hash, location.search))}" title="Sessions of ${escapeHtml(scope.backName)} only">← ${escapeHtml(scope.backName)}</a>`
       : "";
     el.innerHTML = `<span class="scope-name" title="Sessions of every project">all projects</span>${backLink}${where ? `<span class="scope-where" title="New chats start in ${escapeHtml(where)}">new chat in<span class="path"><bdi>${escapeHtml(where)}</bdi></span></span>` : ""}`;
   }
@@ -256,10 +269,10 @@ function renderScope() {
   notifications.setBaseTitle(scope.projectName ? `Chi · ${scope.projectName}` : "Chi");
   // The links follow the hash (an open session, the all-sessions view).
   el.querySelector(".scope-all:not(.scope-back)")?.addEventListener("click", (e) => {
-    e.currentTarget.href = allScopeHref(location.hash, scope.dir);
+    e.currentTarget.href = allScopeHref(location.hash, scope.dir, location.search);
   });
   el.querySelector(".scope-back")?.addEventListener("click", (e) => {
-    e.currentTarget.href = projectScopeHref(scope.backDir, location.hash);
+    e.currentTarget.href = projectScopeHref(scope.backDir, location.hash, location.search);
   });
 }
 
@@ -304,7 +317,7 @@ function cardHtml(s, { deletable = false } = {}) {
   const folderHtml = folder ? `<span class="folder" title="${escapeHtml(s.working_directory)}">${escapeHtml(folder)}</span>` : "";
   const archivedHtml = s.archived ? `<span class="archived-badge" title="Archived: hidden from the lists, kept for good">archived</span>` : "";
   const ctx = cardCtxText(s.ctx_pct);
-  const ctxHtml = ctx ? `<span class="ctx" title="Context used after the last turn">${escapeHtml(ctx)}</span>` : "";
+  const ctxHtml = ctx ? `<span class="ctx" title="${escapeHtml(tokensTipText(s.tokens))}">${escapeHtml(ctx)}</span>` : "";
   const waiting = waitingBadge(s);
   const waitingHtml = waiting ? `<span class="attn attn-${waiting.kind}" title="${escapeHtml(waiting.title)}">${escapeHtml(waiting.text)}</span>` : "";
   const dotWord = waiting ? waiting.title : s.status;
@@ -388,7 +401,7 @@ function renderTop(sessions) {
   topStripEl.classList.remove("loading");
   renderStripShow();
   if (scopeError) {
-    topStripEl.innerHTML = `<div class="hint scope-error">${escapeHtml(scopeError)} · <a href="${escapeHtml(allScopeHref(""))}">show every session</a></div>`;
+    topStripEl.innerHTML = `<div class="hint scope-error">${escapeHtml(scopeError)} · <a href="${escapeHtml(allScopeHref("", null, location.search))}">show every session</a></div>`;
     return;
   }
   // Only archived sessions: no cards, but the tile stays, the way to them.
@@ -686,6 +699,7 @@ function resetTurnView() {
   questionCards.forgetContinue();
   unmatchedMerge = false;
   setTurnRunning(false);
+  releaseDisplayWait();
 }
 
 // (Re)render the selected session from the server and stream on from the
@@ -711,6 +725,7 @@ async function resync({ endText = null } = {}) {
       return;
     }
     if (id !== selected) return;
+    releaseDisplayWait();
     resetTurnView();
     renderSessionView(data);
     // Preview is read-only: a worker is woken only by POST /turn, so attach
@@ -842,9 +857,17 @@ function setMarkdownWarning(warning) {
 // markdown, the status and the timing. Kept as turnEndRead, so an
 // answer_display re-read waits for it.
 let turnEndRead = Promise.resolve();
-// Resolves the wait of a turn_completed with display_pending (its
-// answer_display landed).
-let displayLanded = null;
+// The wait of a turn_completed with display_pending for its answer_display
+// (turn_events.js displayWait). The worker may die in between and never send
+// one, so workerGone (through resetTurnView) and a re-render release it as
+// well as its own timeout: it must never hold the turn's answer forever.
+let displayPending = null;
+
+function releaseDisplayWait() {
+  displayPending?.finish();
+  displayPending = null;
+}
+
 async function readTurnEnd() {
   if (!selected) return;
   const id = selected;
@@ -1150,13 +1173,26 @@ function cardElement(id) {
   return findInTurnRoots(".plugin-card").find((el) => el.dataset.cardId === String(id)) || null;
 }
 
+// A notice is a <details> (a one-line row that opens), a card a <div>: a
+// card that turns into the other kind (btw's "thinking…" → its answer) is
+// drawn on a new element in its place. Returns the element drawn.
 function drawCard(el, card) {
+  const notice = isNoticeCard(card);
+  if (el.tagName !== (notice ? "DETAILS" : "DIV")) {
+    const fresh = document.createElement(notice ? "details" : "div");
+    el.replaceWith(fresh);
+    el = fresh;
+  }
   el.className = cardClass(card);
   el.dataset.cardId = card.id;
   // A running turn's own card (the stage's status waits on one that asks).
   if (card.in_turn) el.dataset.inTurn = "1";
   else delete el.dataset.inTurn;
-  if (card.body_html === undefined && el.dataset.body === String(card.body ?? "") && el.querySelector(".card-body")) {
+  if (notice) {
+    const open = el.open;
+    el.innerHTML = noticeInnerHtml(card);
+    el.open = open;
+  } else if (card.body_html === undefined && el.dataset.body === String(card.body ?? "") && el.querySelector(".card-body")) {
     // The same body again from the stream: keep the rendered one.
     const body = el.querySelector(".card-body").innerHTML;
     el.innerHTML = cardInnerHtml({ ...card, body_html: body });
@@ -1164,6 +1200,7 @@ function drawCard(el, card) {
     el.innerHTML = cardInnerHtml(card);
   }
   el.dataset.body = String(card.body ?? "");
+  return el;
 }
 
 // Show +card+: update the one with its id where it is, else add it (a
@@ -1175,14 +1212,13 @@ function upsertCard(card, { before = null } = {}) {
   if (!card || !card.id) return;
   const existing = cardElement(card.id);
   if (existing) {
-    drawCard(existing, card);
-    existing.classList.add("card-updated");
-    setTimeout(() => existing.classList.remove("card-updated"), 900);
+    const drawn = drawCard(existing, card);
+    drawn.classList.add("card-updated");
+    setTimeout(() => drawn.classList.remove("card-updated"), 900);
     return;
   }
   removeHintIfEmpty();
-  const el = document.createElement("div");
-  drawCard(el, card);
+  const el = drawCard(document.createElement(isNoticeCard(card) ? "details" : "div"), card);
   const asks = (card.actions || []).some((a) => a && a.command);
   if (card.in_turn && !before && !asks && turnDom.card(el)) return;
   const follow = isNearBottom();
@@ -1322,6 +1358,9 @@ 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;
+infoTextEl.addEventListener("click", (e) => {
+  if (e.target.closest(".worker-restart")) restartWorker();
+});
 infoTextEl.addEventListener("click", async (e) => {
   if (!e.target.closest(".copy-attach") || !selected) return;
   if (!(await copyText(`chi --attach ${selected}`))) return;
@@ -1330,6 +1369,44 @@ infoTextEl.addEventListener("click", async (e) => {
   setTimeout(updateInfoBar, 2000);
 });
 
+// The open session's worker runs an older chi than the newest installed:
+// a badge, with Restart when the worker can (else the stop command).
+function currentWorkerBadge() {
+  if (!selected || current.owner !== "worker") return null;
+  return workerBadge({ workerVersion: current.workerVersion, features: current.workerFeatures,
+                       installed: versions.installed, served: versions.served, sessionId: selected });
+}
+
+function workerBadgeHtml() {
+  const badge = currentWorkerBadge();
+  if (!badge) return "";
+  const busy = restartingId === selected;
+  const button = badge.restart
+    ? `<button type="button" class="worker-restart"${busy ? " disabled" : ""}>${busy ? "restarting…" : "Restart"}</button>`
+    : "";
+  return `<span class="worker-badge" title="${escapeHtml(badge.title)}">${escapeHtml(badge.text)}${button}</span>`;
+}
+
+// Restart: the session moves to a new worker on the newest chi; the page
+// 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 (!confirm(restartConfirmText(current.workerVersion, badge.newest))) return;
+  const id = selected;
+  restartingId = id;
+  updateInfoBar();
+  try {
+    const result = await restartSession(id);
+    showToast(result.version ? `Restarted on chi ${result.version}` : "Restarting: the new worker is starting");
+  } catch (e) {
+    showToast(`Can't restart: ${String(e.message).replace(/ \(\d+\)$/, "")}`, null, { sticky: true });
+  } finally {
+    restartingId = null;
+    updateInfoBar();
+  }
+}
+
 function updateInfoBar() {
   const stopBtn = document.getElementById("infoStopBtn");
   const deleteBtn = document.getElementById("infoDeleteBtn");
@@ -1352,6 +1429,11 @@ function updateInfoBar() {
   const idShort = selected.slice(0,8);
   const memText = current.usedMemories.length ? current.usedMemories.join(", ") : "—";
   const ctxText = current.ctxPct !== null ? `ctx ${Math.round(current.ctxPct)}%` : "";
+  const tokens = current.timing.tokens;
+  const ctxTip = tokensTipText(tokens);
+  const speedTextNow = lastSpeedText(tokens);
+  const avgSpeed = speedText(tokens?.avg_decode_tps, tokens?.tps_source);
+  const speedTip = `Decode speed of the last generation${avgSpeed ? `; session average ${avgSpeed}` : ""}`;
   const sessionDuration = currentSessionDuration();
   const timingText = sessionDuration === null ? "" : `session ${formatDuration(sessionDuration)}`;
   const statusClass = current.status ? `status ${escapeHtml(current.status)}` : "status";
@@ -1362,7 +1444,7 @@ function updateInfoBar() {
   const attachCmd = `chi --attach ${selected}`;
   const copied = Date.now() - attachCopiedAt < 2000;
   const copyHtml = `<button type="button" class="copy-attach" title="Copy &quot;${escapeHtml(attachCmd)}&quot; to attach a terminal">${copied ? "copied ✓" : "copy chi --attach"}</button>`;
-  const metaHtml = `<div class="meta"><span class="id" title="${escapeHtml(selected)}">${escapeHtml(idShort)}</span>${copyHtml}<span class="${statusClass}">${escapeHtml(current.status||"")}</span><span class="model${label.mismatch ? " served-mismatch" : ""}" title="${escapeHtml(label.title)}">${escapeHtml(label.text)}</span>${parentHtml}<span class="dir" title="${escapeHtml(current.dir||"")}">${escapeHtml((current.dir||"").slice(0,48))}</span>${ctxText ? `<span class="model">${escapeHtml(ctxText)}</span>` : ""}${timingText ? `<span class="model">${escapeHtml(timingText)}</span>` : ""}</div>`;
+  const metaHtml = `<div class="meta"><span class="id" title="${escapeHtml(selected)}">${escapeHtml(idShort)}</span>${copyHtml}<span class="${statusClass}">${escapeHtml(current.status||"")}</span><span class="model${label.mismatch ? " served-mismatch" : ""}" title="${escapeHtml(label.title)}">${escapeHtml(label.text)}</span>${parentHtml}${current.usedMemories.length ? `<span class="model mem-chip" title="${escapeHtml(memChipTitle(current.usedMemories))}">${escapeHtml(memChipText(current.usedMemories))}</span>` : ""}<span class="dir" title="${escapeHtml(current.dir||"")}">${escapeHtml((current.dir||"").slice(0,48))}</span>${ctxText ? `<span class="model ctx" title="${escapeHtml(ctxTip)}">${escapeHtml(ctxText)}</span>` : ""}${speedTextNow ? `<span class="model speed" title="${escapeHtml(speedTip)}">${escapeHtml(speedTextNow)}</span>` : ""}${timingText ? `<span class="model">${escapeHtml(timingText)}</span>` : ""}${workerBadgeHtml()}</div>`;
   const previewHtml = `<div class="preview-line"><span class="preview">${escapeHtml(current.firstPreview || "—")}</span> · <span class="mem" title="${escapeHtml(current.usedMemories.join(", "))}">mem: ${escapeHtml(memText)}</span></div>`;
   infoTextEl.innerHTML = metaHtml + previewHtml;
   infoTextEl.title = memoriesTooltip(current.usedMemories, current.preloadedMemories, current.mutedMemories);
@@ -1584,10 +1666,10 @@ const streamHandlers = {
   },
   generation_completed: (data) => {
     setLiveTurnNote("");
-    if (data?.served_model) {
-      current.served = [data.served_model, data.requested_model];
-      updateInfoBar();
-    }
+    if (data?.served_model) current.served = [data.served_model, data.requested_model];
+    // The generation's speed and the session's token totals, from the server.
+    current.timing.tokens = generationTokens(current.timing.tokens, data);
+    if (data?.served_model || data?.tokens) updateInfoBar();
     turnDom.generationCompleted();
   },
   // Prompts sent while a turn ran merge into it at an iteration boundary:
@@ -1618,8 +1700,11 @@ const streamHandlers = {
     const out = turnOutput(data);
     if (out) appendChunk(out);
     // after_turn hooks are running and may present the answer: its
-    // answer_display (display: null when they didn't) comes next.
-    const display = data.display_pending ? new Promise((resolve) => { displayLanded = resolve; }) : null;
+    // answer_display (display: null when they didn't) comes next. A worker
+    // that dies before it never sends one: workerGone releases the wait, and
+    // displayWait's timeout ends it whatever happens (4.14).
+    const display = data.display_pending ? displayWait() : null;
+    if (display) displayPending = display;
     turnEndRead = readTurnEnd();
     await turnEndRead;
     // The answer bubble the turn view held at its box's height pops now
@@ -1627,7 +1712,7 @@ const streamHandlers = {
     // plain text pops), and the display if one was coming, so the links
     // never swap in after the pop. The hold reveals by itself after
     // HOLD_MS whatever comes. The stage has no hold.
-    if (display) await display;
+    if (display) await display.promise;
     turnDom.answerReady?.();
   },
   // An after_turn hook presented the answer (AnswerDisplay): it comes after
@@ -1640,8 +1725,7 @@ const streamHandlers = {
       if (Array.isArray(d.messages)) applyFinalMarkdown(d.messages);
     } catch (_) {
     } finally {
-      displayLanded?.();
-      displayLanded = null;
+      releaseDisplayWait();
     }
   },
   turn_canceled: (data) => {
@@ -1822,7 +1906,9 @@ async function handleSendTurn() {
   // An image-only send's text is its placeholders: not for ↑.
   const typed = promptEl.value.trim() !== "";
   if (!selected) {
-    const local = startPageReply(prompt, { images: chips.length });
+    // The start page's own reply (a web-local command) or the hint for a
+    // typo: neither needs a session, so none is made for it (2.29).
+    const local = startPageReplyOrHint(prompt, { commands: current.commands, images: chips.length });
     if (local) {
       promptEl.value = "";
       fitPrompt();
@@ -1885,9 +1971,10 @@ async function handleSendTurn() {
     if (ack?.enqueued_id) sentIds.add(ack.enqueued_id);
     refreshHistory();
     // A turn that failed fast was restored before this ack: its prompt
-    // (and images) go back into the composer.
+    // (and images) go back into the composer, without replacing text typed
+    // since (4.13). The composer still holds the text just sent: it goes.
     const restored = restoreOnAck(ack?.enqueued_id, earlyRestores, { myId: clientId, sentIds });
-    promptEl.value = restored?.refill || "";
+    promptEl.value = composerAfterAck({ sent: prompt, current: promptEl.value, refill: restored?.refill || "" });
     fitPrompt();
     clearChips();
     if (restored?.images?.length) setChips(restoredChips(selected, restored.images));
@@ -1903,6 +1990,10 @@ async function handleSendTurn() {
     if (!streamControl?.live) startStream(selected, selectSeq ?? 0);
   } 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.
     if (/bad_image|too_large/.test(e.message)) {
       alert(e.message);
@@ -2359,6 +2450,7 @@ shortWindow.addEventListener("change", () => {
   applyStripHidden();
 });
 $("#stripShow").addEventListener("click", () => setStripHidden(false));
+$("#stripHideTop").addEventListener("click", () => setStripHidden(true));
 
 $("#filter").addEventListener("input", renderAll);
 // A list whose order was held under the pointer (listOrder) catches up.

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

@@ -3,9 +3,41 @@
 // the element; this module draws it and says where it goes.
 import { escapeHtml, recapPlace } from "./format.js";
 
-// The card's class: a warn card wears the warning colour.
+// The card's class: a warn card wears the warning colour; a notice is a
+// one-line row.
 export function cardClass(card) {
-  return "bubble plugin-card" + (card?.level === "warn" ? " warn" : "");
+  return "bubble plugin-card" + (card?.level === "warn" ? " warn" : "") + (isNoticeCard(card) ? " notice" : "");
+}
+
+// The longest body a notice row carries; a longer one is a card to read.
+export const NOTICE_CHARS = 160;
+
+// Whether a card is a notice (check-in's "Nudged the model at 105 tool
+// calls."): info level, nothing to click, a body of one short line. It
+// shows as a collapsed one-line row, "▸ check-in: Nudged …", as the tool
+// rows and the resolved question cards do; a click opens it. A warn card,
+// one that asks (actions) and one with more to read stay cards.
+export function isNoticeCard(card) {
+  if (!card || card.level === "warn") return false;
+  if ((card.actions || []).some((a) => a && a.command)) return false;
+  const body = String(card.body ?? "").trim();
+  return !body.includes("\n") && body.length <= NOTICE_CHARS;
+}
+
+// A notice's one line: "title: body" (the title alone for no body).
+export function noticeCardLine(card) {
+  const title = String(card?.title ?? "").trim();
+  const body = String(card?.body ?? "").trim();
+  return title && body ? `${title}: ${body}` : title || body;
+}
+
+// A notice's markup inside its <details>: the line as the summary, and
+// where it came from when the row is opened (the line wraps then).
+export function noticeInnerHtml(card) {
+  const title = String(card?.title ?? "").trim();
+  const source = String(card?.source ?? "").trim();
+  const from = source && source !== title ? `<div class="notice-from">from <span class="card-source">${escapeHtml(source)}</span></div>` : "";
+  return `<summary>${escapeHtml(noticeCardLine(card))}</summary>${from}`;
 }
 
 // Whether a card shown as a row of a step leaves the turn's block when the