samagotchi 0.65.0 → 0.67.0

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

@@ -67,7 +67,30 @@ export function turnRefs(chips) {
 }
 
 // Chips again for a prompt the worker handed back (its images are stored
-// already, so they need no upload).
+// already, so they need no upload: to that session).
 export function restoredChips(sessionId, images) {
-  return (images || []).filter((i) => i && i.file).map((ref) => ({ name: ref.name || "image", ref, src: imageUrl(sessionId, ref) }));
+  return (images || []).filter((i) => i && i.file)
+    .map((ref) => ({ name: ref.name || "image", ref, session: sessionId, src: imageUrl(sessionId, ref) }));
+}
+
+// A restored chip has no file of its own: its image, read back from where
+// its session stores it.
+async function fetchChipFile(src, name) {
+  const res = await fetch(src);
+  if (!res.ok) throw new Error(`Can't read ${name} again (${res.status})`);
+  const blob = await res.blob();
+  return new File([blob], name, { type: blob.type });
+}
+
+// Uploads the chips a turn to +sessionId+ needs: a ref is into one session's
+// image store (chip.session), so a chip uploaded to another one (a failed
+// send there, then a switch) goes up again, to this one. Sets each chip's
+// ref and session in place: a failed send keeps them for another try.
+export async function uploadChips(chips, sessionId, { upload, fetchFile = fetchChipFile }) {
+  for (const chip of chips || []) {
+    if (chip.ref && chip.session === sessionId) continue;
+    const file = chip.file || await fetchFile(chip.src, chip.name);
+    chip.ref = await upload(sessionId, file, chip.name);
+    chip.session = sessionId;
+  }
 }

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/llm_context_chip.js

@@ -14,7 +14,7 @@
 
 import { html, nothing, render } from "./vendor/lit-html.js";
 
