samagotchi 0.122.0 → 0.124.0

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

@@ -88,6 +88,23 @@ export function listModels(opts = {}) {
   return api("/api/models", opts);
 }
 
+// Update chi to this exact version; progress and component rows arrive as
+// `chi_update` events on the page's events stream.
+export function updateChi(version, opts = {}) {
+  return api("/api/update", { method: "POST", body: JSON.stringify({ version }), ...opts });
+}
+
+// Restart every worker running an older chi; results arrive as
+// `chi_update` events on the page's events stream.
+export function restartWorkers(opts = {}) {
+  return api("/api/update/restart_workers", { method: "POST", body: JSON.stringify({}), ...opts });
+}
+
+// Ask this chi web to shut down and exec the installed version.
+export function restartWeb(opts = {}) {
+  return api("/api/update/restart_web", { method: "POST", body: JSON.stringify({}), ...opts });
+}
+
 // The prompt history the composer's ↑/↓ walk (the TUI's too), oldest first.
 export function fetchHistory(opts = {}) {
   return api("/api/history", opts).then((j) => (Array.isArray(j.entries) ? j.entries : []));

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

@@ -20,9 +20,10 @@
 // read-only review turn): while the composer holds it (hold(), till it is
 // sent, emptied or Esc'd) Enter queues it, and the line says so.
 //
-// While a participant's review turn runs, the worker queues the owner's
-// input behind it whatever it asks (never a steer or a cut into a
-// read-only turn): Enter queues, no cut is offered, and the line says so.
+// While a participant's turn runs (a review turn, or a working session's
+// pair turn), the worker queues the owner's input behind it whatever it
+// asks (never a steer or a cut into their turn): Enter queues, no cut is
+// offered, and the line says so.
 //
 // deliveryLine is pure (node tests); deliveryLineTemplate is its lit view.
 import { html, nothing, render } from "./vendor/lit-html.js";
@@ -41,9 +42,10 @@ export const APPLY_QUEUES = "your Apply turn queues for after this turn · Esc t
 export const APPLY_QUEUES_SHORT = "Apply: queued after the turn";
 // The same to a worker without the delivery feature: Enter refuses it.
 export const APPLY_CANT_QUEUE = "your Apply turn can't queue on this worker (restart it) · Esc to steer it in instead";
-// The line while a participant's review turn runs (the worker queues).
-export const PARTICIPANT_TURN_QUEUES = "goes in as your own turn after this participant's review turn";
-export const PARTICIPANT_TURN_QUEUES_SHORT = "after their review turn";
+// The line while a participant's turn runs (the worker queues), whichever
+// mode: review or pair.
+export const PARTICIPANT_TURN_QUEUES = "goes in as your own turn after this participant's turn";
+export const PARTICIPANT_TURN_QUEUES_SHORT = "after their turn";
 // The idle row: the keys (the placeholder's hint before the row existed).
 export const IDLE_HINT = "Enter to send · Shift+Enter newline · ↑ history";
 

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

@@ -1182,6 +1182,23 @@ body.has-session.composer-folded #infoBar{border-top-color:transparent}
 .ss-foot{font-size:11.5px;color:var(--text-muted);margin-top:6px}
 .ctx-pop-head{display:flex;align-items:baseline;gap:8px}
 .ctx-pop-head strong{font-family:ui-monospace,monospace;color:var(--text-bright)}
+#updateSheet{width:calc(100vw - 32px);max-width:560px;max-height:calc(100dvh - 32px);overflow:auto;margin:auto;padding:14px 16px;border:1px solid var(--border-strong);border-radius:14px;background:var(--bg-panel);color:var(--text);box-shadow:var(--toast-shadow)}
+#updateSheet::backdrop{background:var(--backdrop);backdrop-filter:blur(3px)}
+.us-head{display:flex;align-items:center;gap:10px}
+.us-head h2{flex:1;min-width:0;font-size:16px;font-weight:650;color:var(--text-bright);overflow-wrap:anywhere}
+.us-close{flex:none;padding:0 6px;background:transparent;color:var(--text-muted);font-size:19px;line-height:1.2}
+.us-status{margin:8px 0;color:var(--text-2);font-size:13px;overflow-wrap:anywhere}
+.us-rows{display:flex;flex-direction:column;gap:7px;list-style:none;margin:10px 0;padding:0}
+.us-row{min-width:0;padding:9px 10px;border-radius:9px;background:var(--bg-inset);overflow-wrap:anywhere}
+.us-row-head{display:flex;align-items:baseline;justify-content:space-between;gap:8px;min-width:0}
+.us-row-head strong{flex:none;max-width:100%;color:var(--text-bright);overflow-wrap:anywhere}
+.us-row-head span{flex:1 1 0;min-width:0;text-align:right;color:var(--text-2);font-size:12px;overflow-wrap:anywhere}
+.us-detail{margin-top:4px;color:var(--text-muted);font-size:12px;overflow-wrap:anywhere}
+.us-kept{margin-top:6px;color:var(--warn-text);font-size:12px}
+.us-kept ul{margin:3px 0 0;padding-left:18px;color:var(--text-2)}
+.us-kept li{overflow-wrap:anywhere}
+.us-foot{display:flex;flex-wrap:wrap;justify-content:flex-end;gap:8px;margin-top:10px}
+@media(max-width:600px){#updateSheet{position:fixed;inset:auto 8px 8px;width:auto;max-width:none;max-height:min(80dvh,calc(100dvh - 16px));margin:0}}
 .ctx-pop-kind{font-size:11px;color:var(--text-muted)}
 .ctx-pop-close{margin-left:auto;padding:0 6px;border:none;background:transparent;color:var(--text-muted);font-size:16px;line-height:1}
 .ctx-pop-close:hover{color:var(--text)}
@@ -1448,8 +1465,9 @@ body.all-view #center, body.all-view #topStrip{display:none}
 /* bottom: above the session's composer card when one shows (--toast-bottom, dock_reserve.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;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-item{display:flex;flex-wrap:wrap;gap:8px 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-message{flex:1 1 180px;min-width:0;overflow-wrap:anywhere}
+#toast .toast-action{flex:0 0 auto;white-space:nowrap;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)}
 /* Each row is as tall as its tallest card. An `auto` row in a grid that overflows its
@@ -1608,6 +1626,7 @@ a{color:var(--accent)}
     <div id="allList"></div>
   </section>
 </main>
+<dialog id="updateSheet" aria-labelledby="updateSheetTitle"></dialog>
 <div id="toast" role="status" aria-live="polite" hidden></div>
 <script type="module" src="/assets/app.js"></script>
 </body>

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

@@ -200,7 +200,7 @@ button.small{font-size:12px;padding:2px 8px}
     </div>
     <div class="p-foot">
       <div class="p-usage" id="usage" aria-label="Your usage" hidden></div>
-      <div class="p-hint">⏎ sends, ⇧⏎ a new line, ↑ an earlier comment. The model answers in a read-only turn; the owner sees everything.</div>
+      <div class="p-hint" id="hint">⏎ sends, ⇧⏎ a new line, ↑ an earlier comment. The model answers in a read-only turn; the owner sees everything.</div>
     </div>
   </div>
 </footer>

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

@@ -12,9 +12,11 @@
 // (spend vs cap, queue, link expiry, model). The owner's participant view
 // mounts none.
 import {
-  authorColor, participantAuthor, authorLabel, toolLine, toolsSummary, refusalText, dequeueText, endedText, streamURL, reloads, endsLiveTurn, liveFrom, applyLive,
+  authorColor, participantAuthor, authorLabel, toolLine, refusalText, dequeueText, endedText, streamURL, reloads, endsLiveTurn, liveFrom, applyLive,
   liveText, withToolSteps, pickSubject, subjectBody, subjectsKey, narrowView, retryDelay, retries, threadGaps, usageItems,
+  modeCopy,
 } from "./participant_model.js";
+import { toolsOverview } from "./tools_overview.js";
 import { fullTime } from "./format.js";
 import { createAuthLost, lostAnswer } from "./auth_lost.js";
 import { REPLACE_SESSION_TEXT, fragmentCode, tradeFragmentCode } from "./token_fragment.js";
@@ -40,7 +42,6 @@ const $ = (id) => document.getElementById(id);
 const body = document.body.dataset;
 const ownerView = body.viewer === "owner";
 const sessionId = body.session || new URLSearchParams(location.hash.slice(1)).get("s") || "";
-const phone = window.matchMedia("(max-width: 640px)");
 
 let data = null;
 let live = null;
@@ -209,7 +210,9 @@ function render() {
     return chip;
   }));
   $("viewBanner").hidden = !ownerView;
-  $("note").textContent = ownerView ? "" : "You can comment and ask; the model answers in a turn that can only read. The owner sees everything.";
+  const copy = modeCopy(viewer.mode);
+  $("note").textContent = ownerView ? "" : copy.note;
+  $("hint").textContent = `⏎ sends, ⇧⏎ a new line, ↑ an earlier comment. ${copy.hint}`;
   $("head").hidden = false;
   $("main").hidden = false;
   renderPlan();
@@ -284,7 +287,7 @@ function messageNode(message) {
     const who = el("div", "p-who");
     who.append(el("b", "", authorLabel(message)));
     if (message.merged) who.append(el("span", "p-tag", "added mid-turn"));
-    if (message.author) who.append(el("span", "p-tag", "review"));
+    if (message.author) who.append(el("span", "p-tag", modeCopy(message.participant_mode).tag));
     node.append(who);
     const text = message.content + (message.images ? `\n[${message.images} image${message.images > 1 ? "s" : ""}]` : "");
     node.append(el("div", "p-bubble", text));
@@ -305,16 +308,11 @@ function messageNode(message) {
   return node;
 }
 
-// +open+: the list's state as the reader left it, else open when short on
-// a wide screen.
+// +open+: the overview's state as the reader left it.
 function toolsNode(rows, open = null) {
-  if (rows.length === 1) {
-    const row = rows[0];
-    return el("div", `p-tools p-tool-one${row.status === "error" ? " error" : row.status === "running" ? " running" : ""}`, `↳ ${toolLine(row)}`);
-  }
   const details = el("details", "p-tools");
-  details.open = open ?? (!phone.matches && rows.length <= 4);
-  details.append(el("summary", "", `${rows.length} tool${rows.length > 1 ? "s" : ""}: ${toolsSummary(rows)}`));
+  details.open = open ?? false;
+  details.append(el("summary", "", toolsOverview(rows)));
   const list = el("ul");
   for (const row of rows) list.append(el("li", row.status === "error" ? "error" : row.status === "running" ? "running" : "", toolLine(row)));
   details.append(list);

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

@@ -38,14 +38,6 @@ export function toolLine(row) {
   return row?.path ? `${row.tool} ${row.path}` : String(row?.tool || "tool");
 }
 
-// A tool rows' summary: "read docs/plan.md", "read docs/plan.md + 2 more".
-export function toolsSummary(rows) {
-  const list = Array.isArray(rows) ? rows : [];
-  if (list.length === 0) return "";
-  const first = toolLine(list[0]);
-  return list.length === 1 ? first : `${first} + ${list.length - 1} more`;
-}
-
 // The conversation with each run of text-less tool steps (a reply that
 // only called tools) folded into the next reply's rows, or one row group
 // when no reply follows: one "3 tools: …" line instead of three.
@@ -271,6 +263,26 @@ export function leftText(iso, now = Date.now()) {
   return `${Math.max(1, Math.floor(left / MINUTE_MS))} min left`;
 }
 
+// What the page says a participant's turn does, by the session's mode
+// (viewer.mode: ParticipantMode.live on the server): a review turn only
+// reads; a pair turn (a working session's) acts with the session's tools
+// under the owner's guardrails. +tag+ is a message's: its own stamp
+// (participant_mode), a message without one a review's.
+export const MODE_COPY = {
+  review: {
+    note: "You can comment and ask; the model answers in a turn that can only read. The owner sees everything.",
+    hint: "The model answers in a read-only turn; the owner sees everything.",
+    tag: "review",
+  },
+  pair: {
+    note: "You can ask the model to work in this session: your turns use its tools, writes included, under the owner's "
+      + "guardrails, and what needs approval goes to the owner. The owner sees everything.",
+    hint: "The model works in this session; the owner approves what needs it and sees everything.",
+    tag: "pair",
+  },
+};
+export const modeCopy = (mode) => MODE_COPY[mode] || MODE_COPY.review;
+
 export function usageItems(usage, now = Date.now()) {
   if (!usage || typeof usage !== "object") return [];
   const items = [];

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

@@ -25,15 +25,35 @@ export function participantName(author) {
 
 // A participant's badge: {author, name, color}, and unnamed: true when
 // neither the prompt nor the list named them yet; null for the owner's.
-export function authorBadge(author, name = null) {
+// +mode+: the turn's participant_mode stamp ("review", "pair"; the
+// message's, or turn_started's), kept as mode: when known.
+export function authorBadge(author, name = null, mode = null) {
   if (!author || author === "owner") return null;
   const known = name || participantName(author);
-  return { author, name: known || UNNAMED, color: authorColor(author), ...(known ? {} : { unnamed: true }) };
+  return { author, name: known || UNNAMED, color: authorColor(author), ...(known ? {} : { unnamed: true }), ...(mode ? { mode } : {}) };
 }
 
-// A badge's text and tooltip (turn_html.js userBubbleTemplate).
-export const authorBadgeText = (name) => `${name} · review`;
-export const authorBadgeTitle = (name) => `A review comment from ${name}, a participant: its turn could only read`;
+// A badge's text and tooltip (turn_html.js userBubbleTemplate), by the
+// turn's mode: a pair turn (a working session's) acted with the session's
+// tools; a review turn, or one whose mode isn't known (a queued prompt, a
+// message from before the stamp), could only read.
+export const PAIR = "pair";
+export const authorBadgeText = (name, mode = null) => (mode === PAIR ? `${name} · pair` : `${name} · review`);
+export const authorBadgeTitle = (name, mode = null) => (mode === PAIR
+  ? `A turn from ${name}, a participant: it acted with this session's tools, its asks came to you`
+  : `A review comment from ${name}, a participant: its turn could only read`);
+
+// The badge on +bubble+ (a prompt drawn before its turn started) takes the
+// turn's +mode+ once turn_started names it.
+export function setBadgeMode(bubble, mode) {
+  const badge = bubble?.querySelector?.(".author-badge");
+  if (!badge || !mode) return;
+  bubble.dataset.participantMode = mode;
+  if (badge.dataset.unnamed) return;
+  const name = participantName(bubble.dataset.author) || badge.textContent.replace(/ · (review|pair)$/, "");
+  badge.textContent = authorBadgeText(name, mode);
+  badge.title = authorBadgeTitle(name, mode);
+}
 
 // The badges under +root+ drawn before the list named their participant
 // (data-unnamed) take the name now known. Bubbles are drawn once
@@ -42,10 +62,11 @@ export const authorBadgeTitle = (name) => `A review comment from ${name}, a part
 export function nameUnnamedBadges(root) {
   let named = 0;
   for (const badge of root?.querySelectorAll?.(".author-badge[data-unnamed]") || []) {
-    const name = participantName(badge.closest("[data-author]")?.dataset.author);
+    const bubble = badge.closest("[data-author]");
+    const name = participantName(bubble?.dataset.author);
     if (!name) continue;
-    badge.textContent = authorBadgeText(name);
-    badge.title = authorBadgeTitle(name);
+    badge.textContent = authorBadgeText(name, bubble?.dataset.participantMode);
+    badge.title = authorBadgeTitle(name, bubble?.dataset.participantMode);
     badge.removeAttribute("data-unnamed");
     named += 1;
   }

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

@@ -181,22 +181,30 @@ function inviteTemplate(invite, { canShare }) {
     ${invite.qr_svg ? html`<div class="pp-qr" .innerHTML=${invite.qr_svg}></div>` : nothing}</div>`;
 }
 
+// The empty list's line, by the session's mode.
+export const EMPTY_REVIEW = "Nobody yet. Invite a person (or an agent) to review: their comments become read-only review turns; you see and approve everything.";
+export const EMPTY_PAIR = "Nobody yet. Invite a person (or an agent) to work with you here: their turns act with this session's tools under your guardrails, and their asks come to you.";
+
 // The popover's content: the participants, the Invite form (or the link it
 // gave), the participant view.
 // +working+: the server's warning for a session that isn't a review session
 // (shown before the Invite, with Start a review of it), null for one.
+// +pair+: a participant invited now gets pair turns (the list's mode: a
+// working session on a worker with pair turns): the empty list says their
+// turns act; otherwise (a review session, an older worker) that they read.
 // +identityHeader+: the header chi web's auth proxy names the signed-in
 // user in (the list's identity_header), null without one: then the Invite
 // has no email field (a bound link could never open).
 export function panelTemplate(grants, { now, sessionId, invite = null, error = null, capFor = null, canShare = false,
-                                        busy = false, working = null, reviewing = false, identityHeader = null } = {}) {
+                                        busy = false, working = null, reviewing = false, identityHeader = null,
+                                        pair = false } = {}) {
   const rows = (grants || []).map((g) => rowModel(g, now));
   const active = rows.filter((row) => row.active);
   const ended = rows.filter((row) => !row.active);
   return html`<div class="ctx-pop-head"><strong>Participants</strong><span class="ctx-pop-kind">this session</span
     ><button type="button" class="ctx-pop-close" data-act="close" aria-label="Close">×</button></div>
     ${active.length ? html`<ul class="pp-list">${active.map((row) => rowTemplate(row, { capFor }))}</ul>`
-      : html`<div class="ctx-pop-meta">Nobody yet. Invite a person (or an agent) to review: their comments become read-only review turns; you see and approve everything.</div>`}
+      : html`<div class="ctx-pop-meta">${pair ? EMPTY_PAIR : EMPTY_REVIEW}</div>`}
     ${ended.length ? html`<details class="pp-ended"><summary>Ended (${ended.length})</summary><ul class="pp-list">${
       ended.map((row) => rowTemplate(row, { capFor }))}</ul></details>` : nothing}
     <div class="ctx-pop-error" role="alert" ?hidden=${!error}>${error || ""}</div>
@@ -233,6 +241,9 @@ export function createParticipantsControl({ el, session, api, onChange = () => {
   // The open session's share warning (GET …/participants), null for a
   // review session.
   let working = null;
+  // What a participant invited now gets (GET …/participants mode: "pair" or
+  // "review", the server's ReviewStart.share_terms), never guessed from the warning.
+  let inviteMode = null;
   // The header chi web's proxy names the user in (GET …/participants), null
   // without one: the Invite's email field.
   let identityHeader = null;
@@ -268,7 +279,7 @@ export function createParticipantsControl({ el, session, api, onChange = () => {
 
   function draw() {
     render(panelTemplate(grants, { now: clock(), sessionId: session(), invite, error, capFor, busy,
-                                   working: startReview ? working : null, reviewing: reviewing(), identityHeader,
+                                   working: startReview ? working : null, pair: inviteMode === "pair", reviewing: reviewing(), identityHeader,
                                    canShare: typeof win.navigator?.share === "function" }), shell.pop);
     shell.replace();
   }
@@ -277,6 +288,7 @@ export function createParticipantsControl({ el, session, api, onChange = () => {
     if (!id) {
       grants = null;
       working = null;
+      inviteMode = null;
       loadedFor = null;
       setParticipantNames([]);
       onChange();
@@ -287,6 +299,7 @@ export function createParticipantsControl({ el, session, api, onChange = () => {
       if (id !== session()) return;
       grants = Array.isArray(body.participants) ? body.participants : [];
       working = typeof body.warning === "string" ? body.warning : null;
+      inviteMode = typeof body.mode === "string" ? body.mode : null;
       identityHeader = typeof body.identity_header === "string" && body.identity_header ? body.identity_header : null;
       loadedFor = id;
       if (setParticipantNames(grants)) onNames();
@@ -296,6 +309,7 @@ export function createParticipantsControl({ el, session, api, onChange = () => {
       if (loadedFor !== id) {
         grants = [];
         working = null;
+        inviteMode = null;
         setParticipantNames([]);
       }
     }

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

@@ -63,10 +63,19 @@ export function relayView(pq) {
   };
 }
 
-// @return {null | {tool, what, isCommand, where, why, paths?, preview?, delegate?}};
+// Who asks when a participant's turn asks (approval.author, Approval.payload):
+// their name, else their id; null for the owner's own turns.
+export function approvalAsker(pq) {
+  const a = (pq && pq.approval) || {};
+  if (!a.author) return null;
+  return a.author_name ? String(a.author_name) : String(a.author).replace(/^p:/, "");
+}
+
+// @return {null | {tool, what, isCommand, where, why, paths?, preview?, delegate?, asker?}};
 // paths are what +what+ joins when it shows paths (the card draws a ref
 // for each); preview is an edit/write's dry-run diff (diff_view.js draws
-// it); delegate is relayView's, for a delegate's approval
+// it); delegate is relayView's, for a delegate's approval; asker is
+// approvalAsker's, for a participant's turn's ask
 export function approvalView(pq) {
   if (!isApproval(pq)) return null;
   const a = pq.approval || {};
@@ -94,6 +103,7 @@ export function approvalView(pq) {
     why: `${reason} (${who})`,
     ...(a.preview && typeof a.preview === "object" ? { preview: a.preview } : {}),
     ...(relayView(pq) ? { delegate: relayView(pq) } : {}),
+    ...(approvalAsker(pq) ? { asker: approvalAsker(pq), askedBy: String(a.asked_by || "") } : {}),
   };
 }
 

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

@@ -320,6 +320,13 @@ export function createQuestionCards({
     box.className = "approval-details";
     // A delegate's approval: who asks, and its task.
     if (view.delegate) box.appendChild(renderDelegateLine(view.delegate));
+    // A participant's turn asks: the server's line (Approval::ASKED_BY), else their name.
+    if (view.asker) {
+      const who = doc.createElement("div");
+      who.className = "approval-delegate approval-asker";
+      who.textContent = view.askedBy || view.asker;
+      box.appendChild(who);
+    }
     const tool = doc.createElement("div");
     tool.className = "approval-tool";
     tool.textContent = view.tool;

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

@@ -53,6 +53,7 @@ import {
 } from "./turn_events.js";
 import { commandView, drawCommandBubble, historyHasCommandBubble } from "./commands.js";
 import { keepEarlyRestore, restoreAction } from "./restore.js";
+import { PAIR, setBadgeMode } from "./participant_names.js";
 
 export function createStreamHandlers(deps) {
   const {
@@ -159,9 +160,12 @@ export function createStreamHandlers(deps) {
       liveTurn.cutAfter = data.cut_after ?? null;
       liveTurn.serverGen = null;
       // A participant's review turn: its id and author, for Apply at its end
-      // (turn_completed names neither).
+      // (turn_completed names neither). A pair turn acted itself: no Apply.
       const author = data.author || data.origin?.author;
-      liveTurn.review = author && author !== "owner" && data.turn_id ? { turn_id: data.turn_id, author, author_name: data.author_name } : null;
+      const pair = data.participant_mode === PAIR;
+      liveTurn.review = author && author !== "owner" && data.turn_id && !pair ? { turn_id: data.turn_id, author, author_name: data.author_name } : null;
+      // Its prompt drawn while queued takes the turn's mode now.
+      if (data.participant_mode) setBadgeMode(promptBubble, data.participant_mode);
       // The owner's input queues behind it (the composer's delivery line).
       liveTurn.participantTurn = !!(author && author !== "owner");
       setTurnRunning(true);

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

@@ -30,9 +30,11 @@ export function createToasts({ el, onChange = () => {}, doc = globalThis.documen
   }
 
   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}`,
+    const actions = Array.isArray(action) ? action : action ? [action] : [];
+    render(html`<span class="toast-message" @click=${(e) => { if (e.target.closest?.("a[href]")) remove(entry); }}>${text}</span>${actions.map((item) =>
+      html`<button type="button" class="toast-action" @click=${() => { remove(entry); item.run(); }}>${item.label}</button>`)}${sticky
+      ? html`<button type="button" class="toast-close" title="Dismiss" aria-label="Dismiss" @click=${() => remove(entry)}>✕</button>`
+      : nothing}`,
     entry.el);
   }
 
@@ -61,7 +63,7 @@ export function createToasts({ el, onChange = () => {}, doc = globalThis.documen
       el.appendChild(duplicate.el);
       if (!duplicate.sticky) duplicate.timer = setTimeout(() => remove(duplicate), TOAST_MS);
       sync();
-      return;
+      return duplicate;
     }
 
     if (entries.length === MAX_TOASTS) {
@@ -72,7 +74,13 @@ export function createToasts({ el, onChange = () => {}, doc = globalThis.documen
     el.appendChild(entry.el);
     if (!sticky) entry.timer = setTimeout(() => remove(entry), TOAST_MS);
     sync();
+    return entry;
+  }
+
+  // Takes down a toast show returned (gone already: nothing).
+  function dismiss(entry) {
+    if (entry) remove(entry);
   }
 
-  return { show };
+  return { show, dismiss };
 }

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

@@ -0,0 +1,42 @@
+// A turn's tool rows as one line: "read 12 files · ran 3 commands · edited
+// 2 files (engine.rb, worker.rb)". Pure, names only (rows carry a tool name
+// and a project path, never args or output); the participant page folds a
+// turn's rows into it, and the owner's page may later.
+const READERS = new Set(["read"]);
+const COMMANDS = new Set(["execute", "bash"]);
+const EDITORS = new Set(["write", "edit"]);
+const FILE_NAMES = 3;
+
+const rowsOf = (rows) => (Array.isArray(rows) ? rows : []);
+const namedPath = (row) => typeof row?.path === "string" && row.path ? row.path : null;
+const basename = (path) => path.split(/[\\/]/).at(-1);
+const noun = (count, singular, plural) => `${count} ${count === 1 ? singular : plural}`;
+
+function fileCount(rows) {
+  const paths = new Set(rows.map(namedPath).filter(Boolean));
+  return paths.size + rows.filter((row) => !namedPath(row)).length;
+}
+
+function fileNames(rows) {
+  const paths = [...new Set(rows.map(namedPath).filter(Boolean))];
+  const names = paths.slice(0, FILE_NAMES).map(basename);
+  if (paths.length > FILE_NAMES) names.push("…");
+  return names.length ? ` (${names.join(", ")})` : "";
+}
+
+export function toolsOverview(rows) {
+  const list = rowsOf(rows);
+  if (!list.length) return "";
+
+  const readers = list.filter((row) => READERS.has(row?.tool));
+  const commands = list.filter((row) => COMMANDS.has(row?.tool));
+  const editors = list.filter((row) => EDITORS.has(row?.tool));
+  const otherCount = list.length - readers.length - commands.length - editors.length;
+  const parts = [];
+
+  if (readers.length) parts.push(`read ${noun(fileCount(readers), "file", "files")}`);
+  if (commands.length) parts.push(`ran ${noun(commands.length, "command", "commands")}`);
+  if (editors.length) parts.push(`edited ${noun(fileCount(editors), "file", "files")}${fileNames(editors)}`);
+  if (otherCount) parts.push(`used ${noun(otherCount, "other tool", "other tools")}`);
+  return parts.join(" · ");
+}

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

@@ -289,8 +289,8 @@ export function initWaitLine({ tasks } = {}) {
 // no "steered" badge, as a reload shows it).
 // A participant's prompt's badge, as an op's field ({author}); {} for the
 // owner's, so their ops stay as they were.
-function authorOf(author, name = null) {
-  const badge = authorBadge(author, name);
+function authorOf(author, name = null, mode = null) {
+  const badge = authorBadge(author, name, mode);
   return badge ? { author: badge } : {};
 }
 
@@ -314,7 +314,7 @@ export function promptOps(event, { myId, known, unmatchedMerge = false, wakeStar
         // draws the bubble from this.
         return [withImages({ op: "start", enqueuedId: id, prompt: event.prompt }, event.images)];
       }
-      return [withImages({ op: "add", enqueuedId: id, prompt: event.prompt, state: "started", label: clientLabel(origin.client_id), ...authorOf(event.author || origin.author, event.author_name) }, event.images)];
+      return [withImages({ op: "add", enqueuedId: id, prompt: event.prompt, state: "started", label: clientLabel(origin.client_id), ...authorOf(event.author || origin.author, event.author_name, event.participant_mode) }, event.images)];
     }
     case "turn_dequeued":
       return event.enqueued_id ? [{ op: "remove", enqueuedId: event.enqueued_id }] : [];
@@ -362,7 +362,8 @@ export function snapshotEvents({ current_turn: turn = null, queued = [], queued_
     const cutAfter = turn.cut_after != null ? { cut_after: turn.cut_after } : {};
     const turnId = turn.turn_id ? { turn_id: turn.turn_id } : {};
     // A participant's turn names them (TurnAccumulator keeps author, author_name).
-    const author = turn.author ? { author: turn.author, ...(turn.author_name ? { author_name: turn.author_name } : {}) } : {};
+    const author = turn.author ? { author: turn.author, ...(turn.author_name ? { author_name: turn.author_name } : {}),
+      ...(turn.participant_mode ? { participant_mode: turn.participant_mode } : {}) } : {};
     // Its wall time (TurnAccumulator keeps turn_started's at): the gap divider before it.
     const at = typeof turn.at === "string" ? { at: turn.at } : {};
     events.push(withImages({ type: "turn_started", prompt: turn.prompt, origin: turn.origin, continue: !!turn.continue, started_at, ...at, ...cutAfter, ...turnId, ...author }, turn.images));

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

@@ -311,9 +311,9 @@ export function steerRowTemplate({ source, text } = {}, { bubble = false } = {})
 export function userBubbleTemplate(message, { label = null, state = null, step = null, thumbs = nothing, own = false, enqueuedId = null, key = null, delivery = null, author = null } = {}) {
   const named = BADGES[state] ? state : null;
   const from = author
-    ? html`<span class="origin-label author-badge" title=${authorBadgeTitle(author.name)} data-unnamed=${author.unnamed ? "1" : nothing}>${authorBadgeText(author.name)}</span>`
+    ? html`<span class="origin-label author-badge" title=${authorBadgeTitle(author.name, author.mode)} data-unnamed=${author.unnamed ? "1" : nothing}>${authorBadgeText(author.name, author.mode)}</span>`
     : label ? html`<span class="origin-label">${label}</span>` : nothing;
-  return html`<div class=${`bubble user${named ? ` ${named}` : ""}${author ? " by-participant" : ""}`} title=${timeTitle(message?.at)} style=${author ? `--author-color:${author.color}` : nothing} data-author=${author?.author || nothing} data-user-state=${named || nothing} data-step=${step ? Number(step) : nothing} data-copy-source=${copySource({ ...message, role: "user" })} data-user-content=${key !== null ? key : nothing} data-turn-id=${message?.turn_id || nothing} data-own=${own ? "1" : nothing} data-enqueued-id=${enqueuedId || nothing} data-delivery=${delivery || nothing}>${from}<div class="user-message">${userBodyTemplate(message?.content)}${thumbs}</div>${stateBadgeTemplate(named, delivery)}</div>`;
+  return html`<div class=${`bubble user${named ? ` ${named}` : ""}${author ? " by-participant" : ""}`} title=${timeTitle(message?.at)} style=${author ? `--author-color:${author.color}` : nothing} data-author=${author?.author || nothing} data-participant-mode=${author?.mode || nothing} data-user-state=${named || nothing} data-step=${step ? Number(step) : nothing} data-copy-source=${copySource({ ...message, role: "user" })} data-user-content=${key !== null ? key : nothing} data-turn-id=${message?.turn_id || nothing} data-own=${own ? "1" : nothing} data-enqueued-id=${enqueuedId || nothing} data-delivery=${delivery || nothing}>${from}<div class="user-message">${userBodyTemplate(message?.content)}${thumbs}</div>${stateBadgeTemplate(named, delivery)}</div>`;
 }
 
 // The notice of a turn that ended with no answer (the server's

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

@@ -20,7 +20,7 @@
 // A block that holds one gen with no thinking and no tool rows hides its
 // chrome (CSS :has), so a plain answer streams like today's bubble, and is
 // removed at the end: the answer bubble takes its place.
-import { authorBadge } from "./participant_names.js";
+import { authorBadge, PAIR } from "./participant_names.js";
 import { applyRowTemplate } from "./review_apply.js";
 import { html, nothing, render } from "./vendor/lit-html.js";
 import { answerRefsOf, setAnswerRefs } from "./answer_refs.js";
@@ -870,7 +870,7 @@ export function turnHistoryNodes(items, timing, { thumbs, workingSet = false, no
   const userTemplate = (m, opts = {}) => {
     const shell = shellCommandMessage(m?.content);
     if (shell) return commandBubbleTemplate({ ...shell, at: m?.at });
-    return userBubbleTemplate(m, { label: sourceLabel(m?.source), thumbs: thumbs(m.images), author: authorBadge(m?.author, m?.author_name), ...opts });
+    return userBubbleTemplate(m, { label: sourceLabel(m?.source), thumbs: thumbs(m.images), author: authorBadge(m?.author, m?.author_name, m?.participant_mode), ...opts });
   };
   // The first text after a delegate report merged mid-turn, unless it is
   // the turn's answer (shown anyway).
@@ -946,8 +946,10 @@ export function turnHistoryNodes(items, timing, { thumbs, workingSet = false, no
     else if (group.answer === null) parts.push(timingTemplate(group));
     else parts.push(answerTemplate(group.answer, timingTemplate(group)));
     // A participant's review turn with a reply: Apply under it (the owner's
-    // page only: the participant page has its own view).
-    const reviewer = group.answer !== null && prompt.turn_id ? authorBadge(prompt.author, prompt.author_name) : null;
+    // page only: the participant page has its own view). Not under a pair
+    // turn: it acted itself.
+    const reviewer = group.answer !== null && prompt.turn_id && prompt.participant_mode !== PAIR
+      ? authorBadge(prompt.author, prompt.author_name) : null;
     if (reviewer) parts.push(applyRowTemplate(prompt.turn_id, reviewer));
     // A canceled turn ends with its cancel line, a failed one whose steps
     // stayed with its failure line, as the live view left them.