samagotchi 0.5.1 → 0.7.0

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

@@ -55,9 +55,18 @@ export function hookNoticeLabel(hook) {
   return /^[a-z][a-z0-9-]*$/.test(name) ? name : "hook";
 }
 
-// The row a step gets when the loop asks again after an empty answer.
-export function emptyRetryLine({ attempt, of } = {}) {
-  return `↻ empty answer, asking again (${attempt}/${of})`;
+// The row a step gets when the loop asks again after an empty answer, or
+// after a plugin cut the generation (stopped_by: the bundle).
+export function emptyRetryLine({ attempt, of, stopped_by: stoppedBy } = {}) {
+  const what = stoppedBy ? `cut by ${stoppedBy}` : "empty answer";
+  return `↻ ${what}, asking again (${attempt}/${of})`;
+}
+
+// The text of a turn's row from a snapshot entry (CardStore): a hook's
+// notice as "<label>: text", the loop's asking-again row as its line.
+export function noticeLine(entry = {}) {
+  if (entry.type === "empty_answer_retry") return emptyRetryLine(entry);
+  return `${hookNoticeLabel(entry.hook)}: ${entry.text || ""}`;
 }
 
 // The live turn's status while the provider is asked again after an error
@@ -211,6 +220,7 @@ export function promptOps(event, { myId, known, unmatchedMerge = false }) {
 // parts in order), then the prompts queued behind it. app.js feeds these to
 // its stream handlers, so a join renders exactly like watching live.
 // `merged_input` is the one synthetic type: a prompt merged into the turn.
+// A `notice` part carries its event as it came (TurnNotice).
 export function snapshotEvents({ current_turn: turn = null, queued = [], started_at = undefined } = {}) {
   const events = [];
   if (turn) {
@@ -256,9 +266,12 @@ export function snapshotEvents({ current_turn: turn = null, queued = [], started
           closeText();
           events.push({ type: "reminder_injected", reminders: part.reminders || [] });
           break;
-        case "hook_notice":
+        // One of the turn's rows (a hook's notice, an empty-answer retry, a
+        // question and its answer): the event itself, which the live
+        // handler draws where it drew it live.
+        case "notice":
           closeText();
-          events.push({ type: "hook_notice", hook: part.hook, text: part.text, level: part.level });
+          if (part.event?.type) events.push({ ...part.event });
           break;
         // A plugin's steer: a steer-only merge, as live.
         case "steer":

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

@@ -1,20 +1,20 @@
-// The turn view of a running turn (web.turn_view): one <details
-// class="turn-work"> per turn holding one <details class="gen"> per
-// generation, the current one live (open, at the bottom), the earlier ones
-// collapsed to one line each. At the turn's end the last generation's
-// narration moves out of the block as the answer bubble, so markdown,
-// annotate and the turn output dedupe work as in the chat view. The same
-// interface as chat_view.js; the grouping rules live in turn_model.js.
+// The turn view of a running turn (web.view: turn, and the stage's block):
+// one <details class="turn-work"> per turn holding one <details
+// class="gen"> per generation, the current one live (open, at the bottom),
+// the earlier ones collapsed to one line each. At the turn's end the last
+// generation's narration moves out of the block as the answer bubble, so
+// markdown, annotate and the turn output dedupe work on a plain bubble.
+// The grouping rules live in turn_model.js.
 //
 // A block that holds one gen with no thinking and no tool rows hides its
 // chrome (CSS :has), so a plain answer streams like today's bubble, and is
 // removed at the end: the answer bubble takes its place.
 import { toolName } from "./activity.js";
 import { leavesBlock } from "./card.js";
-import { activityStatusClass, activityStatusLabel, fillActivityRow } from "./chat_view.js";
 import { copySourceAttr } from "./copy.js";
 import { activityDiffHtml } from "./diff_view.js";
 import { escapeHtml, messageBodyHtml, noteHtml, normalize, steerRowHtml } from "./format.js";
+import { thumbsHtml } from "./images.js";
 import { shouldFollowScroll } from "./scroll.js";
 import { hookNoticeLabel } from "./turn_events.js";
 import { cancelLineHtml, formatDuration, turnGroups, turnTimingText } from "./timing.js";
@@ -23,6 +23,55 @@ import { createTicker } from "./thinking_ticker.js";
 import * as model from "./turn_model.js";
 import { createHold } from "./hold.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), else ok ("done").
+function activityStatusClass(status) {
+  if (status === "running") return "running";
+  if (status === "error") return "error";
+  if (status === "stopped") return "stopped";
+  return "ok";
+}
+
+function activityStatusLabel(status) {
+  if (status === "running") return "running";
+  if (status === "error") return "error";
+  if (status === "stopped") return "stopped";
+  return "done";
+}
+
+// A live tool row filled from its activity row (status, title, output).
+function fillActivityRow(el, row, sessionId) {
+  const statusEl = el.querySelector(".activity-status");
+  statusEl.className = `activity-status ${activityStatusClass(row.status)}`;
+  statusEl.textContent = activityStatusLabel(row.status);
+  const toolEl = el.querySelector(".activity-tool");
+  if (toolEl) toolEl.textContent = toolName(row);
+  const paramsEl = el.querySelector(".activity-params");
+  if (paramsEl) {
+    // The title in place of the params; the full params line on hover.
+    paramsEl.textContent = row.title || row.params || "";
+    paramsEl.title = row.title && row.params ? row.params : "";
+  }
+  const outEl = el.querySelector(".activity-output");
+  if (outEl) {
+    if (row.status === "running") {
+      outEl.style.display = "none";
+      outEl.textContent = "";
+      outEl.title = "";
+    } else {
+      // dispatch prefixes output with "[tool]"; strip that noise for display.
+      const full = (row.output || "").replace(/^\[[^\]]*\]\s*/, "");
+      outEl.title = full;
+      outEl.textContent = full.length > 300 ? `${full.slice(0, 300)}…` : full;
+      outEl.style.display = full ? "" : "none";
+    }
+  }
+  // The images a tool returned (a reloaded row has them too, reloadRowHtml).
+  if (row.images?.length && !el.querySelector(".thumbs")) el.insertAdjacentHTML("beforeend", thumbsHtml(sessionId, row.images));
+  // An edit/write's change, collapsed: "diff +3 −1".
+  if (row.diff && !el.querySelector(".activity-diff")) el.insertAdjacentHTML("beforeend", activityDiffHtml(row.diff));
+}
+
 // The container seams (the stage view composes this view, stage_view.js):
 //   blockHost(el)  puts the turn's block in the page (default: the history);
 //   follow()       keeps the live part in view (default: the history's
@@ -102,7 +151,7 @@ export function createTurnView({
     const text = document.createElement("div");
     text.className = "gen-text streaming";
     // A step after the first shows "…" until its text comes (the first one
-    // only for a prompt, as the chat view's bubble).
+    // only for a prompt).
     if (turn.gens.length > 1) text.textContent = "…";
     el.appendChild(text);
     const entry = { el, summary, thinking: null, text, activity: null, rows: new Map(), toggled: false,
@@ -308,7 +357,7 @@ export function createTurnView({
     }
     entry.summary.textContent = model.genLabel(gen);
     if (!entry.toggled) entry.el.open = false;
-    // The chat view puts every generation's text in seenContent.
+    // Every generation's text goes into seenContent (the turn output dedupe).
     const k = normalize(gen.text);
     if (k) sawText(k);
   }
@@ -449,8 +498,8 @@ export function createTurnView({
     cards.forEach((el) => { if (!el.classList.contains("plugin-card")) el.classList.add("bubble"); });
     if (leaving) entry.el.remove();
     if (plain) {
-      // A plain answer: no block, the bubble where it was (as the chat
-      // view); its thinking, if any, as the chat view's collapsed block.
+      // A plain answer: no block, the bubble where it was; its thinking, if
+      // any, as a collapsed thinking block above it.
       const pieces = [];
       if (gen.thinking) {
         if (!entry.thinkingWrap) thinkingEl(gen);
@@ -485,7 +534,7 @@ export function createTurnView({
     const last = model.currentGen(turn);
     // A completed turn's answer is its last generation's text; a one-step
     // turn without tools leaves the block in any case (canceled, it is the
-    // partial text bubble the chat view leaves).
+    // partial text bubble).
     const promoting = last && (kind === "completed" || (turn.gens.length === 1 && last.tools.length === 0));
     // The box's height, measured while it is still in the DOM and the step
     // still open: the apply below swaps it for the full text and collapses
@@ -613,8 +662,7 @@ function defaultPlaceAnswer(appendToHistory) {
   };
 }
 
-// A reloaded tool row, the live row's markup (chat_view.js
-// fillActivityRow): status, tool, params, output (its "[tool]" tag dropped,
+// A reloaded tool row, the live row's markup (fillActivityRow): status, tool, params, output (its "[tool]" tag dropped,
 // 300 chars, the rest on hover), plus the call's duration from its record.
 // Params, output and the call's images come from the saved messages'
 // parts; without them the row has the record's name, status and duration
@@ -663,7 +711,7 @@ export function turnHistoryHtml(items, timing, { thumbs }) {
     const noBlock = !group.steps.length ||
       (group.steps.length === 1 && group.answer !== null && only.i === null && !only.tools.length && only.thinking);
     if (group.steps.length === 1 && group.answer !== null && only.i === null && !only.tools.length && only.thinking) {
-      // A plain answer with thinking: the chat view's collapsed block, as live.
+      // A plain answer with thinking: the collapsed thinking block, as live.
       parts.push(`<details class="bubble thinking"><summary>thinking</summary><div class="thinking-body">${escapeHtml(only.thinking)}</div></details>`);
     } else if (group.steps.length) {
       const gens = group.steps.map((step) => ({ text: step.i === null ? "" : String(items[step.i].content ?? ""), thinking: step.thinking || "", tools: step.tools }));
@@ -684,6 +732,10 @@ export function turnHistoryHtml(items, timing, { thumbs }) {
     // their own after the prompt.
     const loose = noBlock ? [...group.steps.flatMap((step) => step.steers || []), ...(group.steers || [])] : group.steers || [];
     parts.push(loose.map((i) => steerHtml(i, true)).join(""));
+    // The user's lines merged into the turn: the live "steered" bubbles,
+    // after its steps and before its answer.
+    parts.push((group.merged || []).map((i) =>
+      `<div class="bubble user steered" data-user-state="steered"${items[i].step ? ` data-step="${Number(items[i].step)}"` : ""}${copySourceAttr(items[i], false)}><div class="user-message">${messageBodyHtml(items[i]).body}${thumbs(items[i].images)}</div><span class="state-badge">steered</span></div>`).join(""));
     // A turn with no answer (canceled, or running: no record yet) shows its
     // timing after its prompt and steps, where the live view leaves it.
     if (group.answer === null) parts.push(timingHtml(group));

data/lib/samagotchi/web/server.rb

@@ -59,8 +59,9 @@ module Samagotchi
       # @param new_token [Boolean] replace the LAN access token first
       #   (--new-token): a running server takes the new one at once
       # @return [Integer] the exit status
-      def self.launch(port: nil, host: nil, scope: "project", dir: Dir.pwd, open_browser: false, markdown: false, view: "turn",
-                      annotate_presets: Config::BY_KEY["web.annotate_presets"].default, new_token: false)
+      def self.launch(port: nil, host: nil, scope: "project", dir: Dir.pwd, open_browser: false, markdown: false,
+                      view: Config::BY_KEY["web.view"].default, annotate_presets: Config::BY_KEY["web.annotate_presets"].default,
+                      new_token: false)
         rotate_token if new_token
         setting = host_setting(host)
         lan = Lan.wanted?(setting) ? Lan.choose(setting) : nil
@@ -108,7 +109,7 @@ module Samagotchi
       # @param token_path [String] the LAN access token's file
       # @return [Boolean] false when the port was taken (said so on stderr)
       def self.start(port: nil, host: nil, url: nil, open_browser: false, state_dir: nil, manager: nil, markdown: false,
-                     view: "turn", annotate_presets: Config::BY_KEY["web.annotate_presets"].default, hub: nil, lan: nil,
+                     view: Config::BY_KEY["web.view"].default, annotate_presets: Config::BY_KEY["web.annotate_presets"].default, hub: nil, lan: nil,
                      token_path: Token.path)
         port = resolve_port(port)
         host = resolve_host(host)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -150,9 +150,11 @@ files:
 - lib/samagotchi/bridge/ring_buffer.rb
 - lib/samagotchi/bridge/sse_writer.rb
 - lib/samagotchi/bridge/turn_accumulator.rb
+- lib/samagotchi/bridge/turn_notice.rb
 - lib/samagotchi/bridge_client.rb
 - lib/samagotchi/bridge_client/event_stream.rb
 - lib/samagotchi/bridge_client/sse_parser.rb
+- lib/samagotchi/bundle_command.rb
 - lib/samagotchi/bundle_needs.rb
 - lib/samagotchi/bundles/btw/manifest.yml
 - lib/samagotchi/bundles/btw/plugin.rb
@@ -195,12 +197,15 @@ files:
 - lib/samagotchi/desktop/macos/Hotkey.swift
 - lib/samagotchi/desktop/macos/Images.swift
 - lib/samagotchi/desktop/macos/Info.plist.erb
+- lib/samagotchi/desktop/macos/Kitty.swift
 - lib/samagotchi/desktop/macos/Panel.swift
+- lib/samagotchi/desktop/macos/ProcessRunner.swift
 - lib/samagotchi/desktop_command.rb
 - lib/samagotchi/edit_preview.rb
 - lib/samagotchi/empty_answer_retry.rb
 - lib/samagotchi/engine.rb
 - lib/samagotchi/gem_update.rb
+- lib/samagotchi/guardrail_wiring.rb
 - lib/samagotchi/guardrails.rb
 - lib/samagotchi/guardrails/approval.rb
 - lib/samagotchi/guardrails/approvals.rb
@@ -216,6 +221,7 @@ files:
 - lib/samagotchi/hooks/bundle_loader.rb
 - lib/samagotchi/hooks/loader.rb
 - lib/samagotchi/hooks/registry.rb
+- lib/samagotchi/hooks/stream_watch.rb
 - lib/samagotchi/host_registry.rb
 - lib/samagotchi/idle_client.rb
 - lib/samagotchi/idle_recap.rb
@@ -269,9 +275,12 @@ files:
 - lib/samagotchi/plugin/sessions.rb
 - lib/samagotchi/plugin/side_question.rb
 - lib/samagotchi/plugin/tool_result.rb
+- lib/samagotchi/plugin_tasks.rb
 - lib/samagotchi/project_scope.rb
 - lib/samagotchi/prompt.rb
 - lib/samagotchi/prompt_literal_guard.rb
+- lib/samagotchi/question_desk.rb
+- lib/samagotchi/recap_setup.rb
 - lib/samagotchi/recap_store.rb
 - lib/samagotchi/reminder_store.rb
 - lib/samagotchi/reply_wait.rb
@@ -286,6 +295,7 @@ files:
 - lib/samagotchi/session_manager.rb
 - lib/samagotchi/session_metrics.rb
 - lib/samagotchi/session_observer.rb
+- lib/samagotchi/sessions_command.rb
 - lib/samagotchi/steer.rb
 - lib/samagotchi/system_prompt.rb
 - lib/samagotchi/terminal_ui.rb
@@ -360,7 +370,6 @@ files:
 - lib/samagotchi/web/public/annotations.js
 - lib/samagotchi/web/public/app.js
 - lib/samagotchi/web/public/card.js
-- lib/samagotchi/web/public/chat_view.js
 - lib/samagotchi/web/public/chunk_router.js
 - lib/samagotchi/web/public/command_complete.js
 - lib/samagotchi/web/public/composer_size.js

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

@@ -1,376 +0,0 @@
-// The chat view of a running turn: one streaming answer bubble per
-// generation, one thinking block per turn (above the first bubble) and one
-// activity panel per turn (at the first tool call). This module owns that
-// per-turn DOM; app.js's stream handlers call it and keep the rest (prompt
-// bubbles, cards, the timing line, the session state). turn_view.js offers
-// the same interface with a different placement; app.js picks one at boot.
-//
-// deps: historyEl, appendToHistory(el) (above the live timing line),
-// isNearBottom(), sawText(normalizedText) (the turn output dedupe),
-// sessionId() (image thumbs of a tool row).
-import { newActivity, addStarted, addCompleted, finalizeActivity, activityCount, toolName } from "./activity.js";
-import { copySourceAttr } from "./copy.js";
-import { escapeHtml, leadTrimmed, messageBodyHtml, noteHtml, normalize, steerRowHtml } from "./format.js";
-import { activityDiffHtml } from "./diff_view.js";
-import { thumbsHtml } from "./images.js";
-import { shouldFollowScroll } from "./scroll.js";
-import { tallyText } from "./tally.js";
-import { cancelLineHtml, formatDuration, timedTurnIndexes, turnRecordAt, turnTimingText } from "./timing.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), else ok ("done").
-export function activityStatusClass(status) {
-  if (status === "running") return "running";
-  if (status === "error") return "error";
-  if (status === "stopped") return "stopped";
-  return "ok";
-}
-
-export function activityStatusLabel(status) {
-  if (status === "running") return "running";
-  if (status === "error") return "error";
-  if (status === "stopped") return "stopped";
-  return "done";
-}
-
-export function createChatView({ historyEl, appendToHistory, isNearBottom, sawText, sessionId }) {
-  let streamingBubble = null;
-  let streamingBuffer = "";
-  let rafPending = false;
-  let activityModel = null;
-  let activityEl = null;
-  let activityElBody = null;
-  const activityRowEls = new Map();
-  // One live "thinking" block per turn (Claude-like); streams :generation_chunk
-  // `thinking` deltas and auto-collapses on turn_completed.
-  let thinkingEl = null;
-  let thinkingBodyEl = null;
-  let thinkingBuffer = "";
-
-  function removeHint() {
-    const hint = historyEl.querySelector(".hint");
-    if (hint) hint.remove();
-  }
-
-  function ensureStreamingBubble() {
-    if (streamingBubble) return streamingBubble;
-    removeHint();
-    streamingBubble = document.createElement("div");
-    streamingBubble.className = "bubble output streaming";
-    streamingBubble.textContent = "";
-    appendToHistory(streamingBubble);
-    return streamingBubble;
-  }
-
-  function flush() {
-    rafPending = false;
-    // Runs every animation frame while streaming — must not yank a user who
-    // scrolled up to read; only follow when they were already near the bottom.
-    const follow = isNearBottom();
-    // An empty buffer keeps the "…" placeholder.
-    if (streamingBubble && streamingBuffer) {
-      streamingBubble.textContent = streamingBuffer;
-    }
-    if (thinkingBodyEl) {
-      // The capped thinking box follows its own tail the same way, unless the
-      // user scrolled up inside it.
-      const followThinking = shouldFollowScroll(thinkingBodyEl, 24);
-      thinkingBodyEl.textContent = thinkingBuffer;
-      if (followThinking) thinkingBodyEl.scrollTop = thinkingBodyEl.scrollHeight;
-    }
-    if (follow) historyEl.scrollTop = historyEl.scrollHeight;
-  }
-
-  function scheduleFlush() {
-    if (rafPending) return;
-    rafPending = true;
-    requestAnimationFrame(flush);
-  }
-
-  function appendToken(content) {
-    if (!content) return;
-    // Leading whitespace right after a closed think/tool_call block (or at the
-    // start of the stream) would otherwise render as an empty first line in
-    // the pre-wrap bubble. Trim it only at the start of a bubble so mid-bubble
-    // paragraph spacing is preserved.
-    if (streamingBuffer === "") content = content.replace(/^[ \t\r\n]+/, "");
-    if (!content) return;
-    streamingBuffer += content;
-    ensureStreamingBubble();
-    scheduleFlush();
-  }
-
-  // ── Per-turn live thinking block ─────────────────────────────────────────
-  // Routed from :generation_chunk `thinking`. One <details> per turn; accumulates
-  // across the turn's generations and collapses on turn completion.
-
-  function ensureThinkingEl() {
-    if (thinkingEl) return thinkingEl;
-    removeHint();
-    const details = document.createElement("details");
-    details.className = "bubble thinking";
-    details.open = true;
-    const summary = document.createElement("summary");
-    summary.textContent = "thinking";
-    details.appendChild(summary);
-    const body = document.createElement("div");
-    body.className = "thinking-body";
-    details.appendChild(body);
-    thinkingEl = details;
-    thinkingBodyEl = body;
-    // Prefer Claude-like ordering: thinking above the streaming answer bubble.
-    if (streamingBubble && streamingBubble.parentNode === historyEl) {
-      historyEl.insertBefore(details, streamingBubble);
-    } else {
-      appendToHistory(details);
-    }
-    return details;
-  }
-
-  function appendThinking(content) {
-    // The box starts at the first visible character, not the "\n" after <think>.
-    const piece = leadTrimmed(thinkingBuffer, content);
-    if (!piece) return;
-    thinkingBuffer += piece;
-    ensureThinkingEl();
-    scheduleFlush();
-  }
-
-  function finalizeThinkingEl() {
-    if (thinkingBodyEl) thinkingBodyEl.textContent = thinkingBuffer.replace(/[ \t\r\n]+$/, "");
-    if (thinkingEl) thinkingEl.open = false;
-    thinkingBuffer = "";
-  }
-
-  function resetThinkingState() {
-    thinkingEl = null;
-    thinkingBodyEl = null;
-    thinkingBuffer = "";
-  }
-
-  function finalizeStreaming() {
-    if (streamingBubble) {
-      const k = normalize(streamingBuffer);
-      // The text lands in the bubble on the next animation frame; a generation
-      // can end before one runs (a burst of frames, a hidden tab), so write it
-      // here too or the bubble keeps its "…" placeholder.
-      if (k) {
-        streamingBubble.textContent = streamingBuffer;
-        sawText(k);
-      }
-      else streamingBubble.remove(); // drop text-less bubbles (thinking/tool-only generations, "…" placeholder)
-      streamingBubble.classList.remove("streaming");
-      streamingBubble = null;
-    }
-    streamingBuffer = "";
-    rafPending = false;
-  }
-
-  // ── Per-turn tool/memory activity panel ──────────────────────────────────
-  // One collapsible <details> per turn; each :tool_call_started/completed upserts
-  // a row (keyed by iteration:call_index) that transitions running -> ok/error.
-  // Memory reads/writes flow through the same tool_call events, so they show here too.
-
-  function ensureActivityEl() {
-    if (activityEl) return activityEl;
-    removeHint();
-    const details = document.createElement("details");
-    details.className = "bubble activity";
-    details.open = true;
-    const summary = document.createElement("summary");
-    summary.textContent = "activity";
-    details.appendChild(summary);
-    const body = document.createElement("div");
-    body.className = "activity-body";
-    details.appendChild(body);
-    activityEl = details;
-    activityElBody = body;
-    appendToHistory(details);
-    return details;
-  }
-
-  function renderActivityRow(row) {
-    const el = document.createElement("div");
-    el.className = "activity-row";
-    el.dataset.key = row.key;
-    const statusEl = document.createElement("span");
-    statusEl.className = "activity-status";
-    const toolEl = document.createElement("span");
-    toolEl.className = "activity-tool";
-    toolEl.textContent = toolName(row);
-    const paramsEl = document.createElement("span");
-    paramsEl.className = "activity-params";
-    const outEl = document.createElement("div");
-    outEl.className = "activity-output";
-    outEl.style.display = "none";
-    el.appendChild(statusEl);
-    el.appendChild(toolEl);
-    el.appendChild(paramsEl);
-    el.appendChild(outEl);
-    activityRowEls.set(row.key, el);
-    const follow = isNearBottom();
-    (activityElBody || ensureActivityEl().querySelector(".activity-body")).appendChild(el);
-    updateActivityRowEl(row);
-    if (follow) historyEl.scrollTop = historyEl.scrollHeight;
-  }
-
-  function updateActivityRowEl(row) {
-    const el = activityRowEls.get(row.key);
-    if (!el) return;
-    fillActivityRow(el, row, sessionId());
-  }
-
-  function updateActivitySummary() {
-    if (!activityEl) return;
-    const summary = activityEl.querySelector("summary");
-    if (!summary) return;
-    // From the 3rd call: "activity · 12 tool calls (2 failed) · execute ×7 · …" (the rows show the last call).
-    const tally = tallyText(activityModel?.rows, { last: false });
-    summary.textContent = tally ? `activity · ${tally}` : `activity (${activityCount(activityModel)})`;
-  }
-
-  function finalizeActivityEl() {
-    if (activityModel) finalizeActivity(activityModel);
-    if (activityEl) activityEl.open = false;
-  }
-
-  function resetActivityState() {
-    activityModel = null;
-    activityEl = null;
-    activityElBody = null;
-    activityRowEls.clear();
-  }
-
-  function toolEvent(data, add) {
-    const model = activityModel || (activityModel = newActivity());
-    ensureActivityEl();
-    const row = add(model, data);
-    if (!activityRowEls.has(row.key)) renderActivityRow(row);
-    else updateActivityRowEl(row);
-    updateActivitySummary();
-  }
-
-  return {
-    turnStarted(data) {
-      resetActivityState();
-      resetThinkingState();
-      streamingBuffer = "";
-      ensureStreamingBubble();
-      if (data.prompt) streamingBubble.textContent = "…";
-    },
-    generationStarted() {
-      // A generation left open (a join mid-way) ends where the next begins.
-      finalizeStreaming();
-      ensureStreamingBubble();
-    },
-    chunk({ text, thinking }) {
-      if (text) appendToken(text);
-      if (thinking) appendThinking(thinking);
-    },
-    generationCompleted() {
-      finalizeStreaming();
-    },
-    toolStarted(data) {
-      toolEvent(data, (model, event) => addStarted(model, event).row);
-    },
-    toolCompleted(data) {
-      toolEvent(data, addCompleted);
-    },
-    // Everything a turn's end (completed, canceled, failed) closes.
-    turnEnded() {
-      finalizeStreaming();
-      finalizeActivityEl();
-      finalizeThinkingEl();
-    },
-    // A hook's notice stays the page's bubble in this view.
-    notice() {
-      return false;
-    },
-    // So is a plugin's steer.
-    steer() {
-      return false;
-    },
-    // So is a card.
-    card() {
-      return false;
-    },
-    flush,
-    // The element is rewritten every frame while the turn runs (annotate
-    // skips it).
-    containsLive(el) {
-      return !!thinkingEl?.contains(el);
-    },
-    reset() {
-      streamingBubble = null;
-      streamingBuffer = "";
-      rafPending = false;
-      resetActivityState();
-      resetThinkingState();
-    },
-  };
-}
-
-// One tool row's status, name, params, output and image thumbs from its
-// activity row (activity.js). Shared with the turn view.
-// A reloaded history in the chat view (renderHistory's object path): one
-// bubble per message; each turn's timing line under its last bubble, then
-// its cancel line, where the live view leaves them.
-// +thumbs(images)+ draws a prompt's image thumbs.
-export function chatHistoryHtml(items, timing, { thumbs }) {
-  const timedTurns = timedTurnIndexes(items);
-  return items
-    .map((m, i) => {
-      if (m.role === "note") return `<div class="bubble note">${noteHtml(m)}</div>`;
-      if (m.role === "steer") return steerRowHtml({ source: m.source, text: m.content }, { bubble: true });
-      const turnIndex = timedTurns[i];
-      const cls = m.role === "user" ? "user" : "output";
-      const { body, renderedMarkdown } = messageBodyHtml(m);
-      const markdown = renderedMarkdown ? " markdown" : "";
-      const record = turnIndex === null ? null : turnRecordAt(timing, turnIndex);
-      const timingHtml = record && formatDuration(record.duration_ms)
-        ? `<div class="turn-timing">${escapeHtml(turnTimingText(turnIndex + 1, record.duration_ms, { canceled: record.status === "canceled" }))}</div>`
-        : "";
-      // A canceled turn ends with its cancel line, as the live view left it.
-      const cancelHtml = record ? cancelLineHtml(record, escapeHtml) : "";
-      // A user bubble is a flex row (label, text, badge): its text sits in
-      // one block so quotes stack instead of lining up side by side.
-      const inner = m.role === "user" ? `<div class="user-message">${body}${thumbs(m.images)}</div>` : body;
-      // The timing line goes after the bubble, not in it: under the answer,
-      // or under the prompt of a turn canceled before any answer.
-      return `<div class="bubble ${cls}${markdown}"${copySourceAttr(m, renderedMarkdown)}>${inner}</div>${timingHtml}${cancelHtml}`;
-    })
-    .join("");
-}
-
-export function fillActivityRow(el, row, sessionId) {
-  const statusEl = el.querySelector(".activity-status");
-  statusEl.className = `activity-status ${activityStatusClass(row.status)}`;
-  statusEl.textContent = activityStatusLabel(row.status);
-  const toolEl = el.querySelector(".activity-tool");
-  if (toolEl) toolEl.textContent = toolName(row);
-  const paramsEl = el.querySelector(".activity-params");
-  if (paramsEl) {
-    // The title in place of the params; the full params line on hover.
-    paramsEl.textContent = row.title || row.params || "";
-    paramsEl.title = row.title && row.params ? row.params : "";
-  }
-  const outEl = el.querySelector(".activity-output");
-  if (outEl) {
-    if (row.status === "running") {
-      outEl.style.display = "none";
-      outEl.textContent = "";
-      outEl.title = "";
-    } else {
-      // dispatch prefixes output with "[tool]"; strip that noise for display.
-      const full = (row.output || "").replace(/^\[[^\]]*\]\s*/, "");
-      outEl.title = full;
-      outEl.textContent = full.length > 300 ? `${full.slice(0, 300)}…` : full;
-      outEl.style.display = full ? "" : "none";
-    }
-  }
-  // The images a tool returned (the chat view's reloaded history has no tool
-  // rows; the turn view's has, turn_view.js reloadRowHtml).
-  if (row.images?.length && !el.querySelector(".thumbs")) el.insertAdjacentHTML("beforeend", thumbsHtml(sessionId, row.images));
-  // An edit/write's change, collapsed: "diff +3 −1".
-  if (row.diff && !el.querySelector(".activity-diff")) el.insertAdjacentHTML("beforeend", activityDiffHtml(row.diff));
-}