samagotchi 0.168.0 → 0.169.0

data/lib/samagotchi/compat.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "rubygems/version"
+require "date"
 require_relative "version"
 
 module Samagotchi
@@ -11,23 +12,31 @@ module Samagotchi
     # decided (kept until then). spec/compat_spec.rb fails once VERSION
     # passes a shim's +remove_after+, naming it. Each Ruby file names its
     # shim's id in a comment ("compat shim <id>").
+    # A shim stays at least 14 days after the release that added it.
     # @!attribute files [Array<String>] where the shim lives (from the repository root)
-    Shim = Data.define(:id, :added_in, :remove_after, :files, :what)
+    Shim = Data.define(:id, :added_in, :added_on, :remove_after, :files, :what)
+    MIN_AGE_DAYS = 14
 
     SHIMS = [
-      Shim.new(id: :cards_v1_seed, added_in: "0.151.0", remove_after: "0.170.0",
+      Shim.new(id: :cards_v1_seed, added_in: "0.151.0", added_on: "2026-11-05", remove_after: "0.170.0",
                files: ["lib/samagotchi/bridge/card_store.rb"],
                what: "CardStore#seed_v1 reads a cards.json from before the turn log; its comment says a retention " \
-                     "period after the release that wrote version 2 (0.151.0, 2026-11-05)")
+                     "period after the release that wrote version 2 (0.151.0, 2026-11-05)"),
+      Shim.new(id: :approvals_bare_list, added_in: "0.169.0", added_on: "2026-11-12", remove_after: "0.172.0",
+               files: ["lib/samagotchi/guardrails/approvals.rb"],
+               what: "Approvals reads the bare list written by chi 0.166 and before, converting it on write")
     ].freeze
 
     module_function
 
     # The shims +version+ has passed the remove_after of.
     # @return [Array<Shim>]
-    def overdue_shims(version: VERSION, shims: SHIMS)
+    def overdue_shims(version: VERSION, shims: SHIMS, today: Date.today)
       current = Gem::Version.new(version)
-      shims.select { |shim| shim.remove_after && current > Gem::Version.new(shim.remove_after) }
+      shims.select do |shim|
+        shim.remove_after && current > Gem::Version.new(shim.remove_after) &&
+          Date.iso8601(shim.added_on) + MIN_AGE_DAYS <= today
+      end
     end
 
     def verdict(worker_version:, version: VERSION, worker_protocol: nil, protocol: nil)

data/lib/samagotchi/engine/objectives.rb

@@ -19,13 +19,22 @@ module Samagotchi
         return unless session
 
         synchronize_events do
-          event = @objectives_stage.announce(session, state_dir: session_state_dir, running: live_conversation)
+          event = @objectives_stage.announce(session, view: objectives_view(session.id, session.messages))
           announce(event) if event
         end
       rescue StandardError => e
         Log.warn(:turn, "objectives_announce_failed", error: e.class.name, msg: e.message)
       end
 
+      # The view the worker announces and includes in its snapshots.
+      # @param session_id [String] the session whose objectives to read
+      # @param messages [Array<Hash>] the messages held by the caller's snapshot
+      # @param state_dir [String] the sessions dir
+      # @return [Hash, nil]
+      def objectives_view(session_id, messages, state_dir: session_state_dir)
+        Objectives.view(session_id, messages, state_dir: state_dir, running: live_conversation&.dup)
+      end
+
       # Check this (ObjectivesCheck)'s one side request. Its usage is in the
       # session's side line. Raises as ctx.ask_model's request does.
       # @param request [Array<Hash>] chat messages

data/lib/samagotchi/guardrails/approvals.rb

@@ -30,8 +30,8 @@ module Samagotchi
     #
     # The file is a versioned store, {"version", "approvals": [...]}
     # (FORMAT); a write keeps its version and the keys this chi doesn't
-    # know. A bare list of entries (what 0.166 and before wrote) is not
-    # a versioned store: it is set aside like an unreadable file.
+    # know. A bare list of entries (what 0.166 and before wrote) is read and
+    # becomes versioned on the next write.
     class Approvals
       FILE = "approvals.json"
       COLLECTION = "approvals"
@@ -192,6 +192,10 @@ module Samagotchi
       def parse(text)
         data = JSON.parse(text)
         case data
+        when Array
+          # compat shim approvals_bare_list
+          document = FORMAT.read({ COLLECTION => data }, collection: COLLECTION)
+          [document.entries.map(&:raw).select { |e| e.is_a?(Hash) }, document]
         when Hash
           raise JSON::ParserError, "#{COLLECTION} is not a list" unless data.fetch(COLLECTION, []).is_a?(Array)
 
@@ -199,7 +203,8 @@ module Samagotchi
           # An entry it can't read (no scope) is kept as it is: it matches
           # nothing, and a write keeps it for the chi that wrote it.
           [document.entries.map(&:raw).select { |e| e.is_a?(Hash) }, document]
-        else raise JSON::ParserError, "not a versioned store"
+        else
+          raise JSON::ParserError, "not a versioned store"
         end
       end
 

