samagotchi 0.120.0 → 0.121.0

data/lib/samagotchi/web/public/forms.css

@@ -0,0 +1,12 @@
+/* A form's select box (participants_panel.js' Invite, level_chip.js' Level, llm_context_chip.js' Strategy / Apply):
+   one shape in every dialog. Each browser draws its own closed box (macOS a pill with a double chevron), so a select
+   in a .select-wrap drops it and keeps its dialog's text-field box (the dialog's own `input, select` rule: height,
+   radius, border, background, padding, font); the wrapper draws one thin caret at the right. The open list stays the
+   OS menu. Both pages link it, after tokens.css and before their own <style>: span.select-wrap>select outweighs a
+   dialog's `… select` rule, so its padding shorthand keeps room for the caret. Colours are tokens.css's. */
+.select-wrap{position:relative;display:inline-flex;min-width:0}
+span.select-wrap>select{appearance:none;-webkit-appearance:none;flex:1;min-width:0;padding-right:26px;cursor:pointer}
+.select-wrap::after{content:"";position:absolute;right:11px;top:50%;width:5px;height:5px;border-right:1.5px solid var(--text-muted);border-bottom:1.5px solid var(--text-muted);transform:translateY(-70%) rotate(45deg);pointer-events:none}
+.select-wrap select option{background:var(--bg-raised);color:var(--text)}
+span.select-wrap>select:disabled{opacity:.6;cursor:default}
+.select-wrap:has(select:disabled)::after{opacity:.6}

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

@@ -12,6 +12,7 @@
 <link rel="stylesheet" href="/assets/tokens.css">
 <link rel="stylesheet" href="/assets/annotate_bar.css">
 <link rel="stylesheet" href="/assets/composer.css">
+<link rel="stylesheet" href="/assets/forms.css">
 <style>
 /* Icon masks shared by the phone info bar and the all view's cards (the stroke only shapes the mask; the icon takes currentColor); the image icon is composer.css's. */
 :root{--icon-archive:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='none' stroke='black' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='2' y='2.75' width='12' height='3.5' rx='1'/%3E%3Cpath d='M3.25 6.25v6a1 1 0 0 0 1 1h7.5a1 1 0 0 0 1-1v-6M6.5 9h3'/%3E%3C/svg%3E");--icon-unarchive:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='none' stroke='black' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='2' y='2.75' width='12' height='3.5' rx='1'/%3E%3Cpath d='M3.25 6.25v6a1 1 0 0 0 1 1h7.5a1 1 0 0 0 1-1v-6M8 11.5V8.25M6.5 9.75 8 8.25l1.5 1.5'/%3E%3C/svg%3E")}
