samagotchi 0.42.0 → 0.44.0

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

@@ -156,6 +156,39 @@ export function steerCutLine({ source } = {}) {
   return `↪ cut in for ${STEER_CUT_FOR[source] || "your message"}`;
 }
 
+// The ✂ row of a batch of LLM context edits the server applied
+// (llm_context_edited, LLMContextNotice): its line as the server built
+// it ("✂ forgot 2 outputs, stubbed 1 stale read · frees ~4.1k tokens"),
+// so the web and the TUI say the same.
+export function llmContextLine({ text } = {}) {
+  return text || "✂ LLM context edited";
+}
+
+// The ✂ row's hover: what each group did, one line per output (its id,
+// tool and title), and what the batch costs ("~": chars/4).
+export function llmContextHover({ groups = [], freed_tokens: freed, tail_tokens: tail, staged, moment } = {}) {
+  const lines = [];
+  const output = (item) => [item.id, item.tool, item.title].filter(Boolean).join(" ");
+  for (const group of Array.isArray(groups) ? groups : []) {
+    const items = Array.isArray(group.items) ? group.items : [];
+    if (group.kind === "stale") {
+      lines.push("Stubbed as stale:");
+      for (const item of items) lines.push(`  ${output(item)}${item.note ? ` — ${item.note}` : ""}`);
+    } else if (group.kind === "forget") {
+      lines.push(`Forgotten by the ${group.by || "model"}: ${group.note || ""}`);
+      for (const item of items) lines.push(`  ${output(item)}${item.kept ? ` · lines ${item.kept} kept` : ""}`);
+    }
+  }
+  const cost = [];
+  if (Number(freed) > 0) cost.push(`frees ~${freed} tokens`);
+  if (Number(tail) > 0) cost.push(`the server reads ~${tail} tokens again`);
+  if (cost.length) lines.push(cost.join("; "));
+  if (Number(staged) > 0) lines.push(`${staged} more staged until the turn ends`);
+  lines.push(moment === "turn_end" ? "Sent from the next turn on." : "Sent from the next request on.");
+  lines.push("The session keeps the originals.");
+  return lines.join("\n");
+}
+
 // The one muted line for a turn that ended with no answer (turn_completed's
 // turn_summary.empty_answer, or a reloaded turn's marker): the TUI words
 // it the same (TurnNote.empty_answer_line; spec/shared/labels_matrix.json).
@@ -170,6 +203,7 @@ export function emptyAnswerLine({ retries = 0 } = {}) {
 export function noticeLine(entry = {}) {
   if (entry.type === "empty_answer_retry") return emptyRetryLine(entry);
   if (entry.type === "steer_cut") return steerCutLine(entry);
+  if (entry.type === "llm_context_edited") return llmContextLine(entry);
   return `${hookNoticeLabel(entry.hook)}: ${entry.text || ""}`;
 }
 

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

@@ -33,12 +33,43 @@ function statusWordHtml({ cls, word }) {
   return word ? `<span class="activity-state ${cls}">${word}</span>` : "";
 }
 
+// A reloaded row's ✂ mark: what an LLM context edit saved on its output
+// sends the model instead (MessageParts.edit_marks): a stale stub and
+// what it frees, a forget's note (or the output whose row carries it) and
+// its kept lines, a forget still staged. The live rows get none (a reload
+// shows them).
+export function llmEditLine(edit) {
+  if (!edit || typeof edit !== "object") return "";
+  const kept = edit.kept ? ` · lines ${edit.kept} kept` : "";
+  if (edit.kind === "forget") {
+    if (edit.staged) return `✂ forget staged${kept}`;
+    return `${edit.with ? `✂ forgotten with ${edit.with}` : `✂ forgotten: ${edit.note || ""}`}${kept}`;
+  }
+  if (edit.kind === "stale") {
+    const tokens = Number(edit.tokens) > 0 ? ` · ~${compactTokens(Number(edit.tokens))}` : "";
+    return `✂ stubbed: ${edit.note || "stale"}${tokens}`;
+  }
+  return "";
+}
+
+function compactTokens(n) {
+  return n >= 1000 ? `${(n / 1000).toFixed(1)}k tokens` : `${n} tokens`;
+}
+
+function llmEditHtml(row) {
+  const line = llmEditLine(row.edit);
+  if (!line) return "";
+  const hover = `${row.tool_id ? `${row.tool_id}: ` : ""}${line}\nThe model is sent this instead of the output; the session keeps it.`;
+  return `<div class="activity-edit" title="${escapeHtml(hover)}">${escapeHtml(line)}</div>`;
+}
+
 // A tool row: its status mark, tool, title (else params; the full command,
 // else the full params line, on hover), the word an exception shows, the
 // call's duration, the full command (an execute/task_create's view, also
 // while it runs), the output once done (its "[tool]" tag dropped, 300 chars,
 // the rest on hover), its images (+thumbs+(images) draws them) and an
-// edit's collapsed diff. A part with nothing to say is left out.
+// edit's collapsed diff, and a reloaded row's ✂ mark above its output. A
+// part with nothing to say is left out.
 export function toolRowHtml(row, { thumbs = () => "" } = {}) {
   return `<div class="activity-row" data-key="${escapeHtml(row.key)}">${toolRowInnerHtml(row, { thumbs })}</div>`;
 }
@@ -55,7 +86,7 @@ export function toolRowInnerHtml(row, { thumbs = () => "" } = {}) {
   const status = statusParts(row.status);
   return `${statusMarkHtml(status)}<span class="activity-tool">${escapeHtml(toolName(row))}</span>${params}${statusWordHtml(status)}` +
     `${duration ? `<span class="activity-duration">${escapeHtml(duration)}</span>` : ""}` +
-    `${commandBlockHtml(row.view, row.title)}${output}` +
+    `${commandBlockHtml(row.view, row.title)}${llmEditHtml(row)}${output}` +
     `${row.images?.length ? thumbs(row.images) : ""}${row.diff ? activityDiffHtml(row.diff) : ""}`;
 }
 

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

@@ -422,15 +422,17 @@ export function createTurnView({
   // A hook's line (hook_notice) as a row of the current step, above the row
   // of the call it judged; false with no running turn (app.js shows the
   // bubble then). data.line is a whole row of chi's own (an empty-answer
-  // retry), shown as is.
+  // retry), shown as is; data.cls a class of its own and data.title its
+  // hover (a ✂ row's).
   function notice(data) {
     const r = turn && model.notice(turn, data);
     if (!r) return false;
     const entry = genEls.get(r.gen);
     if (!r.gen.text) entry.text.textContent = "";
     const el = document.createElement("div");
-    el.className = "hook-notice" + (data.level === "warn" ? " warn" : "");
+    el.className = "hook-notice" + (data.level === "warn" ? " warn" : "") + (data.cls ? ` ${data.cls}` : "");
     el.textContent = data.line || `${hookNoticeLabel(data.hook)}: ${data.text || ""}`;
+    if (data.title) el.title = data.title;
     const stick = isNearBottom();
     activityEl(r.gen).appendChild(el);
     if (stick) follow();

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.42.0
+  version: 0.44.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -315,6 +315,7 @@ files:
 - lib/samagotchi/llm_context_command.rb
 - lib/samagotchi/llm_context_edit.rb
 - lib/samagotchi/llm_context_forget.rb
+- lib/samagotchi/llm_context_notice.rb
 - lib/samagotchi/llm_context_override.rb
 - lib/samagotchi/llm_context_stale.rb
 - lib/samagotchi/llm_context_strategy.rb