samagotchi 0.52.0 → 0.54.0

data/lib/samagotchi/tool_activity.rb

@@ -43,8 +43,10 @@ module Samagotchi
         action: tool_activity_action(tool_name, registry: registry, call: call),
         tool: tool_name,
         params: tool_activity_params(tool_name, call, registry: registry),
-        status: tool_activity_status(result, tool_name)
+        status: tool_activity_status(result, tool_name, command: call.is_a?(Hash) ? call[:content] : nil)
       }
+      # A grep that found nothing: ok, and the web row says "no match".
+      event[:no_match] = true if event[:status] == "ok" && tool_name == Tools::Execute::NAME && execute_failed?(result.to_s)
       title = tool_title(tool_name, call, cwd: cwd)
       event[:title] = title if title
       # The name the model used when an alias ran a built-in (called_as: "bash"
@@ -181,13 +183,6 @@ module Samagotchi
       end
     end
 
-    # "error" for an "Error:" result, and for an execute whose command
-    # exited non-zero (its last "exit: N" line; no number: killed by a
-    # signal), so the turn tally's "(N failed)" counts it. "stopped" for a
-    # task_wait the user's Stop ended (the task itself runs on), for one
-    # whose task was stopped (the stop-task button, or the model's task_stop),
-    # and for a command the user's Stop killed or kept from starting: a
-    # cancel, not a failure (its text still starts "Error:" for the model).
     # memory_write's label: a call with only a description changes the index line.
     def memory_write_action(call)
       return "saving memory" unless call.is_a?(Hash)
@@ -205,23 +200,98 @@ module Samagotchi
       request.ids.empty? && request.restore? ? "restoring outputs" : "forgetting outputs"
     end
 
-    def tool_activity_status(result, tool_name = nil)
+    # "error" for an "Error:" result, and for an execute whose command
+    # exited non-zero (its last "exit: N" line; no number: killed by a
+    # signal), so the turn tally's "(N failed)" counts it; but not a grep
+    # that found nothing (no_match?, given the +command+): that stays "ok".
+    # "stopped" for a
+    # task_wait the user's Stop ended (the task itself runs on), for one
+    # whose task was stopped (the stop-task button, or the model's task_stop),
+    # and for a command the user's Stop killed or kept from starting: a
+    # cancel, not a failure (its text still starts "Error:" for the model).
+    def tool_activity_status(result, tool_name = nil, command: nil)
       text = result.to_s
       return "stopped" if text == Tools::Execute::NOT_RUN_ON_STOP
       return "stopped" if tool_name == Tools::Execute::NAME && text.start_with?(Tools::Execute::STOPPED_BY_USER)
       return "error" if text.start_with?("Error:")
-      return "error" if tool_name == Tools::Execute::NAME && execute_failed?(text)
+      if tool_name == Tools::Execute::NAME && execute_failed?(text)
+        return no_match?(text, command) ? "ok" : "error"
+      end
       return "stopped" if tool_name == Tools::TaskWait::NAME && text.match?(/^(wait_result: canceled|status: stopped)$/)
 
       "ok"
     end
 
     def execute_failed?(text)