@@ -425,6 +426,10 @@ button.system-one-wrong:hover:not(:disabled){background:var(--bg-hover);color:va
 .question-option:hover{background:var(--bg-hover)}
 .question-option.selected{border-color:var(--ok);color:var(--text)}
 .question-option input{margin:0;accent-color:var(--warn)}
+/* The model's recommended option (a label ending in "(Recommended)"): an accent row and a small tag. */
+.question-option.recommended{border-color:var(--accent-border);background:var(--accent-bg);color:var(--text)}
+.question-option.recommended.selected{border-color:var(--ok)}
+.question-option-tag{margin-left:auto;flex:none;font-size:11px;color:var(--accent);border:1px solid var(--accent-border);border-radius:999px;padding:0 6px}
 .question-freeform{width:100%;box-sizing:border-box;background:var(--bg-inset);border:1px solid var(--border);color:var(--text);padding:8px 10px;border-radius:8px;font-size:13px;margin-bottom:8px}
 .question-error{color:var(--danger);font-size:12px;margin-bottom:8px}
 .question-error.hidden{display:none}
@@ -1055,12 +1060,9 @@ body.has-session.composer-folded #infoBar{border-top-color:transparent}
 .llmctx-field>span{flex:0 0 58px;font-size:12px;color:var(--text-muted)}
 .llmctx-field select,.llmctx-field input{flex:1;min-width:0;box-sizing:border-box;padding:5px 8px;border-radius:7px;border:1px solid var(--border-strong);background:var(--bg-inset);color:var(--text);font:inherit;font-size:13px;line-height:1.4}
 .llmctx-field select:focus,.llmctx-field input:focus{outline:none;border-color:var(--accent-border)}
-/* The settings selects draw their own closed box (each browser's native one differs) with the model picker's drawn caret on the label; the open list stays the OS menu. */
-.llmctx-field select{appearance:none;-webkit-appearance:none;padding-right:26px;cursor:pointer}
-.llmctx-field select option{background:var(--bg-raised);color:var(--text)}
+/* A select's closed box and caret: forms.css (.select-wrap); here the wrapper takes the field's width. */
+.llmctx-field>.select-wrap{flex:1}
 .llmctx-field input::placeholder{color:var(--text-faint);opacity:1}
-.llmctx-field:has(select){position:relative}
-.llmctx-field:has(select)::after{content:"";position:absolute;right:11px;top:50%;width:5px;height:5px;border-right:1.5px solid var(--text-muted);border-bottom:1.5px solid var(--text-muted);transform:translateY(-70%) rotate(45deg);pointer-events:none}
 .llmctx-form .llmctx-set{background:var(--accent-bg);color:var(--accent);border-color:var(--accent-border)}
 .llmctx-form .llmctx-set:disabled{opacity:.6;cursor:default}
 /* Attached context (context_chips.js): a row of its own under the meta; not the composer's #chips/.chip. */

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

@@ -69,8 +69,8 @@ export function formTemplate(cfg, summary, { running = false, kind = SESSION, ch
     ><span class="ctx-pop-kind">${fresh ? NEW_SESSION : "this session"}</span
     ><button type="button" class="ctx-pop-close" data-act="close" aria-label="Close">×</button></div
     ><div class=${`ctx-pop-meta ${cfg.nowClass}`}>${nowText(now)}</div
-    ><label class="llmctx-field"><span>Level</span><select name="level">${option(DEFAULT, follow, chosen)}${
-      cfg.levels.map((level) => option(level, level, chosen))}</select></label
+    ><label class="llmctx-field"><span>Level</span><span class="select-wrap"><select name="level">${option(DEFAULT, follow, chosen)}${
+      cfg.levels.map((level) => option(level, level, chosen))}</select></span></label
     ><div class="ctx-pop-meta">${cfg.when(fresh)}${running ? " A turn is running: it applies after this turn." : ""}</div
     ><div class="ctx-pop-actions"><button type="submit" class="llmctx-set">Set</button></div></form>`;
 }

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

@@ -179,10 +179,10 @@ export function formTemplate(summary, { running = false, kind = SESSION, choice
     ><span class="ctx-pop-kind">${fresh ? NEW_SESSION : "this session"}</span
     ><button type="button" class="ctx-pop-close" data-act="close" aria-label="Close">×</button></div
     ><div class="ctx-pop-meta llmctx-now">${nowText(now)}</div
-    ><label class="llmctx-field"><span>Strategy</span><select name="strategy" .value=${chosen(own.strategy)}>${
-      option(DEFAULT, follow("strategy"))}${strategyOptions(own.strategy).map((s) => option(s.value, s.label))}</select></label
-    ><label class="llmctx-field"><span>Apply</span><select name="apply" .value=${chosen(own.apply)}>${
-      option(DEFAULT, follow("apply"))}${APPLIES.map((a) => option(a, a))}</select></label
+    ><label class="llmctx-field"><span>Strategy</span><span class="select-wrap"><select name="strategy" .value=${chosen(own.strategy)}>${
+      option(DEFAULT, follow("strategy"))}${strategyOptions(own.strategy).map((s) => option(s.value, s.label))}</select></span></label
+    ><label class="llmctx-field"><span>Apply</span><span class="select-wrap"><select name="apply" .value=${chosen(own.apply)}>${
+      option(DEFAULT, follow("apply"))}${APPLIES.map((a) => option(a, a))}</select></span></label
     ><label class="llmctx-field"><span>Budget</span><input name="budget" type="text" inputmode="numeric" autocomplete="off"
       placeholder="follow the model (64000, 64k or off)" .value=${own.budget}></label
     ><div class="ctx-pop-error llmctx-error" ?hidden=${!error}>${error || ""}</div

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

@@ -8,6 +8,7 @@
 <link rel="stylesheet" href="/assets/tokens.css">
 <link rel="stylesheet" href="/assets/annotate_bar.css">
 <link rel="stylesheet" href="/assets/composer.css">
+<link rel="stylesheet" href="/assets/forms.css">
 <style>
 /* The participant page (participant.js): the thread with the composer pinned, and for a review session its subjects
    (the Plan): beside the thread on a wide screen, a Plan | Thread toggle on a narrow one (the composer pinned in both).

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

@@ -24,7 +24,7 @@ import { appendQuote } from "./annotations.js";
 import { messageAuthorData, participantQuote, participantSource } from "./participant_annotate.js";
 import { mountComposer } from "./composer_mount.js";
 import { PROMPT_LINE_PX } from "./composer_size.js";
-import { forgetReviewHistory, readReviewHistory, recordReviewComment } from "./review_history.js";
+import { forgetReviewHistory, readReviewHistory, recordReviewComment, rememberReviewHistory } from "./review_history.js";
 
 // A link's #code= opened in a browser that already has a cookie: traded
 // first, the page reloads without it.
@@ -48,6 +48,7 @@ let liveStale = false;
 let source = null;
 let reloadTimer = null;
 let retryTimer = null;
+let usageTimer = null;
 // Reads of the review that failed in a row (the retry's backoff), and the
 // latest read asked for (an older one answering after it is dropped).
 let failures = 0;
@@ -93,8 +94,10 @@ function showEnded(json) {
   if (ended) return;
   ended = true;
   source?.close();
+  clearTimeout(usageTimer);
+  usageTimer = null;
   // The link is over: its comments' ↑/↓ list goes with it.
-  forgetReviewHistory(data?.viewer?.id);
+  forgetReviewHistory(data?.viewer?.id, ownerView ? null : sessionId);
   for (const id of ["head", "main", "dock", "plan"]) $(id).hidden = true;
   $("endedText").textContent = endedText(json);
   $("ended").hidden = false;
@@ -123,6 +126,7 @@ async function load() {
   failures = 0;
   $("offline").hidden = true;
   data = json;
+  if (!ownerView) rememberReviewHistory(sessionId, data?.viewer?.id);
   live = liveFrom(data.current_turn);
   liveStale = false;
   render();
@@ -428,9 +432,11 @@ function renderDock() {
 }
 
 // The participant's own usage, one line under the comment box (only what
-// their grant's exposure shows; the server sends nothing else). Redrawn at
-// every re-read: a turn's end, a queued or taken-back comment.
+// their grant's exposure shows; the server sends nothing else). Spent and
+// queued change on re-reads; the link's time redraws each minute without one.
 function renderUsage(usage) {
+  clearTimeout(usageTimer);
+  usageTimer = null;
   const items = usageItems(usage);
   const row = $("usage");
   row.hidden = items.length === 0;
@@ -440,6 +446,9 @@ function renderUsage(usage) {
     span.title = item.title;
     return span;
   }));
+  if (!ended && Number.isFinite(Date.parse(usage?.expires_at || ""))) {
+    usageTimer = setTimeout(() => renderUsage(usage), 60_000);
+  }
 }
 
 function showError(text) {

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

@@ -189,13 +189,13 @@ export function panelTemplate(grants, { now, sessionId, invite = null, error = n
       data-act="start-review" ?disabled=${reviewing}>${reviewing ? "Starting…" : "Start a review of it"}</button></div>` : nothing}
     ${invite ? inviteTemplate(invite, { canShare }) : html`<form class="pp-invite">
       <div class="pp-invite-row"><input name="name" type="text" placeholder="Name (Alex)" autocomplete="off" aria-label="Their name" maxlength="64"
-      ><select name="kind" aria-label="A person or an agent"><option value="human">person</option><option value="agent">agent</option></select></div>
+      ><span class="select-wrap"><select name="kind" aria-label="A person or an agent"><option value="human">person</option><option value="agent">agent</option></select></span></div>
       ${identityHeader ? html`<div class="pp-invite-row"><input name="identity" type="email" placeholder="Their email (alex@example.com)"
         autocomplete="off" aria-label="Their email: the link opens only for that account"></div>
       <div class="ctx-pop-meta pp-bind-note">With their email the link opens only for them, signed in through the proxy.
         Without one, anyone the proxy lets in who gets the link can open it.</div>` : nothing}
-      <div class="pp-invite-row"><label>Expires <select name="days">${EXPIRY_DAYS.map((d) => html`<option value=${d}
-        ?selected=${d === DEFAULT_EXPIRY_DAYS}>${d === 1 ? "1 day" : `${d} days`}</option>`)}</select></label
+      <div class="pp-invite-row"><label>Expires <span class="select-wrap"><select name="days">${EXPIRY_DAYS.map((d) => html`<option value=${d}
+        ?selected=${d === DEFAULT_EXPIRY_DAYS}>${d === 1 ? "1 day" : `${d} days`}</option>`)}</select></span></label
       ><label>Cap $<input name="cap" type="text" inputmode="decimal" placeholder="2" autocomplete="off" aria-label="Spending cap, dollars"></label
       ><button type="submit" class="pp-invite-btn" ?disabled=${busy}>Invite</button></div></form>`}
     <div class="ctx-pop-actions pp-foot">${invite ? html`<button type="button" data-act="another">Invite another</button>` : nothing}<a

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

@@ -15,6 +15,20 @@ export function isContinue(pq) {
   return !!pq && pq.kind === "continue";
 }
 
+// A model's recommended option: its label ends in "(Recommended)" (the
+// ask_user_question description asks for it first, the mark at the end).
+// The answer keeps the full label; only what the card shows drops the mark.
+const RECOMMENDED = /\s*\(Recommended\)$/;
+export function isRecommended(label) {
+  return RECOMMENDED.test(String(label ?? "").trim());
+}
+
+// An option's label as the card shows it: without the recommended mark.
+export function optionText(label) {
+  const s = String(label ?? "");
+  return isRecommended(s) ? s.trim().replace(RECOMMENDED, "") || s : s;
+}
+
 export const CONTINUE_REASON_PLACEHOLDER = "Stop, because… (the model reads it)";
 
 // Why a step-limit question closed unanswered (its question_cancelled reason).
@@ -135,7 +149,7 @@ export function resultText(pq, { answer = null, cancelled = false, reason = "" }
     return `Allowed: ${sel[0]}`;
   }
   const parts = [];
-  if (sel.length) parts.push(sel.join(", "));
+  if (sel.length) parts.push(sel.map(optionText).join(", "));
   if (freeform) parts.push(freeform);
   return parts.length ? `Answered: ${parts.join(" · ")}` : "Answered";
 }

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

@@ -16,8 +16,8 @@ import { dismissQuestion, sendAnswer, sendCommand } from "./data.js";
 import { diffTemplate } from "./diff_view.js";
 import { render } from "./vendor/lit-html.js";
 import {
-  answerErrorText, approvalAllowed, approvalView, CONTINUE_REASON_PLACEHOLDER, deniedReason, isContinue, keepsAskingText,
-  nextCardAction, relayedToView, relayView, resultText, summaryText,
+  answerErrorText, approvalAllowed, approvalView, CONTINUE_REASON_PLACEHOLDER, deniedReason, isContinue, isRecommended,
+  keepsAskingText, nextCardAction, optionText, relayedToView, relayView, resultText, summaryText,
 } from "./question_card.js";
 import { sessionHash } from "./route.js";
 import { clientLabel, isOwn } from "./turn_events.js";
@@ -129,6 +129,15 @@ export function createQuestionCards({
         text.textContent = String(label);
         row.appendChild(input);
         row.appendChild(text);
+        // The model's pick: marked, its mark a tag, nothing pre-checked.
+        if (!approval && isRecommended(label)) {
+          row.classList.add("recommended");
+          text.textContent = optionText(label);
+          const tag = doc.createElement("span");
+          tag.className = "question-option-tag";
+          tag.textContent = "recommended";
+          row.appendChild(tag);
+        }
         list.appendChild(row);
       });
       card.appendChild(list);

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

@@ -8,6 +8,7 @@
 import { readStored, removeStored, writeStored } from "./storage.js";
 
 export const REVIEW_HISTORY_PREFIX = "chi_review_history:";
+const REVIEW_HISTORY_SESSION_PREFIX = "chi_review_history_session:";
 // How many comments a grant's list keeps (the oldest go first).
 export const REVIEW_HISTORY_MAX = 50;
 
@@ -46,7 +47,14 @@ export function recordReviewComment(grantId, text) {
   writeStored(key, JSON.stringify(withComment(readReviewHistory(grantId), text)));
 }
 
-export function forgetReviewHistory(grantId) {
-  const key = reviewHistoryKey(grantId);
+export function rememberReviewHistory(sessionId, grantId) {
+  if (sessionId && grantId) writeStored(`${REVIEW_HISTORY_SESSION_PREFIX}${sessionId}`, grantId);
+}
+
+export function forgetReviewHistory(grantId, sessionId) {
+  const sessionKey = sessionId ? `${REVIEW_HISTORY_SESSION_PREFIX}${sessionId}` : null;
+  const remembered = sessionKey ? readStored(sessionKey) : null;
+  if (sessionKey) removeStored(sessionKey);
+  const key = reviewHistoryKey(grantId || remembered);
   if (key) removeStored(key);
 }

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

@@ -16,6 +16,9 @@ export function chipModel(summary) {
   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.groups)) {
+    parts.push(`Source groups: ${summary.groups.length ? summary.groups.join(", ") : "none"}.`);
+  }
   const reachable = Array.isArray(summary.reachable) ? summary.reachable : [];
   const removed = Array.isArray(summary.removed) ? summary.removed : [];
   if (reachable.length) {

data/lib/samagotchi/web/tunnel.rb

@@ -103,10 +103,19 @@ module Samagotchi
         # @return [Result]
         # @raise [Timeout]
         # @raise [SystemCallError] the command can't run (ENOENT, EACCES)
-        def call(argv, timeout:)
+        # +before_timeout+ lets a test synchronize the deadline with a
+        # child-side ready signal; the timeout starts after it returns.
+        def call(argv, timeout:, before_timeout: nil)
           Open3.popen3(*argv, pgroup: true) do |stdin, out, err, wait|
             stdin.close
             readers = [out, err].map { |io| Thread.new { io.read }.tap { |t| t.report_on_exception = false } }
+            begin
+              before_timeout&.call
+            rescue StandardError
+              stop(wait.pid)
+              readers.each { |reader| reader.join(1) }
+              raise
+            end
             unless wait.join(timeout)
               stop(wait.pid)
               readers.each { |reader| reader.join(1) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.120.0
+  version: 0.121.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -770,6 +770,7 @@ files:
 - lib/samagotchi/web/public/families_view.js
 - lib/samagotchi/web/public/favicon.svg
 - lib/samagotchi/web/public/format.js
+- lib/samagotchi/web/public/forms.css
 - lib/samagotchi/web/public/hold.js
 - lib/samagotchi/web/public/icons/chi-180.png
 - lib/samagotchi/web/public/icons/chi-192.png