samagotchi 0.55.0 → 0.56.0

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

@@ -0,0 +1,49 @@
+// The session bar's reasoning history chip: which of its own reasoning the
+// session's model gets back from the next turn on ("reasoning all";
+// "· session" when the session set its own), and a popover with a level
+// select that runs /reasoning-history in the session's worker. The summary
+// is the session's reasoning_history (SettingExplained#summary; null on a
+// native host, which ignores it, or from an older worker: no chip then).
+// A config on level_chip.js.
+
+import * as level from "./level_chip.js";
+import { html, nothing } from "./vendor/lit-html.js";
+
+export const LEVELS = ["drop", "turn", "all"];
+
+export const CONFIG = Object.freeze({
+  name: "Reasoning history",
+  prefix: "reasoning",
+  command: "/reasoning-history",
+  levels: LEVELS,
+  anchor: "[data-rh-chip]",
+  formClass: "rh-form",
+  popoverClass: "rh-popover",
+  nowClass: "rh-now",
+  when: () => "From the next turn's start. A change to or from all makes the server read the conversation again.",
+});
+
+export function chipModel(summary) {
+  return level.chipModel(CONFIG, summary);
+}
+
+// The session bar's chip (a lit-html template; info_bar.js), nothing
+// without a summary.
+export function chipTemplate(summary) {
+  const chip = chipModel(summary);
+  if (!chip) return nothing;
+  return html`<button type="button" class=${`model rh-chip${chip.own ? " own" : ""}`} title=${chip.title} data-rh-chip aria-haspopup="dialog">${chip.text}</button>`;
+}
+
+export function commandLine(choice, initial = null) {
+  return level.commandLine(CONFIG, choice, initial);
+}
+
+export function formTemplate(summary, opts) {
+  return level.formTemplate(CONFIG, summary, opts);
+}
+
+// The chip's popover in the session bar (level_chip.js createLevelControl).
+export function createReasoningHistoryControl({ id = "reasoningHistoryPopover", ...opts }) {
+  return level.createLevelControl({ cfg: CONFIG, id, ...opts });
+}

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

@@ -45,6 +45,9 @@ export function emptySessionState() {
     // The LLM context strategy, apply rule and budget the next turn runs
     // under, each with its source (the info bar's llm ctx chip), or null.
     llmContext: null,
+    // Which of its reasoning the model gets back from the next turn on, with
+    // its source (the reasoning history chip), or null (a native host).
+    reasoningHistory: null,
     timing: normalizeTiming(),
   };
 }
