samagotchi 0.65.0 → 0.66.0

data/lib/samagotchi/tools/registry.rb

@@ -35,8 +35,15 @@ module Samagotchi
 
       def initialize
         @entries = {}
+        @toolkit = nil
       end
 
+      # The session's resolved toolkit (Toolkit::Resolved), which the lists
+      # below and #offered filter by; nil declares every tool (full). The
+      # Engine sets it at a turn's start, before the prompt is built, and
+      # only there: a request's declared tools never change mid-turn.
+      attr_accessor :toolkit
+
       # @return [Entry]
       def register(name, schema:, handler:, label: nil, preview: nil, targets: nil, refs: nil, source: "core", layer: nil)
         raise ArgumentError, "tool #{name} is already registered" if @entries.key?(name)
@@ -59,19 +66,40 @@ module Samagotchi
       # @return [Entry, nil]
       def offered(name, layers: [])
         entry = self[name]
-        entry if entry&.offered?(layers)
+        entry if entry&.offered?(layers) && declared?(entry)
+      end
+
+      # The entry +name+ names when the session's toolkit leaves it out (a
+      # real tool the model can't call here), nil otherwise.
+      # @return [Entry, nil]
+      def left_out(name, layers: [])
+        entry = self[name]
+        entry if entry&.offered?(layers) && !declared?(entry)
+      end
+
+      # The tools +toolkit+ (the session's by default) leaves out of a turn
+      # under +layers+.
+      # @return [Array<String>] in declaration order
+      def left_out_names(layers: [], toolkit: @toolkit)
+        ordered(@entries.values.select { |entry| entry.offered?(layers) && !declared?(entry, toolkit) }).map(&:name)
       end
 
+      # Every tool +source+ registered, declared or not (a plugin's tool set
+      # changing: Plugin::Api.apply_tools).
+      # @return [Array<Entry>]
+      def by_source(source) = @entries.values.select { |entry| entry.source == source }
+
       # The tools a turn offers is per turn: +layers+, the turn's LLM
       # context layers (LLMContextStrategy), adds the tools gated by them.
       # Without layers (none, the default) the list is what it always was.
       # @return [Array<String>] in declaration order
-      def names(layers: []) = entries(layers: layers).map(&:name)
+      def names(layers: [], toolkit: @toolkit) = entries(layers: layers, toolkit: toolkit).map(&:name)
 
-      # @return [Array<Entry>] in declaration order
-      def entries(layers: [])
-        core, added = @entries.values.select { |entry| entry.offered?(layers) }.partition(&:core?)
-        core + added.sort_by { |entry| [entry.source.to_s, entry.name] }
+      # @return [Array<Entry>] in declaration order: the ones the turn's
+      #   layers offer and the session's toolkit declares
+      #   (+toolkit+: another one's, for what a change would declare)
+      def entries(layers: [], toolkit: @toolkit)
+        ordered(@entries.values.select { |entry| entry.offered?(layers) && declared?(entry, toolkit) })
       end
 
       # @return [Array<Hash>] the schemas, in declaration order
@@ -81,6 +109,15 @@ module Samagotchi
         @entries.freeze
         super
       end
+
+      private
+
+      def declared?(entry, toolkit = @toolkit) = toolkit.nil? || toolkit.declares?(entry)
+
+      def ordered(entries)
+        core, added = entries.partition(&:core?)
+        core + added.sort_by { |entry| [entry.source.to_s, entry.name] }
+      end
     end
   end
 end

data/lib/samagotchi/version.rb

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

data/lib/samagotchi/web/app.rb

@@ -566,6 +566,14 @@ module Samagotchi
         LLMContextStrategy.for_session(session, registry: host_registry)
       end
 
+      # A session's toolkit as its file names it ({name:, label:}), nil on
+      # full: without a worker nothing resolves it (a bundle's kits load in
+      # the worker), so the tools it leaves out aren't known here.
+      def toolkit_for(session)
+        toolkit = session.toolkit
+        toolkit && !toolkit.full? ? { name: toolkit.name, label: toolkit.label } : nil
+      end
+
       # A session's thinking level with where it came from and its own
       # (SettingExplained#summary), as its worker would resolve it; nil
       # when it can't be. Config and the registry only: no network.