data/lib/samagotchi/session_continue.rb

@@ -21,6 +21,7 @@ require_relative "worker_link"
 require_relative "model_profile"
 require_relative "log"
 require_relative "session_manager"
+require_relative "session_stores"
 
 module Samagotchi
   # The next link of a session chain: chi send --new --continues and web
@@ -76,7 +77,7 @@ module Samagotchi
     # (taking an UndoContext) that gives it back when the continue fails;
     # empty when there is nothing to undo (CARRY's comment says why).
     # +store+ is the SessionManager::SESSION_STATE_STORES store it carries.
-    CarryStep = Data.define(:name, :store, :carry, :undo)
+    CarryStep = Data.define(:name, :store, :carry, :undo, :files)
     # What a carry step works on: the previous link (a Session), the new
     # link's id, the delegates moving (ChildMove::Plan#move).
     CarryContext = Data.define(:previous, :to, :state_dir, :move)
@@ -100,15 +101,16 @@ module Samagotchi
       # Its open delegates (ChildMove): given back to the previous link
       # first, then the rings one rang the link with just before the undo.
       CarryStep.new(name: :children, store: :session_files, carry: :carry_children,
-                    undo: { moved_back: :undo_move, link_stopped: :return_rings }),
+                    undo: { moved_back: :undo_move, link_stopped: :return_rings },
+                    files: %w[delegates.json parent.json]),
       # Its movable context too, with a note saying what moved and stayed.
       # No undo: ContextSources.move copies (the previous link keeps its
       # sources), and the link's copies go with its delete (remove_files).
-      CarryStep.new(name: :context, store: :context_sources, carry: :carry_context, undo: {}),
+      CarryStep.new(name: :context, store: :context_sources, carry: :carry_context, undo: {}, files: ["left.json"]),
       # Its objectives: the list reads as the latest word. No undo: a note
       # written into the link only (NoteMove::CONTINUE_SOURCES: never given
       # back), which goes with its delete.
-      CarryStep.new(name: :objectives, store: :session_files, carry: :carry_objectives, undo: {}),
+      CarryStep.new(name: :objectives, store: :session_files, carry: :carry_objectives, undo: {}, files: []),
       # Its waiting notes last: the carry above read a pending /objectives
       # edit from them first. They keep their names, so they still sort
       # ahead of the link's own notes. A note sent to the previous link
@@ -117,17 +119,12 @@ module Samagotchi
       # once the link is out of the chain, and again for a note an older chi
       # wrote after its folder went.
       CarryStep.new(name: :notes, store: :session_files, carry: :carry_notes,
-                    undo: { link_unlinked: :give_back_notes, link_deleted: :give_back_strays })
+                    undo: { link_unlinked: :give_back_notes, link_deleted: :give_back_strays }, files: [])
     ].freeze
 
     # The SessionManager::SESSION_STATE_STORES a continue deliberately
     # leaves with the previous link, and why: every store is in CARRY or here.
-    NOT_CARRIED = {
-      plugin_session_state: "a bundle's per-session state (ctx.session_dir) stays with the archived link",
-      participants: "the archive ends the previous link's review (D8); a continue copies no grants",
-      system_one_runs: "System 1's saved runs record the previous link's own turns",
-      context_candidates_log: "the candidates log records the previous link's own turns"
-    }.freeze
+    NOT_CARRIED = SessionStores::STORES.reject(&:carried?).to_h { |store| [store.file, store.continue] }.freeze
 
     # The model a new link runs on (#model_for): the name to spawn it with,
     # and why it isn't the previous link's (nil when it is, or was given).

data/lib/samagotchi/session_manager/removal.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "../session_stores"
+
 module Samagotchi
   class SessionManager
     # A delete that would pull the session from under its live worker.
@@ -61,9 +63,7 @@ module Samagotchi
 
     # Every store with session-scoped state. Deletion, retention and failed
     # continuation cleanup all pass through this registry.
-    SESSION_STATE_STORES = %i[
-      session_files plugin_session_state context_sources participants system_one_runs context_candidates_log
-    ].freeze
+    SESSION_STATE_STORES = SessionStores.removal_stores
 
     # Removal: archive, unarchive and delete a session (an archive takes its
     # delegates too), and the retention sweep's entry. Calls LifecyclePart's

