samagotchi 0.77.0 → 0.79.0

data/lib/samagotchi/session_metrics.rb

@@ -144,6 +144,9 @@ module Samagotchi
       # (finish_reason length). `retries` counts the network's only.
       :cuts,
       :capped,
+      # Replayed thinking blocks a preserved-thinking recovery dropped
+      # (:generation_completed's thinking_dropped, ChatLoop).
+      :thinking_dropped,
       :model,
       # The model the turn ran on (asked host:model, :generation_started's
       # model_ref; the first generation's), and whether its open generation
@@ -505,6 +508,7 @@ module Samagotchi
         retries: totals.retries,
         cuts: totals.cuts,
         capped: totals.capped,
+        thinking_dropped: totals.thinking_dropped,
         started_at: @started_at,
         last_activity_at: @last_activity_at,
         # From the session's first start (an earlier process's too), to now.
@@ -589,6 +593,7 @@ module Samagotchi
           retries: 0,
           cuts: 0,
           capped: 0,
+          thinking_dropped: 0,
           model: nil,
           model_ref: nil,
           gen_switch: false,
@@ -679,12 +684,15 @@ module Samagotchi
       end
     end
 
+    # A generation's cut, output cap and dropped thinking blocks, into the turn.
     def count_cut(event)
       @mutex.synchronize do
         next unless @turn
 
         @turn.cuts += 1 if event[:stopped_by] && event[:stopped_by].to_s != "steer"
         @turn.capped += 1 if event[:finish_reason].to_s == "length"
+        dropped = event[:thinking_dropped]
+        @turn.thinking_dropped += dropped if dropped.is_a?(Integer) && dropped.positive?
       end
     end
 
@@ -872,6 +880,7 @@ module Samagotchi
       }
       fields[:cache_write_tokens_sum] = turn.cache_write_sum if turn.cache_write_sum.positive?
       fields[:reprefill_tokens_sum] = turn.reprefill_sum if turn.reprefill_sum.positive?
+      fields[:thinking_dropped] = turn.thinking_dropped if turn.thinking_dropped.positive?
       fields.merge!(cost: turn.cost_sum, cost_source: "reported") if turn.cost_sum
       fields[:cost_estimate] = turn.cost_estimate_sum if turn.cost_estimate_sum.positive?
       fields[:switch_prefill_tokens] = turn.switch_prefill_tokens if turn.switch_prefill_tokens

data/lib/samagotchi/terminal_ui/formatting.rb

@@ -600,6 +600,9 @@ module Samagotchi
         # A looped session: loop-guard's cuts, or thinking that ran to the cap.
         lines << "thinking cuts:    #{snapshot[:cuts].to_i}"
         lines << "output cap hits:  #{snapshot[:capped].to_i}"
+        # Claude 5.x: replayed thinking a prefix change made the API drop.
+        dropped = snapshot[:thinking_dropped].to_i
+        lines << "thinking dropped: #{dropped} blocks (preserved-thinking recovery)" if dropped.positive?
         context = snapshot[:context] || {}
         if context[:used_tokens]
           pct = context_pct_text(context, snapshot[:llm_context])

data/lib/samagotchi/terminal_ui.rb

@@ -42,8 +42,8 @@ require_relative "children_status"
 require_relative "log"
 
 module Samagotchi
-  # Loaded on first use: session_manager requires this file (its worker
-  # process loads the whole UI stack through it), a require cycle otherwise.
+  # Loaded on first use: this autoload keeps SessionManager and its ~80
+  # files unloaded until the delegate/session path needs them.
   autoload :SessionManager, File.expand_path("session_manager", __dir__)
 
   # The in-process terminal front end (`chi --no-shared`, `chi scratch`,

data/lib/samagotchi/tools/delegate.rb

@@ -10,8 +10,8 @@ require_relative "delegate_wait"
 require_relative "../child_reports"
 
 module Samagotchi
-  # Loaded on first use: session_manager requires terminal_ui, which
-  # requires KernelLoop and so these tools (a require cycle otherwise).
+  # Loaded on first use: this autoload keeps SessionManager and its ~80
+  # files unloaded until the delegate/session path needs them.
   autoload :SessionManager, File.expand_path("../session_manager", __dir__)
 
   module Tools

data/lib/samagotchi/tools/delegate_result.rb

