samagotchi 0.76.0 → 0.78.0

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

@@ -590,10 +590,25 @@ body.has-session #composer{flex-wrap:wrap;row-gap:6px}
 #lightbox[hidden]{display:none}
 #lightbox img{max-width:96vw;max-height:94vh;border-radius:6px}
 #composer textarea{flex:1 1 auto;min-height:72px;resize:none;background:transparent;border:0;color:var(--text);padding:2px;border-radius:0;font-size:15px;line-height:1.45}
-#composeGrip{position:absolute;left:0;right:0;top:-5px;height:10px;cursor:ns-resize;z-index:2;touch-action:none}
+#composeGrip{position:relative;height:10px;margin:-5px 0;cursor:ns-resize;z-index:2;touch-action:none}
 #composeGrip::after{content:"";position:absolute;left:50%;top:3px;width:36px;height:4px;margin-left:-18px;border-radius:2px;background:var(--border-strong);opacity:0;transition:opacity .12s ease}
-#composer:hover #composeGrip::after,#composeGrip.dragging::after{opacity:1}
+#composeGrip:hover::after,#composeGrip:has(+ #composer:hover)::after,#composeGrip.dragging::after{opacity:1}
 #composeGrip:hover::after,#composeGrip.dragging::after{background:var(--accent)}
+/* Folded (app.js, composer_fold.js): the grip is the handle on the info bar's top edge, drawn always, wider so it reads as a control;
+   draft = the accent, waiting = the attention colour; .will-fold = a drag past the fold threshold (released it hides the box). */
+body.has-session.composer-folded #composeGrip::after{opacity:1;width:48px;margin-left:-24px}
+#composeGrip.draft::after{background:var(--accent)}
+#composeGrip.waiting::after{background:var(--warn)}
+#composeGrip.will-fold::after{opacity:1;background:var(--accent)}
+#composeGrip:focus-visible{outline:none}
+#composeGrip:focus-visible::after{opacity:1;box-shadow:0 0 0 2px var(--accent-ring)}
+/* A phone has no hover: the pill is always there and the hit zone is taller, ~96 px wide and centred (full width would cover the
+   info bar's buttons while folded, the stage card's bottom in the stage view); it reaches 7 px below the edge, the info bar's
+   border and padding, so it never covers a button of the bar. */
+@media(max-width:600px){
+  #composeGrip{width:96px;height:26px;margin:-19px auto -7px}
+  #composeGrip::after{top:17px;opacity:1}
+}
 #composer textarea::placeholder{color:var(--text-faint)}
 /* Key hint: its line is always reserved, so focusing never shifts the layout. */
 #composeHint{order:1;flex:1;min-width:0;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;font-size:11px;line-height:14px;color:var(--text-faint);padding-left:2px;opacity:0;transition:opacity .12s ease;user-select:none}