data/lib/samagotchi/session_stores.rb

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+module Samagotchi
+  # The files that hold state for a session, including stores outside its
+  # sidecar directory. `corpus_dir` is relative to the compatibility corpus.
+  # A Symbol in `continue` names the carry step; a String explains why it stays.
+  module SessionStores
+    Store = Data.define(:file, :owner, :removal, :cross_version, :continue, :corpus_dir, :corpus_exception) do
+      def initialize(file:, owner:, removal:, cross_version:, continue:, corpus_dir:, corpus_exception: nil)
+        super
+      end
+
+      def carried? = continue.is_a?(Symbol)
+
+      def corpus_exception? = !corpus_exception.nil?
+    end
+
+    SIDE_CAR = "sessions/compat-session"
+    CONTEXT = "context/sessions/compat-session"
+
+    STORES = [
+      Store.new(file: "archived", owner: "ArchiveStore", removal: :session_files, cross_version: true,
+                continue: "the archived link remains its own session", corpus_dir: SIDE_CAR),
+      Store.new(file: "state.json", owner: "PluginSessionState", removal: :plugin_session_state, cross_version: false,
+                continue: "bundle state stays with the archived link", corpus_dir: nil),
+      Store.new(file: "left.json", owner: "ContextSources", removal: :context_sources, cross_version: true,
+                continue: :context, corpus_dir: CONTEXT),
+      Store.new(file: "participants.json", owner: "Participants", removal: :participants, cross_version: true,
+                continue: "a continue ends the previous link's review", corpus_dir: SIDE_CAR),
+      Store.new(file: "judgments.jsonl", owner: "SystemOne::RunsStore", removal: :system_one_runs, cross_version: false,
+                continue: "saved judgments belong to the previous link", corpus_dir: nil),
+      Store.new(file: "context_candidates.jsonl", owner: "ContextCandidatesLog", removal: :context_candidates_log,
+                cross_version: false, continue: "candidate records belong to the previous link", corpus_dir: nil),
+      Store.new(file: "bridge.json", owner: "WorkerSidecar", removal: :session_files, cross_version: true,
+                continue: "the bridge endpoint belongs to the old worker", corpus_dir: SIDE_CAR),
+      Store.new(file: "cards.json", owner: "Bridge::CardStore", removal: :session_files, cross_version: true,
+                continue: "cards describe turns in the previous link", corpus_dir: SIDE_CAR),
+      Store.new(file: "pending_card.json", owner: "Bridge::PendingCard", removal: :session_files, cross_version: true,
+                continue: "an open card belongs to its running turn", corpus_dir: SIDE_CAR),
+      Store.new(file: "turn_drawings.jsonl", owner: "Bridge::TurnDrawings", removal: :session_files, cross_version: true,
+                continue: "drawings describe turns in the previous link", corpus_dir: "sessions/compat-drawn"),
+      Store.new(file: "move.json", owner: "ChildMove", removal: :session_files, cross_version: true,
+                continue: "an interrupted move belongs to the previous continue", corpus_dir: SIDE_CAR),
+      Store.new(file: "continue.json", owner: "ContinueIntent", removal: :session_files, cross_version: true,
+                continue: "the intent records the previous link's continue", corpus_dir: SIDE_CAR),
+      Store.new(file: "objectives.lock", owner: "Objectives", removal: :session_files, cross_version: false,
+                continue: "a lock is not session data", corpus_dir: SIDE_CAR),
+      Store.new(file: "objectives_cards.json", owner: "Objectives", removal: :session_files, cross_version: true,
+                continue: "proposal answers belong to the previous link", corpus_dir: SIDE_CAR),
+      Store.new(file: "objective_checks.jsonl", owner: "ObjectivesCheck", removal: :session_files, cross_version: true,
+                continue: "checks belong to the previous link", corpus_dir: SIDE_CAR),
+      Store.new(file: "objective_tracks.jsonl", owner: "ObjectivesTrack", removal: :session_files, cross_version: true,
+                continue: "tracks belong to the previous link", corpus_dir: SIDE_CAR),
+      Store.new(file: "owner.lock", owner: "OwnerLock", removal: :session_files, cross_version: false,
+                continue: "the owner lock is not session data", corpus_dir: SIDE_CAR),
+      Store.new(file: "reminders.json", owner: "ReminderCarry", removal: :session_files, cross_version: true,
+                continue: "a restart hand-off is not a continue carry", corpus_dir: SIDE_CAR),
+      Store.new(file: "recap.json", owner: "RecapStore", removal: :session_files, cross_version: true,
+                continue: "the recap remains with the previous link", corpus_dir: SIDE_CAR),
+      Store.new(file: "stopped", owner: "Session", removal: :session_files, cross_version: true,
+                continue: "the stop marker belongs to the previous link", corpus_dir: SIDE_CAR),
+      Store.new(file: "parent.json", owner: "Session", removal: :session_files, cross_version: true,
+                continue: :children, corpus_dir: SIDE_CAR),
+      Store.new(file: "starting", owner: "StartingMarker", removal: :session_files, cross_version: true,
+                continue: "a start marker belongs to its spawn", corpus_dir: nil,
+                corpus_exception: "the corpus marker would always be stale, so it cannot pin the live-start handshake"),
+      Store.new(file: "thinking_tails.jsonl", owner: "ThinkingTails", removal: :session_files, cross_version: true,
+                continue: "generation tails remain with the previous link", corpus_dir: SIDE_CAR),
+      Store.new(file: "delegates.json", owner: "Tools::DelegateCursors", removal: :session_files, cross_version: true,
+                continue: :children, corpus_dir: SIDE_CAR),
+      Store.new(file: "delegates.lock", owner: "Tools::DelegateCursors", removal: :session_files, cross_version: false,
+                continue: "a lock is not session data", corpus_dir: SIDE_CAR)
+    ].freeze
+
+    def self.removal_stores = STORES.map(&:removal).uniq.freeze
+
+    def self.corpus_stores = STORES.select(&:cross_version).freeze
+  end
+end