-      exit_line = text.lines.reverse_each.find { |line| line.start_with?("exit: ") }
-      return false unless exit_line
+      code = execute_exit_code(text)
+      !code.nil? && code != "0"
+    end
+
+    # The code on an execute result's last "exit: N" line ("" when killed
+    # by a signal); nil with no exit line.
+    def execute_exit_code(text)
+      exit_line = text.to_s.lines.reverse_each.find { |line| line.start_with?("exit: ") }
+      exit_line && exit_line[/\Aexit: (\d*)/, 1]
+    end
+
+    # The grep family: exit 1 means "searched, found nothing".
+    NO_MATCH_COMMANDS = %w[grep egrep fgrep rg ag pgrep].freeze
+    # Commands that can fail without a message, so an "&&" after them may
+    # hide which step exited 1.
+    SILENT_FAILERS = ["test", "[", "[[", "false", "diff", "cmp", "which", "type", "hash"].freeze
+    QUIET_FLAGS = %w[-q --quiet -s].freeze
+    # Any output sent to /dev/null (">", "1>", "2>", ">>"): its message may be gone.
+    TO_DEV_NULL = %r{>\s*/dev/null}
+    # Commands that end the script with their own code: the exit 1 may be theirs.
+    EXITS = %w[exit return].freeze
+
+    # An execute that exited 1 with no stderr block, whose last step is a
+    # grep-family command, and where no "&&" follows a step that could have
+    # failed silently: a search that found nothing, not a failure. Also
+    # false with a background "&" step (CommandSteps splits "&>" there too),
+    # an earlier exit/return, or set -e (any earlier step's failure ends the
+    # script). When unsure (no command, a command CommandSteps can't read),
+    # false.
+    def no_match?(text, command)
+      return false if command.nil? || execute_exit_code(text) != "1"
+      return false if text.to_s.each_line.any? { |line| line.chomp == "stderr:" }
+
+      steps = CommandSteps.parse(command)&.steps
+      return false unless steps && NO_MATCH_COMMANDS.include?(step_words(steps.last).first)
+      return false if steps.any? { |step| step.op == "&" }
+      return false if steps[0...-1].any? { |step| ends_script?(step) }
+
+      steps.each_cons(2).none? { |step, after| after.op == "&&" && silent_failer?(step) }
+    end
+
+    # A step's words from its command word on: no NAME=value prefixes, the
+    # command word without its path.
+    def step_words(step)
+      words = Guardrails::ShellLex.lex(step.text).filter_map { |kind, value| value if kind == :word }
+      words = words.drop_while { |word| word.match?(/\A[A-Za-z_][A-Za-z0-9_]*=/) }
+      return [] if words.empty?
+
+      [File.basename(words.first), *words.drop(1)]
+    end
+
+    # exit / return, or set -e (-e alone or in a flag group, -o errexit).
+    def ends_script?(step)
+      name, *args = step_words(step)
+      return true if EXITS.include?(name)
+      return false unless name == "set"
+
+      args.any? { |arg| arg.match?(/\A-[a-z]*e/) } || args.each_cons(2).include?(%w[-o errexit])
+    end
+
+    def silent_failer?(step)
+      return true if step.text.match?(TO_DEV_NULL) || step.text.lstrip.start_with?("((")
+
+      name, *args = step_words(step)
+      return true if SILENT_FAILERS.include?(name)
+      return true if name == "command" && args.intersect?(%w[-v -V])
+      return true if NO_MATCH_COMMANDS.include?(name) && args.intersect?(QUIET_FLAGS)
 
-      code = exit_line[/\Aexit: (\d*)/, 1]
-      code != "0"
+      name == "git" && args.first == "diff" && args.intersect?(%w[--quiet --exit-code])
     end
 
     def tool_activity_params(tool_name, call, registry: nil)

data/lib/samagotchi/version.rb

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

data/lib/samagotchi/web/app.rb

@@ -9,6 +9,7 @@ require "uri"
 require "rack"
 require "rack/request"
 
+require_relative "../analytics_file"
 require_relative "../client_id"
 require_relative "../delivery"
 require_relative "../answer_tail"
@@ -697,7 +698,7 @@ module Samagotchi
       # the new link started is not a refusal of it.
       def continue_from(given, prompt:, title:)
         [@manager.continue_session(given, prompt: prompt, title: title, state_dir: @state_dir), nil]
-      rescue SessionManager::ContinueRefused => e
+      rescue SessionContinue::Refused => e
         extra = e.reason == :continued ? { next_id: e.ids.first } : { ids: e.ids }
         [nil, json_response(409, { error: e.reason.to_s, detail: e.message, **extra })]
       rescue SessionManager::ArchiveRefused => e
@@ -1722,13 +1723,7 @@ module Samagotchi
       end
 
       def read_analytics(session_id)
-        path = File.join(@session_class.session_dir(session_id, state_dir: default_state_dir), "analytics.json")
-        return {} unless File.file?(path)
-
-        data = JSON.parse(File.read(path))
-        data.is_a?(Hash) ? data : {}
-      rescue JSON::ParserError, SystemCallError
-        {}
+        AnalyticsFile.read(@session_class.session_dir(session_id, state_dir: default_state_dir)) || {}
       end
 
       def merge_timing_records(persisted, live)

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

