samagotchi 0.134.0 → 0.136.0

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

@@ -19,7 +19,7 @@
 //   refresh()             fetch the list (no events stream)
 //   select(id)            open a session
 //   confirmDelete(id), setArchived(id, archive), archiveOne(id, archive)
-//   updateInfoBar(), updateSessionTitle(), showToast(text, action)
+//   updateSessionTitle(), showToast(text, action)
 //   allViewOpen(), openAllView(), leaveAllView(hash)
 //   renameShown(owner)    whether a card's title has its ✎ (session_title.js)
 //   onRename()            the active card's ✎ clicked (session_rename.js open)
@@ -231,7 +231,7 @@ function draw(el, template) {
 export function createListsView(deps) {
   const {
     doc, win, topStripEl, allListEl, sessions, selected, scope, scopeError, eventsLive, refresh, select,
-    confirmDelete, setArchived, archiveOne, updateInfoBar, updateSessionTitle, showToast,
+    confirmDelete, setArchived, archiveOne, updateSessionTitle, showToast,
     allViewOpen, openAllView, leaveAllView, renameShown = () => false, onRename = () => {}, renaming = () => false,
   } = deps;
   const $ = (s) => doc.querySelector(s);
@@ -302,18 +302,25 @@ export function createListsView(deps) {
   // is the cards drawn, which select mode picks from.
   const drawnOrder = new Map(); // list element → card ids in the order last drawn
   const heldLists = new Set(); // lists drawn in a held order
+  // Lists whose last draw was hidden (the strip under the all view, which
+  // the store's list write draws as the view opens): that order was never
+  // seen, so a hover that stuck on the strip doesn't hold it afterwards.
+  const drawnHidden = new Set();
   const canHover = win.matchMedia?.("(hover: hover)").matches ?? false;
   function listOrder(el, next, idOf = (s) => s.id) {
     // The strip's popover holds it too (the pointer leaves the strip for it,
     // and a touch screen has no hover at all), and so does a rename typed
     // over its active card (the card doesn't jump away under the input).
-    const holding = el.getClientRects().length > 0
+    const shown = el.getClientRects().length > 0;
+    const holding = shown
       && ((canHover && el.matches(":hover")) || (el === topStripEl && (familyPop.isOpen() || renaming())) || chainPopIn(el));
-    const held = holding ? drawnOrder.get(el) : null;
+    const held = holding && !drawnHidden.has(el) ? drawnOrder.get(el) : null;
     const ordered = held ? heldOrder(held, next, idOf) : next;
     if (held && ordered.some((x, i) => idOf(x) !== idOf(next[i]))) heldLists.add(el);
     else heldLists.delete(el);
     drawnOrder.set(el, ordered.map(idOf));
+    if (shown) drawnHidden.delete(el);
+    else drawnHidden.add(el);
     return ordered;
   }
 
@@ -498,7 +505,7 @@ export function createListsView(deps) {
     noteChainFamilies(cards);
     const refused = scopeError();
     if (refused) {
-      draw(topStripEl, html`<div class="hint scope-error">${refused} · <a href=${allScopeHref("", null, win.location.search)}>show every session</a></div>`);
+      draw(topStripEl, html`<div class="hint scope-error">${refused} · <a href=${allScopeHref("")}>show every session</a></div>`);
       lastDrawn.delete(topStripEl);
       familyPop.close();
       chainPop.close();
@@ -727,14 +734,9 @@ export function createListsView(deps) {
     selecting.running = { done: 0, total: ids.length, archive };
     updateSelectBar();
     try {
-      const outcome = await runBatch(ids, async (id) => {
-        const answer = await archiveOne(id, archive);
-        if (answer.ok) {
-          render();
-          updateInfoBar();
-        }
-        return answer;
-      }, (done) => {
+      // An archived one flips in the store's list (archiveOne): the lists
+      // and the bar redraw from there.
+      const outcome = await runBatch(ids, (id) => archiveOne(id, archive), (done) => {
         selecting.running.done = done;
         updateSelectBar();
       });

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

@@ -105,6 +105,8 @@ export function createLiveTiming({
 
     start(startedAt = new Date(now()).toISOString(), id = null) {
       stopTicker();
+      // In place, on purpose: the running turn's own clock in the session
+      // store's timing (session_fields.js, D8).
       timing().activeTurn = id ? { id, started_at: startedAt } : { started_at: startedAt };
       turnId = id || null;
       // The turns ended so far, so this one comes next.

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

@@ -1,28 +1,18 @@
-// The session bar's LLM context chip: the strategy the next turn runs under
-// ("llm ctx stale,forget"; "· session" when the session set its own), and a
-// popover that sets the session's own strategy, apply rule and budget by
-// running /llm-context in its worker (the command's reply shows in the
-// conversation, like a typed one). The values and where each came from are
-// the session's llm_context (LLMContextStrategy::Explained#summary: the
+// The session's LLM context (LLMContextStrategy::Explained#summary: the
 // worker's snapshot, a command_ran, or the server's own reading of the
-// session file).
+// session file) as the settings panels read and change it: the session's own
+// values (ownValues), the /llm-context line a session bar's pick runs in its
+// worker (commandLine; settings_chip.js), a typed budget (parseBudget).
 //
-// The start page's new session sets its strategy in the ⚙ panel instead
+// The start page's new session sets its strategy in the ⚙ panel
 // (start_settings.js): mergeChoice and choiceWords are its, a choice in the
 // session file's shape sent as POST /api/sessions' llm_context words.
 
-import { createChipPopover } from "./chip_popover.js";
-import { html, nothing, render } from "./vendor/lit-html.js";
-
-const STRATEGIES = [
-  { value: "none", label: "none" },
-  { value: "stale", label: "stale" },
-  { value: "stale,forget", label: "stale + forget (experimental)" },
-];
 export const APPLIES = ["payoff", "next_request", "turn_end"];
-export const SESSION = "session";
 
 const DEFAULT = "default";
+// What a budget parseBudget refuses gets, under the fields.
+export const BUDGET_ERROR = "A budget is a number of tokens from 4000 (4k) to 10000000, or off.";
 const LAYER_ORDER = ["stale", "forget"];
 
 // Layers as one value, in chi's order (stale before forget); unknown ones after.
@@ -41,31 +31,12 @@ export function ownValues(summary) {
   return { strategy, apply: own.apply || DEFAULT, budget };
 }
 
-// The chip: its text, tooltip and whether the session set its own; null
-// without a summary (an older worker).
-export function chipModel(summary) {
-  if (!summary || !summary.strategy) return null;
-  const own = summary.strategy_source === "session" || !!summary.own;
-  const budget = summary.budget_tokens ? `${summary.budget_tokens} tokens` : "off";
-  const title = `LLM context strategy: ${summary.strategy} (${summary.strategy_where}); apply ${summary.apply} ` +
-    `(${summary.apply_where}); budget ${budget} (${summary.budget_where}). Click to change it for this session.`;
-  return { text: `llm ctx ${summary.strategy}${own ? ` · ${SESSION}` : ""}`, title, own };
-}
-
-// The session bar's chip (a lit-html template; info_bar.js), nothing
-// without a summary.
-export function chipTemplate(summary) {
-  const chip = chipModel(summary);
-  if (!chip) return nothing;
-  return html`<button type="button" class=${`model llmctx-chip${chip.own ? " own" : ""}`} title=${chip.title} aria-haspopup="dialog">${chip.text}</button>`;
-}
-
-// The /llm-context line for the form's values. With +initial+ (the values
-// the form opened with) only the fields the user changed go, so a value the
-// form can't show is never unset by a Set; null when nothing changed.
+// The /llm-context line for the panel's values. With +initial+ (the
+// session's own values, ownValues) only the fields that differ go, so a
+// value the tap didn't touch is never unset; null when nothing changed.
 // Without it every field goes, "default" for one left to the model, and all
-// of them default is a reset. With --yes: the form states what a change
-// costs, so a Set is the choice (no confirm step), as level_chip.js's.
+// of them default is a reset. With --yes: the panel states what a change
+// costs, so a pick is the choice (no confirm step), as level_chip.js's.
 export function commandLine({ strategy = DEFAULT, apply = DEFAULT, budget = "" } = {}, initial = null) {
   const words = { strategy, apply, budget: String(budget).trim() || DEFAULT };
   const was = initial && { strategy: initial.strategy, apply: initial.apply, budget: String(initial.budget).trim() || DEFAULT };
@@ -104,7 +75,7 @@ export function mergeChoice(choice, { strategy = DEFAULT, apply = DEFAULT, budge
     else if (field === "apply") next.apply = word;
     else {
       const tokens = parseBudget(word);
-      if (tokens === null) throw new Error("A budget is a number of tokens from 4000 (4k) to 10000000, or off.");
+      if (tokens === null) throw new Error(BUDGET_ERROR);
       next.budget_tokens = tokens;
     }
   }
@@ -122,105 +93,3 @@ export function choiceWords(choice) {
   if (typeof choice.budget_tokens === "number") words.budget = choice.budget_tokens > 0 ? String(choice.budget_tokens) : "off";
   return Object.keys(words).length ? words : undefined;
 }
-
-// The strategy list, with the session's own value when it isn't one of them
-// (forget alone, a newer chi's layer).
-function strategyOptions(chosen) {
-  if (chosen === DEFAULT || STRATEGIES.some((s) => s.value === chosen)) return STRATEGIES;
-  return [...STRATEGIES, { value: chosen, label: chosen }];
-}
-
-const option = (value, label) => html`<option value=${value}>${label}</option>`;
-
-// The popover's form: the values now (each with its source), and the
-// session's own to change.
-export function nowText(summary) {
-  const budget = summary.budget_tokens ? `${summary.budget_tokens} tokens` : "off";
-  return `Now: ${summary.strategy} (${summary.strategy_where}) · apply ${summary.apply} (${summary.apply_where}) · ` +
-    `budget ${budget} (${summary.budget_where})`;
-}
-
-// The popover's form (a lit-html template). +now+ is the summary its "Now:"
-// line reads (refresh passes a newer one, the rest stays as the form opened,
-// so lit leaves what the user typed alone). The selects take their value as a property (.value), set after their
-// options: +unset+ draws the options alone, the first pass renderForm makes.
-export function formTemplate(summary, { running = false, now = summary, unset = false } = {}) {
-  const own = ownValues(summary);
-  const follow = (field) => (summary[`${field}_source`] === "session" ? "follow the model" : `follow the model (${summary[field]})`);
-  const when = "From the next turn's start. Turning forget on or off re-reads the whole prompt once.";
-  const chosen = (value) => (unset ? nothing : value);
-  return html`<form class="llmctx-form"><div class="ctx-pop-head"><strong>LLM context</strong
-    ><span class="ctx-pop-kind">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><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-meta">${when}${running ? " A turn is running: it applies after this turn." : ""}</div
-    ><div class="ctx-pop-actions"><button type="button" class="ctx-pop-detach" data-act="reset">follow the model</button
-    ><button type="submit" class="llmctx-set">Set</button></div></form>`;
-}
-
-// Draws the form into +target+ (formTemplate's options). A first draw (no
-// form there yet) makes two passes, the options and then the selects'
-// values: lit sets an element's own bindings before its children, so a
-// select's .value would land before its options exist. A later draw is
-// one pass, and lit writes only what changed since the last (the "Now:"
-// line), never a value the user changed.
-export function renderForm(target, summary, opts = {}) {
-  if (!target.firstElementChild) render(formTemplate(summary, { ...opts, unset: true }), target);
-  render(formTemplate(summary, opts), target);
-}
-
-// The chip's popover (chip_popover.js' shell). el: where the chip is drawn
-// (#infoText, info_bar.js: clicks are delegated); summary(): the open
-// session's llm_context; session(): the open session's id; running(): a
-// turn runs; run(line): sends the command. id and anchor: the popover's id
-// and the chip's selector.
-export function createLlmContextControl({ el, summary, session = () => null, running = () => false, run,
-                                          id = "llmContextPopover", anchor = ".llmctx-chip",
-                                          doc = document, win = window }) {
-  // The values the form opened with.
-  let initial = null;
-  // What the open form was drawn from: the summary, the form's options and
-  // the summary its "Now:" line reads.
-  let shown = null;
-  const draw = (changes = {}) => {
-    shown = { ...shown, ...changes };
-    renderForm(shell.pop, shown.data, { ...shown.opts, now: shown.now });
-  };
-
-  // A refresh (a newer summary): an open form keeps what the user typed;
-  // only its "Now:" line follows (the same template again: lit writes that
-  // line alone).
-  function show(data, opening) {
-    if (!opening) return draw({ now: data });
-    initial = ownValues(data);
-    shown = { data, opts: { running: running() } };
-    draw({ now: data });
-  }
-
-  function submit(form) {
-    const values = { strategy: form.elements.strategy.value, apply: form.elements.apply.value,
-                     budget: form.elements.budget.value };
-    const line = commandLine(values, initial);
-    shell.close();
-    if (line) run(line);
-  }
-
-  function act(name) {
-    if (name !== "reset") return;
-    shell.close();
-    run(commandLine());
-  }
-
-  const shell = createChipPopover({
-    id, className: "ctx-popover llmctx-popover", width: 360, el, anchor, summary, session, show,
-    onClose: () => { initial = null; shown = null; }, onSubmit: submit, onAct: act, doc, win,
-  });
-
-  return { close: shell.close, refresh: shell.refresh, get open() { return shell.isOpen(); } };
-}

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

@@ -8,7 +8,7 @@
 // steps' texts.
 const TEXTS = ".bubble.output, .gen:not(.live) > .gen-text";
 // The closed steps' texts still shown raw: a live turn's (a reload's come
-// rendered, turn_view.js textTemplate).
+// rendered, turn_block.js textTemplate).
 const RAW_STEPS = ".gen:not(.live) > .gen-text:not(.markdown)";
 
 export function createMarkdownPlace({

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

@@ -0,0 +1,14 @@
+// chi web's JSON as notifications.js and push_devices.js call it:
+// (method, path, body). Over the page's api (data.js), so a signed-out
+// proxy answer (a 401, a redirect, HTML) reports auth_lost as every other
+// read does, and a refusal throws api()'s Error (the server's words, .status,
+// .code).
+
+import { api as pageApi } from "./data.js";
+
+// @param body the JSON body (undefined: none)
+// @param opts api()'s fetch options (specs: fetchImpl); api: another client
+// @return a Promise of the answer's JSON ({} for an empty one)
+export function methodApi(method, path, body, { api = pageApi, ...opts } = {}) {
+  return api(path, { ...opts, method, ...(body === undefined ? {} : { body: JSON.stringify(body) }) });
+}

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

@@ -36,6 +36,7 @@ import {
   isWaitingTag, openPushKeys, pushSupported, subscribe as pushSubscribe, unsubscribe as pushUnsubscribe,
 } from "./push.js";
 import { createPushDevices } from "./push_devices.js";
+import { methodApi } from "./method_api.js";
 
 export const NOTIFY_KEY = "chi_notify";
 // The device id chi web gave this app's subscription (POST subscribe's
@@ -64,17 +65,9 @@ const PUSH_TITLES = {
   denied: "Notifications are blocked for this app in the phone's settings",
 };
 
-// fetch's JSON, or an Error with chi web's detail.
-async function defaultApi(method, path, body) {
-  const res = await fetch(path, {
-    method,
-    headers: body === undefined ? {} : { "Content-Type": "application/json" },
-    body: body === undefined ? undefined : JSON.stringify(body),
-  });
-  const data = res.status === 204 ? null : await res.json().catch(() => null);
-  if (!res.ok) throw new Error(data?.detail || `HTTP ${res.status}`);
-  return data;
-}
+// chi web's JSON, or api()'s Error; a signed-out answer reports auth_lost
+// (method_api.js).
+const defaultApi = (method, path, body) => methodApi(method, path, body);
 
 // How a presence report goes: a beacon when the page is leaving (it
 // outlives the page; same origin, so the cookie goes), else the api's

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

@@ -171,6 +171,16 @@ function scheduleReload() {
   reloadTimer = setTimeout(load, 120);
 }
 
+// The types the participant stream sends: exactly Web::ParticipantView::EVENTS
+// (spec/web/participant_view_spec.rb reads this list), so a type the server
+// starts sending isn't dropped here unseen.
+const STREAM_EVENTS = [
+  "generation_chunk", "generation_retrying", "tool_call_started", "tool_call_completed",
+  "turn_started", "turn_completed", "turn_canceled", "turn_failed", "turn_enqueued", "turn_dequeued", "input_merged",
+  "question_requested", "question_answered", "question_cancelled", "continue_offered", "continue_resolved",
+  "snapshot", "reset", "verdict_recorded",
+];
+
 // The stream from the review data's cursor; a closed or refused stream is
 // opened again from fresh data (a worker may have started or restarted).
 function connect() {
@@ -203,12 +213,7 @@ function connect() {
       renderLive();
     }
   };
-  for (const type of ["generation_chunk", "generation_retrying", "tool_call_started", "tool_call_completed",
-    "turn_started", "turn_completed", "turn_canceled", "turn_failed", "turn_enqueued", "turn_dequeued", "input_merged",
-    "question_requested", "question_answered", "question_cancelled", "continue_offered", "continue_resolved",
-    "snapshot", "reset", "verdict_recorded"]) {
-    source.addEventListener(type, onEvent);
-  }
+  for (const type of STREAM_EVENTS) source.addEventListener(type, onEvent);
   source.onerror = () => {
     if (source.readyState !== EventSource.CLOSED) return;
     scheduleRetry(retryDelay(failures));

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

@@ -1,6 +1,6 @@
 // The open session's participants by author ("p:<id>" → name), for the
 // author badges on their prompts (turn_events.js promptOps, a reload's
-// turn_view.js): the participants panel sets it when it reads the list. A
+// turn_block.js): the participants panel sets it when it reads the list. A
 // prompt's own author_name (a saved message, turn_started) comes first; a
 // badge drawn before the list came, with neither, says UNNAMED until
 // nameUnnamedBadges names it.

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

@@ -18,6 +18,7 @@ import { html, nothing, render } from "./vendor/lit-html.js";
 import { createChipPopover } from "./chip_popover.js";
 import { authorColor, participantAuthor } from "./participant_model.js";
 import { setParticipantNames } from "./participant_names.js";
+import { stillOn } from "./latest.js";
 
 // Seen this recently: here now (the chip's dot). The gate writes
 // last_used_at at most once a minute, so two minutes.
@@ -298,9 +299,10 @@ export function createParticipantsControl({ el, session, api, onChange = () => {
       onChange();
       return;
     }
+    const still = stillOn(session, id);
     try {
       const body = await api.list(id);
-      if (id !== session()) return;
+      if (!still()) return;
       grants = Array.isArray(body.participants) ? body.participants : [];
       working = typeof body.warning === "string" ? body.warning : null;
       inviteMode = typeof body.mode === "string" ? body.mode : null;
@@ -309,7 +311,7 @@ export function createParticipantsControl({ el, session, api, onChange = () => {
       loadedFor = id;
       if (setParticipantNames(grants)) onNames();
     } catch {
-      if (id !== session()) return;
+      if (!still()) return;
       // Another session's list and warning are not this one's.
       if (loadedFor !== id) {
         grants = [];

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

@@ -1,24 +1,20 @@
 // The project picker opened by the top-bar scope chip. The server supplies
-// the project roots and their current/default marks; links carry the view
-// without carrying a session hash into another project's list.
+// the project roots and their current/default marks; links never carry a
+// session hash into another project's list.
 
 import { html, nothing, render } from "./vendor/lit-html.js";
 import { allScopeHref, projectScopeHref } from "./scope.js";
 import { createChipPopover } from "./chip_popover.js";
-
-function homeHref(search) {
-  const view = new URLSearchParams(search || "").get("view");
-  return view ? `/?view=${encodeURIComponent(view)}` : "/";
-}
+import { createLatest } from "./latest.js";
 
 function sessionCount(count) {
   const n = Number(count) || 0;
   return `${n} session${n === 1 ? "" : "s"}`;
 }
 
-function projectRow(row, search) {
+function projectRow(row) {
   return html`<a class=${`project-row${row.default ? " default" : ""}${row.current ? " current" : ""}`}
-    href=${row.default ? homeHref(search) : projectScopeHref(row.dir, "", search)}
+    href=${row.default ? "/" : projectScopeHref(row.dir, "")}
     aria-current=${row.current ? "page" : nothing}>
     <span class="project-main"><span class="project-name">${row.name}</span
       >${row.default ? html`<span class="project-default">default</span>` : nothing
@@ -30,14 +26,14 @@ function projectRow(row, search) {
 
 // +rows+ is the API's ordered list. When there is no project scope, the
 // all-projects row is current; a bad ?dir= has no current project to mark.
-export function pickerTemplate({ rows = [], loading = false, error = "", search = "", currentDir = null,
+export function pickerTemplate({ rows = [], loading = false, error = "", currentDir = null,
                                  allCurrent = false } = {}) {
-  const allHref = allScopeHref("", currentDir, search);
+  const allHref = allScopeHref("", currentDir);
   return html`<div class="ctx-pop-head"><strong>Projects</strong><button type="button" class="ctx-pop-close"
       data-act="close" aria-label="Close">×</button></div>
     ${loading ? html`<div class="project-note" role="status">Loading projects…</div>` : nothing}
     ${error ? html`<div class="project-note project-error" role="alert">${error}</div>` : nothing}
-    <nav class="project-list" aria-label="Projects">${rows.map((row) => projectRow(row, search))}
+    <nav class="project-list" aria-label="Projects">${rows.map((row) => projectRow(row))}
       <a id="projectAll" class=${`project-row project-all${allCurrent ? " current" : ""}`}
         href=${allHref} aria-current=${allCurrent ? "page" : nothing}>
         <span class="project-main"><span class="project-name">All projects</span
@@ -47,20 +43,20 @@ export function pickerTemplate({ rows = [], loading = false, error = "", search
     </nav>`;
 }
 
-// +scopeError+ returns the page's current folder error, if any. +where+
-// supplies the live query string so links retain ?view= without a hash.
-export function createProjectPicker({ el, scope, scopeError = () => null, api, where = () => ({ search: "" }),
+// +scopeError+ returns the page's current folder error, if any.
+export function createProjectPicker({ el, scope, scopeError = () => null, api,
                                       doc = globalThis.document, win = globalThis.window }) {
   let rows = [];
   let loading = false;
   let error = "";
-  let loads = 0;
+  // Only the newest read is drawn; a close drops the one out (latest.js).
+  const latest = createLatest();
 
   const currentDir = () => scopeError() ? null : scope.dir || null;
   const paint = (focus = false) => {
     const failedScope = !!scopeError();
     render(pickerTemplate({
-      rows, loading, error, search: where().search, currentDir: currentDir(),
+      rows, loading, error, currentDir: currentDir(),
       allCurrent: !scope.dir && !failedScope,
     }), shell.pop);
     if (focus) {
@@ -71,7 +67,7 @@ export function createProjectPicker({ el, scope, scopeError = () => null, api, w
   };
 
   async function load(focus = false) {
-    const turn = ++loads;
+    const fresh = latest.begin();
     loading = true;
     error = "";
     if (shell.isOpen()) {
@@ -83,14 +79,14 @@ export function createProjectPicker({ el, scope, scopeError = () => null, api, w
       const dir = currentDir();
       const answer = await api(`/api/projects${dir ? `?dir=${encodeURIComponent(dir)}` : ""}`);
       if (!Array.isArray(answer)) throw new Error("the server returned an invalid project list");
-      if (turn !== loads) return;
+      if (!fresh()) return;
       rows = answer;
     } catch (e) {
-      if (turn !== loads) return;
+      if (!fresh()) return;
       error = `Can't read projects: ${e?.message || e}`;
       rows = [];
     }
-    if (turn !== loads) return;
+    if (!fresh()) return;
     loading = false;
     if (shell.isOpen()) {
       paint(focus);
@@ -108,7 +104,7 @@ export function createProjectPicker({ el, scope, scopeError = () => null, api, w
       paint();
       void load(true);
     },
-    onClose: () => { loads += 1; },
+    onClose: () => { latest.drop(); },
   });
 
   return { pop: shell.pop, isOpen: shell.isOpen, load };

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

@@ -91,7 +91,7 @@ export function createQuestionCards({
     summary.textContent = summaryText(pq);
     card.appendChild(summary);
     // A hand toggle: the resolve's auto-collapse then leaves it as the user
-    // left it (rememberToggle-style, as turn_view.js does).
+    // left it (rememberToggle-style, as turn_block.js does).
     summary.addEventListener("click", () => { card.dataset.toggled = "1"; });
 
     // Relayed to the parent: say where else it waits (QuestionDesk#annotate).
@@ -632,7 +632,7 @@ export function createQuestionCards({
     pendingQuestion: () => pending,
     renderContinue: renderContinueCard,
     resolveContinue: resolveContinueCard,
-    // The turn view was reset: a later offer draws a new card.
+    // The running turn's DOM was reset: a later offer draws a new card.
     forgetContinue() { continueEl = null; },
   };
 }

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

@@ -1,13 +1,10 @@
-// The session bar's reasoning history chip: which of its own reasoning the
-// session's model gets back from the next turn on ("reasoning all";
-// "· session" when the session set its own), and a popover with a level
-// select that runs /reasoning-history in the session's worker. The summary
-// is the session's reasoning_history (SettingExplained#summary; null on a
-// native host, which ignores it, or from an older worker: no chip then).
-// A config on level_chip.js.
+// Reasoning history as a level setting (level_chip.js): which of its own
+// reasoning the session's model gets back from the next turn on. The session
+// bar's ⚙ panel draws its row on a chat host (settings_chip.js; the summary
+// is null on a native host, which ignores it, or from an older worker: no
+// row then) and runs /reasoning-history in the session's worker.
 
 import * as level from "./level_chip.js";
-import { html, nothing } from "./vendor/lit-html.js";
 
 export const LEVELS = ["drop", "turn", "all"];
 
@@ -16,34 +13,11 @@ export const CONFIG = Object.freeze({
   prefix: "reasoning",
   command: "/reasoning-history",
   levels: LEVELS,
-  anchor: "[data-rh-chip]",
-  formClass: "rh-form",
-  popoverClass: "rh-popover",
-  nowClass: "rh-now",
-  when: () => "From the next turn's start. A change to or from all makes the server read the conversation again.",
+  cost: "A reasoning history change to or from all makes the server read the conversation again.",
 });
 
-export function chipModel(summary) {
-  return level.chipModel(CONFIG, summary);
-}
-
-// The session bar's chip (a lit-html template; info_bar.js), nothing
-// without a summary.
-export function chipTemplate(summary) {
-  const chip = chipModel(summary);
-  if (!chip) return nothing;
-  return html`<button type="button" class=${`model rh-chip${chip.own ? " own" : ""}`} title=${chip.title} data-rh-chip aria-haspopup="dialog">${chip.text}</button>`;
-}
-
+// The /reasoning-history line for a level, with --yes; null when it is the
+// session's (+initial+).
 export function commandLine(choice, initial = null) {
   return level.commandLine(CONFIG, choice, initial);
 }
-
-export function formTemplate(summary, opts) {
-  return level.formTemplate(CONFIG, summary, opts);
-}
-
-// The chip's popover in the session bar (level_chip.js createLevelControl).
-export function createReasoningHistoryControl({ id = "reasoningHistoryPopover", ...opts }) {
-  return level.createLevelControl({ cfg: CONFIG, id, ...opts });
-}

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

@@ -21,6 +21,8 @@ export function restoreAction(event, { myId, sentIds, composerEmpty }) {
     own,
     label: own ? null : clientLabel(origin.client_id),
     ...(back && event.verify ? { verify: event.verify } : {}),
+    // A Revise turn's draft ({turn_id}): its composer chip comes back.
+    ...(back && event.revises?.turn_id ? { revises: { turn_id: event.revises.turn_id } } : {}),
   }, back ? event.images : null);
 }