data/lib/samagotchi/turn_stages/objectives.rb

@@ -97,18 +97,16 @@ module Samagotchi
       # @param state_dir [String] the sessions dir
       def note(session, note, recorder:, state_dir:) = audit(state_dir, recorder).note(session, note)
 
-      # The session's objectives as the page draws them (Objectives.view), when
-      # that differs from the last announced: after an edit (its file written,
-      # pending), once a list note is in, at a turn's end (its moves) and after
-      # a rollback. A session with no list announces nothing. The caller
+      # The session's objectives as the page draws them (Engine#objectives_view),
+      # when that differs from the last announced: after an edit (its file
+      # written, pending), once a list note is in, at a turn's end (its moves)
+      # and after a rollback. A session with no list announces nothing. The caller
       # (Engine#announce_objectives) holds the event lock, the one guard of
       # the last view, announces the event and logs a failure: it only
       # informs, never fails a turn.
-      # @param state_dir [String] the sessions dir
-      # @param running [Array<Hash>, nil] the running turn's conversation (Engine#live_conversation), nil between turns
+      # @param view [Hash, nil] the view from Engine#objectives_view
       # @return [Hash, nil] the :objectives_updated event to announce, nil when the view is the same
-      def announce(session, state_dir:, running:)
-        view = Samagotchi::Objectives.view(session.id, session.messages, state_dir: state_dir, running: running&.dup)
+      def announce(session, view:)
         return if view.nil? || view == @announced
 
         @announced = view

data/lib/samagotchi/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Samagotchi
-  VERSION = "0.168.0"
+  VERSION = "0.169.0"
   # Sent as the User-Agent of every HTTP request chi makes.
   USER_AGENT = "chi/#{VERSION}"
 end

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

@@ -448,12 +448,14 @@ const questionCards = createQuestionCards({
   isNearBottom: () => isNearBottom(),
   scrollToEnd: () => { historyEl.scrollTop = historyEl.scrollHeight; },
   removeHintIfEmpty: () => removeHintIfEmpty(),
-  askingText: () => turnDom.askingText(),
+  askingText: (pq) => turnDom.askingText(pq),
   renderMarkdown,
   linkRefs: linkRefsIn,
   pairRefs: pairRefsIn,
   // The bar's chip reads questionCards.pendingQuestion() (sessionWaits).
   onPending: () => store.touch("infoBar"),
+  // The stage's waiting cards as data (stage_waiting.js).
+  onSettled: (key) => turnDom.settleWaiting?.(key),
 });
 // The history's bubbles (bubbles.js): output, end lines, every client's
 // prompts, the recap, warnings and notices, command and note bubbles.

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

@@ -2,7 +2,7 @@
 // One observer per turn root, filtered to TEXTS, as copy.js and answer_fold.js:
 // every path that fills a root (a reload, a session switch, a turn's end, an
 // answer_display, Revise's clones, a step's swap) arrives the same way, and
-// cards, the asking slot and question replies are never touched. A block is
+// cards, a lead-in bubble and question replies are never touched. A block is
 // drawn when it comes near its scroller's view (a closed <details> opening is
 // such a coming near), and one that moves to another scroller while it waits
 // (the stage's hand-off to #history) is watched there.

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

@@ -15,6 +15,7 @@ import { stepText } from "./turn_block.js";
 import { llmContextNotice, noticeLine } from "./turn_events.js";
 import { hookNoticeTemplate, TURN_PROMPT, turnPromptBubbles } from "./bubbles.js";
 import { stillOn } from "./latest.js";
+import { pluginCardKey } from "./stage_waiting.js";
 
 // The elements of the reloaded turn that ends before +before+ (the next
 // turn's prompt, or null for the last turn), its prompt first.
