samagotchi 0.136.1 → 0.138.0

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

@@ -121,8 +121,10 @@ export function createSendTurn({
     turnDom.handOff({ immediate: true });
     const sending = composer.chips().slice();
     // Into a running turn the echo says what it waits for (its delivery); a
-    // line with images always waits for the turn's end (the worker queues it).
-    const shownDelivery = isRunning ? (sending.length ? "queue" : delivery || "next_step") : null;
+    // line with images, or a Verify or a Revise, always waits for the turn's
+    // end (the worker queues it).
+    const anchored = !!verify() || !!revise();
+    const shownDelivery = isRunning ? (sending.length || anchored ? "queue" : delivery || "next_step") : null;
     const echo = makeUserBubble(prompt, { state: "queued", own: true, images: sending, delivery: shownDelivery });
     if (!turnDom.holds()) historyEl.scrollTop = historyEl.scrollHeight;
     if (!store.current.firstPreview || store.current.firstPreview === "—") {

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

@@ -77,7 +77,7 @@ export function chipTemplate(summaries) {
   const chip = summaries && chipModel(summaries);
   if (!chip) return nothing;
   return html`<button type="button" class=${`model settings-chip${chip.own ? " own" : ""}`} title=${chip.title}
-    aria-label=${chip.label} aria-haspopup="dialog" data-settings-chip><span class="chip-icon sc-gear" aria-hidden="true">⚙</span>${
+    aria-label=${chip.label} aria-haspopup="dialog" aria-expanded="false" data-settings-chip><span class="chip-icon sc-gear" aria-hidden="true">⚙</span>${
     chip.text ? html`<span class="sc-own"> ${chip.text}</span>` : nothing}</button>`;
 }
 
@@ -197,7 +197,7 @@ export function createSettingsControl({ el, summaries, session = () => null, run
   };
   const shell = createChipPopover({
     id, className: "ctx-popover start-settings session-settings", width: 440, el, anchor, summary: present, session,
-    show, sheet: true, sheetShare: SHEET_TALL, modal: true, label: PANEL_LABEL, onOpen: focusInside,
+    show, sheet: true, sheetShare: SHEET_TALL, label: PANEL_LABEL, onOpen: focusInside,
     onClose: () => { shown = null; error = null; }, onSubmit: submit, onAct: act, doc, win,
   });
   // An edit makes the disclosure Set's error stale.

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

@@ -57,10 +57,12 @@ function readCollapsed() {
 // on a running task_wait. +renderMarkdown+ and +linkRefs+: the asking
 // slot's markdown read and ref pass (stage_slots.js). +workingSet+: the
 // page's working set (working_set_view.js, web.working_set; null: off): its
-// rail in the live slots, its footprint at the hand-off.
+// rail in the live slots, its footprint at the hand-off. +onCancel+: the
+// status row's Stop turn (a promise of the cancel request; the button is
+// disabled until it settles); null: no Stop turn.
 export function createStageView({
   historyEl, isNearBottom: historyNearBottom, sawText, sessionId, dockEl, centerEl, taskStop = null,
-  renderMarkdown, linkRefs, workingSet = null,
+  renderMarkdown, linkRefs, workingSet = null, onCancel = null,
 }) {
   // The dock becomes a clear column: the stage's card, then the composer's
   // (its rows moved into .dock-card, which wears the glass and the focus ring).
@@ -82,6 +84,22 @@ export function createStageView({
   const miniTool = node("span", "ts-mini", status);
   const defer = node("span", "ts-defer", status);
   defer.textContent = "moves up when you leave";
+  // Stop turn, at the row's right edge beside the fold: while the turn
+  // hasn't ended (refresh), in a collapsed stage too (the row stays).
+  const cancel = node("button", "ts-cancel", status);
+  cancel.type = "button";
+  cancel.title = "Cancel the running turn, whoever sent it";
+  cancel.textContent = "Stop turn";
+  cancel.hidden = true;
+  cancel.addEventListener("click", async () => {
+    if (!onCancel || cancel.disabled) return;
+    cancel.disabled = true;
+    try {
+      await onCancel();
+    } finally {
+      cancel.disabled = false;
+    }
+  });
   const fold = node("button", "ts-fold", status);
   fold.type = "button";
 
@@ -164,6 +182,10 @@ export function createStageView({
   // A ref's "show in turn" opened a collapsed stage (not kept).
   let revealed = false;
   let rafPending = false;
+  // A turn the page knows runs (the session says running) with none in the
+  // stage to show (a join without its current_turn): the status row alone,
+  // so Stop turn stays in reach (runningWithoutTurn).
+  let bare = false;
   let foldTimer = null;
   // The question room (drawRoom): the pending ask card whose asking text
   // overflowed its cap, and the turn's raised cap (stage_frame.js; kept
@@ -321,6 +343,7 @@ export function createStageView({
     if (!blocked && wasWaiting) stage.style.setProperty("--live-held", `${live.offsetHeight}px`);
     stage.classList.toggle("plain", plain);
     stage.classList.toggle("ended", !!endKind);
+    cancel.hidden = !onCancel || !!endKind;
     stage.classList.toggle("waiting", blocked);
     stage.classList.toggle("asking", !!slots.asking);
     stage.dataset.phase = slots.phase;
@@ -568,6 +591,7 @@ export function createStageView({
     phaseEl.textContent = "";
     stepEl.textContent = "";
     miniTool.textContent = "";
+    cancel.hidden = true;
     chipLabel.textContent = "";
     slotsView.reset();
     rail?.reset();
@@ -604,6 +628,7 @@ export function createStageView({
 
   // The stage empty and hidden, its frame free.
   function clearStage() {
+    dropBare();
     cancelFold();
     emptySlots();
     stage.hidden = true;
@@ -679,11 +704,19 @@ export function createStageView({
     if (fold.wasAtEnd) easeScrollTo(historyEl, () => historyEl.scrollHeight - historyEl.clientHeight, { reduce: !fold.animate || reducedMotion() });
   }
 
+  function dropBare() {
+    if (!bare) return;
+    bare = false;
+    stage.classList.remove("bare");
+    delete stage.dataset.phase;
+  }
+
   // ── the view interface (app.js) ──────────────────────────────────────────
 
   return {
     turnStarted(data) {
       if (folding) finishFold();
+      dropBare();
       // A turn that never ended (released, not handed off) leaves its queued
       // lines waiting still: they stay.
       const waiting = [...queuedSlot.children].filter((el) => el !== data?.promptBubble);
@@ -829,6 +862,22 @@ export function createStageView({
     // A turn is in the stage (running, or ended and not handed off yet):
     // nothing the turn does touches the history's scroll.
     holds: () => holding,
+    // The page's turn runs but the stage holds none (+on+); false: it ended.
+    // A turn the stage holds draws its own row: nothing to do then.
+    runningWithoutTurn(on) {
+      if (holding || folding) return;
+      if (!on) {
+        if (bare) clearStage();
+        return;
+      }
+      emptySlots();
+      bare = true;
+      stage.classList.add("bare");
+      stage.dataset.phase = "running";
+      phaseEl.textContent = "running";
+      cancel.hidden = !onCancel;
+      show();
+    },
     handOff,
     root: stage,
     scrollEl: scroller,

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

@@ -0,0 +1,26 @@
+// Query parameters the page no longer reads, dropped from the address bar
+// as it loads (app.js, history.replaceState), so a bookmark or a link kept
+// from an older chi stops carrying them: ?view= (the turn view, removed in
+// 0.135.0). The rest of the query stays as written (?dir='s readable
+// slashes too), in its order.
+//
+// A module of its own: static JS is cached at unversioned URLs, and a new
+// export on an old module would blank the page.
+
+export const STALE_PARAMS = ["view"];
+
+// A query part's name ("view" of "view=turn"), decoded as URLSearchParams
+// reads it.
+function nameOf(part) {
+  const raw = part.split("=", 1)[0].replace(/\+/g, " ");
+  try { return decodeURIComponent(raw); } catch { return raw; }
+}
+
+// +search+ (a location.search) without the stale parameters, "?…" or "";
+// null when it has none (nothing to replace).
+export function withoutStaleParams(search) {
+  const parts = String(search || "").replace(/^\?/, "").split("&").filter(Boolean);
+  const kept = parts.filter((part) => !STALE_PARAMS.includes(nameOf(part)));
+  if (kept.length === parts.length) return null;
+  return kept.length ? `?${kept.join("&")}` : "";
+}

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

@@ -190,7 +190,7 @@ export function createStartSettings({ el, button, openers = `#${button.id}`, thi
     id: "startSettingsPopover", className: "ctx-popover start-settings", width: 440, el, anchor: `#${button.id}`, openers,
     // Taller than a plain sheet: the Apply and budget fields or the review
     // form would push the note under the edge of a 60 % one.
-    summary: () => ({}), sheet: true, sheetShare: SHEET_TALL, expands: true, modal: true, label: PANEL_LABEL, doc, win,
+    summary: () => ({}), sheet: true, sheetShare: SHEET_TALL, label: PANEL_LABEL, doc, win,
     show: (_data, opening) => {
       if (opening) {
         const choice = llmContext.choice();

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

@@ -109,7 +109,7 @@ export function createStartToolkit({ el, button, openers = `#${button.id}`, tool
 
   const shell = createChipPopover({
     id: "startToolkitPopover", className: "ctx-popover start-toolkit", width: 380, el, anchor: `#${button.id}`, openers,
-    summary: () => toolkits(), sheet: true, expands: true, modal: true, label: LIST_LABEL, doc, win,
+    summary: () => toolkits(), sheet: true, label: LIST_LABEL, doc, win,
     show: () => draw(),
     onOpen: focusInside,
     onClose: () => { error = null; },

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

@@ -185,7 +185,8 @@ export function createStreamHandlers(deps) {
       liveTurn.timing.start(data.started_at, data.turn_id || null);
     }),
     turn_completed: async (data) => {
-      // The turn's id: the event names none, its turn_started did.
+      // The turn's id: the event names it (an older worker names
+      // none: its turn_started did).
       const turnId = data.turn_id || liveTurn.timing.turnId || null;
       activityEnded();
       // A participant's turn: their spend and turns in the panel moved.
@@ -194,11 +195,15 @@ export function createStreamHandlers(deps) {
       const out = turnOutput(data);
       if (out) appendChunk(out);
       if (data.verdict) deps.placeVerdict?.(data.verdict);
-      // A Revise turn that revised: its prompt takes the stamp, as a reload
-      // draws it, and the stack folds (revise_stack.js follows the DOM).
-      if (data.revises?.turn_id && turnId) {
+      // Its prompt takes the turn's stamps, as a reload draws them
+      // (revise_stack.js follows the DOM): a Revise turn that revised
+      // (the stack folds), and a Verify turn (no Revise on its answer, for
+      // every viewer, verdict or not; the sender's echo had it already).
+      if ((data.revises?.turn_id || data.verify) && turnId) {
         for (const prompt of findInTurnRoots(".bubble.user[data-turn-id]")) {
-          if (prompt.dataset.turnId === turnId) prompt.dataset.revises = data.revises.turn_id;
+          if (prompt.dataset.turnId !== turnId) continue;
+          if (data.revises?.turn_id) prompt.dataset.revises = data.revises.turn_id;
+          if (data.verify) prompt.dataset.verify = "1";
         }
       }
       // after_turn hooks are running and may present the answer: its

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

@@ -100,6 +100,8 @@ export function createRing(parent) {
 export function createWorkingSetRail({ live, stage, onOpen, onChange }) {
   const rail = el("div", "ts-ws", live);
   rail.setAttribute("role", "button");
+  rail.setAttribute("aria-haspopup", "dialog");
+  rail.setAttribute("aria-expanded", "false");
   rail.tabIndex = 0;
   const head = el("div", "ws-head", rail);
   const name = el("span", "ws-name", head);

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

@@ -105,7 +105,7 @@ export function footprintTemplate(items, ordinal) {
   const sep = html` <span class="sep">·</span> `;
   const parts = fp.labels.map((l, i) => html`${i ? sep : nothing}<span class=${`l ${l.kind}${l.state && l.state !== "live" ? ` ${l.state}` : ""}`} title=${labelTitle(l)}>${l.glyph ? html`<span class="k">${l.glyph}</span> ` : nothing}${labelText({ ...l, glyph: "" })}</span>${footTag(l)}`);
   const text = footprintText(items, BUDGETS.footprint);
-  return html`<div class="ws-foot" role="button" tabindex="0" data-ws-turn=${ordinal} data-ws-sig=${footSig(items)} aria-label=${`Working set of this turn: ${text.replace(/^touched /, "")}. Open the list.`}><span class="w">touched</span> ${parts}${fp.tail ? html`${sep}<span class="w">${fp.tail}</span>` : nothing}${fp.edited ? html`${sep}<span class="e">edited ${fp.edited}</span>` : nothing}${fp.stale ? html`${sep}<span class="s">${fp.stale} stale</span>` : nothing}${fp.forgotten ? html`${sep}<span class="f">${fp.forgotten} forgotten</span>` : nothing}${fp.dropped ? html`${sep}<span class="f">${fp.dropped} dropped</span>` : nothing}</div>`;
+  return html`<div class="ws-foot" role="button" tabindex="0" aria-haspopup="dialog" aria-expanded="false" data-ws-turn=${ordinal} data-ws-sig=${footSig(items)} aria-label=${`Working set of this turn: ${text.replace(/^touched /, "")}. Open the list.`}><span class="w">touched</span> ${parts}${fp.tail ? html`${sep}<span class="w">${fp.tail}</span>` : nothing}${fp.edited ? html`${sep}<span class="e">edited ${fp.edited}</span>` : nothing}${fp.stale ? html`${sep}<span class="s">${fp.stale} stale</span>` : nothing}${fp.forgotten ? html`${sep}<span class="f">${fp.forgotten} forgotten</span>` : nothing}${fp.dropped ? html`${sep}<span class="f">${fp.dropped} dropped</span>` : nothing}</div>`;
 }
 
 // What a footprint shows that can change after it is drawn: its items'
@@ -186,7 +186,7 @@ export function createWorkingSet({ historyEl, stageRoot = () => null, state, ses
 
   const popover = createChipPopover({
     id: "workingSetPopover", className: "ctx-popover ws-popover", width: 420, el: infoEl, anchor: ".ws-chip",
-    openers: ".ws-chip, .ts-ws, .ws-foot", sheet: true,
+    openers: ".ws-chip, .ts-ws, .ws-foot", sheet: true, label: "Working set",
     // The chip opens the session's scope; the rail and a footprint set
     // theirs before they open it.
     summary: (anchor) => {

data/lib/samagotchi/web/session_summary.rb

@@ -94,7 +94,7 @@ module Samagotchi
           memory_index: saved&.memory_index,
           # Its side requests, apart from the tokens (the tooltip's own line).
           side: saved&.side,
-          # Hidden from the strip and the list unless "include archived".
+          # Hidden from the strip and the list unless the all view's "archived" toggle is on.
           archived: ArchiveStore.archived?(session_dir),
           project_root: session.project_root(cache: root_cache),
           # A worker is reachable: WorkerLink answers Live (the lock held by

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.136.1
+  version: 0.138.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -353,6 +353,7 @@ files:
 - lib/samagotchi/guardrails/gate.rb
 - lib/samagotchi/guardrails/implicit_writers.rb
 - lib/samagotchi/guardrails/load_failures.rb
+- lib/samagotchi/guardrails/mise_paths.rb
 - lib/samagotchi/guardrails/model_size.rb
 - lib/samagotchi/guardrails/outside.rb
 - lib/samagotchi/guardrails/pair_boundary.rb
@@ -843,6 +844,7 @@ files:
 - lib/samagotchi/web/public/participant_names.js
 - lib/samagotchi/web/public/participants_panel.js
 - lib/samagotchi/web/public/plain_line.js
+- lib/samagotchi/web/public/popover_modal.js
 - lib/samagotchi/web/public/project_picker.js
 - lib/samagotchi/web/public/prompt_history.js
 - lib/samagotchi/web/public/push.js
@@ -859,6 +861,7 @@ files:
 - lib/samagotchi/web/public/review_history.js
 - lib/samagotchi/web/public/review_start.js
 - lib/samagotchi/web/public/revise_stack.js
+- lib/samagotchi/web/public/revise_switch.js
 - lib/samagotchi/web/public/route.js
 - lib/samagotchi/web/public/scope.js
 - lib/samagotchi/web/public/scroll.js
@@ -881,6 +884,7 @@ files:
 - lib/samagotchi/web/public/stage_slots.js
 - lib/samagotchi/web/public/stage_view.js
 - lib/samagotchi/web/public/stage_watch.js
+- lib/samagotchi/web/public/stale_params.js
 - lib/samagotchi/web/public/start_page.js
 - lib/samagotchi/web/public/start_settings.js
 - lib/samagotchi/web/public/start_toolkit.js