samagotchi 0.149.0 → 0.150.0

data/lib/samagotchi/web/auto_update.rb

@@ -197,7 +197,7 @@ module Samagotchi
       end
 
       # A newer chi this didn't install, settled: a run of its own from here.
-      # The terminal's table already told what `chi update` kept.
+      # The terminal's table already told what `chi update` merged or left behind.
       def adopt_installed
         return unless @restart == "idle" && @seen
 
@@ -215,10 +215,10 @@ module Samagotchi
         return Log.info(:web, "auto_update_deferred", version: version, why: result) if result.is_a?(Symbol)
 
         rows = result.rows
-        record = AutoUpdateRecord.new(version: version, from: VERSION, at: @clock.call.iso8601, kept: kept_files(rows),
-                                      phase: "installed")
+        record = AutoUpdateRecord.new(version: version, from: VERSION, at: @clock.call.iso8601, kept: files_in(rows, "kept"),
+                                      merged: files_in(rows, "merged"), phase: "installed")
         if result.done?
-          Log.info(:web, "auto_update_installed", version: version, kept: record.kept.size)
+          Log.info(:web, "auto_update_installed", version: version, kept: record.kept.size, merged: record.merged.size)
           installed(record)
         else
           failed(record, rows)
@@ -232,7 +232,7 @@ module Samagotchi
         return carry_on(save(record)) unless @restart == "never"
 
         save(record.with(phase: "done", pushed: true))
-        @hub.publish_notice(kind: "installed", version: record.version, kept: record.kept.size)
+        @hub.publish_notice(kind: "installed", version: record.version, kept: record.kept.size, merged: record.merged.size)
       end
 
       # The next step of a run on record.
@@ -328,7 +328,7 @@ module Samagotchi
         record = restart_workers(record) || record
         Log.info(:web, "auto_update_done", version: record.version, restarted: record.restarted, left: record.left)
         save(record.with(phase: record.left_to_try?(@clock.call, RETRY_FOR) ? RETRYING : "done", pushed: true))
-        @hub.publish_notice(kind: "updated", version: record.version, kept: record.kept.size,
+        @hub.publish_notice(kind: "updated", version: record.version, kept: record.kept.size, merged: record.merged.size,
                             restarted: record.restarted, left: record.left)
       end
 
@@ -366,8 +366,8 @@ module Samagotchi
                             installed: gem_installed)
       end
 
-      def kept_files(rows)
-        rows.flat_map { |row| Array(row["kept"]).map(&:to_s) }.uniq
+      def files_in(rows, field)
+        rows.flat_map { |row| Array(row[field]).map(&:to_s) }.uniq
       end
     end
   end

data/lib/samagotchi/web/auto_update_record.rb

@@ -13,8 +13,10 @@ module Samagotchi
     # +phase+: installed, workers, web (AutoUpdate::OPEN_PHASES), retrying,
     # done or failed. +restarted+ and +left+ count the stale workers (`workers` in
     # the file); +at+ is when the install ended, an ISO 8601 string.
-    AutoUpdateRecord = Data.define(:version, :from, :at, :kept, :phase, :restarted, :left, :detail, :pushed) do
-      def initialize(version:, phase:, from: nil, at: nil, kept: [], restarted: 0, left: 0, detail: nil, pushed: false)
+    # +kept+ and +merged+ name the edited memory files that stayed behind and
+    # that took the update (chi update --json's).
+    AutoUpdateRecord = Data.define(:version, :from, :at, :kept, :merged, :phase, :restarted, :left, :detail, :pushed) do
+      def initialize(version:, phase:, from: nil, at: nil, kept: [], merged: [], restarted: 0, left: 0, detail: nil, pushed: false)
         super
       end
 
@@ -30,14 +32,14 @@ module Samagotchi
 
         workers = hash["workers"].is_a?(Hash) ? hash["workers"] : {}
         new(version: version, phase: phase, from: hash["from"], at: hash["at"],
-            kept: Array(hash["kept"]).grep(String), restarted: workers["restarted"].to_i, left: workers["left"].to_i,
+            kept: Array(hash["kept"]).grep(String), merged: Array(hash["merged"]).grep(String), restarted: workers["restarted"].to_i, left: workers["left"].to_i,
             detail: hash["detail"], pushed: hash["pushed"] == true)
       end
 
       # What goes in the file, for .from_h to read back.
       # @return [Hash{String => Object}]
       def to_store