@@ -71,15 +72,18 @@ export function createCardsPlace({
     if (!card || !card.id) return;
     turnDom.settleFold?.();
     const existing = cardElement(card.id);
+    const asks = (card.actions || []).some((a) => a && a.command);
     if (existing) {
       const drawn = drawCard(existing, card);
       drawn.classList.add("card-updated");
       setTimeout(() => drawn.classList.remove("card-updated"), 900);
+      // Redrawn without its actions (check-in's card turned into its notice
+      // row): it no longer asks (stage_waiting.js).
+      if (!asks) turnDom.settleWaiting?.(pluginCardKey(card.id), { only: "asks" });
       return;
     }
     bubbles.removeHintIfEmpty();
     const el = drawCard(document.createElement(isNoticeCard(card) ? "details" : "div"), card);
-    const asks = (card.actions || []).some((a) => a && a.command);
     if (card.in_turn && !before && !asks && turnDom.card(el)) return;
     bubbles.placeFollowing(el, before);
   }

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

@@ -49,10 +49,10 @@ body{font-family: ui-sans-serif,system-ui,-apple-system,Segoe UI,Roboto,Helvetic
 /* A session that waits on the user (a question, an approval, a card with actions): the warning colour of its question card, also when active or hovered. */
 #topStrip .card.waiting,#allList .card.waiting{border-color:color-mix(in srgb,var(--warn) 75%,transparent)}
 @media(hover:hover){#topStrip .card.waiting:hover,#allList .card.waiting:hover{border-color:var(--warn)}}
-@supports not ((backdrop-filter:blur(1px)) or (-webkit-backdrop-filter:blur(1px))){.turn-stage,#topStrip .card,#allList .card,#allHead input{background:var(--bg-panel)}.bubble.question{background:color-mix(in srgb,var(--warn) 7%,var(--bg-panel))}.bubble.plugin-card{background:color-mix(in srgb,var(--accent) 6%,var(--bg-panel))}}
-@media (prefers-reduced-transparency:reduce){.turn-stage,#topStrip .card,#allList .card,#allHead input{background:var(--bg-panel);-webkit-backdrop-filter:none;backdrop-filter:none}.bubble.question{background:color-mix(in srgb,var(--warn) 7%,var(--bg-panel));-webkit-backdrop-filter:none;backdrop-filter:none}.bubble.plugin-card{background:color-mix(in srgb,var(--accent) 6%,var(--bg-panel));-webkit-backdrop-filter:none;backdrop-filter:none}}
+@supports not ((backdrop-filter:blur(1px)) or (-webkit-backdrop-filter:blur(1px))){.turn-stage,#topStrip .card,#allList .card,#allHead input{background:var(--bg-panel)}.bubble.question{background:var(--bg-panel)}.bubble.plugin-card{background:color-mix(in srgb,var(--accent) 6%,var(--bg-panel))}}
+@media (prefers-reduced-transparency:reduce){.turn-stage,#topStrip .card,#allList .card,#allHead input{background:var(--bg-panel);-webkit-backdrop-filter:none;backdrop-filter:none}.bubble.question{background:var(--bg-panel);-webkit-backdrop-filter:none;backdrop-filter:none}.bubble.plugin-card{background:color-mix(in srgb,var(--accent) 6%,var(--bg-panel));-webkit-backdrop-filter:none;backdrop-filter:none}}
 body.no-glass .turn-stage,body.no-glass #topStrip .card,body.no-glass #allList .card,body.no-glass #allHead input{background:var(--bg-panel);-webkit-backdrop-filter:none;backdrop-filter:none}
-body.no-glass .bubble.question{background:color-mix(in srgb,var(--warn) 7%,var(--bg-panel));-webkit-backdrop-filter:none;backdrop-filter:none}
+body.no-glass .bubble.question{background:var(--bg-panel);-webkit-backdrop-filter:none;backdrop-filter:none}
 body.no-glass .bubble.plugin-card{background:color-mix(in srgb,var(--accent) 6%,var(--bg-panel));-webkit-backdrop-filter:none;backdrop-filter:none}
 button,input,textarea,select{font:inherit}
 button{background:var(--primary);border:0;color:var(--on-solid);padding:8px 12px;border-radius:8px;cursor:pointer;transition:filter .12s ease,background .12s ease}
@@ -426,24 +426,26 @@ 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. 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}
+/* 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. So is a running turn's block opened in the
+   history (data-opened-turn, stage_asking.js openTurn): the step's text is in it while a card without a lead-in waits. */
+.turn-work:not([data-opened-turn]):not(:has(.gen~.gen,.thinking-body,.activity-body,.gen:not(.live)>.gen-text)){border:0;padding:0;background:transparent}
+.turn-work:not([data-opened-turn]):not(:has(.gen~.gen,.thinking-body,.activity-body,.gen:not(.live)>.gen-text))>summary,.turn-work:not([data-opened-turn]):not(:has(.gen~.gen,.thinking-body,.activity-body,.gen:not(.live)>.gen-text)) .gen>summary{display:none}
+.turn-work:not([data-opened-turn]):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([data-opened-turn]):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}
+/* A question card asks for input like the composer card, so it wears the same glass (the recipe above), no amber: what
+   waits says so in the stage's status row ("waiting for you", its dot) and on a waiting lead-in bubble. */
+.bubble.question{border-left:3px solid var(--border-strong);padding:10px 12px}
 /* Collapsed (resolved) question: one line, like the thinking and activity blocks.
-   The left bar keeps --warn here; the existing answered/cancelled/denied classes
+   The left bar is neutral here; the existing answered/cancelled/denied classes
    (which apply whether open or not) recolour it once resolved. */
 .bubble.question:not([open]){padding:3px 10px;background:transparent;border-color:transparent;box-shadow:none;-webkit-backdrop-filter:none;backdrop-filter:none;align-self:flex-start;border-radius:6px;transition:background .12s ease}
-.bubble.question:not([open]){border-left-color:var(--warn)}
+.bubble.question:not([open]){border-left-color:var(--border-strong)}
 @media(hover:hover){.bubble.question:not([open]):hover{background:var(--bg-panel)}}
 .bubble.question:not([open])>summary{font-size:12px;font-weight:500}
 .bubble.question>summary{cursor:pointer;color:var(--text-muted);font-size:13px;font-weight:600;user-select:none;list-style:none}
 .bubble.question>summary::-webkit-details-marker{display:none}
-.bubble.question>summary::before{content:"▸ ";color:var(--warn)}
+.bubble.question>summary::before{content:"▸ ";color:var(--text-faint)}
 .bubble.question[open]>summary::before{content:"▾ "}
 /* An answered card keeps the reply that asked it (question_cards.js): muted under its "Q → A" line, two lines while
    closed (newlines as spaces); open, the summary's copy goes and the body's starts the card, whole, as written and
@@ -456,6 +458,9 @@ button.system-one-wrong,.system-one-wrong.marked{flex:none;padding:1px 6px;borde
 .bubble.said+.bubble.question :is(.question-said,.question-said-full){display:none}
 /* Its asking step in the steps block doesn't repeat the reason either (stage_opened.js data-said, until the hand-off). */
 .turn-work>details.gen[data-said]>.gen-text{display:none}
+/* A card that waits in the stage has no toggle of its own (stage_view.js): the stage's fold is the one. */
+.turn-stage .bubble.question:not(.answered):not(.cancelled)>summary{cursor:default}
+.turn-stage .bubble.question:not(.answered):not(.cancelled)>summary::before{content:none}
 .question-reason-link{float:right;margin-left:12px;padding:0;border:0;background:none;color:var(--accent);font-size:12.5px;font-weight:500;line-height:inherit}
 @media(hover:hover){.question-reason-link:hover:not(:disabled){filter:none;text-decoration:underline}}
 /* The reply that asked the model's own question, a conversation bubble while its turn runs (live only): a label line ("chi ·
@@ -479,19 +484,13 @@ button.system-one-wrong,.system-one-wrong.marked{flex:none;padding:1px 6px;borde
   --md-strong-color:currentColor;--md-blockquote-color:currentColor;--md-code-color:currentColor;
   --md-pre-size:12px;--md-cell-size:12.5px
 }
-.ts-asking.md-compact{
-  --md-heading-size:14.5px;--md-heading-color:var(--text-bright);
-  --md-subheading-size:14px;--md-subheading-color:var(--text-2);
-  --md-strong-color:var(--text-bright);--md-blockquote-color:var(--text-muted);--md-code-color:var(--text);
-  --md-pre-size:12.5px;--md-cell-size:13px
-}
 .gen-text.md-compact{
   --md-heading-size:14.5px;--md-heading-color:var(--text);
   --md-subheading-size:14px;--md-subheading-color:var(--text-2);
   --md-strong-color:var(--text);--md-blockquote-color:var(--text-muted);--md-code-color:var(--text);
   --md-pre-size:12.5px;--md-cell-size:13px
 }
-.md-compact:is(.ts-asking,.question-said-full,.gen-text,.said-text){white-space:normal}
+.md-compact:is(.question-said-full,.gen-text,.said-text){white-space:normal}
 .md-compact :is(h1,h2,h3,h4,h5,h6){font-size:var(--md-heading-size);font-weight:600;line-height:1.4;margin:8px 0 2px;color:var(--md-heading-color)}
 .md-compact :is(h4,h5,h6){font-size:var(--md-subheading-size);color:var(--md-subheading-color)}
 .md-compact :is(p,ul,ol,blockquote,table,pre){margin:0 0 6px}
@@ -541,7 +540,7 @@ button.system-one-wrong,.system-one-wrong.marked{flex:none;padding:1px 6px;borde
 .question-option{display:flex;gap:8px;align-items:center;font-size:13px;color:var(--text-2);padding:6px 8px;border:1px solid var(--border);border-radius:8px;cursor:pointer}
 @media(hover:hover){.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)}
+.question-option input{margin:0;accent-color:var(--accent)}
 /* 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)}
@@ -558,7 +557,7 @@ button.system-one-wrong,.system-one-wrong.marked{flex:none;padding:1px 6px;borde
 .bubble.question.cancelled .question-result{color:var(--text-muted)}
 .question-submit{align-self:flex-end;font-size:13px}
 .question-dismiss{font-size:13px;margin-left:8px}
-.bubble.question.approval{border-left-color:var(--warn);background:color-mix(in srgb,var(--warn) 7%,var(--glass-bg))}
+.bubble.question.approval{border-left-color:var(--border-strong)}
 .bubble.question.approval.answered:not(.denied){border-left-color:var(--ok)}
 .bubble.question.approval:not([open]){background:transparent}
 @media(hover:hover){.bubble.question.approval:not([open]):hover{background:var(--bg-panel)}}
@@ -575,9 +574,9 @@ button.system-one-wrong,.system-one-wrong.marked{flex:none;padding:1px 6px;borde
 .question-relayed.hidden{display:none}
 .question-relayed a{color:var(--text);font-weight:600}
 .approval-tool{font-weight:700;color:var(--text);margin-bottom:4px}
-.approval-what{margin:0 0 6px;padding:8px 10px;background:var(--bg-inset);border:1px solid var(--warn-border);border-radius:6px;white-space:pre-wrap;word-break:break-all;color:var(--warn-bright);font-size:12.5px}
+/* What it approves, neutral like the card (no amber on question cards): the command in the code's own box. */
+.approval-what{margin:0 0 6px;padding:8px 10px;background:var(--bg-inset);border:1px solid var(--border);border-radius:6px;white-space:pre-wrap;word-break:break-all;color:var(--text-2);font-size:12.5px}
 .approval-where,.approval-why{font-size:12px;color:var(--text-muted);overflow-wrap:anywhere}
-.approval-why{color:var(--warn-text)}
 .approval-label{color:var(--text-faint)}
 /* A diff (diff_view.js): the approval card's dry run and a tool row's change. */
 .approval-diff{margin:0 0 6px}
@@ -841,7 +840,9 @@ body.stage-view .turn-stage{position:absolute;left:0;right:0;bottom:100%;margin-
 .turn-stage[hidden]{display:none}
 .turn-stage.ended{border-left-color:var(--border-strong)}
 .turn-stage[data-phase="answered"]{border-left-color:var(--ok)}
-.turn-stage[data-phase="canceled"],.turn-stage[data-phase="waiting for you"]{border-left-color:var(--warn)}
+.turn-stage[data-phase="canceled"]{border-left-color:var(--warn)}
+/* A card waits: the box has no amber edge (the status row's word and dot say it). */
+.turn-stage[data-phase="waiting for you"]{border-left-color:var(--border-strong)}
 .turn-stage[data-phase="failed"]{border-left-color:var(--danger)}
 .turn-stage[data-phase="no answer"]{border-left-color:var(--warn)}
 .turn-stage.enter{animation:ts-rise .35s cubic-bezier(.3,.7,.2,1)}
@@ -900,21 +901,36 @@ body.stage-view .turn-stage{position:absolute;left:0;right:0;bottom:100%;margin-
 .ts-headline.thinking{font-size:13.5px;font-style:italic;color:var(--text-muted)}
 .ts-think-tag{font-style:normal;font-size:12.5px;color:var(--think-text);margin-right:6px}
 .ts-headline.fresh{animation:ts-fade .3s ease}
-/* While a question or approval waits: the whole reply that asked it, in the headline's place; raw as a closed step's
-   text, then its markdown when web.markdown is on (.markdown, stage_slots.js drawAsking); capped so the card keeps
-   its room, read from the top. */
-.ts-asking{max-height:calc(var(--stage-max,60vh) * .35);overflow:auto;scrollbar-width:thin;white-space:pre-wrap;overflow-wrap:anywhere;font-size:14px;line-height:1.55;color:var(--narr);border-left:2px solid var(--border-strong);padding-left:10px}
-/* The asking form (stage_view.js, a turn opened in the history while the model's own question waits): its reply is a
-   bubble in the conversation (.bubble.said), the stage shows the status row and the card alone; the prompt, the live
+/* The asking form (stage_view.js, a card docked: its turn opened in the history, a reply before chi's own question or
+   approval a bubble there, .bubble.said): the stage shows the status row and the card alone; the prompt, the live
    slots (the working set's rail with them) and the steps chip come back with the working form after the answer. */
 .turn-stage.asking-form :is(.ts-prompt,.ts-live,.ts-foot){display:none}
-/* It is one box (the mock-up's option A): the stage's frame takes the card's look (the card's tint, no glass; its amber edge
-   is the waiting phase's), the status row is the box's first line, and the card inside drops its own box, so there is no
-   box in a box and no second amber edge. */
-.turn-stage.asking-form{background:color-mix(in srgb,var(--warn) 7%,var(--bg-panel));-webkit-backdrop-filter:none;backdrop-filter:none;border-radius:12px}
+/* It is one box (the mock-up's option A): the stage's frame takes the card's look (opaque, no glass, no amber: the status
+   row's "waiting for you" and its dot say it waits), the status row is the box's first line, and the card inside drops
+   its own box, so there is no box in a box. */
+.turn-stage.asking-form{background:var(--bg-panel);-webkit-backdrop-filter:none;backdrop-filter:none;border-radius:12px}
 .turn-stage.asking-form .ts-scroll{padding-top:6px}
-.turn-stage.asking-form .ts-extras>.bubble.question{border:0;border-radius:0;background:transparent;padding:0}
-.turn-stage.asking .ts-headline{display:none}
+.turn-stage.asking-form .ts-extras>:is(.bubble.question,.bubble.plugin-card:not(.warn)){border:0;border-radius:0;background:transparent;padding:0}
+/* The asking form folded (stage_view.js, its fold is that question's only): the status row says "waiting for you" and the
+   question (the mini tool's slot, in the UI font, right after the phase), then the step and the timing. On a phone those
+   two leave the row and the question takes a second line under it. */
+.ts-mini.ts-mini-question{order:1;font-family:inherit;font-size:12.5px;color:var(--text)}
+/* Two cards docked (stage_view.js drawDocked): one at a time, the one that stops chi in front; the pager after the phase
+   says where it is ("‹ 1 of 2 ›"), the other waits behind it. */
+.turn-stage .ts-extras>.ts-behind{display:none}
+.ts-pager{flex:none;display:inline-flex;align-items:center;gap:2px;color:var(--text-2)}
+.ts-pager[hidden]{display:none}
+.ts-page{flex:none;min-width:22px;height:22px;padding:0 4px;border-radius:6px;background:transparent;color:var(--text-muted);font-size:14px;line-height:1}
+.ts-page:disabled{opacity:.35}
+@media(hover:hover){.ts-page:hover:not(:disabled){filter:none;background:var(--bg-hover);color:var(--text)}}
+.ts-page-label{font-variant-numeric:tabular-nums}
+/* check-in docked while nothing blocks (stage_view.js .asks-live): the row says the running call right after the phase,
+   then the turn's time; the step count is the history's steps line. The live step's text streams under the card. */
+.turn-stage.asks-live .ts-status>:not(.ts-mark,.ts-phase,.ts-mini){order:2}
+.turn-stage.asks-live .ts-mini{order:1}
+.turn-stage.asks-live .ts-step{display:none}
+.ts-asks-text{padding-top:8px;border-top:1px dashed var(--border-strong);white-space:pre-wrap;overflow-wrap:anywhere;font-size:14px;line-height:1.55;color:var(--text)}
+.turn-stage.asking-form.collapsed .ts-status>:not(.ts-mark,.ts-phase,.ts-mini){order:2}
 @keyframes ts-fade{from{opacity:.35}}
 .ts-now{height:var(--ts-now-h);display:flex;align-items:center;gap:8px;min-width:0;padding:0 9px;border-radius:8px;background:var(--accent-tint);font-size:13px}
 .ts-spin{flex:none;width:11px;height:11px;border:2px solid var(--warn);border-right-color:transparent;border-radius:50%;animation:init-spin .8s steps(16) infinite}
@@ -974,7 +990,7 @@ body.stage-view .turn-stage{position:absolute;left:0;right:0;bottom:100%;margin-
 :is(.ts-extras>.bubble.user,.ts-prompt:not(.full)>.bubble.user)>.user-message.markdown :is(hr,img,.copy-btn){display:none}
 /* Inside the dock's own blur a second backdrop-filter sees nothing: the cards are opaque here (as #commandList is). */
 .turn-stage .bubble.question,.turn-stage .bubble.plugin-card{-webkit-backdrop-filter:none;backdrop-filter:none;box-shadow:none}
-.turn-stage .bubble.question{background:color-mix(in srgb,var(--warn) 7%,var(--bg-panel))}
+.turn-stage .bubble.question{background:var(--bg-panel)}
 .turn-stage .bubble.plugin-card{background:color-mix(in srgb,var(--accent) 6%,var(--bg-panel))}
 .turn-stage .bubble.plugin-card.warn{background:color-mix(in srgb,var(--warn) 7%,var(--bg-panel))}
 .ts-answer{display:flex;flex-direction:column;gap:8px}
@@ -1194,7 +1210,10 @@ button.ws-row:hover:not(:disabled){filter:none}@media(hover:hover){button.ws-row
   /* The quiet signal's short text on a phone; in the status row it takes the step's and the mini tool's room. */
   .ts-stall .long{display:none}
   .ts-stall .short{display:inline}
-  .turn-stage.stalled:is(.collapsed,.plain) :is(.ts-step,.ts-mini){display:none}
+  .turn-stage.stalled:is(.collapsed,.plain) :is(.ts-step,.ts-mini:not(.ts-mini-question)){display:none}
+  .turn-stage.asking-form.collapsed .ts-status{flex-wrap:wrap;row-gap:4px}
+  .turn-stage.asking-form.collapsed :is(.ts-step,.ts-timing){display:none}
+  .ts-mini.ts-mini-question{order:3;flex-basis:100%}
   /* An approval's Submit in sight on a phone: its folder, reason and rows a little tighter. */
   .approval-where,.approval-why{line-height:1.35}
   .bubble.question.approval .question-option{padding:5px 8px}

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

@@ -36,7 +36,7 @@ export function createMarkdownPlace({
     pairAnswerRefs(el);
   }
 
-  // The refs in one rendered text (the stage's asking slot, a kept reply),
+  // The refs in one rendered text (a lead-in bubble, a kept reply),
   // as linkTextRefs links the answers': a plugin's +refs+ first
   // (pairRefsIn), then the `path:line` ones.
   function linkRefsIn(el, refs) {