@@ -6,8 +6,8 @@ require_relative "delegate"
 require_relative "delegate_wait"
 
 module Samagotchi
-  # Loaded on first use: session_manager requires terminal_ui, which
-  # requires KernelLoop and so these tools (a require cycle otherwise).
+  # Loaded on first use: this autoload keeps SessionManager and its ~80
+  # files unloaded until the delegate/session path needs them.
   autoload :SessionManager, File.expand_path("../session_manager", __dir__)
 
   module Tools

data/lib/samagotchi/tools/list_sessions.rb

@@ -6,8 +6,8 @@ require_relative "../session"
 require_relative "peers"
 
 module Samagotchi
-  # Loaded on first use: session_manager requires terminal_ui, which
-  # requires KernelLoop and so these tools (a require cycle otherwise).
+  # Loaded on first use: this autoload keeps SessionManager and its ~80
+  # files unloaded until the delegate/session path needs them.
   autoload :SessionManager, File.expand_path("../session_manager", __dir__)
 
   module Tools

data/lib/samagotchi/version.rb

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

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

@@ -56,7 +56,9 @@ import { actionLine, annotationActions, composerWithAction } from "./annotate_ac
 import { copyText, installCopy } from "./copy.js";
 import { createQuestionCards } from "./question_cards.js";
 import { splitSnapshotCards } from "./card.js";
-import { PROMPT_LINE_PX, PROMPT_MIN_PX, gripFloor, promptHeight } from "./composer_size.js";
+import { PROMPT_LINE_PX, PROMPT_MIN_PX, promptHeight } from "./composer_size.js";
+import { GRIP_KEY, createComposerGrip } from "./composer_grip.js";
+import { readStored, writeStored } from "./storage.js";
 import { createCommandList } from "./command_list.js";
 import { createPromptHistory } from "./prompt_history.js";
 import { ALL_SESSIONS_HASH, sessionHash, sessionIdFromHash } from "./route.js";
@@ -64,6 +66,7 @@ import { scopeDir, scopeTemplate } from "./scope.js";
 import { html, nothing, render } from "./vendor/lit-html.js";
 import { easeScrollTo, FOLLOW_MS, shouldFollowScroll } from "./scroll.js";
 import { SHORT_WINDOW_QUERY, stripAutoHidden } from "./strip.js";
+import { waitingOn } from "./notify.js";
 import { applySessionEvent, inTree, sortedByUpdated } from "./sessions_list.js";
 import { createNotifications } from "./notifications.js";
 import { tabTitle, topBarTitle } from "./session_title.js";