@@ -848,6 +856,10 @@ module Samagotchi
         # native host), else the server's reading (an older worker, none).
         history = snapshot&.key?("reasoning_history") ? snapshot["reasoning_history"] : reasoning_history_for(session)
         session_json = session_json.merge(reasoning_history: history)
+        # Its toolkit when it isn't full (the tools chip): the worker's, which
+        # resolved it, else the name saved in the session file.
+        toolkit = snapshot&.key?("toolkit") ? snapshot["toolkit"] : toolkit_for(session)
+        session_json = session_json.merge(toolkit: toolkit)
         raw_messages = turn_snapshot ? turn_snapshot["messages"] : session.messages
         timing = timing_payload(id, live_metrics: snapshot && snapshot["metrics"], persisted: persisted)
         json_response(200, {

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

@@ -0,0 +1,109 @@
+// Annotation actions: a bundle's pills in the Annotate bar (chi.annotation,
+// docs/plugins.md). Each prepares a command line of its plugin with the
+// selection filled into its template under it:
+//
+//   /claude validate
+//   From your thinking:
+//   > the quoted line
+//
+// and fills the composer with it (the note goes under), or sends it at once
+// (send: true). The pills ride on the session's command listing (the
+// worker's snapshot), so a muted bundle's go with its command. Pure: no DOM.
+// A module of its own: static JS is cached at unversioned URLs, and a new
+// export on an old module would blank the page.
+
+import { quoteBlock } from "./annotations.js";
+
+// How many plugin pills the bar shows; the rest go behind "⋯".
+export const INLINE_ACTIONS = 3;
+
+// The session's commands' annotations, flattened in listing order: {label,
+// line, template, send, command, anytime, source}. anytime: the command
+// runs mid-turn (a send pill needs it while a turn runs).
+export function annotationActions(commands) {
+  const out = [];
+  for (const c of Array.isArray(commands) ? commands : []) {
+    if (!c || typeof c.name !== "string" || !Array.isArray(c.annotations)) continue;
+    for (const a of c.annotations) {
+      if (!a || typeof a.label !== "string" || !a.label || typeof a.line !== "string" || !a.line) continue;
+      out.push({
+        label: a.label,
+        line: a.line,
+        template: typeof a.template === "string" && a.template ? a.template : "{quote}",
+        send: a.send === true,
+        command: c.name,
+        anytime: c.mid_turn === "anytime" || c.anytime === true,
+        source: typeof c.source === "string" ? c.source : "",
+      });
+    }
+  }
+  return out;
+}
+
+// Whether two action lists draw the same pills (the bar redraws only on a
+// change).
+export function sameActions(a, b) {
+  return JSON.stringify(a) === JSON.stringify(b);
+}
+
+// The selection as templates read it: {quote} the labelled block Annotate
+// makes (annotations.js quoteBlock), {text} the selection alone with the
+// same trimming (CRLF → LF, each line's trailing blanks, blank lines at
+// either end; indentation kept), {source} where it came from (answer,
+// thinking, step, tool, user). null when it holds no text.
+export function selectionFields(raw, source = {}) {
+  const quote = quoteBlock(raw, source);
+  if (!quote) return null;
+  const lines = String(raw ?? "").replace(/\r\n?/g, "\n").split("\n").map((l) => l.replace(/\s+$/, ""));
+  while (lines.length && !lines[0]) lines.shift();
+  while (lines.length && !lines[lines.length - 1]) lines.pop();
+  return { quote, text: lines.join("\n"), source: source.kind || "answer" };
+}
+
+// +template+ with {quote}, {text} and {source} filled from +fields+; any
+// other {x} stays as written.
+export function fillTemplate(template, fields) {
+  return String(template ?? "").replace(/\{(quote|text|source)\}/g, (_, key) => String(fields?.[key] ?? ""));
+}
+
+// The line the pill prepares: its command line, the filled template under it.
+export function actionLine(action, fields) {
+  return `${action.line}\n${fillTemplate(action.template, fields)}`;
+}
+
+// The composer's text after a fill pill (+line+: actionLine's):
+//   - empty: the line;
+//   - it already starts with the same command line: the filled part is
+//     appended (several selections collect under one command);
+//   - another draft: the line on top, the draft under it, after a blank line
+//     (nothing leaves chi without a click on Send).
+export function composerWithAction(value, action, line) {
+  const draft = String(value ?? "");
+  if (!draft.trim()) return line;
+  const filled = line.slice(action.line.length + 1);
+  if (draft.trimStart().split("\n")[0].trim() === action.line) {
+    const before = draft.replace(/\s+$/, "");
+    return `${before}\n\n${filled}`;
+  }
+  return `${line.replace(/\s+$/, "")}\n\n${draft.replace(/^\s*\n/, "")}`;
+}
+
+// Whether a pill can be clicked: a fill pill always; a send pill while a
+// turn runs only when its command runs mid-turn (anytime), else it would come
+// back busy.
+export function actionEnabled(action, running) {
+  return !action.send || !running || action.anytime;
+}
+
+// A pill's tooltip: its label and bundle, that a send pill sends at once,
+// and why it is disabled.
+export function actionTitle(action, running) {
+  const base = action.source ? `${action.label} (${action.source})` : action.label;
+  if (!actionEnabled(action, running)) return `${base}: ${action.command} waits for the turn to end`;
+  return action.send ? `${base}: sends at once` : base;
+}
+
+// The pills shown inline and the ones behind "⋯".
+export function splitInline(actions, max = INLINE_ACTIONS) {
+  return { inline: actions.slice(0, max), more: actions.slice(max) };
+}

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

@@ -7,10 +7,15 @@
 // bubble rewrites its text every frame, which would collapse it by the time
 // a button is clicked.
 //
+// A bundle's pills (chi.annotation) come after the presets: each prepares
+// its command line with the selection (annotate_actions.js), at most 3
+// inline, the rest behind "⋯".
+//
 // The quoting rules are annotations.js'; this is the bar.
 
 import { annotateBarLeft, annotationSource, quoteBlock } from "./annotations.js";
 import { presetNote } from "./annotate_presets.js";
+import { actionEnabled, actionTitle, sameActions, selectionFields, splitInline } from "./annotate_actions.js";
 
 // @param presets the preset texts (annotate_presets.js parsePresets)
 // @param canAnnotate () => whether the open session takes annotations (one
@@ -21,11 +26,18 @@ import { presetNote } from "./annotate_presets.js";
 //   until its step closes)
 // @param onQuote (text) runs with the quote (and a preset's note) to append
 //   to the composer; the selection is cleared and the bar hidden first
+// @param actions () => the open session's annotation actions
+//   (annotate_actions.js annotationActions), read on every selection
+// @param running () => whether a turn runs (a send pill may wait for it)
+// @param onAction (action, fields) runs with a clicked pill's action and the
+//   selection's {quote, text, source}; the selection is cleared and the bar
+//   hidden first
 // @param doc, win the page's document and window
 // @return {schedule(), hide(), el}; schedule() re-reads the selection on the
 //   next frame (call it on scroll)
 export function createAnnotateBar({
-  presets, canAnnotate, roots, isLive, onQuote, doc = globalThis.document, win = globalThis.window,
+  presets, canAnnotate, roots, isLive, onQuote, actions = () => [], running = () => false, onAction = () => {},
+  doc = globalThis.document, win = globalThis.window,
 }) {
   const bar = doc.createElement("div");
   bar.id = "annotateBar";
@@ -46,11 +58,63 @@ export function createAnnotateBar({
     btn.title = text;
     bar.appendChild(btn);
   });
+  // The plugin pills: a separator, the inline ones, then ⋯ and the list
+  // it opens. Redrawn only when the session's actions change.
+  const group = doc.createElement("span");
+  group.className = "annotate-actions";
+  group.hidden = true;
+  bar.appendChild(group);
   doc.body.appendChild(bar);
   let pendingQuote = null;
+  let pendingFields = null;
+  let drawn = [];
+  let moreList = null;
+
+  function drawActions(list) {
+    drawn = list;
+    moreList = null;
+    group.hidden = !list.length;
+    if (!list.length) return group.replaceChildren();
+    const sep = doc.createElement("span");
+    sep.className = "annotate-sep";
+    sep.setAttribute("aria-hidden", "true");
+    const pill = (action, i) => {
+      const btn = button(action.label, "annotate-action");
+      btn.dataset.action = String(i);
+      if (action.send) btn.dataset.sends = "";
+      return btn;
+    };
+    const { inline, more } = splitInline(list);
+    const nodes = [sep, ...inline.map(pill)];
+    if (more.length) {
+      const toggle = button("⋯", "annotate-more");
+      toggle.title = "More actions";
+      toggle.setAttribute("aria-label", "More actions");
+      moreList = doc.createElement("div");
+      moreList.className = "annotate-more-list";
+      moreList.hidden = true;
+      more.forEach((action, j) => moreList.appendChild(pill(action, inline.length + j)));
+      nodes.push(toggle, moreList);
+    }
+    group.replaceChildren(...nodes);
+  }
+
+  // Each pill's state for whether a turn runs (a send pill may wait).
+  function markActions() {
+    const now = running();
+    const all = [...group.children, ...(moreList ? moreList.children : [])];
+    for (const btn of all) {
+      if (btn.dataset?.action === undefined) continue;
+      const action = drawn[Number(btn.dataset.action)];
+      btn.disabled = !actionEnabled(action, now);
+      btn.title = actionTitle(action, now);
+    }
+  }
 
   function hide() {
     pendingQuote = null;
+    pendingFields = null;
+    if (moreList) moreList.hidden = true;
     bar.hidden = true;
   }
 
@@ -67,9 +131,14 @@ export function createAnnotateBar({
     // Clip to where the selection starts: one tool row, one bubble.
     const clipped = range.cloneRange();
     if (!source.root.contains(range.endContainer)) clipped.setEnd(source.root, source.root.childNodes.length);
-    const block = quoteBlock(clipped.toString(), source);
+    const raw = clipped.toString();
+    const block = quoteBlock(raw, source);
     if (!block) return hide();
     pendingQuote = block;
+    pendingFields = selectionFields(raw, source);
+    const list = actions() || [];
+    if (!sameActions(list, drawn)) drawActions(list);
+    markActions();
     const rects = clipped.getClientRects();
     const rect = rects.length ? rects[rects.length - 1] : clipped.getBoundingClientRect();
     bar.hidden = false;
@@ -109,6 +178,19 @@ export function createAnnotateBar({
   bar.addEventListener("click", (e) => {
     const btn = e.target.closest("button");
     if (!btn || !pendingQuote) return;
+    if (btn.className === "annotate-more") {
+      moreList.hidden = !moreList.hidden;
+      return;
+    }
+    if (btn.dataset.action !== undefined) {
+      const action = drawn[Number(btn.dataset.action)];
+      if (!action || btn.disabled) return;
+      const fields = pendingFields;
+      win.getSelection()?.removeAllRanges();
+      hide();
+      onAction(action, fields);
+      return;
+    }
     const preset = btn.dataset.index === undefined ? null : presets[Number(btn.dataset.index)];
     const text = preset ? presetNote(pendingQuote, preset) : pendingQuote;
     win.getSelection()?.removeAllRanges();

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

@@ -46,6 +46,7 @@ import { createTaskStopper } from "./task_stop.js";
 import { appendQuote } from "./annotations.js";
 import { parsePresets } from "./annotate_presets.js";
 import { createAnnotateBar } from "./annotate_bar.js";
+import { actionLine, annotationActions, composerWithAction } from "./annotate_actions.js";
 import { copyText, installCopy } from "./copy.js";
 import { ctxBarText, ctxBarTip, lastSpeedText, speedText } from "./ctx.js";
 import { createQuestionCards } from "./question_cards.js";
@@ -1476,6 +1477,8 @@ function updateInfoBar() {
     llmContext: current.llmContext,
     thinking: current.thinking,
     reasoningHistory: current.reasoningHistory,
+    // The tools chip (toolkit_chip.js): null on full.
+    toolkit: current.toolkit,
     // The model notes the session's prompt carried.
     notes: promptNotesChip(current.promptNotes),
     memories: current.usedMemories,
@@ -2379,18 +2382,29 @@ function showToast(text, action = null, { sticky = false } = {}) {
 }
 
 // Annotate (annotate_bar.js): a selection in the conversation offers
-// "Annotate" and the presets, which append a quote to the composer.
+// "Annotate" and the presets, which append a quote to the composer, and the
+// session's plugins' pills (chi.annotation, annotate_actions.js), which fill
+// the composer with their command line and the quote, or send it at once.
+function fillComposer(text) {
+  promptEl.value = text;
+  fitPrompt();
+  promptEl.focus();
+  promptEl.setSelectionRange(promptEl.value.length, promptEl.value.length);
+  promptEl.scrollTop = promptEl.scrollHeight;
+}
+
 const annotateBar = createAnnotateBar({
   presets: parsePresets(document.body.dataset.annotatePresets),
   canAnnotate: () => !!selected && current.owner !== "tui",
   roots: turnRoots,
   isLive: (root) => liveTurn.running && turnDom.containsLive(root),
-  onQuote: (text) => {
-    promptEl.value = appendQuote(promptEl.value, text);
-    fitPrompt();
-    promptEl.focus();
-    promptEl.setSelectionRange(promptEl.value.length, promptEl.value.length);
-    promptEl.scrollTop = promptEl.scrollHeight;
+  onQuote: (text) => fillComposer(appendQuote(promptEl.value, text)),
+  actions: () => annotationActions(current.commands),
+  running: () => liveTurn.running,
+  onAction: (action, fields) => {
+    const line = actionLine(action, fields);
+    if (action.send) runSessionCommand(line);
+    else fillComposer(composerWithAction(promptEl.value, action, line));
   },
 });
 historyEl.addEventListener("scroll", annotateBar.schedule);

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

@@ -10,7 +10,8 @@ import { anchorInsertIndex, commandAnchor, isShellCommandLine, keepsCommandBubbl
 // Whether a composer line in an open session is one of its commands
 // (+commands+: the session GET's listing), as the terminals decide
 // (Commands::Registry#lookup): a "!" line with something after the "!", or
-// a listed name alone or followed by a space; a terminal's own (/stats,
+// a listed name alone or followed by whitespace (a newline too: an
+// annotation action's line puts the quote under the name); a terminal's own (/stats,
 // /exit) too, which the page answers itself (webLocalReply). An unknown
 // "/word" (a path, a typo) goes to the model as a prompt, as in a terminal.
 export function sessionCommandLine(text, commands) {
@@ -19,7 +20,8 @@ export function sessionCommandLine(text, commands) {
   if (!line.startsWith("/")) return false;
   if (webLocalReply(line)) return true;
   return (Array.isArray(commands) ? commands : [])
-    .some((c) => c && typeof c.name === "string" && (line === c.name || line.startsWith(`${c.name} `)));
+    .some((c) => c && typeof c.name === "string"
+      && (line === c.name || (line.startsWith(c.name) && /\s/.test(line[c.name.length]))));
 }
 
 // /cut TEXT and /queue TEXT: the UIs' own words for a delivery (listed

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

@@ -480,6 +480,15 @@ button.task-stop:hover:not(:disabled){background:var(--danger-bg-dim);filter:non
 #annotateBar{position:fixed;z-index:20;display:flex;flex-wrap:wrap;gap:4px;max-width:calc(100vw - 16px)}
 #annotateBar[hidden]{display:none}
 #annotateBar button{font-size:12px;padding:4px 10px;border-radius:999px;box-shadow:0 2px 8px var(--shadow-strong)}
+/* A bundle's pills (chi.annotation) after a thin separator; beyond 3, "⋯" opens the rest in a list under it. */
+#annotateBar .annotate-actions{display:flex;flex-wrap:wrap;gap:4px;align-items:center;position:relative}
+#annotateBar .annotate-actions[hidden]{display:none}
+#annotateBar .annotate-sep{width:1px;align-self:stretch;margin:3px 2px;background:var(--border-strong)}
+#annotateBar .annotate-action,#annotateBar .annotate-more{background:var(--accent-bg);color:var(--accent);border:1px solid var(--accent-border);padding:3px 10px;max-width:32ch;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+#annotateBar .annotate-action:disabled{opacity:.5;cursor:not-allowed}
+#annotateBar .annotate-action[data-sends]::after{content:"↗";margin-left:4px;opacity:.75}
+#annotateBar .annotate-more-list{position:absolute;top:calc(100% + 4px);right:0;display:flex;flex-direction:column;align-items:flex-end;gap:4px}
+#annotateBar .annotate-more-list[hidden]{display:none}
 #annotateBar .annotate-preset{background:var(--bg-raised);color:var(--text-2);border:1px solid var(--border-strong);padding:3px 10px;max-width:32ch;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
 /* Copy buttons (copy.js): top-right in an answer and a code block, left of a prompt (its right edge is the page's); shown on hover or focus, always (dim) on touch. They hold no text: "copied ✓" is CSS content. */
 .bubble.output,.bubble.user{position:relative}

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

@@ -1,6 +1,6 @@
 // The session bar's info line (#infoText): the open session's id, its copy
 // chi --attach button, status, model, chain links, parent and delegates,
-// llm ctx, thinking and reasoning history chips, model notes, memories, folder, ctx, speed,
+// llm ctx, thinking, reasoning history and tools chips, model notes, memories, folder, ctx, speed,
 // session clock and the worker's version badge. A lit-html template over a
 // plain model app.js builds (updateInfoBar), so the markup lives here and
 // runs under node --test (spec/web/public/info_bar.test.js).
@@ -16,6 +16,7 @@ import { ALL_SESSIONS_HASH, sessionHash } from "./route.js";
 import { chipTemplate as llmContextChip } from "./llm_context_chip.js";
 import { chipTemplate as thinkingChip } from "./thinking_chip.js";
 import { chipTemplate as reasoningHistoryChip } from "./reasoning_history_chip.js";
+import { chipTemplate as toolkitChip } from "./toolkit_chip.js";
 
 export const PREV = "←";
 export const NEXT = "→";
@@ -62,7 +63,8 @@ function kidsTemplate(kids) {
 //   mismatch}: format.js modelLabel), chain ({prev, next}: chainLinkTemplate's
 //   links or null), parent ({id, title} or null), kids (format.js
 //   childrenSummary), llmContext, thinking and reasoningHistory (the chips'
-//   summaries; reasoningHistory null on a native host: no chip), notes
+//   summaries; reasoningHistory null on a native host: no chip), toolkit
+//   (the tools chip's summary, null on full: no chip), notes
 //   ({text, title} or null), memories (the used names), dir, ctx ({text,
 //   tip}), speed ({text, tip} or null), clock (the session time's text, ""
 //   for none), worker ({badge, busy} or null).
@@ -70,7 +72,7 @@ export function infoBarHtml(bar) {
   if (!bar) return nothing;
   const attach = `chi --attach ${bar.id}`;
   const memories = bar.memories || [];
-  return html`<div class="meta"><span class="id" title=${bar.id}>${String(bar.id).slice(0, 8)}</span><button type="button" class="copy-attach" title=${`Copy "${attach}" to attach a terminal`}>${bar.copied ? "copied ✓" : "copy chi --attach"}</button><span class=${bar.status ? `status ${bar.status}` : "status"}>${bar.status || ""}</span><span class=${`model${bar.model.mismatch ? " served-mismatch" : ""}`} title=${bar.model.title}>${bar.model.text}</span>${bar.chain?.prev ? chainLinkTemplate(bar.chain.prev, PREV, "The previous link of this chain") : nothing}${bar.chain?.next ? chainLinkTemplate(bar.chain.next, NEXT, "The next link of this chain") : nothing}${bar.parent ? html`<a class="model parent" href=${sessionHash(bar.parent.id)} title=${bar.parent.title}>delegated by ${String(bar.parent.id).slice(0, 8)}</a>` : nothing}${kidsTemplate(bar.kids)}${llmContextChip(bar.llmContext)}${thinkingChip(bar.thinking)}${reasoningHistoryChip(bar.reasoningHistory)}${bar.notes ? html`<span class="model notes-chip" title=${bar.notes.title}>${bar.notes.text}</span>` : nothing}${memories.length ? html`<span class="model mem-chip" title=${memChipTitle(memories)}>${memChipText(memories)}</span>` : nothing}<span class="dir" title=${bar.dir || ""}><bdi>${bar.dir || ""}</bdi></span><span class="model ctx" title=${bar.ctx.tip}>${bar.ctx.text}</span>${bar.speed ? html`<span class="model speed" title=${bar.speed.tip}>${bar.speed.text}</span>` : nothing}${bar.clock ? html`<span class="model session-time">${bar.clock}</span>` : nothing}${workerBadgeTemplate(bar.worker)}</div>`;
+  return html`<div class="meta"><span class="id" title=${bar.id}>${String(bar.id).slice(0, 8)}</span><button type="button" class="copy-attach" title=${`Copy "${attach}" to attach a terminal`}>${bar.copied ? "copied ✓" : "copy chi --attach"}</button><span class=${bar.status ? `status ${bar.status}` : "status"}>${bar.status || ""}</span><span class=${`model${bar.model.mismatch ? " served-mismatch" : ""}`} title=${bar.model.title}>${bar.model.text}</span>${bar.chain?.prev ? chainLinkTemplate(bar.chain.prev, PREV, "The previous link of this chain") : nothing}${bar.chain?.next ? chainLinkTemplate(bar.chain.next, NEXT, "The next link of this chain") : nothing}${bar.parent ? html`<a class="model parent" href=${sessionHash(bar.parent.id)} title=${bar.parent.title}>delegated by ${String(bar.parent.id).slice(0, 8)}</a>` : nothing}${kidsTemplate(bar.kids)}${llmContextChip(bar.llmContext)}${thinkingChip(bar.thinking)}${reasoningHistoryChip(bar.reasoningHistory)}${toolkitChip(bar.toolkit)}${bar.notes ? html`<span class="model notes-chip" title=${bar.notes.title}>${bar.notes.text}</span>` : nothing}${memories.length ? html`<span class="model mem-chip" title=${memChipTitle(memories)}>${memChipText(memories)}</span>` : nothing}<span class="dir" title=${bar.dir || ""}><bdi>${bar.dir || ""}</bdi></span><span class="model ctx" title=${bar.ctx.tip}>${bar.ctx.text}</span>${bar.speed ? html`<span class="model speed" title=${bar.speed.tip}>${bar.speed.text}</span>` : nothing}${bar.clock ? html`<span class="model session-time">${bar.clock}</span>` : nothing}${workerBadgeTemplate(bar.worker)}</div>`;
 }
 
 // Draws +bar+ into +el+ (#infoText), with the memories in its tooltip.

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

@@ -48,6 +48,7 @@ export function emptySessionState() {
     // Which of its reasoning the model gets back from the next turn on, with
     // its source (the reasoning history chip), or null (a native host).
     reasoningHistory: null,
+    toolkit: null,
     timing: normalizeTiming(),
   };
 }
@@ -83,6 +84,8 @@ export function sessionStateFrom(data) {
   state.thinking = s.thinking || null;
   // null on a native host (it ignores the level) and from an older worker.
   state.reasoningHistory = s.reasoning_history || null;
+  // The tools chip's (null on full).
+  state.toolkit = s.toolkit || null;
   state.parentId = s.parent_id || null;
   state.continues = s.continues || null;
   state.commands = Array.isArray(data.commands) ? data.commands : [];

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

@@ -229,6 +229,11 @@ export function createStreamHandlers(deps) {
         updateInfoBar();
         reasoningHistoryControl.refresh();
       }
+      // /toolkit changed what the next turn declares; null: full (no chip).
+      if ("toolkit" in data) {
+        state().toolkit = data.toolkit || null;
+        updateInfoBar();
+      }
       if (view.resync) await resync();
       // A card's action that isn't anytime (the step-limit question's
       // /continue) has no bubble: nothing to remove. An anytime or queued
@@ -246,6 +251,9 @@ export function createStreamHandlers(deps) {
       // message renders as one) — no second bubble, or the output shows twice.
       else if (view.resync && historyHasCommandBubble(findInTurnRoots(".bubble.command"), view.line)) { /* drawn by the resync */ }
       else addCommandBubble(view);
+      // This tab's command refused as busy (a plugin's command mid-turn): the
+      // composer was cleared when it went; its line comes back to send later.
+      if (view.own && view.busy && composer.empty()) composer.refill(view.line);
     },
     // An anytime command (/help, a plugin's /btw) runs at once, beside a
     // turn: its bubble goes here, so the cards it shows come after it. One
@@ -301,6 +309,11 @@ export function createStreamHandlers(deps) {
     // shows elsewhere (a hook's links in the rendered answer) isn't drawn,
     // not even in the stage trail; a joined turn's notices come here too.
     hook_notice: (data) => {
+      // A plugin put the session on another toolkit (ctx.use_toolkit).
+      if ("toolkit" in data) {
+        state().toolkit = data.toolkit || null;
+        updateInfoBar();
+      }
       if (shownElsewhere(data, capabilities())) return;
       if (!turnDom.notice(data)) showHookNotice(data);
     },

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

@@ -0,0 +1,29 @@
+// The session bar's tools chip: the session's toolkit when it isn't full
+// ("tools lean"), with the tools it leaves out and how to change them in
+// its tooltip. The summary is the session's toolkit ({name, label,
+// left_out, fallback}: Toolkit::Explained#summary; the worker's snapshot or
+// a command_ran; the server's own reading of the session file has no
+// left_out). Changing it is /toolkit (no popover yet).
+
+import { html, nothing } from "./vendor/lit-html.js";
+
+// The chip's text and tooltip; null without a summary (full).
+export function chipModel(summary) {
+  if (!summary) return null;
+  const label = summary.label || summary.name;
+  const parts = [`Toolkit: ${label}, the tools this session declares.`];
+  if (summary.fallback) parts.push(`${summary.fallback}: every tool is declared (full) until it resolves.`);
+  if (Array.isArray(summary.left_out)) {
+    parts.push(summary.left_out.length ? `Not loaded: ${summary.left_out.join(", ")}.` : "Nothing left out.");
+  }
+  parts.push("/toolkit lists them; /toolkit NAME, add TOOL or remove TOOL changes them from the next turn.");
+  return { text: `tools ${label}${summary.fallback ? " ?" : ""}`, title: parts.join(" ") };
+}
+
+// The session bar's chip (a lit-html template; info_bar.js), nothing on
+// full.
+export function chipTemplate(summary) {
+  const chip = chipModel(summary);
+  if (!chip) return nothing;
+  return html`<span class="model tools-chip" title=${chip.title}>${chip.text}</span>`;
+}

data/lib/samagotchi/worker.rb

@@ -878,6 +878,8 @@ module Samagotchi
       # /reasoning-history or /model: the level the next turn runs under
       # (the web's chip); nil on a native host, which ignores it.
       event[:reasoning_history] = @engine.reasoning_history_explained&.summary if changed.intersect?(%i[reasoning_history model])
+      # /toolkit: what the next turn declares (the web's chip; nil on full).
+      event[:toolkit] = @engine.toolkit_summary if changed.include?(:toolkit)
       event[:confirm] = confirm.to_h if confirm
       event[:output_truncated] = true if text.length > COMMAND_OUTPUT_LIMIT
       @engine.announce(event)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.65.0
+  version: 0.66.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -190,6 +190,11 @@ files:
 - lib/samagotchi/bundles/claude-peer/scripts/chi-peer-SKILL.md
 - lib/samagotchi/bundles/claude-peer/scripts/pair
 - lib/samagotchi/bundles/claude-peer/skill_claude_peer.md
+- lib/samagotchi/bundles/codex-peer/manifest.yml
+- lib/samagotchi/bundles/codex-peer/plugin.rb
+- lib/samagotchi/bundles/codex-peer/scripts/chi-peer-SKILL.md
+- lib/samagotchi/bundles/codex-peer/scripts/pair
+- lib/samagotchi/bundles/codex-peer/skill_codex_peer.md
 - lib/samagotchi/bundles/coordinator/manifest.yml
 - lib/samagotchi/bundles/coordinator/plugin.rb
 - lib/samagotchi/bundles/coordinator/skill_coordinator.md
@@ -489,6 +494,8 @@ files:
 - lib/samagotchi/tool_row_fields.rb
 - lib/samagotchi/tool_runner.rb
 - lib/samagotchi/tool_view.rb
+- lib/samagotchi/toolkit.rb
+- lib/samagotchi/toolkit_command.rb
 - lib/samagotchi/tools/args.rb
 - lib/samagotchi/tools/ask_user_question.rb
 - lib/samagotchi/tools/builtin_calls.rb
@@ -543,6 +550,7 @@ files:
 - 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
 - lib/samagotchi/web/public/annotate_presets.js
 - lib/samagotchi/web/public/annotations.js
@@ -608,6 +616,7 @@ files:
 - lib/samagotchi/web/public/thinking_chip.js
 - lib/samagotchi/web/public/thinking_ticker.js
 - lib/samagotchi/web/public/timing.js
+- lib/samagotchi/web/public/toolkit_chip.js
 - lib/samagotchi/web/public/turn_events.js
 - lib/samagotchi/web/public/turn_html.js
 - lib/samagotchi/web/public/turn_model.js