-export const STRATEGIES = [
+const STRATEGIES = [
   { value: "none", label: "none" },
   { value: "stale", label: "stale" },
   { value: "stale,forget", label: "stale + forget (experimental)" },
@@ -144,7 +144,7 @@ export function choiceWords(choice) {
 
 // The strategy list, with the session's own value when it isn't one of them
 // (forget alone, a newer chi's layer).
-export function strategyOptions(chosen) {
+function strategyOptions(chosen) {
   if (chosen === DEFAULT || STRATEGIES.some((s) => s.value === chosen)) return STRATEGIES;
   return [...STRATEGIES, { value: chosen, label: chosen }];
 }

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

@@ -2,6 +2,8 @@
 // summaries (GET /api/events). The page shows an OS notification and a
 // title badge for what it returns, while the tab is not in front.
 
+import { clip } from "./format.js";
+
 // The bell's state. OS notifications need a secure context: on chi web
 // over http at a LAN address the API is missing or always denied, so the
 // bell is hidden there (the title badge still counts).
@@ -16,7 +18,7 @@ export function notifyState({ hasNotification, secureContext, permission, wanted
 // chi ran for a delegate child's report (last_turn origin delegate_report)
 // or an attached context change (context): nobody started it, so nobody
 // watched it.
-export const DONE_MIN_SECONDS = 10;
+const DONE_MIN_SECONDS = 10;
 const UNWATCHED_ORIGINS = ["delegate_report", "context"];
 
 // The step-limit question (kind "continue": a turn ran out of iterations
@@ -90,7 +92,7 @@ const cardKey = (sessionId, cardId) => `${sessionId}:card:${cardId}`;
 // @param prev the summary held before (null for a session not seen yet)
 // @param next the new summary (null when the session is gone)
 // @return [String] keys, maybe none
-export function closedKeys(prev, next) {
+function closedKeys(prev, next) {
   const keys = [];
   const q = prev?.pending_question;
   const nq = next?.pending_question;
@@ -147,7 +149,7 @@ export function trackAttention(state, type, data = {}) {
 // No question or answer text (it would show on a lock screen).
 export function attentionText(session, attention) {
   const name = String(session?.title || session?.first_preview || session?.last_prompt || "chi session").trim();
-  const title = name.length > 60 ? `${name.slice(0, 60)}…` : name;
+  const title = clip(name, 61);
   const seconds = Math.round(Number(session?.last_turn?.seconds) || 0);
   const body = {
     question: "needs an answer",
@@ -171,7 +173,7 @@ export function attentionText(session, attention) {
 // lowest claim (a tab id) shows it (4.11). Without BroadcastChannel every
 // tab goes on alone, at once.
 export const NOTIFY_CHANNEL = "chi-notify";
-export const NOTIFY_HOLD_MS = 300;
+const NOTIFY_HOLD_MS = 300;
 // How long a key seen in front is remembered (its frame may come late).
 const SEEN_TTL_MS = 10 * 60 * 1000;
 

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

@@ -70,7 +70,7 @@ export function approvalView(pq) {
   const reason = a.reason ? String(a.reason) : "(no reason given)";
   return {
     // A plugin tool's label ("chrome: screenshot"), as its row shows it;
-    // else the tool the call acts as (an MCP tool behind mcp_call).
+    // else the tool the call acts as (an MCP tool behind call_tool).
     tool: a.label || a.acts_as || a.tool || "",
     // A tool without a command or path (an MCP tool): its compact args.
     what: command || paths.join("\n") || a.args || "",

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

@@ -30,7 +30,7 @@ const SKIP = "pre, a, [data-ref-kind]";
 // The ref a match names: { path, line, endLine } or null. A path has a `/`
 // or an extension (`10:30` is a time, `host:8080` a port); line 0 is never
 // a ref; an end line not after the line is dropped.
-export function refOf(groups) {
+function refOf(groups) {
   const path = groups?.path || "";
   if (!path.includes("/") && !/\.[A-Za-z0-9]+$/.test(path)) return null;
   if (groups.from === undefined) return { path, line: null, endLine: null };

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

@@ -48,7 +48,17 @@ 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(),
+    // The event id (or, from an older worker, the event_seq) the session was
+    // rendered at (null: no live worker then), where a stream opened later
+    // has to start; set by the page's resync, not by the payload.
+    streamSeq: null,
+    // The stream was opened from 0 (a wake with no cursor to go on) and no
+    // new turn has started on it yet (app.js followWokenWorker).
+    streamFromGuess: false,
+    // When the info bar's "copy chi --attach" copied (its "copied ✓").
+    attachCopiedAt: 0,
   };
 }
 
@@ -64,6 +74,11 @@ export function sessionStateFrom(data) {
     served: s.served_model ? [s.served_model, s.served_model_for, s.served_expected_by || null] : null,
     dir: s.working_directory,
     owner: s.owner || null,
+    // Its live worker's chi and features (null and [] without one): a
+    // switch shows its stale-worker badge, task stop and queue at once,
+    // not at the session's next hub event (followSelectedSession).
+    workerVersion: s.worker_version || null,
+    workerFeatures: Array.isArray(s.worker_features) ? s.worker_features : [],
     timing: normalizeTiming(data.timing),
   };
   // The saved fill, so a reloaded or stopped session shows it before its
@@ -83,6 +98,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/session_title.js

@@ -1,4 +1,4 @@
-import { normalize } from "./format.js";
+import { clip, normalize } from "./format.js";
 
 // Where the open session's title shows: once on screen. Its strip card says
 // it when the strip is shown and has an `.active` card for it; otherwise
@@ -21,6 +21,5 @@ export function topBarTitle({ title, cardShown, stripHidden, allView }) {
 export function tabTitle({ title, base }) {
   const text = normalize(title);
   if (!text) return base;
-  const cut = text.length > TAB_TITLE_CHARS ? `${text.slice(0, TAB_TITLE_CHARS)}…` : text;
-  return `${cut} · ${base}`;
+  return `${clip(text, TAB_TITLE_CHARS + 1)} · ${base}`;
 }

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

@@ -188,14 +188,6 @@ export function familySummary(f) {
   return delegatesSummary(f.members.map((m) => m.session));
 }
 
-// The chip's words: "▸ 3 delegates · 1 live · 1 waiting".
-export function familyChipText(sum) {
-  if (!sum) return "";
-  const waiting = sum.counts?.waiting || 0;
-  return [`\u25B8 ${sum.total} ${sum.total === 1 ? "delegate" : "delegates"}`,
-    sum.live ? `${sum.live} live` : "", waiting ? `${waiting} waiting` : ""].filter(Boolean).join(" \u00b7 ");
-}
-
 // Whether a family's list is open: the user's toggle (+toggles+, head id →
 // bool) wins; else open when a member waits on the user (the head's own
 // wait is on its card already) or a search matched a member.

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

@@ -15,9 +15,9 @@ const FILE_TOOLS = new Set(["read", "edit", "write"]);
 const TASK_TOOLS = new Set(["task_wait", "task_get", "task_stop"]);
 const TRAIL = 3;
 // The hand-off waits this long after the stage was last in use.
-export const QUIET_MS = 1500;
+const QUIET_MS = 1500;
 // A touch, wheel or scroll counts as use this long (phones have no hover).
-export const TOUCH_MS = 4000;
+const TOUCH_MS = 4000;
 
 // One headline sentence as plain text: the markdown a streaming answer
 // carries (headings, quotes, bullets, table pipes, emphasis, code ticks,

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/strip.js

@@ -3,9 +3,9 @@ import { waitingOn } from "./notify.js";
 // How many session cards the top strip shows for its width in px: a card
 // needs about 360 px plus a 12 px gap next to the 150 px "All sessions" tile;
 // never fewer than 3 (narrow screens scroll them), never more than 6.
-export const STRIP_TILE_PX = 150;
-export const STRIP_GAP_PX = 12;
-export const STRIP_CARD_PX = 360;
+const STRIP_TILE_PX = 150;
+const STRIP_GAP_PX = 12;
+const STRIP_CARD_PX = 360;
 
 export function stripColumns(width) {
   const fit = Math.floor(((width || 0) - STRIP_TILE_PX - STRIP_GAP_PX) / (STRIP_CARD_PX + STRIP_GAP_PX));

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

@@ -6,9 +6,10 @@
 // button disabled. Pure but for the injected calls, so `node --test`
 // covers it; turn_view.js and stage_view.js draw the button.
 import { stopTask as postStopTask } from "./data.js";
+import { clip } from "./format.js";
 
 // What a worker that has the route names in its sidecar features.
-export const TASK_STOP_FEATURE = "task_stop";
+const TASK_STOP_FEATURE = "task_stop";
 const COMMAND_SHOWN = 120;
 
 // The task a row's button would stop: a running task_wait's (its server
@@ -61,7 +62,7 @@ export function taskCommand(gens, taskId) {
 
 export function confirmText(taskId, command) {
   const line = String(command || "").replace(/\s+/g, " ").trim();
-  const what = !line ? taskId : line.length > COMMAND_SHOWN ? `${line.slice(0, COMMAND_SHOWN - 1)}…` : line;
+  const what = line ? clip(line, COMMAND_SHOWN) : taskId;
   return `Stop task ${what}?`;
 }
 

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/web/public/turn_events.js

@@ -26,7 +26,7 @@ export function workerGoneText({ turnRunning, stopped = false }) {
 
 // How long a turn's answer waits for the after_turn hooks' answer_display
 // before the page stops waiting and pops what it has (4.14).
-export const DISPLAY_WAIT_MS = 20000;
+const DISPLAY_WAIT_MS = 20000;
 
 // The wait between a turn_completed with display_pending and its
 // answer_display. The worker can die in between (a crash, a stop, an idle

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

@@ -8,7 +8,7 @@ import { html, nothing, render } from "./vendor/lit-html.js";
 import { commandBlockTemplate, rowHover } from "./command_view.js";
 import { copySource } from "./copy.js";
 import { activityDiffTemplate } from "./diff_view.js";
-import { steerSender } from "./format.js";
+import { clip, steerSender } from "./format.js";
 import { rowTitleRef } from "./refs.js";
 import { readLinesTemplate } from "./read_view.js";
 import { STOPPED_LINE_CLASS, cancelLineText, formatDuration } from "./timing.js";
@@ -105,7 +105,7 @@ export function toolRowInnerTemplate(row, { thumbs = () => nothing, stop = nothi
   const duration = formatDuration(row.duration_ms);
   const full = row.status === "running" ? "" : String(row.output || "").replace(/^\[[^\]]*\]\s*/, "");
   const output = full
-    ? html`<div class="activity-output" title=${full}>${full.length > 300 ? `${full.slice(0, 300)}…` : full}</div>`
+    ? html`<div class="activity-output" title=${full}>${clip(full, 301)}</div>`
     : nothing;
   const status = statusParts(row.status, { noMatch: !!row.no_match });
   return html`${statusMarkTemplate(status)}<span class="activity-tool">${toolName(row)}</span>${params}${stop}${alias}${statusWordTemplate(status)}${duration ? html`<span class="activity-duration">${duration}</span>` : nothing}${commandBlockTemplate(row.view, row.title)}${llmEditTemplate(row)}${output}${full ? readLinesTemplate(row) : nothing}${row.images?.length ? thumbs(row.images) : nothing}${row.diff ? activityDiffTemplate(row.diff) : nothing}`;

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

@@ -25,7 +25,7 @@
 // - the turn's end closes the current gen.
 import { addCompleted, addStarted, newActivity, toolName } from "./activity.js";
 import { tallyText } from "./tally.js";
-import { leadTrimmed } from "./format.js";
+import { clip, leadTrimmed } from "./format.js";
 
 const LABEL_MAX = 80;
 const LABEL_TOOLS = 3;
@@ -194,7 +194,7 @@ function isStep(gen) {
 }
 
 function cut(line) {
-  return line.length > LABEL_MAX ? `${line.slice(0, LABEL_MAX).trimEnd()}…` : line;
+  return clip(line, LABEL_MAX + 1);
 }
 
 // "3 tool calls (1 failed)": failed = status error, the tally's predicate

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

@@ -58,7 +58,7 @@ function closedLabel(gen) {
 // that would repeat "thinking"). +body+ is the text: a string, or the live
 // step's Text node (appended by delta: a selection in it survives).
 // +cls+ "bubble thinking" is a plain answer's collapsed thinking block.
-export function thinkingTemplate({ body, wrapped = true, line = null, cls = "thinking", on = {} }) {
+function thinkingTemplate({ body, wrapped = true, line = null, cls = "thinking", on = {} }) {
   const inner = html`<div class="thinking-body">${body}</div>`;
   if (!wrapped) return inner;
   const summary = line === null ? "thinking" : html`<span class="thinking-tag">thinking · </span>${line}`;

data/lib/samagotchi/web/server.rb

@@ -241,10 +241,6 @@ module Samagotchi
         knows_dir(InfoProbe.call(host, port, timeout: timeout))
       end
 
-      def self.probe_verdict(status, body)
-        knows_dir(InfoProbe.verdict(status, body))
-      end
-
       def self.knows_dir(info)
         info.is_a?(Hash) && !Array(info["features"]).include?("dir") ? :other : info
       end

data/lib/samagotchi/worker.rb

@@ -218,7 +218,7 @@ module Samagotchi
     # The session, its Engine and what runs its turns, before anyone can
     # reach it.
     def start
-      # The wake turns' budget (delegate reports, attached context), from now.
+      # The wake turns' budget (delegate reports, attached context, peers), from now.
       @wakes = WorkerWakes.new(grace: WAKE_START_GRACE)
       # This worker holds the session now (a continue's starting marker held
       # off any other until it did), and a continue that died moving
@@ -272,7 +272,8 @@ module Samagotchi
                                         predecessor: @session.continues)
       # Its attached context's notes (ContextSources).
       @context_absorber = ContextAbsorber.new(session_id: @session_id, state_dir: @state_dir,
-                                              project_root: @session.project_root)
+                                              project_root: @session.project_root,
+                                              peer_sources: @engine.peer_sources, peer_turns: -> { @wakes.peer_turns })
       # What comes in between turns, and how each kind is saved.
       @inbound = WorkerInbound.new(session: @session, state_dir: @state_dir, session_dir: @session_dir, engine: @engine,
                                    context_absorber: @context_absorber, wakes: @wakes,
@@ -496,13 +497,14 @@ module Samagotchi
     # A turn nobody typed for a changed source (a context wake): a continue
     # turn from context:<name> whose first message is the wake note already
     # in the conversation (named by +turn_id+), on the same rules as a
-    # delegate report's wake turn: it counts toward session.max_wakes, and
-    # a failure goes back to before the turn (the note stays, as a plain
-    # one: WorkerInbound#unmark_wake) and pauses wakes until a human's input.
+    # delegate report's wake turn: it counts toward session.max_wakes (a
+    # peer's answer toward context.peer_turns too), and a failure goes back
+    # to before the turn (the note stays, as a plain one:
+    # WorkerInbound#unmark_wake) and pauses wakes until a human's input.
     # +context_wake+: a WorkerInbound::ContextWake.
     def run_context_wake_turn(context_wake)
       name = context_wake.name
-      Log.info(:worker, "context_wake_turn", name: name, in_a_row: @wakes.count!)
+      Log.info(:worker, "context_wake_turn", name: name, in_a_row: @wakes.count!(peer: context_wake.peer?))
       @turn_flow.before_prompt_turn
       run_engine_turn(nil, continue: true, origin: context_wake.origin,
                            id: context_wake.turn_id, max_iterations: IterationLimit.for) do |result, error|
@@ -878,6 +880,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)
@@ -1218,12 +1222,13 @@ module Samagotchi
 
     # A human's input (ClientId.human?) un-archives the session;
     # a delegate's, a plugin's or a reminder's doesn't.
-    # It also resets the delegate-report wakes (budget and pause).
+    # It also resets the wakes (budget and pause); input typed in the web or
+    # a TUI the peer wakes too (chi send doesn't: a peer can run it).
     def user_input(client_id)
       return unless ClientId.human?(client_id)
 
       ArchiveStore.user_input(@session_id, state_dir: @state_dir)
-      @wakes.human_input!
+      @wakes.human_input!(interactive: ClientId.interactive?(client_id))
     end
 
     def stopped_on_disk?

data/lib/samagotchi/worker_inbound.rb

@@ -4,12 +4,14 @@ require "fileutils"
 require "securerandom"
 require "time"
 
+require_relative "child_reports"
 require_relative "client_id"
 require_relative "config"
 require_relative "context_note"
 require_relative "log"
 require_relative "session"
 require_relative "session_inbox"
+require_relative "worker_wakes"
 
 module Samagotchi
   # What comes into a worker's session between turns, each kind with its
@@ -43,6 +45,8 @@ module Samagotchi
     # the turn +turn_id+.
     ContextWake = Data.define(:delivery, :turn_id) do
       def name = delivery.name
+      # For a peer agent's answer (its own budget, WorkerWakes#peer_open?).
+      def peer? = !delivery.peer.nil?
       def origin = { client_id: "#{ClientId::CONTEXT_PREFIX}#{name}" }
     end
 
@@ -230,14 +234,42 @@ module Samagotchi
     # context.wake is on, the wake budget is open (WorkerWakes#context_open?:
     # no continue offer, not paused, under session.max_wakes, past the start
     # grace) and the source hasn't woken the session in the last
-    # CONTEXT_WAKE_WINDOW. The others stay plain notes. Within the start
-    # grace a change is a note: it came while the session was away.
+    # CONTEXT_WAKE_WINDOW; a peer's answer (Delivery#peer) has no window but
+    # the peer budget (WorkerWakes#peer_open?). The others stay plain notes.
+    # Within the start grace a change is a note: it came while the session
+    # was away. A peer's answer held by either budget is announced once.
     def context_wake_for(batch, now: Time.now)
       candidates = batch.deliveries.select(&:wake_note)
       return nil if candidates.empty? || !context_wakes_on?
-      return nil unless @wakes.context_open?(awaiting_continue: @awaiting_continue.call, names: candidates.map(&:name))
 
-      candidates.find { |delivery| !woke_lately?(delivery.subscription, now) }
+      unless @wakes.context_open?(awaiting_continue: @awaiting_continue.call, names: candidates.map(&:name))
+        peer_held(candidates.find(&:peer), ChildRing::MAX_WAKES_KEY) if @wakes.spent?
+        return nil
+      end
+
+      held = []
+      waking = candidates.select do |delivery|
+        next !woke_lately?(delivery.subscription, now) unless delivery.peer
+
+        next true if @wakes.peer_open?(name: delivery.name)
+
+        held << delivery
+        false
+      end
+      peer_held(held.first, WorkerWakes::PEER_TURNS_KEY)
+      waking.first
+    end
+
+    # A peer's answer waits as a note: the UIs hear it once per
+    # interactive input (WorkerWakes#notice_peer_budget!). +key+: the
+    # budget that holds it.
+    def peer_held(delivery, key)
+      return unless delivery && @wakes.notice_peer_budget!
+
+      turns = key == ChildRing::MAX_WAKES_KEY ? @wakes.max : @wakes.peer_turns
+      @engine.announce(type: :hook_notice, hook: "context", level: :info, between_turns: true,
+                       text: "#{delivery.peer} answered again; it waits as a note for your next message " \
+                             "(#{turns} wake turn#{"s" if turns != 1} in a row, #{key})")
     end
 
     def context_wakes_on? = Config.get("context.wake") != false