@@ -851,6 +866,12 @@ body.stage-view .turn-stage{position:absolute;left:0;right:0;bottom:100%;margin-
 #infoBar #infoArchiveBtn:hover{color:var(--text);background:var(--bg-hover)}
 #infoBar #infoDeleteBtn{background:transparent;color:var(--text-muted);border:1px solid transparent}
 #infoBar #infoDeleteBtn:hover{color:var(--on-solid);background:var(--danger-bg);border-color:var(--danger-bg)}
+/* The composer folded away (composer_fold.js, the fold button): the info bar is the page's bottom edge.
+   Stop turn comes into the bar while folded and a turn runs. */
+body.has-session.composer-folded #composer,body.has-session.composer-folded #initRow{display:none}
+body.has-session.composer-folded #infoBar{border-top-color:transparent}
+#infoBar #infoCancelBtn{background:var(--bg-raised);color:var(--danger-text);border:1px solid color-mix(in srgb,var(--danger) 55%,transparent)}
+#infoBar #infoCancelBtn:hover:not(:disabled){color:var(--on-solid);background:var(--danger-bg);border-color:var(--danger-bg)}
 /* The LLM context and thinking chips (llm_context_chip.js, thinking_chip.js): model-like chips that open their popovers; accent when the session set its own. */
 #infoBar .meta .llmctx-chip,#infoBar .meta .think-chip,#infoBar .meta .rh-chip{padding:2px 6px;border-radius:6px;font-size:11px;font-weight:400;border:1px solid transparent;cursor:pointer;font-family:inherit;white-space:nowrap}
 #infoBar .meta .llmctx-chip:hover,#infoBar .meta .think-chip:hover,#infoBar .meta .rh-chip:hover{color:var(--text);border-color:var(--accent-border);background:var(--accent-bg)}
@@ -932,6 +953,8 @@ body.stage-view .turn-stage{position:absolute;left:0;right:0;bottom:100%;margin-
   #infoBar>button::before{content:"";display:block;width:14px;height:14px;background:currentColor;-webkit-mask:var(--icon) center/contain no-repeat;mask:var(--icon) center/contain no-repeat}
   #infoBar #infoArchiveBtn{--icon:var(--icon-archive)}
   #infoBar #infoArchiveBtn.archived{--icon:var(--icon-unarchive)}
+  #infoBar #infoContinueBtn{--icon:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='none' stroke='black' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M3 8h9M8.5 4.5 12 8l-3.5 3.5'/%3E%3C/svg%3E")}
+  #infoBar #infoCancelBtn{--icon:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='none' stroke='black' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='4' y='4' width='8' height='8' rx='1.5'/%3E%3C/svg%3E")}
   #infoBar #infoStopBtn{--icon:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='none' stroke='black' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M8 2v5.5M4.6 4.4a5 5 0 1 0 6.8 0'/%3E%3C/svg%3E")}
   #infoBar #infoDeleteBtn{--icon:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='none' stroke='black' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M2.5 4.5h11M6 4.5V2.75h4V4.5M4 4.5l.7 8.6a1 1 0 0 0 1 .9h4.6a1 1 0 0 0 1-.9l.7-8.6M6.75 7.25v4.5M9.25 7.25v4.5'/%3E%3C/svg%3E")}
 }
@@ -1121,8 +1144,9 @@ body.all-view #center, body.all-view #topStrip{display:none}
 .card.archived:hover{opacity:.85}
 .card .archived-badge,.family-row .archived-badge{font-size:10px;padding:1px 6px;border-radius:6px;border:1px solid var(--border-strong);color:var(--text-muted)}
 /* bottom: above the session's composer card when one shows (--toast-bottom, app.js placeToast). */
-#toast{position:fixed;left:50%;bottom:var(--toast-bottom,24px);transform:translateX(-50%);width:max-content;max-width:calc(100vw - 32px);box-sizing:border-box;z-index:50;display:flex;gap:12px;align-items:center;padding:8px 14px;border-radius:10px;background:var(--bg-raised);color:var(--text);border:1px solid var(--border-strong);box-shadow:var(--toast-shadow);font-size:13px}
+#toast{position:fixed;left:50%;bottom:var(--toast-bottom,24px);transform:translateX(-50%);width:max-content;max-width:calc(100vw - 32px);box-sizing:border-box;z-index:50;display:flex;flex-direction:column;align-items:center;gap:8px}
 #toast[hidden]{display:none}
+#toast .toast-item{display:flex;gap:12px;align-items:center;width:max-content;max-width:100%;box-sizing:border-box;padding:8px 14px;border-radius:10px;background:var(--bg-raised);color:var(--text);border:1px solid var(--border-strong);box-shadow:var(--toast-shadow);font-size:13px}
 #toast .toast-action{background:transparent;border:0;color:var(--accent);font-weight:600;cursor:pointer;padding:2px 4px}
 #toast .toast-close{background:transparent;border:0;color:var(--text-muted);cursor:pointer;padding:2px 4px;margin-left:-6px}
 #toast .toast-close:hover{color:var(--text)}
@@ -1207,13 +1231,13 @@ a{color:var(--accent)}
     <div id="lightbox" hidden><img alt=""></div>
     <div id="dock">
       <div id="initRow" role="status" aria-live="polite" hidden></div>
+      <div id="composeGrip" tabindex="0" aria-label="Message box" title="Drag to make the message box taller (double-click resets)"></div>
       <div id="composer" style="position:relative">
         <div id="commandList" role="listbox" aria-label="Commands" hidden></div>
         <div id="modelPanel" hidden>
           <label class="model-search"><svg viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.6" aria-hidden="true"><circle cx="7" cy="7" r="4.5"/><path d="M10.5 10.5 14 14" stroke-linecap="round"/></svg><input id="modelSearch" type="text" placeholder="Search models" autocomplete="off" spellcheck="false" role="combobox" aria-label="Search models" aria-autocomplete="list" aria-controls="modelList" aria-expanded="false"></label>
           <div id="modelList" role="listbox" aria-label="Models"></div>
         </div>
-        <div id="composeGrip" title="Drag to make the message box taller (double-click resets)"></div>
         <div id="deliveryLine" aria-live="off" hidden></div>
         <div class="compose-col">
           <div id="chips" hidden></div>
@@ -1233,6 +1257,7 @@ a{color:var(--accent)}
       <div id="infoBar">
         <div class="info" id="infoText"></div>
         <div id="contextChips" aria-label="Attached context" hidden></div>
+        <button class="ghost" id="infoCancelBtn" title="Cancel the running turn, whoever sent it" style="display:none">Stop turn</button>
         <button class="ghost" id="infoContinueBtn" title="Continue: start the next link of this session's chain from its recap (this one is archived)" style="display:none">continue →</button>
         <button class="ghost" id="infoArchiveBtn" title="Archive: hide from the lists, keep for good" style="display:none">archive</button>
         <button class="ghost" id="infoStopBtn" title="Stop session (terminate worker)" style="display:none">stop session</button>

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

@@ -0,0 +1,53 @@
+// Where the page's rendered markdown and its refs go (moved out of app.js):
+// a text as its markdown HTML, the `path:line` refs in one rendered text,
+// a final answer's rendering and refs, and the refs across the page. The
+// page's state comes in as getters (capabilities, roots, currentDir), read
+// at each call.
+export function createMarkdownPlace({
+  capabilities, renderText, roots, touchedFiles, currentDir, linkRefs, applyFinalAnswer, findInTurnRoots, normalize,
+  pairAnswerRefs,
+}) {
+  // A text the page already shows as its markdown HTML (POST /api/render,
+  // sanitised there), or null: markdown off here (no request), or a failed
+  // read (the raw text stays).
+  function renderMarkdown(text) {
+    if (capabilities().display !== true) return Promise.resolve(null);
+    return renderText(text)
+      .then((d) => (typeof d?.html === "string" && d.html ? d.html : null))
+      .catch(() => null);
+  }
+
+  // The `path:line` refs in one rendered text (the stage's asking slot, a
+  // kept reply), as linkTextRefs links the answers'.
+  function linkRefsIn(el) {
+    linkRefs(el, touchedFiles(roots()), currentDir());
+  }
+
+  // The turn's answer as its rendered markdown and with its plugin refs,
+  // once it is final (the turn-end read, an answer_display re-read:
+  // answer_refs.js applyFinalAnswer); then the refs.
+  function applyFinalMarkdown(messages) {
+    applyFinalAnswer(messages, findInTurnRoots(".bubble.output"), normalize);
+    linkTextRefs();
+  }
+
+  // The refs on the answers' and closed steps' texts, on this page: first
+  // each answer's own (a plugin's, answer_refs.js), then the `path:line`
+  // refs that name a file the session's rows (and cards) touched
+  // (ref_scan.js), which leave a plugin's alone. Not mid-stream: at a
+  // turn's end and after a reload's render. A ref already made stays as it
+  // is.
+  function linkTextRefs() {
+    const pageRoots = roots();
+    const touched = touchedFiles(pageRoots);
+    for (const root of pageRoots) {
+      for (const el of root.querySelectorAll(".bubble.output")) pairAnswerRefs(el);
+    }
+    if (!touched.size) return;
+    for (const root of pageRoots) {
+      for (const el of root.querySelectorAll(".bubble.output, .gen:not(.live) > .gen-text")) linkRefs(el, touched, currentDir());
+    }
+  }
+
+  return { renderMarkdown, linkRefsIn, applyFinalMarkdown, linkTextRefs };
+}

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

@@ -75,12 +75,16 @@ export function createStreamHandlers(deps) {
     generation_started: (data) => {
       // The request after a /model's unresolved window started: whatever it
       // brings, the ctx tooltip no longer waits for it (ctxBarTip).
-      state().ctxUnknownAfterSwitch = false;
+      const current = state();
+      let contextChanged = current.ctxUnknownAfterSwitch !== false;
+      current.ctxUnknownAfterSwitch = false;
       if (data?.context_window_tokens) {
-        const current = state();
+        const source = data.context_window_source || null;
+        contextChanged ||= current.ctxWindow !== data.context_window_tokens || current.ctxWindowSource !== source;
         current.ctxWindow = data.context_window_tokens;
-        current.ctxWindowSource = data.context_window_source || null;
+        current.ctxWindowSource = source;
       }
+      if (contextChanged) updateInfoBar();
       liveTurn.timing.setNote("");
       // The step's clock (the composer's delivery line): the page's own at a
       // live start; a replay's comes from the snapshot's generation age,

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

@@ -0,0 +1,69 @@
+import { html, nothing, render } from "./vendor/lit-html.js";
+
+// The page's toasts (app.js showToast): a stack in #toast, newest last, at
+// most MAX_TOASTS. Each item has its own 6 s timer, or none when sticky: a
+// sticky one stays until its action, its ✕ or a link in it is clicked, so a
+// later notice can't hide an error. +text+: words, or a template
+// (chains.js openChildrenTemplate: a link in it opens that session and hides
+// the toast). The same text again while it shows reuses its item, moved to
+// the end with a fresh timer. When a 4th comes, the oldest non-sticky goes
+// (the oldest of all if every one is sticky).
+const TOAST_MS = 6000;
+const MAX_TOASTS = 3;
+
+export function createToasts({ el, onChange = () => {}, doc = globalThis.document }) {
+  const entries = [];
+
+  function sync() {
+    el.hidden = entries.length === 0;
+    onChange();
+  }
+
+  function remove(entry, notify = true) {
+    const index = entries.indexOf(entry);
+    if (index < 0) return;
+    if (entry.timer !== null) clearTimeout(entry.timer);
+    entry.timer = null;
+    entries.splice(index, 1);
+    entry.el.remove();
+    if (notify) sync();
+  }
+
+  function draw(entry, text, action, sticky) {
+    render(html`<span class="toast-message" @click=${(e) => { if (e.target.closest?.("a[href]")) remove(entry); }}>${text}</span>${action
+      ? html`<button type="button" class="toast-action" @click=${() => { remove(entry); action.run(); }}>${action.label}</button>`
+      : nothing}${sticky ? html`<button type="button" class="toast-close" title="Dismiss" aria-label="Dismiss" @click=${() => remove(entry)}>✕</button>` : nothing}`,
+    entry.el);
+  }
+
+  function show(text, action = null, { sticky = false } = {}) {
+    const candidate = { el: doc.createElement("div"), timer: null, sticky, key: null };
+    candidate.el.className = "toast-item";
+    draw(candidate, text, action, sticky);
+    candidate.key = candidate.el.querySelector(".toast-message").textContent;
+
+    const duplicate = entries.find((entry) => entry.key === candidate.key);
+    if (duplicate) {
+      if (duplicate.timer !== null) clearTimeout(duplicate.timer);
+      duplicate.timer = null;
+      duplicate.sticky = sticky;
+      duplicate.key = candidate.key;
+      draw(duplicate, text, action, sticky);
+      entries.push(...entries.splice(entries.indexOf(duplicate), 1));
+      el.appendChild(duplicate.el);
+      if (!sticky) duplicate.timer = setTimeout(() => remove(duplicate), TOAST_MS);
+      sync();
+      return;
+    }
+
+    if (entries.length === MAX_TOASTS) {
+      remove(entries.find((entry) => !entry.sticky) || entries[0], false);
+    }
+    entries.push(candidate);
+    el.appendChild(candidate.el);
+    if (!sticky) candidate.timer = setTimeout(() => remove(candidate), TOAST_MS);
+    sync();
+  }
+
+  return { show };
+}

data/lib/samagotchi/worker.rb

@@ -4,6 +4,7 @@ require "fileutils"
 
 require_relative "client_id"
 require_relative "config"
+require_relative "engine"
 require_relative "events"
 require_relative "session"
 require_relative "session_inbox"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.76.0
+  version: 0.78.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -393,6 +393,7 @@ files:
 - lib/samagotchi/memory_bundle/trash.rb
 - lib/samagotchi/memory_bundle/uninstaller.rb
 - lib/samagotchi/memory_paths.rb
+- lib/samagotchi/message_parts.rb
 - lib/samagotchi/model_catalog.rb
 - lib/samagotchi/model_list_store.rb
 - lib/samagotchi/model_match.rb
@@ -412,6 +413,7 @@ files:
 - lib/samagotchi/paths.rb
 - lib/samagotchi/peer_sources.rb
 - lib/samagotchi/pending_input_queue.rb
+- lib/samagotchi/pending_question.rb
 - lib/samagotchi/plugin/api.rb
 - lib/samagotchi/plugin/attached_context.rb
 - lib/samagotchi/plugin/context.rb
@@ -485,6 +487,7 @@ files:
 - lib/samagotchi/terminal_ui/input_support.rb
 - lib/samagotchi/terminal_ui/line_reader.rb
 - lib/samagotchi/terminal_ui/live_region.rb
+- lib/samagotchi/terminal_ui/model_segments_text.rb
 - lib/samagotchi/terminal_ui/one_shot_sink.rb
 - lib/samagotchi/terminal_ui/plain_surface.rb
 - lib/samagotchi/terminal_ui/question_prompt.rb
@@ -573,7 +576,6 @@ files:
 - lib/samagotchi/web/info_probe.rb
 - lib/samagotchi/web/lan.rb
 - lib/samagotchi/web/markdown_renderer.rb
-- lib/samagotchi/web/message_parts.rb
 - lib/samagotchi/web/public/activity.js
 - lib/samagotchi/web/public/annotate_actions.js
 - lib/samagotchi/web/public/annotate_bar.js
@@ -592,6 +594,7 @@ files:
 - lib/samagotchi/web/public/command_view.js
 - lib/samagotchi/web/public/commands.js
 - lib/samagotchi/web/public/composer.js
+- lib/samagotchi/web/public/composer_fold.js
 - lib/samagotchi/web/public/composer_size.js
 - lib/samagotchi/web/public/context_chips.js
 - lib/samagotchi/web/public/copy.js
@@ -615,6 +618,7 @@ files:
 - lib/samagotchi/web/public/live_timing.js
 - lib/samagotchi/web/public/live_turn.js
 - lib/samagotchi/web/public/llm_context_chip.js
+- lib/samagotchi/web/public/markdown_place.js
 - lib/samagotchi/web/public/model_pick.js
 - lib/samagotchi/web/public/model_picker.js
 - lib/samagotchi/web/public/notice_links.js
@@ -651,6 +655,7 @@ files:
 - lib/samagotchi/web/public/thinking_ticker.js
 - lib/samagotchi/web/public/timing.js
 - lib/samagotchi/web/public/toast_place.js
+- lib/samagotchi/web/public/toasts.js
 - lib/samagotchi/web/public/toolkit_chip.js
 - lib/samagotchi/web/public/turn_events.js
 - lib/samagotchi/web/public/turn_html.js

data/lib/samagotchi/web/message_parts.rb

@@ -1,274 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "../model_profile"
-require_relative "../tool_call_parser"
-require_relative "../tool_activity"
-require_relative "../tool_row_fields"
-require_relative "../llm/native_tool_normalizer"
-require_relative "../tools/builtins"
-require_relative "../image_store"
-require_relative "../llm_context_edit"
-require_relative "../token_usage"
-require_relative "../row_refs"
-require_relative "../tool_output_cut"
-
-module Samagotchi
-  module Web
-    # What a saved assistant message did, for the web turn view's reload: its
-    # thinking and its tool calls (name, the params line the live row shows,
-    # the output from the tool_response messages after it). Two storage
-    # shapes, best effort:
-    #   * the native loop (a profile, llama.cpp): the raw response as content
-    #     (thinking + tool-call markup, Qwen or Gemma), then one tool_response
-    #     whose content joins every call's output with "\n\n---\n\n";
-    #   * the chat loop (api: openai): the text without thinking, the host's
-    #     reasoning as +thinking+ (older sessions have none), the calls as
-    #     tool_calls ({id, name, arguments}), then one tool_response per call
-    #     (tool_call_id).
-    # A message that can't be read gives no parts, never an error.
-    #
-    # A call's images (a read image, a plugin or MCP tool's) are on its
-    # tool_response: chat, per call; native, one list for every call, split
-    # by the saved image_counts (older sessions without them: only a lone
-    # call gets them).
-    #
-    # A call's chi-owned id (ToolIds, saved as tool_ids) is the part's
-    # tool_id:, and an LLM context edit saved on its output (LLMContextEdit,
-    # under edits) the part's edit: (.edit_marks), the row's ✂ mark.
-    #
-    # A plugin tool's params are what its live row showed (its preview),
-    # saved with the result as tool_params (native: one per call, chat: one
-    # per result); its label ("chrome: screenshot") likewise as tool_labels,
-    # the part's label:, and its row refs as tool_refs (RowRefs, checked
-    # again here), the part's refs:. The web server has no Engine and runs no plugins, so a
-    # result without them (older sessions) falls back to the given
-    # registry: the built-ins', and a plugin tool's arguments as key="value"
-    # from the parsers' args:, as the live row shows them for a tool
-    # without a preview.
-    module MessageParts
-      JOINER = "\n\n---\n\n"
-      # A joined output's pieces each start with "[tool]": split there first,
-      # so an output that holds the joiner itself stays whole.
-      JOINER_BEFORE_TAG = /\n\n---\n\n(?=\[)/
-      # The row shows 300 chars and the rest on hover; a read of a big file
-      # would otherwise ride along with every reload. A longer one keeps its
-      # head and tail (ToolOutputCut.preview).
-      OUTPUT_MAX = ToolOutputCut::WEB_PREVIEW_CHARS
-
-      QWEN_THINK = %r{<think>(.*?)</think>}m
-      QWEN_OPEN_THINK = %r{\A(.*?)</think>}m # the template opened the block
-      GEMMA_THOUGHT = Regexp.new("#{Regexp.escape(ModelProfile::GEMMA_THOUGHT_CHANNEL_OPEN)}(.*?)" \
-                                 "(?:#{Regexp.escape(ModelProfile::GEMMA_THOUGHT_CHANNEL_CLOSE)}|\\z)", Regexp::MULTILINE)
-
-      CallRef = Struct.new(:name, :arguments)
-
-      module_function
-
-      # @param message [Hash] a saved model message (symbol or string keys)
-      # @param responses [Array<Hash>] the tool_response messages after it
-      # @param registry [Tools::Registry] the session's tools
-      # @param cwd [String, nil] the session's working directory (a file
-      #   tool's title is relative to it)
-      # @param marks [Hash{String => Hash}] the session's edit marks by
-      #   output id (.edit_marks)
-      # @return [Hash, nil] { thinking:, tools: [{ tool:, params:, title:,
-      #   output:, output_truncated:, images:, tool_id:, edit: }] } with only what it found; nil for nothing
-      def for_message(message, responses, registry: Tools::Builtins.default, cwd: nil, marks: {})
-        content = field(message, :content).to_s
-        calls = field(message, :tool_calls)
-        tools = if calls.is_a?(Array) && !calls.empty?
-                  native_tools(calls, responses, registry, cwd, marks)
-                else
-                  markup_tools(content, responses, registry, cwd, marks)
-                end
-        parts = {}
-        thinking = [field(message, :thinking).to_s.strip, thinking_of(content)].reject(&:empty?).join("\n\n")
-        parts[:thinking] = thinking unless thinking.empty?
-        parts[:tools] = tools unless tools.empty?
-        parts.empty? ? nil : parts
-      rescue StandardError
-        nil
-      end
-
-      def thinking_of(content)
-        blocks = content.scan(QWEN_THINK).flatten
-        if blocks.empty? && !content.include?("<think>") && (open = content[QWEN_OPEN_THINK, 1])
-          blocks = [open]
-        end
-        blocks += content.scan(GEMMA_THOUGHT).flatten
-        blocks.map(&:strip).reject(&:empty?).join("\n\n")
-      end
-
-      def markup_tools(content, responses, registry, cwd = nil, marks = {})
-        calls = []
-        calls.concat(ToolCallParser::Qwen.new(ModelProfile.qwen36).parse(content)) if content.include?("<tool_call>")
-        calls.concat(ToolCallParser::Gemma.new(ModelProfile.gemma4).parse(content)) if content.include?("<|tool_call>")
-        return [] if calls.empty?
-
-        joined = responses.empty? ? nil : responses.map { |r| field(r, :content).to_s }.join(JOINER)
-        outputs = split_outputs(joined, calls.length)
-        shown = saved_list(responses, :tool_params, calls.length)
-        labels = saved_list(responses, :tool_labels, calls.length)
-        diffs = saved_list(responses, :tool_diffs, calls.length)
-        refs = saved_list(responses, :tool_refs, calls.length)
-        ids = saved_list(responses, :tool_ids, calls.length)
-        images = split_images(responses, calls.length)
-        calls.each_with_index.map do |call, i|
-          tool_part(call, outputs[i], registry, shown[i], images[i], label: labels[i], diff: diffs[i], refs: refs[i],
-                                                                     cwd: cwd, tool_id: ids[i], marks: marks)
-        end
-      end
-
-      # A per-call list saved with the joined result(s), or none when its
-      # length doesn't match the calls.
-      def saved_list(responses, key, count)
-        list = responses.flat_map { |r| Array(field(r, key)) }
-        list.length == count ? list : []
-      end
-
-      # Each call's images from the joined tool_response(s).
-      def split_images(responses, count)
-        images = responses.flat_map { |r| Array(field(r, :images)) }
-        return [] if images.empty?
-
-        counts = responses.flat_map { |r| Array(field(r, :image_counts)) }
-        return count == 1 ? [images] : [] unless counts.length == count && counts.sum == images.length
-
-        counts.map { |n| images.shift(n) }
-      end
-
-      def native_tools(calls, responses, registry, cwd = nil, marks = {})
-        # By id only for an id that names one response: a server may omit
-        # it (nil), send "" or repeat it; those pair by position.
-        ids = responses.map { |r| field(r, :tool_call_id).to_s }
-        unique = ->(id) { !id.empty? && ids.count(id) == 1 }
-        by_id = responses.each_with_index.to_h { |r, i| [ids[i], r] }.select { |id, _| unique.call(id) }
-        calls.each_with_index.map do |raw, i|
-          ref = CallRef.new(field(raw, :name).to_s, field(raw, :arguments))
-          call = LLM::NativeToolNormalizer.normalize(ref) || { name: ref.name }
-          response = by_id[field(raw, :id).to_s] || (responses[i] && !unique.call(ids[i]) ? responses[i] : nil)
-          tool_part(call, response && field(response, :content).to_s, registry, field(response, :tool_params),
-                    response && field(response, :images), label: field(response, :tool_labels),
-                                                          diff: field(response, :tool_diffs),
-                                                          refs: field(response, :tool_refs), cwd: cwd,
-                                                          tool_id: Array(field(response, :tool_ids)).first, marks: marks)
-        end
-      end
-
-      # The ✂ mark of each output an LLM context edit is saved on, by its
-      # id, from +messages+ (a session's, symbol or string keys): {kind:
-      # "stale" | "forget", staged: true while a forget waits for the
-      # turn's end, note: (a stale stub's reason, "superseded by a later
-      # read"; the first output of a forget_outputs call's, its note), with:
-      # (the others of that call's: the first one's id), kept: ("12-40, 50",
-      # a forget's kept lines)}. A forget call's outputs share the note,
-      # author and stamp (LLMContextView's key); the first in the session's
-      # order carries the note.
-      # @return [Hash{String => Hash}]
-      def edit_marks(messages)
-        first = {}
-        Array(messages).each_with_object({}) do |entry, marks|
-          next unless field(entry, :role).to_s == "tool_response"
-
-          saved = field(entry, :edits)
-          next unless saved.is_a?(Hash)
-
-          edits = saved.filter_map { |id, hash| LLMContextEdit.from_h(id, hash) }.to_h { |edit| [edit.id, edit] }
-          order = Array(field(entry, :tool_ids)).map(&:to_s)
-          edits.sort_by { |id, _| order.index(id) || order.size }.each do |id, edit|
-            marks[id] = edit_mark(edit, first)
-          end
-        end
-      rescue StandardError
-        {}
-      end
-
-      def edit_mark(edit, first)
-        mark = { kind: edit.kind.to_s }
-        mark[:staged] = true unless edit.applied?
-        if edit.kind == :stale
-          mark[:note] = edit.note[/superseded by .*\z/] || edit.note
-        else
-          key = [edit.note, edit.by, edit.staged_at]
-          if first.key?(key)
-            mark[:with] = first[key]
-          else
-            first[key] = edit.id
-            mark[:note] = edit.note
-          end
-          kept = edit.keep.map { |from, to| from == to ? from.to_s : "#{from}-#{to}" }
-          mark[:kept] = kept.join(", ") unless kept.empty?
-        end
-        mark
-      end
-
-      # +output+'s ✂ mark (+marks+ by +id+); an applied stale stub says
-      # what it frees: its output, ~chars/4.
-      def mark_of(id, marks, output)
-        mark = marks[id]
-        return nil unless mark
-        return mark unless mark[:kind] == "stale" && !mark[:staged] && output
-
-        mark.merge(tokens: (output.length / TokenUsage::CHARS_PER_TOKEN).ceil)
-      end
-
-      # +count+ outputs from a joined tool_response: the "[tool]"-tagged
-      # split when it gives the right count, else the plain one; extra pieces
-      # stay with the last call, missing ones are nil.
-      def split_outputs(joined, count)
-        return [] if joined.nil?
-        return [joined] if count == 1
-
-        pieces = joined.split(JOINER_BEFORE_TAG, -1)
-        pieces = joined.split(JOINER, -1) if pieces.length != count
-        return pieces if pieces.length == count
-
-        head = pieces.first(count - 1)
-        rest = pieces.drop(count - 1)
-        head + [rest.empty? ? nil : rest.join(JOINER)]
-      end
-
-      # +shown+ is the saved params line, when it is a String.
-      # +diff+ is what an edit/write changed (EditPreview.change), saved as
-      # tool_diffs. +refs+: a plugin tool's row refs, saved as tool_refs
-      # (RowRefs.for_display checks them again against +cwd+). +cwd+: the
-      # session's working directory, for the title.
-      # +tool_id+: its output's ToolIds id, with its ✂ mark in +marks+.
-      def tool_part(call, output, registry, shown = nil, images = nil, label: nil, diff: nil, refs: nil, cwd: nil,
-                    tool_id: nil, marks: {})
-        # A built-in reached through call_tool reloads as that built-in's
-        # row, with via (its saved params and label are the built-in's).
-        call = Tools::BuiltinCalls.unwrap_saved(call, output)
-        name = call[:name].to_s
-        params = shown.is_a?(String) ? shown : ToolActivity.tool_activity_params(name, call, registry: registry)
-        part = { tool: name, params: params.to_s }
-        # Its row fields (ToolRowFields: title, called_as, via, view, ref), built from the saved
-        # call (never saved themselves), so older sessions get them too. The
-        # saved call is rebuilt by BuiltinCalls, which sets called_as and via again.
-        part.merge!(ToolRowFields.for(name, call, cwd: cwd))
-        part[:label] = label if label.is_a?(String) && !label.empty?
-        unless output.nil?
-          part[:output] = ToolOutputCut.preview(output, cap: OUTPUT_MAX, tool: name)
-          part[:output_truncated] = true if output.length > OUTPUT_MAX
-        end
-        shots = Array(images).select { |image| image.is_a?(Hash) }
-        part[:images] = shots.map { |image| ImageStore.symbolize(image).slice(:file, :name, :width, :height) } unless shots.empty?
-        part[:diff] = diff if diff.is_a?(Hash)
-        row_refs = RowRefs.for_display(refs, cwd: cwd)
-        part[:refs] = row_refs unless row_refs.empty?
-        if tool_id
-          part[:tool_id] = tool_id.to_s
-          mark = mark_of(tool_id.to_s, marks, output)
-          part[:edit] = mark if mark
-        end
-        part
-      end
-
-      def field(hash, key)
-        return nil unless hash.is_a?(Hash)
-
-        hash.key?(key) ? hash[key] : hash[key.to_s]
-      end
-    end
-  end
-end