@@ -132,7 +135,7 @@ const llmContextNewControl = createLlmContextControl({
   choose: (next) => {
     newChatLlmContext = next;
     renderNewChatLlmContext();
-    promptEl.focus();
+    focusPrompt();
   },
   id: "llmContextNewPopover",
   anchor: "#llmContextNew",
@@ -168,7 +171,7 @@ const thinkingNewControl = createThinkingControl({
   choose: (next) => {
     newChatThinking = next;
     renderNewChatThinking();
-    promptEl.focus();
+    focusPrompt();
   },
   id: "thinkingNewPopover",
   anchor: "#thinkingNew",
@@ -202,6 +205,7 @@ let pageEditorUrl = null;
 const promptEl = $("#prompt");
 const actionBtn = $("#actionBtn");
 const cancelBtn = $("#cancelBtn");
+const infoCancelBtn = $("#infoCancelBtn");
 const modelPickEl = $("#modelPick");
 const composeHintEl = $("#composeHint");
 
@@ -739,9 +743,10 @@ function clearSelection() {
   closeStream();
   setMarkdownWarning(null);
   setCapabilities(null, null);
+  composerGrip.newVisit();
   updateComposerMode();
   updateInfoBar();
-  promptEl.focus();
+  focusPrompt();
 }
 
 // A short line on the start page (the open session went away); gone at the
@@ -774,11 +779,13 @@ async function select(id) {
   closeStream();
   resetSessionState();
   resetTurnView();
+  composerGrip.newVisit();
   updateInfoBar();
   contextChips.load(id);
   updateComposerMode();
   await resync();
-  promptEl.focus();
+  // A folded composer stays folded: typing on the page opens it.
+  focusPrompt({ open: false });
 }
 
 // Clear everything that belongs to one turn's rendering.
@@ -815,6 +822,9 @@ async function resync({ endText = null } = {}) {
       return;
     }
     if (id !== selected) return;
+    // An archived session opens folded: decided once per visit, from its
+    // first answer (the list may not hold it yet, or ever under ?dir).
+    composerGrip.decideVisit(data.session?.archived);
     const kept = keptCommandBubbles(historyEl, id);
     resetTurnView();
     renderSessionView(data, { kept });
@@ -1089,6 +1099,7 @@ function updateInfoBar() {
     archiveBtn.title = buttons.archive.title;
   }
   if (stopBtn) stopBtn.style.display = buttons.stop.shown ? "" : "none";
+  drawFoldControls();
   // No session: the start page hides the info bar (the storage path is on
   // #/sessions). The session clock ticks every second while a turn runs:
   // lit writes its text alone, the bar's other nodes (a tooltip, a button
@@ -1260,6 +1271,8 @@ const streamHandlers = createStreamHandlers({
   composer: {
     empty: () => !promptEl.value.trim() && !chips.length,
     refill: (text) => {
+      // A failed turn's line back: seen, so the composer opens (this visit).
+      openForVisit();
       promptEl.value = text;
       fitPrompt();
     },
@@ -1427,6 +1440,8 @@ async function handleSendTurn({ delivery: chosen = null } = {}) {
     // (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 });
+    // A restored line must be seen: the composer opens for this visit.
+    if (restored?.refill && sentTo === selected) openForVisit();
     promptEl.value = composerAfterAck({ sent: line, current: promptEl.value, refill: restored?.refill || "" });
     fitPrompt();
     clearChips();
@@ -1463,7 +1478,7 @@ async function handleSendTurn({ delivery: chosen = null } = {}) {
     showToast(cantText("send", e), null, { sticky: true });
   } finally {
     actionBtn.disabled = current.owner === "tui";
-    promptEl.focus();
+    focusPrompt();
   }
 }
 
@@ -1488,7 +1503,8 @@ const composerCommands = createComposerCommands({
     clear: () => clearComposer(),
     done: () => {
       actionBtn.disabled = current.owner === "tui";
-      promptEl.focus();
+      // A chip's command (the info bar) leaves a folded composer folded.
+      focusPrompt({ open: false });
     },
   },
 });
@@ -1505,6 +1521,7 @@ function clearComposer() {
 async function handleCancel() {
   if (!selected) return;
   cancelBtn.disabled = true;
+  infoCancelBtn.disabled = true;
   try {
     await cancelTurn(selected);
   } catch (e) {
@@ -1512,6 +1529,7 @@ async function handleCancel() {
     if (e.code !== "not_running") alert(e.message);
   } finally {
     cancelBtn.disabled = false;
+    infoCancelBtn.disabled = false;
   }
 }
 
@@ -1560,7 +1578,7 @@ const modelPicker = createModelPicker({
       renderNewChatLlmContext();
       renderNewChatThinking();
     }
-    promptEl.focus();
+    focusPrompt();
   },
 });
 // A pick on a fresh link: /model in its worker (its command bubble and the
@@ -1611,9 +1629,7 @@ function syncModelPick() {
 }
 // Leaving a session: the start page's remembered model again (no fetch).
 function restoreStartPick() {
-  let stored = null;
-  try { stored = localStorage.getItem(MODEL_KEY); } catch (_) {}
-  modelPicker.restore(stored);
+  modelPicker.restore(readStored(MODEL_KEY));
   renderNewChatLlmContext();
   renderNewChatThinking();
 }
@@ -1624,8 +1640,7 @@ async function loadModels() {
   } catch (_) {
     return;
   }
-  let stored = null;
-  try { stored = localStorage.getItem(MODEL_KEY); } catch (_) {}
+  const stored = readStored(MODEL_KEY);
   if (!modelPicker.setModels(payload, stored)) return;
   startPickTitle = payload.warning ? `${START_PICK_TITLE} · ${payload.warning}` : START_PICK_TITLE;
   modelPickEl.hidden = false;
@@ -1652,6 +1667,7 @@ let chips = [];
 function renderChips() {
   render(chipsTemplate(chips), chipsEl);
   chipsEl.hidden = !chips.length;
+  drawFoldControls();
 }
 
 function setChips(list) {
@@ -1668,7 +1684,7 @@ function addImageFiles(files) {
   if (!files.length) return false;
   for (const file of files) chips.push({ file, name: chipName(file, chips.length), src: URL.createObjectURL(file) });
   renderChips();
-  promptEl.focus();
+  focusPrompt();
   return true;
 }
 
@@ -1680,9 +1696,7 @@ chipsEl.addEventListener("click", (e) => {
   renderChips();
 });
 // ── Composer height: grows with the text; the top-edge grip sets a floor ───
-const GRIP_KEY = "chi_composer_floor";
-let promptFloor = null;
-try { promptFloor = Number(localStorage.getItem(GRIP_KEY)) || null; } catch (_) {}
+let promptFloor = Number(readStored(GRIP_KEY)) || null;
 
 // The empty box: one line in a session, three on the start page.
 function promptMinPx() {
@@ -1697,33 +1711,6 @@ function fitPrompt() {
   promptEl.style.overflowY = scrolls ? "auto" : "hidden";
 }
 
-const composeGrip = $("#composeGrip");
-composeGrip.addEventListener("pointerdown", (e) => {
-  e.preventDefault();
-  composeGrip.setPointerCapture(e.pointerId);
-  composeGrip.classList.add("dragging");
-  const startY = e.clientY;
-  const startH = promptEl.offsetHeight;
-  const move = (ev) => {
-    promptFloor = gripFloor(startH + (startY - ev.clientY), window.innerHeight, promptMinPx());
-    fitPrompt();
-  };
-  const up = () => {
-    composeGrip.classList.remove("dragging");
-    composeGrip.removeEventListener("pointermove", move);
-    composeGrip.removeEventListener("pointerup", up);
-    composeGrip.removeEventListener("pointercancel", up);
-    try { localStorage.setItem(GRIP_KEY, String(promptFloor || "")); } catch (_) {}
-  };
-  composeGrip.addEventListener("pointermove", move);
-  composeGrip.addEventListener("pointerup", up);
-  composeGrip.addEventListener("pointercancel", up);
-});
-composeGrip.addEventListener("dblclick", () => {
-  promptFloor = null;
-  try { localStorage.removeItem(GRIP_KEY); } catch (_) {}
-  fitPrompt();
-});
 promptEl.addEventListener("input", fitPrompt);
 window.addEventListener("resize", fitPrompt);
 fitPrompt();
@@ -1806,6 +1793,29 @@ document.addEventListener("keydown", (e) => {
   if (e.key === "Escape" && !lightboxEl.hidden) lightboxEl.hidden = true;
 });
 cancelBtn.addEventListener("click", () => handleCancel());
+infoCancelBtn.addEventListener("click", () => handleCancel());
+
+// The composer's grip and fold (composer_grip.js).
+const composerGrip = createComposerGrip({
+  composeGrip: $("#composeGrip"),
+  promptEl,
+  infoCancelBtn,
+  infoBarEl: $("#infoBar"),
+  session: () => selected,
+  fitPrompt,
+  promptMinPx,
+  floor: () => promptFloor,
+  setFloor: (px) => { promptFloor = px; },
+  draft: () => !!(promptEl.value.trim() || chips.length),
+  waiting: () => !!(waitingOn(allSessions.find((s) => s.id === selected)) || questionCards.pendingQuestion()),
+  turnRunning: () => liveTurn.running,
+  allViewOpen,
+  lightboxOpen: () => !lightboxEl.hidden,
+  imageFiles,
+  addImageFiles,
+});
+// Bound here, not hoisted: no top-level code above this line may call them.
+const { openForVisit, focusPrompt, drawFoldControls } = composerGrip;
 // The / autocomplete (command_list.js): the session's commands while the
 // composer holds one "/word".
 const commandList = createCommandList({
@@ -1934,9 +1944,10 @@ async function continueSelected() {
 // continue's 201.
 function fillOpener(created) {
   if (promptEl.value.trim() || chips.length) return;
+  openForVisit();
   promptEl.value = openerText(created);
   fitPrompt();
-  promptEl.focus();
+  focusPrompt();
   promptEl.setSelectionRange(promptEl.value.length, promptEl.value.length);
 }
 
@@ -2039,9 +2050,10 @@ function showToast(text, action = null, options = {}) { toasts.show(text, action
 // 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) {
+  openForVisit();
   promptEl.value = text;
   fitPrompt();
-  promptEl.focus();
+  focusPrompt();
   promptEl.setSelectionRange(promptEl.value.length, promptEl.value.length);
   promptEl.scrollTop = promptEl.scrollHeight;
 }
@@ -2077,12 +2089,8 @@ const notifications = createNotifications({ button: $("#notifyBtn") });
 // The latest-sessions strip can be hidden for more chat room; the choice
 // stays per browser (it replaced zen mode, so a zen user starts hidden).
 function stripHiddenSaved() {
-  try {
-    const saved = localStorage.getItem("chi_strip_hidden");
-    return saved === null ? localStorage.getItem("chi_zen") === "1" : saved === "1";
-  } catch (_) {
-    return false;
-  }
+  const saved = readStored("chi_strip_hidden");
+  return saved === null ? readStored("chi_zen") === "1" : saved === "1";
 }
 // A short window hides the strip by itself, so the stage keeps room for a
 // card that waits (its question and choices); the sessions pill brings it
@@ -2098,7 +2106,7 @@ function applyStripHidden() {
 }
 function setStripHidden(hidden) {
   if (hidden) lists.familyPop.close();
-  try { localStorage.setItem("chi_strip_hidden", hidden ? "1" : "0"); } catch (_) {}
+  writeStored("chi_strip_hidden", hidden ? "1" : "0");
   stripShownWhileShort = !hidden && shortWindow.matches;
   applyStripHidden();
 }

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

@@ -0,0 +1,58 @@
+// The session's composer can fold away for room to read (the info bar under
+// it stays and becomes the page's bottom edge). The user's own fold or
+// unfold is saved per browser (chi_composer_collapsed); an archived
+// session opens folded for that visit; the page expanding it by itself (a
+// focus, a restored line, a quote) opens it for the visit only. A visit is
+// one select() call.
+
+export const COMPOSER_FOLD_KEY = "chi_composer_collapsed";
+
+// Whether the composer is folded: the saved choice or an archived visit,
+// unless this visit opened it.
+export function composerFolded({ saved, archivedVisit, visitOpen }) {
+  if (visitOpen) return false;
+  return !!saved || !!archivedVisit;
+}
+
+// The composer's grip while it is the fold's handle. Expanded it only says
+// how to resize and hide; folded it is drawn as the handle on the info
+// bar's top edge, pulled up or clicked to open, and marked: `draft` (the
+// box holds text or images: folding never clears them: the accent),
+// `waiting` (the attention colour: the session waits on the user, and its
+// card may not take the focus while a draft is there). The title carries
+// the words.
+// @return {title, folded, draft, waiting}
+export function foldHandle({ folded, draft, waiting }) {
+  if (!folded) {
+    return { title: "Drag to make the message box taller, down to hide it (double-click resets)", folded: false, draft: false, waiting: false };
+  }
+  const marked = !!draft;
+  let title = "Pull up or click to write";
+  if (marked) title += " · a draft is in it";
+  if (waiting) title += " · the session waits on you";
+  return { title, folded: true, draft: marked, waiting: !!waiting };
+}
+
+// Whether a key pressed on the page (the composer folded) opens it and
+// lands in the message box: a printable character, not Space (it scrolls,
+// and the turn marker and the stage headline use it), no Ctrl/Meta/Alt,
+// not taken already, not mid-composition, and not while the focus is in a
+// field of its own (an input, textarea, select or contenteditable), the
+// all-sessions view or the lightbox is open. An IME's first key arrives as
+// "Process": it doesn't open it.
+// +active+: document.activeElement.
+export function opensOnKey(e, { active, allView, lightbox }) {
+  if (!e || e.defaultPrevented || e.isComposing) return false;
+  if (e.ctrlKey || e.metaKey || e.altKey) return false;
+  const key = typeof e.key === "string" ? e.key : "";
+  if ([...key].length !== 1 || key === " ") return false;
+  if (allView || lightbox) return false;
+  return !editable(active);
+}
+
+function editable(el) {
+  if (!el) return false;
+  if (el.isContentEditable) return true;
+  const tag = (el.tagName || "").toUpperCase();
+  return tag === "INPUT" || tag === "TEXTAREA" || tag === "SELECT";
+}