@@ -119,6 +119,8 @@ export function addCompleted(model, event = {}, now = null) {
   if (event.activity?.params) row.params = event.activity.params;
   if (event.activity?.title) row.title = event.activity.title;
   if (event.activity?.called_as) row.called_as = event.activity.called_as;
+  // A grep that found nothing (status ok): the row says "no match".
+  if (event.activity?.no_match) row.no_match = true;
   // The images the tool returned (a reload in the turn view draws them from
   // the saved parts, turn_html.js toolRowHtml).
   if (event.images?.length) row.images = event.images;

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

@@ -48,7 +48,7 @@ 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, ctxBarText, generationTokens, lastSpeedText, speedText, tokensTipText } from "./ctx.js";
+import { extractCtxPct, savedCtxPct, cardCtxText, ctxBarText, ctxBarTip, generationTokens, lastSpeedText, speedText } from "./ctx.js";
 import { createQuestionCards } from "./question_cards.js";
 import { cardClass, cardInnerHtml, cardPlace, isCard, isNoticeCard, noticeInnerHtml, shownElsewhere, splitSnapshotCards, turnNoticePlace } from "./card.js";
 import { PROMPT_LINE_PX, PROMPT_MIN_PX, gripFloor, promptHeight } from "./composer_size.js";
@@ -126,7 +126,6 @@ const llmContextNewControl = createLlmContextControl({
 // in the session's worker.
 const thinkingControl = createThinkingControl({
   el: infoTextEl,
-  escapeHtml,
   summary: () => (selected ? current.thinking : null),
   session: () => selected,
   running: () => liveTurn.running,
@@ -139,7 +138,6 @@ let newChatThinking = null;
 const newChatThinkingSummary = () => (modelPickEl.hidden ? null : modelPicker.chosenRow()?.thinking || null);
 const thinkingNewControl = createThinkingControl({
   el: thinkingNewEl,
-  escapeHtml,
   summary: newChatThinkingSummary,
   kind: NEW_CHAT,
   choice: () => newChatThinking,
@@ -464,7 +462,7 @@ function cardHtml(s, { deletable = false, archivable = false, selectable = 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="${escapeHtml(tokensTipText(s.tokens, undefined, s.memory_index))}">${escapeHtml(ctx)}</span>` : "";
+  const ctxHtml = ctx ? `<span class="ctx" title="${escapeHtml(ctxBarTip(s.tokens, s.memory_index, { pct: s.ctx_pct }))}">${escapeHtml(ctx)}</span>` : "";
   const waiting = waitingBadge(s);
   const waitingHtml = waiting ? `<span class="attn attn-${waiting.kind}" title="${escapeHtml(waiting.title)}">${escapeHtml(waiting.text)}</span>` : "";
   // A turn a hook stopped wears its own badge, unless the session waits on
@@ -2023,9 +2021,9 @@ function updateInfoBar() {
   const idShort = selected.slice(0,8);
   const ctxText = ctxBarText(current.ctxPct, current.ctxWindowSource);
   const tokens = current.timing.tokens;
-  const ctxTip = tokensTipText(tokens, undefined, current.timing.memoryIndex,
-                               { tokens: current.ctxWindow, source: current.ctxWindowSource, pct: current.ctxPct,
-                                 budget: current.llmContext?.budget_tokens });
+  const ctxTip = ctxBarTip(tokens, current.timing.memoryIndex,
+                           { tokens: current.ctxWindow, source: current.ctxWindowSource, pct: current.ctxPct,
+                             budget: current.llmContext?.budget_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}` : ""}`;
@@ -2051,7 +2049,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>${chainHtml}${parentHtml}${kidsHtml}${llmContextChipHtml(current.llmContext, escapeHtml)}${thinkingChipHtml(current.thinking, escapeHtml)}${notesHtml}${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||"")}"><bdi>${escapeHtml(current.dir||"")}</bdi></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 session-time"></span>` : ""}${workerBadgeHtml()}</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>${chainHtml}${parentHtml}${kidsHtml}${llmContextChipHtml(current.llmContext, escapeHtml)}${thinkingChipHtml(current.thinking, escapeHtml)}${notesHtml}${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||"")}"><bdi>${escapeHtml(current.dir||"")}</bdi></span><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 session-time"></span>` : ""}${workerBadgeHtml()}</div>`;
   // The session clock ticks every second while a turn runs: only its text
   // changes, the bar's other nodes (a tooltip, a button mid-press) stay.
   renderStable(infoTextEl, metaHtml, { ".session-time": timingText });

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

@@ -4,17 +4,22 @@
 
 // The commands to offer while the composer holds one "/word" being typed
 // (no space or newline yet): the session's slash commands that start with
-// it, by name. The terminal UIs' own (local: /stats, /exit …) don't run here.
+// it, by name. A UI's own (local) one is offered only when its uis name
+// the web (/cut); the terminals' own (/stats, /exit …) don't run here.
 export function commandMatches(commands, text) {
   const typed = String(text || "");
   if (!/^\/\S*$/.test(typed)) return [];
   const needle = typed.toLowerCase();
   return (Array.isArray(commands) ? commands : [])
-    .filter((c) => c && !c.local && typeof c.name === "string" && c.name.startsWith("/"))
+    .filter((c) => c && runsInWeb(c) && typeof c.name === "string" && c.name.startsWith("/"))
     .filter((c) => c.name.toLowerCase().startsWith(needle))
     .sort((a, b) => a.name.localeCompare(b.name));
 }
 
+function runsInWeb(command) {
+  return !command.local || (Array.isArray(command.uis) && command.uis.includes("web"));
+}
+
 // What picking +name+ does to the composer: {text, send}. The name
 // completes with a space for its arguments; ⏎ on a name already typed in
 // full sends it as it is (⏎ on "/help" runs /help).

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

@@ -62,9 +62,11 @@ export function savedCtxPct(context, budgetTokens = null) {
   return (used / against) * 100;
 }
 
-// A session card's quiet ctx: "12%", or "" when the list row has none.
+// A session card's quiet ctx: "12%", "ctx ?" when the list row has none (the
+// chip is always shown; "ctx ?" never means 0 — no request in this session
+// yet; a lone "?" beside the folder would read as "? project").
 export function cardCtxText(pct) {
-  return num(pct) === null ? "" : `${Math.round(pct)}%`;
+  return num(pct) === null ? "ctx ?" : `${Math.round(pct)}%`;
 }
 
 // A decode speed: "87 tok/s", "1.9k tok/s"; "~64 tok/s" for an estimate (no
@@ -123,12 +125,24 @@ export function memoryIndexText(memoryIndex) {
 
 // The info bar's ctx: "ctx 12%", "ctx ~12%" when the window is chi's
 // default (no server, model list or setting gave one, so the percent is of
-// a guess); "" without a pct.
+// a guess); "ctx ?" when there is no percent yet (no request in this session
+// — the chip is always shown; "?" never means 0).
 export function ctxBarText(pct, windowSource = null) {
-  if (num(pct) === null) return "";
+  if (num(pct) === null) return "ctx ?";
   return `ctx ${windowSource === "default" ? "~" : ""}${Math.round(pct)}%`;
 }
 
+// The info bar's / the card's ctx tooltip: the window line under the title
+// when there's a number (tokensTipText), or why there's none — "No request
+// in this session yet" — when the page has no percent (before any request;
+// the page isn't told context.status is off, and the window always resolves,
+// so "?" never means 0).
+export function ctxBarTip(tokens, memoryIndex, window) {
+  if (num(window?.pct) === null) return "No request in this session yet";
+
+  return tokensTipText(tokens, undefined, memoryIndex, window);
+}
+
 // The ctx tooltip's window line ({tokens:, source:, pct:, budget:} the
 // session's window, where it came from, the meter's value and the LLM
 // context budget): "context: ~41.0k of 128.0k tokens (server)", as /stats

data/lib/samagotchi/web/public/index.html

@@ -136,7 +136,8 @@ main{flex:1;display:flex;flex-direction:column;gap:16px;padding:16px;overflow:au
 /* A row's status is a mark in a 14 px slot, drawn from its class (no text: a copy or an annotate quote gets
    no glyph; the word is its aria-label and title). The glyphs the stage already uses: done ✓, error and
    blocked ✕, stopped ■, running its border spinner (still once the turn is over: a dead worker's row).
-   An exception also shows its word after the title (.activity-state). */
+   An exception also shows its word after the title (.activity-state); a done grep that found nothing a muted
+   "no match" (.no-match). */
 .activity-status{width:14px;text-align:center;font-size:12px;font-weight:700}
 .activity-status.ok::before{content:"\2713";opacity:.85}
 .activity-status.error::before,.activity-status.blocked::before{content:"\2715"}
@@ -149,6 +150,7 @@ main{flex:1;display:flex;flex-direction:column;gap:16px;padding:16px;overflow:au
 :is(.activity-status,.activity-state).error{color:var(--danger)}
 :is(.activity-status,.activity-state).stopped{color:var(--warn-text);opacity:.8}
 :is(.activity-status,.activity-state).blocked{color:var(--danger-text)}
+.activity-state.no-match{color:var(--text-muted);font-weight:500}
 .activity-tool{color:var(--accent);font-weight:600}
 /* The stop-task button on a running task_wait (task_stop.js): a small ghost
    button in the danger colours, at the row's end and in the stage's now slot. */
@@ -328,7 +330,7 @@ button.task-stop:hover:not(:disabled){background:var(--danger-bg-dim);filter:non
 .question-freeform{width:100%;box-sizing:border-box;background:var(--bg-inset);border:1px solid var(--border);color:var(--text);padding:8px 10px;border-radius:8px;font-size:13px;margin-bottom:8px}
 .question-error{color:var(--danger);font-size:12px;margin-bottom:8px}
 .question-error.hidden{display:none}
-.question-result{margin-top:6px;font-size:12px;color:var(--ok);font-weight:600}
+.question-result{margin-top:6px;font-size:12px;color:var(--ok);font-weight:600;white-space:pre-wrap;overflow-wrap:anywhere}
 /* 4.02: a resolved card whose summary already carries the result hides the
    body line; a hand-toggled one keeps it (its expanded body shows it). */
 .question-result.hidden{display:none}

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

@@ -145,7 +145,9 @@ export function truncate(text, n = 80) {
 // asks its tool and command: "execute: rm -rf tmp → Denied").
 export function summaryText(pq, { answer = null, cancelled = false, reason = "" } = {}) {
   if (cancelled || answer) {
-    const result = resultText(pq, { answer, cancelled, reason }).replace(/^Answered: /, "");
+    // A deny's typed reason stays out of the one-liner (the body line has it).
+    const result = !cancelled && deniedReason(pq, answer) ? "Denied"
+      : resultText(pq, { answer, cancelled, reason }).replace(/^Answered: /, "");
     const relay = relayView(pq);
     const asked = summaryAsked(pq);
     const text = asked ? `${truncate(asked, 60)} → ${result}` : result;
@@ -165,6 +167,12 @@ function summaryAsked(pq) {
   return String(pq.question || pq.header || "").split("\n")[0];
 }
 
+// The reason typed with an approval's deny ("" when none, or not a deny).
+export function deniedReason(pq, answer) {
+  if (approvalAllowed(pq, answer) !== false) return "";
+  return answer && answer.freeform ? String(answer.freeform) : "";
+}
+
 // Whether the answer allowed the call (the card turns green) or denied it.
 export function approvalAllowed(pq, answer) {
   if (!isApproval(pq)) return null;

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

@@ -15,7 +15,7 @@
 import { dismissQuestion, sendAnswer, sendCommand } from "./data.js";
 import { diffHtml } from "./diff_view.js";
 import {
-  answerErrorText, approvalAllowed, approvalView, CONTINUE_REASON_PLACEHOLDER, isContinue, nextCardAction,
+  answerErrorText, approvalAllowed, approvalView, CONTINUE_REASON_PLACEHOLDER, deniedReason, isContinue, nextCardAction,
   relayedToView, resultText, summaryText,
 } from "./question_card.js";
 import { sessionHash } from "./route.js";
@@ -339,8 +339,10 @@ export function createQuestionCards({
     if (summary) summary.textContent = summaryText(pending, { answer, cancelled, reason });
     // 4.02: a reopened card's summary already carries the result (the
     // snapshot re-renders it resolved), and the body line repeats it. It
-    // stays for a hand-toggled card, whose expanded body the user looks at.
-    if (summary && !questionEl.dataset.toggled) note.classList.add("hidden");
+    // stays for a hand-toggled card, whose expanded body the user looks at,
+    // and for a deny with a reason: the summary says only "Denied".
+    const keepNote = questionEl.dataset.toggled || (!cancelled && deniedReason(pending, answer));
+    if (summary && !keepNote) note.classList.add("hidden");
     if (!questionEl.dataset.toggled) questionEl.open = false;
     pending = null;
   }

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

@@ -12,6 +12,7 @@
 // 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";
 
 export const LEVELS = ["off", "low", "medium", "high"];
 const DEFAULT = "default";
@@ -36,6 +37,8 @@ export function chipModel(summary, { kind = SESSION } = {}) {
   return { text: `think ${summary.level}${own ? ` · ${kind}` : ""}`, title, own };
 }
 
+// The session bar's chip, as a string: the info bar is still built as one
+// (app.js); it becomes a template when the info bar moves to lit.
 export function chipHtml(summary, escapeHtml) {
   const chip = chipModel(summary);
   if (!chip) return "";
@@ -50,32 +53,31 @@ export function commandLine(level, initial = null) {
   return `/thinking ${level}`;
 }
 
-function option(value, label, chosen, escapeHtml) {
-  return `<option value="${escapeHtml(value)}"${value === chosen ? " selected" : ""}>${escapeHtml(label)}</option>`;
-}
-
 // "Now: low (session)", "Now: default (the model's own)".
 export function nowText(summary) {
   return `Now: ${summary.level} (${summary.source || "the model's own"})`;
 }
 
-// The popover's form. For the new chat (kind NEW_CHAT), +summary+ is the
-// model's and +choice+ the level the form shows.
-export function formHtml(summary, escapeHtml, { running = false, kind = SESSION, choice = null } = {}) {
+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 `<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">${escapeHtml(nowText(summary))}</div>` +
-    `<label class="llmctx-field"><span>Level</span><select name="level">` +
-    option(DEFAULT, follow, chosen, escapeHtml) +
-    LEVELS.map((level) => option(level, level, chosen, escapeHtml)).join("") + `</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>`;
+  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 chip's popover, as createLlmContextControl's: el is where the chip
@@ -86,7 +88,7 @@ export function formHtml(summary, escapeHtml, { running = false, kind = SESSION,
 // 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, escapeHtml, summary, session = () => null, running = () => false, run,
+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 }) {
@@ -99,6 +101,11 @@ export function createThinkingControl({ el, escapeHtml, summary, session = () =>
   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);
@@ -117,7 +124,8 @@ export function createThinkingControl({ el, escapeHtml, summary, session = () =>
     if (!data) return;
     initial = (fresh ? choice() : data.own) || DEFAULT;
     openFor = session();
-    pop.innerHTML = formHtml(data, escapeHtml, { running: running(), kind, choice: choice() });
+    shown = { data, opts: { running: running(), kind, choice: choice() } };
+    draw(data);
     pop.hidden = false;
     place(anchor);
   }
@@ -126,17 +134,19 @@ export function createThinkingControl({ el, escapeHtml, summary, session = () =>
     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.
+  // 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();
-    const now = pop.querySelector(".think-now");
-    if (now) now.textContent = nowText(data);
+    draw(data);
   }
 
   el.addEventListener("click", (e) => {

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

@@ -264,14 +264,20 @@ function canceledSteps(g, record, tools) {
 }
 
 // A call's row from its tool record alone (no saved parts): the record's
-// called_as too, so "(called as bash)" shows after a reload, as live.
+// called_as too, so "(called as bash)" shows after a reload, as live, and
+// its no_match ("no match" on a grep that found nothing).
 function recordRows(tools, iteration) {
   return tools.filter((r) => Number(r.iteration) === iteration).map((r) => ({
     key: `${iteration}:${r.call_index ?? 0}`, tool: r.tool, status: r.status, duration_ms: r.duration_ms,
     ...(r.called_as ? { called_as: r.called_as } : {}),
+    ...noMatch(r),
   }));
 }
 
+function noMatch(record) {
+  return record?.no_match ? { no_match: true } : {};
+}
+
 // A turn whose saved messages carry their parts (the server's ?parts=1):
 // every assistant message is one step. Its calls take the turn's records by
 // tool, in call order (each the next record of its tool, consumed with the
@@ -292,7 +298,7 @@ function partsTurn(g, items, record, tools, stepsOnly = false) {
     const rows = Array.isArray(parts.tools)
       ? parts.tools.map((call, j) => {
         const r = takeRecord(pool, call.tool);
-        return { key: `${iteration}:${j + 1}`, status: r?.status || "ok", duration_ms: r?.duration_ms, ...call };
+        return { key: `${iteration}:${j + 1}`, status: r?.status || "ok", duration_ms: r?.duration_ms, ...noMatch(r), ...call };
       })
       : [];
     const thinking = String(parts.thinking || "");

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

@@ -12,16 +12,20 @@ import { emptyAnswerLine } from "./turn_events.js";
 
 // A row's status (live, or a saved tool record's on reload): running,
 // error, stopped (a task_wait the user's Stop ended), blocked (a guardrail
-// denied it), else ok ("done").
+// denied it), else ok ("done"; a grep that found nothing is ok too, with
+// a "no match" word, see statusParts).
 const NAMED_STATUSES = ["running", "error", "stopped", "blocked"];
 
 // A row's status as its parts: the mark's class (CSS draws the glyph), its
 // label (aria-label and title) and the word an exception shows after the
-// title (empty for done and running).
-export function statusParts(status) {
+// title (empty for done and running). A done grep that found nothing
+// (+noMatch+, the activity's no_match) keeps the done mark and shows a
+// muted "no match" word (its own class, wordCls).
+export function statusParts(status, { noMatch = false } = {}) {
   const named = NAMED_STATUSES.includes(status);
   const cls = named ? status : "ok";
   const label = named ? status : "done";
+  if (cls === "ok" && noMatch) return { cls, label, word: "no match", wordCls: "no-match" };
   return { cls, label, word: cls === "ok" || cls === "running" ? "" : label };
 }
 
@@ -29,8 +33,8 @@ function statusMarkHtml({ cls, label }) {
   return `<span class="activity-status ${cls}" role="img" aria-label="${label}" title="${label}"></span>`;
 }
 
-function statusWordHtml({ cls, word }) {
-  return word ? `<span class="activity-state ${cls}">${word}</span>` : "";
+function statusWordHtml({ cls, word, wordCls }) {
+  return word ? `<span class="activity-state ${wordCls || cls}">${word}</span>` : "";
 }
 
 // A reloaded row's ✂ mark: what an LLM context edit saved on its output
@@ -85,7 +89,7 @@ export function toolRowInnerHtml(row, { thumbs = () => "" } = {}) {
   const output = full
     ? `<div class="activity-output" title="${escapeHtml(full)}">${escapeHtml(full.length > 300 ? `${full.slice(0, 300)}…` : full)}</div>`
     : "";
-  const status = statusParts(row.status);
+  const status = statusParts(row.status, { noMatch: !!row.no_match });
   return `${statusMarkHtml(status)}<span class="activity-tool">${escapeHtml(toolName(row))}</span>${params}${alias}${statusWordHtml(status)}` +
     `${duration ? `<span class="activity-duration">${escapeHtml(duration)}</span>` : ""}` +
     `${commandBlockHtml(row.view, row.title)}${llmEditHtml(row)}${output}` +