-        { "version" => version, "from" => from, "at" => at, "kept" => kept, "phase" => phase,
+        { "version" => version, "from" => from, "at" => at, "kept" => kept, "merged" => merged, "phase" => phase,
           "workers" => { "restarted" => restarted, "left" => left }, "detail" => detail,
           "pushed" => pushed ? true : nil }.compact
       end

data/lib/samagotchi/web/participant_view.rb

@@ -85,7 +85,7 @@ module Samagotchi
         llm_context_edited merged_input objectives_updated participants_changed pending_input_merged plugin_init_finished
         plugin_init_started plugin_init_wait prompt_restored question question_relay reasoning_history_refused
         recap_ready reminder_injected sampling_refused session_end session_start side_usage steer_cut thinking_dropped
-        thinking_refused tool_dispatch_completed tool_dispatch_started used_memories_updated working_set_updated
+        thinking_refused tool_dispatch_completed tool_dispatch_started turn_rolled_back used_memories_updated working_set_updated
       ].freeze
 
       # A merged input line's saved sources a participant sees: a person's

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

@@ -1188,8 +1188,9 @@ function renderSessionView(data, { kept = [] } = {}) {
   restoreCommandBubbles(historyEl, kept);
   // A failed turn's prompt went back to the user: shown after the
   // conversation, marked failed, as it was live (prompt_restored).
-  if (data.failed_turn) {
-    makeUserBubble(data.failed_turn.prompt, { state: "failed" }).dataset.failedTurn = "1";
+  const failedPrompt = data.failed_turn ? makeUserBubble(data.failed_turn.prompt, { state: "failed" }) : null;
+  if (failedPrompt) {
+    failedPrompt.dataset.failedTurn = "1";
     addEndBubble(failedTurnText(data.failed_turn));
   }
   seedSeenFromDom();
@@ -1203,7 +1204,8 @@ function renderSessionView(data, { kept = [] } = {}) {
   // A live worker's last cards and between-turns notices, where they
   // arrived; the running turn's go into its step once it is drawn.
   const snapshotCards = splitSnapshotCards(data.cards, pageCapabilities);
-  placeSnapshotCards(snapshotCards.placed);
+  // Above a failed turn's prompt: it came after them, and it is no turn.
+  placeSnapshotCards(snapshotCards.placed, { before: failedPrompt });
   // The recap saved with the session (also a stopped one's), else a live
   // worker's from before saved_recap existed. After the cards: the last
   // turn's check-in notice goes to the end, and the recap closes the page.

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

@@ -0,0 +1,13 @@
+// Whether a finished turn's steps block stays open: a completed turn's closes
+// to its summary line, whatever its steps said (opened, it shows the outline).
+// A canceled or failed turn with an outline stays open: its last narrated step
+// is the only text the reader gets. A "gone" end (the worker left) counts as
+// completed: its partial answer bubble carries the text, and a reload, which
+// can't tell it from one, draws the same. The live end, the stage's hand-off
+// and a reload all ask here.
+//
+// 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 function openAfterEnd(kind, outlined) {
+  return !!outlined && (kind === "canceled" || kind === "failed");
+}

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

@@ -26,8 +26,10 @@ export function removeQueuedBubble(bubble) {
   if (slot && slot.childElementCount === 0) slot.remove();
 }
 
-// A prompt that started a turn: not a line steered into a running one.
-export const TURN_PROMPT = ".bubble.user:not(.steered)";
+// A prompt that started a turn: not a line steered into a running one, nor a
+// failed turn's prompt, drawn again after the history (it went back to its
+// sender: the session and the turn count have no such turn).
+export const TURN_PROMPT = ".bubble.user:not(.steered):not(.failed)";
 
 // The history's turn prompts, oldest first (what turns_since counts).
 export function turnPromptBubbles(historyEl) {

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

@@ -46,7 +46,7 @@ export function turnAnswerEl(turnEls) {
 //   (bubbles.js createBubbles)
 // @param followWokenWorker () follows the worker a card's command woke
 // @param api {getSession, sendCommand} (data.js)
-// @return {cardElement(id), upsertCard(card, {before}), placeSnapshotCards(entries),
+// @return {cardElement(id), upsertCard(card, {before}), placeSnapshotCards(entries, {before}),
 //   refreshCardBodies(), onCardAction(event)}
 const HELD_UNTIL_ANSWERED = /^\/objectives --card /;
 
@@ -63,9 +63,12 @@ export function createCardsPlace({
   // running turn's card as a row of its step; else before +before+ or at the
   // end of the history). A running turn's card with actions asks the user
   // something (check-in's Nudge / Keep going / Stop): it goes under the turn's
-  // block, not into a step that collapses when the next one starts.
+  // block, not into a step that collapses when the next one starts. A turn
+  // still sliding away arrives first: its list of pieces holds this card's
+  // element, and an update may swap that (drawCard, a notice to a card).
   function upsertCard(card, { before = null } = {}) {
     if (!card || !card.id) return;
+    turnDom.settleFold?.();
     const existing = cardElement(card.id);
     if (existing) {
       const drawn = drawCard(existing, card);
@@ -81,11 +84,13 @@ export function createCardsPlace({
   }
 
   // A snapshot's cards and notices, each above the first turn after it; a
-  // turn's own notice where it showed live (placeTurnNotice).
-  function placeSnapshotCards(entries) {
+  // turn's own notice where it showed live (placeTurnNotice). +end+: what
+  // closes the history below them (a failed turn's prompt), for those with
+  // no turn after them.
+  function placeSnapshotCards(entries, { before: end = null } = {}) {
     const users = turnPromptBubbles(historyEl);
     for (const entry of entries) {
-      const before = cardPlace(users, entry);
+      const before = cardPlace(users, entry) || end;
       if (isCard(entry)) upsertCard(entry, { before });
       else if (entry.type === "question") placeResolvedQuestion(entry, before);
       else if (entry.type === "guardrail_warning") bubbles.showGuardrailWarning(entry.message, entry.label || "guardrails", { before });

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

@@ -56,7 +56,8 @@ export function installDetailsMotion({ root, selector, motion = canAnimate }) {
     const summary = e.target.closest?.("summary");
     const details = summary?.parentElement;
     if (!details || !details.matches?.(selector) || summary.parentElement !== details) return;
-    if (e.target.closest("a, button, input, label") !== null && e.target !== summary) return;
+    // A live part of the summary (a steps block's footprint opens its own view).
+    if (e.target.closest("a, button, input, label, .ws-foot") !== null && e.target !== summary) return;
     if (!motion(details)) return;
     e.preventDefault();
     if (busy.has(details)) return;

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

@@ -346,10 +346,16 @@ button.system-one-wrong,.system-one-wrong.marked{flex:none;padding:1px 6px;borde
 .thinking-body{margin-top:6px;font-size:13px;color:var(--text-3);white-space:pre-wrap;word-break:break-word;font-style:italic;max-height:240px;overflow:auto}
 /* The turn block (the stage's cloud, the history): one block per turn, its steps as collapsed rows, the live one open on top. */
 .turn-work{border:1px solid var(--border);border-left:3px solid var(--accent);border-radius:12px;background:var(--bg-panel);padding:8px 12px;font-size:14px}
-.turn-work>summary{cursor:pointer;color:var(--text-muted);font-size:13px;font-weight:600;user-select:none;list-style:none}
+.turn-work>summary{position:relative;padding-left:13px;cursor:pointer;color:var(--text-muted);font-size:13px;font-weight:600;user-select:none;list-style:none}
 .turn-work>summary::-webkit-details-marker{display:none}
-.turn-work>summary::before{content:"▸ ";color:var(--accent)}
-.turn-work[open]>summary::before{content:"▾ "}
+.turn-work>summary::before{content:"▸";position:absolute;left:0;color:var(--accent)}
+/* The summary's line: flex on this span, not on <summary> (WebKit's flex on a summary has had quirks). The chevron and the steps toggle the block, the footprint opens the turn's working set (working_set_view.js footClick). */
+.tw-sum{display:flex;align-items:baseline;gap:10px;min-width:0}
+/* The count gives way before the footprint, which is what the line is for. */
+.ws-foot~.turn-steps{margin-left:auto;flex:0 100 auto;min-width:0;overflow:hidden;text-overflow:ellipsis;font-size:12px;font-weight:500;color:var(--text-muted);white-space:nowrap}
+/* A phone has no count to tap, and the chevron is then the only way to the steps: its hit area spreads over the block's padding, the glyph stays where it is. */
+@media (max-width:600px){.ws-foot~.turn-steps{display:none}.turn-work>summary::before{left:-12px;top:-8px;width:36px;box-sizing:border-box;padding:8px 0 8px 12px}}
+.turn-work[open]>summary::before{content:"▾"}
 /* Closed, a block keeps its box (the bar, the border, the width): a click changes its height only (details_motion.js); thinking and the recap the same. */
 /* A step's body (thinking, narration, rows, cards) sits --step-indent right of its summary, so the thinking
    chevron and the row marks share one column under the step's own chevron. The summary takes it back with a
@@ -399,11 +405,11 @@ button.system-one-wrong,.system-one-wrong.marked{flex:none;padding:1px 6px;borde
 .gen:not(.live) .gen-text{font-size:14px;color:var(--text-2)}
 .gen-text:empty{display:none}
 .gen .activity-body{margin-top:6px}
-/* One gen, no thinking, no tool rows: nothing to stack yet, so the narration streams like a plain answer bubble. */
-.turn-work:not(:has(.gen~.gen,.thinking-body,.activity-body)){border:0;padding:0;background:transparent}
-.turn-work:not(:has(.gen~.gen,.thinking-body,.activity-body))>summary,.turn-work:not(:has(.gen~.gen,.thinking-body,.activity-body)) .gen>summary{display:none}
-.turn-work:not(:has(.gen~.gen,.thinking-body,.activity-body)) .gen{margin:0;padding:0;border:0;background:transparent}
-.turn-work:not(:has(.gen~.gen,.thinking-body,.activity-body)) .gen-text{margin:0;background:var(--bg-panel);border:1px solid var(--border);border-left:3px solid var(--accent);border-radius:12px;padding:12px 14px;opacity:.95}
+/* One gen, no thinking, no tool rows: nothing to stack yet, so the narration streams like a plain answer bubble. A step that closed with text (a line steered in after it, its answer gone from the block) is a row: its summary is the way to its text. */
+.turn-work:not(:has(.gen~.gen,.thinking-body,.activity-body,.gen:not(.live)>.gen-text)){border:0;padding:0;background:transparent}
+.turn-work:not(:has(.gen~.gen,.thinking-body,.activity-body,.gen:not(.live)>.gen-text))>summary,.turn-work:not(:has(.gen~.gen,.thinking-body,.activity-body,.gen:not(.live)>.gen-text)) .gen>summary{display:none}
+.turn-work:not(:has(.gen~.gen,.thinking-body,.activity-body,.gen:not(.live)>.gen-text)) .gen{margin:0;padding:0;border:0;background:transparent}
+.turn-work:not(:has(.gen~.gen,.thinking-body,.activity-body,.gen:not(.live)>.gen-text)) .gen-text{margin:0;background:var(--bg-panel);border:1px solid var(--border);border-left:3px solid var(--accent);border-radius:12px;padding:12px 14px;opacity:.95}
 @media(max-width:600px){.gen{--step-indent:8px}}
 /* A question card asks for input like the composer card, so it wears the same glass (the recipe above); only its warm tint is its own. */
 .bubble.question{border-left:3px solid var(--warn);background:color-mix(in srgb,var(--warn) 7%,var(--glass-bg));padding:10px 12px}
@@ -978,11 +984,11 @@ body.working-set .ts-live{position:relative;padding-right:264px}
 }
 body.working-set .turn-stage.waiting .ts-live{min-height:calc(var(--ts-live-h) + var(--ws-row-h,0px))}
 body.working-set .turn-stage.held-wait:not(.waiting) .ts-live{min-height:max(calc(var(--ts-live-h) + var(--ws-row-h,0px)),var(--live-held,0px))}
-/* A finished turn's footprint, under its closed block (working_set_view.js): one faint line; a click opens its list. */
-.ws-foot{display:block;width:fit-content;max-width:calc(100% - 13px);box-sizing:border-box;margin:-4px 0 0 13px;padding:0 6px;border-radius:6px;font-family:ui-monospace,SFMono-Regular,Menlo,monospace;font-size:11.5px;line-height:18px;color:var(--text-faint);white-space:nowrap;overflow:hidden;text-overflow:ellipsis;cursor:pointer}
-@media(hover:hover){.ws-foot:hover{color:var(--text-muted);background:var(--bg-hover)}}
+/* A finished turn's footprint, its block's summary line (working_set_view.js): a click opens its list. */
+.ws-foot{flex:0 1 auto;min-width:0;padding:0 6px;border-radius:6px;font-family:ui-monospace,SFMono-Regular,Menlo,monospace;font-size:12.5px;font-weight:500;color:var(--text);white-space:nowrap;overflow:hidden;text-overflow:ellipsis;cursor:pointer}
+@media(hover:hover){.ws-foot:hover{background:var(--bg-hover)}}
 .ws-foot:focus-visible{outline:2px solid var(--accent-ring);outline-offset:1px}
-.ws-foot .w{font-family:ui-sans-serif,system-ui,sans-serif}
+.ws-foot .w{font-family:ui-sans-serif,system-ui,sans-serif;font-weight:600;color:var(--text-muted)}
 .ws-foot .sep{color:var(--border-strong)}
 .ws-foot .e{color:var(--accent)}
 .ws-foot .k{color:var(--think-text)}
@@ -1327,8 +1333,6 @@ body.has-session.composer-folded #infoBar{border-top-color:transparent}
 .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)}

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

@@ -226,12 +226,11 @@ export function handOffDue({ ended, pending, inUse, quietSinceMs, nowMs }) {
 }
 
 // A handed-off turn's nodes in the order the turn block leaves them: the
-// prompt bubble (none for a reminder turn), the block, its working set's
-// footprint line (web.working_set), the extras in arrival order, the
-// answer's pieces, the timing line, the end line, the kept cards, then the
-// lines queued for after the turn (they run next).
-export function handOffOrder({ prompt = null, block = null, footprint = null, extras = [], answer = [], timing = null, end = null, kept = [], queued = [] }) {
-  return [prompt, block, footprint, ...extras, ...answer, timing, end, ...kept, ...queued].filter(Boolean);
+// prompt bubble (none for a reminder turn), the block, the extras in arrival
+// order, the answer's pieces, the timing line, the end line, the kept cards,
+// then the lines queued for after the turn (they run next).
+export function handOffOrder({ prompt = null, block = null, extras = [], answer = [], timing = null, end = null, kept = [], queued = [] }) {
+  return [prompt, block, ...extras, ...answer, timing, end, ...kept, ...queued].filter(Boolean);
 }
 
 // The rows that wait for the running turn's end to run as their own: a

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

@@ -15,6 +15,7 @@
 // stage_frame.js's, and the in-use watch that times the hand-off is
 // stage_watch.js's.
 import { createTurnBlock } from "./turn_block.js";
+import { openAfterEnd } from "./block_open.js";
 import { chipLabelText, flashOf, handOffDue, handOffOrder, headlineOf, isPlain, liveSlots, MARKS, miniToolText, placeFor, placeKind, QUEUED_CHILDREN, stepSlotText } from "./stage_model.js";
 import { createStageSlots, node } from "./stage_slots.js";
 import { createStageFrame, reducedMotion } from "./stage_frame.js";
@@ -687,7 +688,7 @@ export function createStageView({
   // the pieces arrive in the history and it follows a reader who was at its
   // end. Not with +immediate+ (another turn takes the stage at once), a
   // reduced motion, a hidden page or a collapsed stage: all at once.
-  let folding = null; // { pieces, block, wasAtEnd, animate } while it slides
+  let folding = null; // { pieces, block, endKind, wasAtEnd, animate } while it slides
   function handOff({ immediate = false } = {}) {
     if (folding && immediate) finishFold();
     if (!holding || !endKind) return;
@@ -695,12 +696,12 @@ export function createStageView({
     view.chronological();
     const block = blockEl && blockEl.parentNode === cloudBody ? blockEl : null;
     // The turn's set joins the page's turns (a plain one's too: the turns
-    // keep their places); its footprint goes under the block.
+    // keep their places); its footprint takes the block's summary line.
     const footprint = workingSet ? workingSet.handOff(view.current().turn, promptWords()) : null;
+    if (block && footprint) block.querySelector(":scope > summary > .tw-sum")?.prepend(footprint);
     const pieces = handOffOrder({
       prompt: promptSlot.firstElementChild,
       block,
-      footprint: block ? footprint : null,
       extras: [...extras.children],
       answer: [...answer.children],
       timing: timingSlot.firstElementChild,
@@ -708,7 +709,7 @@ export function createStageView({
       queued: [...queuedSlot.children],
     });
     const animate = !immediate && !reducedMotion() && !document.hidden && !collapsed;
-    folding = { pieces, block: blockEl, wasAtEnd: historyNearBottom(), animate };
+    folding = { pieces, block: blockEl, endKind, wasAtEnd: historyNearBottom(), animate };
     releaseTurn();
     if (!animate) return finishFold();
     stage.classList.add("leaving");
@@ -721,9 +722,9 @@ export function createStageView({
     const fold = folding;
     if (!fold) return;
     folding = null;
-    // Closed, unless it is an outline (turn_block.js outlineBlock): the
-    // history reads its narrated steps without a click.
-    if (fold.block) fold.block.open = fold.block.classList.contains("outline");
+    // The stage held it open; here it takes its place in the history:
+    // closed, unless the turn was cut short with an outline (block_open.js).
+    if (fold.block) fold.block.open = openAfterEnd(fold.endKind, fold.block.classList.contains("outline"));
     historyEl.querySelector(":scope > .hint")?.remove();
     for (const el of fold.pieces) {
       historyEl.appendChild(el);

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

@@ -17,14 +17,17 @@
 // walks childNodes (or reads firstChild/lastChild) must skip comments;
 // element queries, :empty and textContent are unaffected.
 //
-// A block that holds one gen with no thinking and no tool rows hides its
+// A block that holds one live 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.
+// removed at the end: the answer bubble takes its place. A lone step that
+// closed with text keeps its chrome: a line steered in after it left it alone
+// in the block when the answer went, and its summary is the way to its text.
 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";
 import { bindRowRefs } from "./refs.js";
+import { openAfterEnd } from "./block_open.js";
 import { leavesBlock } from "./card.js";
 import { failedTurnText, normalize, sourceLabel } from "./format.js";
 import { thumbsTemplate } from "./images.js";
@@ -132,7 +135,7 @@ function nodesOf(template) {
 // ---- A finished block's outline ----
 
 // A finished block as its outline (turn_model.js outlineRuns of +gens+, its
-// steps in order): open, each narrated step a one-line row as before, each
+// steps in order): each narrated step a one-line row as before, each
 // run of steps that said nothing hidden behind one "N steps" fold that
 // shows them. The live turn's end and a reload call it alike. The folds sit
 // between the steps, not in them (`:scope > .gen` still counts steps), each
@@ -178,7 +181,6 @@ export function outlineBlock(blockEl, gens) {
     const step = e.target.closest?.(".gen.folded");
     if (step?.parentElement === blockEl) unfold.get(step)?.();
   });
-  blockEl.open = true;
   return true;
 }
 
@@ -214,7 +216,7 @@ export function createTurnBlock({
   let turn = null;
   let blockEl = null;
   let blockSummaryEl = null;
-  let blockToggled = false;
+  let blockStepsEl = null;
   // gen → a step's live state (newStep), its rendered nodes between
   // part.startNode and end.
   const genEls = new Map();
@@ -237,16 +239,20 @@ export function createTurnBlock({
     blockEl = document.createElement("details");
     blockEl.className = "turn-work";
     blockEl.open = true;
-    blockToggled = false;
     blockSummaryEl = document.createElement("summary");
+    const line = document.createElement("span");
+    line.className = "tw-sum";
+    blockStepsEl = document.createElement("span");
+    blockStepsEl.className = "turn-steps";
+    line.appendChild(blockStepsEl);
+    blockSummaryEl.appendChild(line);
     blockEl.appendChild(blockSummaryEl);
-    blockSummaryEl.addEventListener("click", () => { blockToggled = true; });
     updateBlockSummary();
     blockHost(blockEl);
   }
 
   function updateBlockSummary() {
-    if (blockSummaryEl && turn) blockSummaryEl.textContent = model.blockSummary(turn, { running: !turn.ended });
+    if (blockStepsEl && turn) blockStepsEl.textContent = model.blockSummary(turn, { running: !turn.ended });
   }
 
   // The step rendered again from its state (stepTemplate). Each live step
@@ -621,6 +627,7 @@ export function createTurnBlock({
       placeAnswer(pieces, { plain: true, blockEl });
       blockEl = null;
       blockSummaryEl = null;
+      blockStepsEl = null;
     } else {
       placeAnswer(bubble ? [...cards, bubble] : [...cards, ...(endNote ? [endNote] : [])], { plain: false, blockEl });
     }
@@ -649,11 +656,12 @@ export function createTurnBlock({
     if (blockEl) {
       updateBlockSummary();
       blockEl.classList.add("done");
-      // The outline (turn_model.js outlineRuns): open on its narrated steps'
-      // rows, as a reload draws it; a block with nothing said closes.
+      // The outline (turn_model.js outlineRuns), for when it is opened. Closed
+      // as a reload draws it, unless the turn was cut short (block_open.js).
+      // The stage decides again as the block reaches the history.
       chronological();
       const outlined = outlineBlock(blockEl, model.blockGens(turn));
-      if (!blockToggled) blockEl.open = outlined;
+      blockEl.open = openAfterEnd(kind, outlined);
       for (const el of blockEl.querySelectorAll(".plugin-card")) {
         if (leavesBlock({ warn: el.classList.contains("warn"), kind })) kept.push(el);
       }
@@ -682,7 +690,7 @@ export function createTurnBlock({
     turn = null;
     blockEl = null;
     blockSummaryEl = null;
-    blockToggled = false;
+    blockStepsEl = null;
     // Clear every ticker timer before the map goes (a live step mid-dwell).
     for (const entry of genEls.values()) stopTicker(entry);
     genEls.clear();
@@ -821,7 +829,7 @@ function failedLineTemplate(record) {
 // template, images.js thumbsTemplate). +workingSet+ (the stage's
 // web.working_set): each block stamped with its
 // turn's ordinal and its rows with theirs (working_set_view.js), and the
-// turn's footprint line after it.
+// turn's footprint on its summary line.
 export function turnHistoryNodes(items, timing, { thumbs, workingSet = false, now = Date.now() }) {
   const timingTemplate = (group) => {
     const record = group.record;
@@ -861,9 +869,11 @@ export function turnHistoryNodes(items, timing, { thumbs, workingSet = false, no
   };
   const steerTemplate = (i, bubble) => steerRowTemplate({ source: items[i].source, text: items[i].content }, { bubble });
   const parts = [];
-  // Each block's steps, in order: its outline once the nodes exist; and
-  // its turn's place among the turns (the working set's stamp).
+  // Each block's steps, in order: its outline once the nodes exist; how its
+  // turn ended (whether it stays open); and its turn's place among the turns
+  // (the working set's stamp).
   const outlines = [];
+  const blockEnds = [];
   const blockTurns = [];
   let turnOrdinal = -1;
   const groups = turnGroups(items, timing);
@@ -903,10 +913,14 @@ export function turnHistoryNodes(items, timing, { thumbs, workingSet = false, no
         // Its text knows its message's refs (a question's), as an answer does.
         at: group.steps[k].i,
       }));
-      parts.push(html`<details class="turn-work done"><summary>${model.blockSummary({ gens, ended: true })}</summary>${steps}</details>`);
+      // Its summary line: the working set's footprint, when the turn touched
+      // something, then the steps (the live block's, stage_view.js handOff).
+      const foot = workingSet ? footprintTemplate(groupItems(group, turnOrdinal), turnOrdinal) : nothing;
+      parts.push(html`<details class="turn-work done"><summary><span class="tw-sum">${foot}<span class="turn-steps">${model.blockSummary({ gens, ended: true })}</span></span></summary>${steps}</details>`);
       outlines.push(gens);
+      // No record: a turn saved before them, or running at the reload.
+      blockEnds.push(group.record?.status ?? "completed");
       blockTurns.push(turnOrdinal);
-      if (workingSet) parts.push(footprintTemplate(groupItems(group, turnOrdinal), turnOrdinal));
     }
     // Steers with no step to sit in, or in a turn that shows no block: on
     // their own after the prompt.
@@ -941,9 +955,10 @@ export function turnHistoryNodes(items, timing, { thumbs, workingSet = false, no
     parts.push(failedLineTemplate(group.record));
   }
   const out = nodesOf(parts);
-  // A finished turn's block as the live end leaves it: its outline, open.
+  // A finished turn's block as the live end leaves it: its outline, closed
+  // unless the turn was cut short.
   const blocks = [...out.children].filter((el) => el.matches(".turn-work"));
-  blocks.forEach((block, i) => outlineBlock(block, outlines[i] || []));
+  blocks.forEach((block, i) => { block.open = openAfterEnd(blockEnds[i], outlineBlock(block, outlines[i] || [])); });
   if (workingSet) stampHistory(blocks, blockTurns);
   // Each answer bubble and step text knows its message's refs
   // (answer_refs.js; the page pairs them after the render), the index

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

@@ -279,7 +279,7 @@ export function isNarrated(gen) {
 // them): each narrated step a row, each run of the others between (tool-only,
 // thinking-only) one fold ({fold: [indices]}), so every mid-turn text's first
 // line reads without a click and the steps that said nothing take one line.
-// [] when no step said anything: the block stays closed, as before.
+// [] when no step said anything: nothing to outline.
 // A last run of one thinking-only step stays a row (no "· 1 step" at the end).
 export function outlineRuns(gens) {
   if (!gens.some(isNarrated)) return [];

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

@@ -1,12 +1,17 @@
 import { html, nothing, render } from "./vendor/lit-html.js";
 
+// chi update's own words for the row (FileStanding owns what it says of a file).
+// One that speaks of edited files runs long, so it gets the row's whole width.
 function installRow(row) {
-  const kept = Array.isArray(row.kept) ? row.kept.map(String) : [];
+  const count = (list) => (Array.isArray(list) ? list.length : 0);
+  const behind = count(row.kept) > 0;
+  const long = behind || count(row.merged) > 0 || count(row.earlier) > 0;
+  const status = row.status || "working";
   const versions = [row.from, row.to].filter(Boolean).join(" → ");
   return html`<li class="us-row">
-    <div class="us-row-head"><strong>${row.component || "chi update"}</strong><span>${row.status || "working"}</span></div>
+    <div class="us-row-head"><strong>${row.component || "chi update"}</strong>${long ? nothing : html`<span>${status}</span>`}</div>
     ${versions ? html`<div class="us-detail">${versions}</div>` : nothing}
-    ${kept.length ? html`<div class="us-kept"><strong>Kept edited files:</strong><ul>${kept.map((file) => html`<li>${file}</li>`)}</ul></div>` : nothing}
+    ${long ? html`<div class=${behind ? "us-kept" : "us-detail"}>${status}</div>` : nothing}
   </li>`;
 }
 

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

@@ -95,17 +95,18 @@ function footTag(label) {
   return html` <button type="button" class="ws-step p" data-ws="jump" data-at=${atAttr(first.at)} title=${title}>${text}</button>`;
 }
 
-// The footprint line of a finished turn's +items+ (turn +ordinal+), nothing
-// for a turn that touched nothing: "touched web/public/ · 9 files · ◆ 3
-// memories s1–5 · +1 url · edited 2". A click opens the expanded view at
-// that turn; a step tag jumps to its call.
+// The footprint of a finished turn's +items+ (turn +ordinal+), nothing for a
+// turn that touched nothing: "touched web/public/ · 9 files · ◆ 3 memories
+// s1–5 · +1 url · edited 2". It sits in the turn block's summary line, so a
+// span (phrasing content). A click opens the expanded view at that turn; a
+// step tag jumps to its call.
 export function footprintTemplate(items, ordinal) {
   const fp = footprint(items, BUDGETS.footprint);
   if (!fp) return nothing;
   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" 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>`;
+  return html`<span 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}</span>`;
 }
 
 // What a footprint shows that can change after it is drawn: its items'
@@ -418,10 +419,12 @@ export function createWorkingSet({ historyEl, stageRoot = () => null, state, ses
     }
   });
 
-  // A footprint: its step tag jumps, the rest opens that turn's view.
+  // A footprint: its step tag jumps, the rest opens that turn's view. Inside
+  // a <summary>, the click is cancelled so it doesn't toggle the block.
   function footClick(e) {
     const foot = e.target.closest?.(".ws-foot");
     if (!foot) return;
+    if (foot.closest("summary")) e.preventDefault();
     const tag = e.target.closest(".ws-step[data-at]");
     if (tag) {
       const at = parseAt(tag.dataset.at);
@@ -563,7 +566,7 @@ export function createWorkingSet({ historyEl, stageRoot = () => null, state, ses
     // The rail's first-sight times, for the popover's fresh rows.
     setSeen(fn) { seenAt = fn; },
     // The running turn hands off: its set joins the turns; its footprint
-    // line (null: it touched nothing) goes after its block.
+    // (null: it touched nothing) goes into its block's summary.
     handOff(turn, prompt = "") {
       const ordinal = turns.length;
       const items = itemsOfTurn(turn, ordinal);

data/lib/samagotchi/web/push/notifier.rb

@@ -5,6 +5,7 @@ require "uri"
 require "time"
 require_relative "attention"
 require_relative "../../log"
+require_relative "../../memory_bundle/file_standing"
 
 module Samagotchi
   module Web
@@ -52,10 +53,10 @@ module Samagotchi
         AUTO_NOTICES = {
           "installed" => lambda do |version, notes|
             ["installed", "chi #{version} is installed",
-             "chi web and its sessions switch over when you restart them.#{kept_words(notes[:kept])}"]
+             "chi web and its sessions switch over when you restart them.#{file_words(notes)}"]
           end,
           "updated" => lambda do |version, notes|
-            ["updated", "chi updated to #{version}", "#{restarted_words(notes[:restarted], notes[:left])}#{kept_words(notes[:kept])}"]
+            ["updated", "chi updated to #{version}", "#{restarted_words(notes[:restarted], notes[:left])}#{file_words(notes)}"]
           end,
           "restart_failed" => lambda do |version, notes|
             ["restart_failed", "chi #{version} is installed; chi web didn't restart",
@@ -79,13 +80,10 @@ module Samagotchi
           "#{words}."
         end
 
-        # " Kept your edits in 2 files." ("" for none).
-        def self.kept_words(count)
-          if count.to_i.positive?
-            " Kept your edits in #{count} #{count == 1 ? "file" : "files"}."
-          else
-            ""
-          end
+        # " Merged the update into 1 file you edited. 2 files stay behind." ("" for none).
+        def self.file_words(notes)
+          words = MemoryBundle::FileStanding.counts_sentence(merged: notes[:merged].to_i, behind: notes[:kept].to_i)
+          words.empty? ? "" : " #{words}"
         end
 
         # A show carries +open+ only while its JSON stays this small: one

data/lib/samagotchi/web/session_hub.rb

@@ -216,7 +216,8 @@ module Samagotchi
       # `chi_update` frames are the page's), and not kept for a snapshot.
       # @param kind [String] installed, updated or failed
       # @param version [String] the release it is about
-      # @param notes [Hash] detail:, kept: (a count), restarted:, left:
+      # @param notes [Hash] detail:, kept:, merged: (counts of edited files that
+      #   stayed behind and that took the update), restarted:, left:
       def publish_notice(kind:, version:, **notes)
         @monitor.synchronize { emit("chi_notice", { kind: kind, version: version, **notes }) }
         nil