@@ -78,6 +81,8 @@ export function sessionStateFrom(data) {
   state.promptNotes = Array.isArray(s.prompt_notes) ? s.prompt_notes : [];
   state.llmContext = s.llm_context || null;
   state.thinking = s.thinking || null;
+  // null on a native host (it ignores the level) and from an older worker.
+  state.reasoningHistory = s.reasoning_history || null;
   state.parentId = s.parent_id || null;
   state.continues = s.continues || null;
   state.commands = Array.isArray(data.commands) ? data.commands : [];

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

@@ -15,7 +15,8 @@
 //   capabilities()        the page's capabilities (card.js shownElsewhere)
 //   historyEl             the history element (keepFollowing, the failed-turn redraw)
 //   liveTurn, turnDom, shownTexts, questionCards, contextChips,
-//   llmContextControl, thinkingControl      the page's views
+//   llmContextControl, thinkingControl,
+//   reasoningHistoryControl                 the page's views
 //   sentIds, earlyRestores                  restore.js's bookkeeping
 //   stream: {takeGuess(), restart()}        the stream was opened from a
 //                         guess (takeGuess: whether, and forget it); restart:
@@ -49,7 +50,7 @@ import { keepEarlyRestore, restoreAction } from "./restore.js";
 export function createStreamHandlers(deps) {
   const {
     selected, state, clientId, capabilities, historyEl,
-    liveTurn, turnDom, shownTexts, questionCards, contextChips, llmContextControl, thinkingControl,
+    liveTurn, turnDom, shownTexts, questionCards, contextChips, llmContextControl, thinkingControl, reasoningHistoryControl,
     sentIds, earlyRestores, stream, composer, getSession,
     resync, updateInfoBar, applyPromptOps, showSteers, markRecapStale, setTurnRunning, setLiveStatus, endTurnView,
     appendChunk, readTurnEnd, applyFinalMarkdown, refreshTimingFromSession, makeUserBubble, addEndBubble,
@@ -213,6 +214,13 @@ export function createStreamHandlers(deps) {
         updateInfoBar();
         thinkingControl.refresh();
       }
+      // /reasoning-history (or /model) changed it; null: the model now runs
+      // on a native host, which ignores it (the chip goes).
+      if ("reasoning_history" in data) {
+        state().reasoningHistory = data.reasoning_history || null;
+        updateInfoBar();
+        reasoningHistoryControl.refresh();
+      }
       if (view.resync) await resync();
       // A card's action that isn't anytime (the step-limit question's
       // /continue) has no bubble: nothing to remove. An anytime or queued

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

@@ -2,20 +2,35 @@
 // low"; "· session" when the session set its own), and a popover with a
 // level select that runs /thinking in the session's worker (the command's
 // reply shows in the conversation, like a typed one). The level and where
-// it came from are the session's thinking (Thinking::Explained#summary:
+// it came from are the session's thinking (SettingExplained#summary:
 // {level, source, own}; the worker's snapshot, a command_ran, or the
-// server's own reading of the session file).
+// server's own reading of the session file). A config on level_chip.js.
 //
 // The start page has one too (kind "new chat"): it shows the picked
 // model's level (GET /api/models' thinking) and keeps a choice for the
 // next create only (POST /api/sessions' thinking), never remembered:
 // nothing is sent unless the user sets one.
 
-import { NEW_CHAT, SESSION, popoverPlace } from "./llm_context_chip.js";
-import { html, nothing, render } from "./vendor/lit-html.js";
+import { SESSION } from "./llm_context_chip.js";
+import * as level from "./level_chip.js";
+import { html, nothing } from "./vendor/lit-html.js";
 
 export const LEVELS = ["off", "low", "medium", "high"];
-const DEFAULT = "default";
+
+export const CONFIG = Object.freeze({
+  name: "Thinking",
+  prefix: "think",
+  command: "/thinking",
+  levels: LEVELS,
+  anchor: "[data-think-chip]",
+  formClass: "think-form",
+  popoverClass: "think-popover",
+  nowClass: "think-now",
+  when: (fresh) => (fresh ? "For the new chat's first turn on; not remembered for the next one."
+    : "From the next turn's start. On Gemma the whole prompt is read again; a hosted API reads the whole conversation again."),
+});
+
+export const { nowText } = level;
 
 // The new chat's choice (a level, or null) laid over the model's summary:
 // what the chip shows. The model's own summary without a choice.
@@ -28,13 +43,8 @@ export function withChoice(summary, choice) {
 // set its own; null without a summary (an older worker). The default with
 // nothing set anywhere shows too ("think default"): the chip is where the
 // level is set.
-export function chipModel(summary, { kind = SESSION } = {}) {
-  if (!summary || !summary.level) return null;
-  const own = !!summary.own;
-  const what = kind === NEW_CHAT ? "the new chat" : "this session";
-  const from = own ? what : summary.source || "the model's own";
-  const title = `Thinking: ${summary.level} (${from}). Click to change it for ${what}.`;
-  return { text: `think ${summary.level}${own ? ` · ${kind}` : ""}`, title, own };
+export function chipModel(summary, opts) {
+  return level.chipModel(CONFIG, summary, opts);
 }
 
 // The session bar's chip (a lit-html template; info_bar.js), nothing
@@ -45,134 +55,19 @@ export function chipTemplate(summary) {
   return html`<button type="button" class=${`model think-chip${chip.own ? " own" : ""}`} title=${chip.title} data-think-chip aria-haspopup="dialog">${chip.text}</button>`;
 }
 
-// The /thinking line for a select value ("default" unsets the session's
-// own); null when it is what the form opened with.
-export function commandLine(level, initial = null) {
-  if (initial !== null && level === initial) return null;
-  return `/thinking ${level}`;
-}
-
-// "Now: low (session)", "Now: default (the model's own)".
-export function nowText(summary) {
-  return `Now: ${summary.level} (${summary.source || "the model's own"})`;
+// The /thinking line for a select value, with --yes (level_chip.js
+// commandLine); null when it is what the form opened with.
+export function commandLine(choice, initial = null) {
+  return level.commandLine(CONFIG, choice, initial);
 }
 
-const option = (value, label, chosen) => html`<option value=${value} ?selected=${value === chosen}>${label}</option>`;
-
-// The popover's form (a lit-html template). For the new chat (kind
-// NEW_CHAT), +summary+ is the model's and +choice+ the level the form
-// shows; +now+ is the summary its "Now:" line reads (refresh passes a
-// newer one, the rest stays as the form opened).
-export function formTemplate(summary, { running = false, kind = SESSION, choice = null, now = summary } = {}) {
-  const fresh = kind === NEW_CHAT;
-  const chosen = (fresh ? choice : summary.own) || DEFAULT;
-  const follow = summary.own && !fresh ? "follow the model" : `follow the model (${summary.level})`;
-  const when = fresh ? "For the new chat's first turn on; not remembered for the next one."
-    : "From the next turn's start. On Gemma the whole prompt is read again; a hosted API may restart its cache.";
-  return html`<form class="think-form llmctx-form"><div class="ctx-pop-head"><strong>Thinking</strong
-    ><span class="ctx-pop-kind">${fresh ? NEW_CHAT : "this session"}</span
-    ><button type="button" class="ctx-pop-close" data-act="close" aria-label="Close">×</button></div
-    ><div class="ctx-pop-meta think-now">${nowText(now)}</div
-    ><label class="llmctx-field"><span>Level</span><select name="level">${option(DEFAULT, follow, chosen)}${
-      LEVELS.map((level) => option(level, level, chosen))}</select></label
-    ><div class="ctx-pop-meta">${when}${running ? " A turn is running: it applies after this turn." : ""}</div
-    ><div class="ctx-pop-actions"><button type="submit" class="llmctx-set">Set</button></div></form>`;
+// The popover's form (level_chip.js formTemplate).
+export function formTemplate(summary, opts) {
+  return level.formTemplate(CONFIG, summary, opts);
 }
 
-// The chip's popover, as createLlmContextControl's: el is where the chip
-// is drawn (clicks are delegated: #infoText, info_bar.js);
-// summary(): the open session's thinking; session(): its id; running():
-// a turn runs; run(line): sends the command. The start page's (kind
-// NEW_CHAT): summary() is the picked model's, choice() the pending level
-// and choose(next) takes a Set's (null for "follow the model"). id and
-// anchor (the chip's selector) keep it apart from the llm ctx control on
-// the same element.
-export function createThinkingControl({ el, summary, session = () => null, running = () => false, run,
-                                        kind = SESSION, choice = () => null, choose = null,
-                                        id = "thinkingPopover", anchor: anchorSel = "[data-think-chip]",
-                                        doc = document, win = window }) {
-  const fresh = kind === NEW_CHAT;
-  const pop = doc.createElement("div");
-  pop.id = id;
-  pop.className = "ctx-popover think-popover";
-  pop.setAttribute("role", "dialog");
-  pop.hidden = true;
-  doc.body.appendChild(pop);
-  let initial = null;
-  let openFor = null;
-  // What the open form was drawn from: the model's or session's summary
-  // and the form's options. A closed popover is empty, so each open draws
-  // a fresh form (an unsent pick is gone).
-  let shown = null;
-  const draw = (now) => render(formTemplate(shown.data, { ...shown.opts, now }), pop);
-
-  function place(anchor) {
-    const width = Math.min(320, win.innerWidth - 32);
-    pop.style.width = `${width}px`;
-    pop.style.maxHeight = "";
-    const at = popoverPlace(anchor.getBoundingClientRect(), { width, height: pop.offsetHeight,
-                                                              innerWidth: win.innerWidth, innerHeight: win.innerHeight });
-    pop.style.left = `${at.left}px`;
-    pop.style.top = at.top === undefined ? "" : `${at.top}px`;
-    pop.style.bottom = at.bottom === undefined ? "" : `${at.bottom}px`;
-    if (at.maxHeight !== undefined) pop.style.maxHeight = `${at.maxHeight}px`;
-  }
-
-  function open(anchor) {
-    const data = summary();
-    if (!data) return;
-    initial = (fresh ? choice() : data.own) || DEFAULT;
-    openFor = session();
-    shown = { data, opts: { running: running(), kind, choice: choice() } };
-    draw(data);
-    pop.hidden = false;
-    place(anchor);
-  }
-
-  function close() {
-    pop.hidden = true;
-    initial = null;
-    openFor = null;
-    shown = null;
-    render(nothing, pop);
-  }
-
-  function isOpen() { return !pop.hidden; }
-
-  // A new summary: an open form keeps the user's pick; only "Now:" follows
-  // (the same template again: lit writes that line alone).
-  function refresh() {
-    if (!isOpen()) return;
-    const data = summary();
-    if (!data || session() !== openFor) return close();
-    draw(data);
-  }
-
-  el.addEventListener("click", (e) => {
-    const anchor = e.target.closest(anchorSel);
-    if (!anchor) return;
-    e.stopPropagation();
-    if (isOpen()) close();
-    else open(anchor);
-  });
-  pop.addEventListener("submit", (e) => {
-    e.preventDefault();
-    const level = e.target.elements.level.value;
-    const was = initial;
-    close();
-    if (fresh) return choose(level === DEFAULT ? null : level);
-    const line = commandLine(level, was);
-    if (line) run(line);
-  });
-  pop.addEventListener("click", (e) => {
-    if (e.target.closest("[data-act]")?.dataset.act === "close") close();
-  });
-  doc.addEventListener("click", (e) => {
-    if (isOpen() && !pop.contains(e.target) && !e.target.closest?.(anchorSel)) close();
-  });
-  doc.addEventListener("keydown", (e) => {
-    if (e.key === "Escape" && isOpen()) close();
-  });
-
-  return { close, refresh, get open() { return isOpen(); } };
+// The chip's popover (level_chip.js createLevelControl); the start page's
+// passes kind NEW_CHAT, choice and choose.
+export function createThinkingControl({ id = "thinkingPopover", ...opts }) {
+  return level.createLevelControl({ cfg: CONFIG, id, ...opts });
 }

data/lib/samagotchi/worker.rb

@@ -693,7 +693,8 @@ module Samagotchi
       resolved = @continue_offer.resolved?(awaiting, result)
       @engine.synchronize_events do
         @continue_offer.announce_resolved(result, command) if resolved
-        announce_command(command, status: result.status.to_s, output: result.output, changed: Array(result.changed))
+        announce_command(command, status: result.status.to_s, output: result.output, changed: Array(result.changed),
+                                  confirm: result.confirm)
         shown.each { |event| @engine.announce(event) }
       end
       save_or_log(:command) { save_session } unless Array(result.changed).empty?
@@ -706,9 +707,14 @@ module Samagotchi
     #   the cards and notices it showed, held: they follow its command_ran,
     #   as its output
     def run_command_line(command)
-      @engine.holding_announcements { command_result(command) { @commands.run(command.line) } }
+      @engine.holding_announcements { command_result(command) { @commands.run(command.line, confirm: confirm?(command)) } }
     end
 
+    # Whether +command+ asks before a costly /thinking or /reasoning-history
+    # change (CacheConfirm): only a person at a web tab or a TUI sees the
+    # question; chi send, a delegate, a plugin and a card's action apply it.
+    def confirm?(command) = ClientId.interactive?(command.client_id) && !command.card
+
     # The block's Result for +command+; one that raised, or found no
     # command for the line, is an error Result saying so.
     # @return [SessionCommands::Result]
@@ -767,9 +773,9 @@ module Samagotchi
     # saved.
     def start_anytime_command(command)
       @engine.spawn_anytime do
-        result = command_result(command) { @engine.running_anytime { @commands.run(command.line) } }
+        result = command_result(command) { @engine.running_anytime { @commands.run(command.line, confirm: confirm?(command)) } }
         announce_command(command, status: result.status.to_s, output: result.output, changed: Array(result.changed),
-                                  anytime: true)
+                                  anytime: true, confirm: result.confirm)
       rescue StandardError => e
         Log.warn(:worker, "anytime_command_failed", line: command.line, error: e.class.name, msg: e.message)
       end
@@ -777,7 +783,9 @@ module Samagotchi
 
     # @param anytime [Boolean] an anytime command's: its line was shown at
     #   its command_queued already
-    def announce_command(command, status:, output:, changed:, anytime: false)
+    # @param confirm [CacheConfirm::Confirm, nil] the change asks first: the
+    #   line that applies it (the TUI's prefill, the web's Apply button)
+    def announce_command(command, status:, output:, changed:, anytime: false, confirm: nil)
       text = output.to_s
       event = { type: :command_ran, **command.event_fields, status: status, output: text[0, COMMAND_OUTPUT_LIMIT],
                 changed: changed.map(&:to_s), model_name: @engine.effective_model_name }
@@ -788,6 +796,10 @@ module Samagotchi
       event[:llm_context] = @engine.llm_context_summary if changed.intersect?(%i[llm_context model])
       # /thinking or /model: the level the next turn runs at (the web's chip).
       event[:thinking] = @engine.thinking_explained&.summary if changed.intersect?(%i[thinking model])
+      # /reasoning-history or /model: the level the next turn runs under
+      # (the web's chip); nil on a native host, which ignores it.
+      event[:reasoning_history] = @engine.reasoning_history_explained&.summary if changed.intersect?(%i[reasoning_history model])
+      event[:confirm] = confirm.to_h if confirm
       event[:output_truncated] = true if text.length > COMMAND_OUTPUT_LIMIT
       @engine.announce(event)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.55.0
+  version: 0.56.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -212,6 +212,7 @@ files:
 - lib/samagotchi/bundles/system/manifest.yml
 - lib/samagotchi/bundles/system/memory_guide.md
 - lib/samagotchi/bundles/system/self_map.md
+- lib/samagotchi/cache_confirm.rb
 - lib/samagotchi/cancellation_controller.rb
 - lib/samagotchi/child_move.rb
 - lib/samagotchi/child_reports.rb
@@ -318,6 +319,7 @@ files:
 - lib/samagotchi/llm/native_tool_normalizer.rb
 - lib/samagotchi/llm/openai_chat.rb
 - lib/samagotchi/llm/prompt_cache.rb
+- lib/samagotchi/llm/stream_drops.rb
 - lib/samagotchi/llm/turn_settings.rb
 - lib/samagotchi/llm/usage.rb
 - lib/samagotchi/llm/utf8_scrub.rb
@@ -394,6 +396,8 @@ files:
 - lib/samagotchi/prompt_warmup.rb
 - lib/samagotchi/question_desk.rb
 - lib/samagotchi/queued_command.rb
+- lib/samagotchi/reasoning_history.rb
+- lib/samagotchi/reasoning_history_command.rb
 - lib/samagotchi/recap_setup.rb
 - lib/samagotchi/recap_store.rb
 - lib/samagotchi/relay.rb
@@ -420,6 +424,7 @@ files:
 - lib/samagotchi/session_retention.rb
 - lib/samagotchi/session_setup.rb
 - lib/samagotchi/sessions_command.rb
+- lib/samagotchi/setting_explained.rb
 - lib/samagotchi/steer.rb
 - lib/samagotchi/steer_cut.rb
 - lib/samagotchi/system_prompt.rb
@@ -540,6 +545,7 @@ files:
 - lib/samagotchi/web/public/info_bar.js
 - lib/samagotchi/web/public/init_row.js
 - lib/samagotchi/web/public/kept_commands.js
+- lib/samagotchi/web/public/level_chip.js
 - lib/samagotchi/web/public/lists_view.js
 - lib/samagotchi/web/public/live_timing.js
 - lib/samagotchi/web/public/live_turn.js
@@ -551,6 +557,7 @@ files:
 - lib/samagotchi/web/public/prompt_history.js
 - lib/samagotchi/web/public/question_card.js
 - lib/samagotchi/web/public/question_cards.js
+- lib/samagotchi/web/public/reasoning_history_chip.js
 - lib/samagotchi/web/public/refs.js
 - lib/samagotchi/web/public/restore.js
 - lib/samagotchi/web/public/route.js