samagotchi 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 760138c7792d414a15c39e074c5a6dc0ad44dfd0937c12707c3e6428a3544d43
-  data.tar.gz: d347cc3e3d7433292c40484beb73b95e2e3a9efb48ecd5ba5168b3c562c8d7e2
+  metadata.gz: 7cb85a0b5509a00cd396dd2db8c269c7959ccbbdd004649d626476067b652bbd
+  data.tar.gz: b2a46cc3632563de6f1d7c0f979b9ac54bccdfa765a643c576a5c24d7b492bf3
 SHA512:
-  metadata.gz: ae3585c68672ad0b163448b92c83e9f2d60dbc5efd60c47090170d80750ad20a08a5eae97aebf0dbc57629909db228de565a6a3a00ccb40bff9757ea66c3aeff
-  data.tar.gz: 4330ef708fe3ebc22f30e4cf249f88fb68a870eb1afd3be9894822e8e819ca25d393b34ffbabf56ef23ee784016b7cdcae9014d709f42db31fac88f501048ddb
+  metadata.gz: '07187883e2ffb8d0a0cbeaafd870551df02e166d7301e3696223efeba5d7b4eaab002a4ccc5180dd88c8d20c8cbcec302b2c9932ea99bd0b872b34051375d651'
+  data.tar.gz: 759493ed3abbd40da61128bca6cbb2805937697af546739b52e1e365b01867d1c648484aefdd7a4b1512acc50515d2c588f6fc48342c36f238b2c34713827750

data/CHANGELOG.md

@@ -8,6 +8,32 @@ and commands may change between minor versions. How releases are made:
 
 ## [Unreleased]
 
+## [0.15.0] - 2026-10-02
+
+### Added
+
+- The hidden session strip's pill counts the sessions that wait for you (`▾ 5 sessions · 1 live · 1 waiting`, in the
+  warn colour).
+- The all-sessions search finds the sessions that wait for you: `waiting`, `question`, `approval` or `needs you`.
+
+### Fixed
+
+- `chi --resume ID` (and `--attach`) shows the last exchange's tool calls as the live tool rows
+  (`tool> running command (execute command="true"): ok`) between the prompt and the answer, not the prompt and the
+  answer alone.
+- A `--no-shared` REPL keeps the session's `cards.json` as a worker does: its turns count, so the cards and notices an
+  earlier worker showed stay where they were in the web, and the REPL's own are saved too.
+- A deleted, discarded or retention-pruned session takes its plugins' state with it: a bundle's
+  `plugins/<bundle>/sessions/<id>.json` (or `<id>/`) under the state dir, such as check-in's `/checkin` settings, no
+  longer stays behind.
+- `chi self`'s context window row shows the current model's configured window: its `models.<key>.window_tokens`, else
+  its host's `hosts.<name>.window_tokens`, else `context.window_tokens` or the default, and says which.
+- The web pairs each prompt with its own turn's timing: a failed turn (its prompt went back to you) no longer shifts
+  the timing lines and turn numbers of the turns after it. chi saves a turn id on each prompt; prompts saved before
+  this still pair by their place.
+
+Update with `chi update` (no bundle changes).
+
 ## [0.14.0] - 2026-10-02
 
 ### Added
@@ -782,7 +808,8 @@ and long-lived sessions.
 - A macOS desktop helper (`chi desktop install`): a "Send to chi" Service and a
   hotkey panel that send selected text or the clipboard to your sessions.
 
-[Unreleased]: https://github.com/dm1try/samagotchi/compare/v0.14.0...HEAD
+[Unreleased]: https://github.com/dm1try/samagotchi/compare/v0.15.0...HEAD
+[0.15.0]: https://github.com/dm1try/samagotchi/compare/v0.14.0...v0.15.0
 [0.14.0]: https://github.com/dm1try/samagotchi/compare/v0.13.0...v0.14.0
 [0.13.0]: https://github.com/dm1try/samagotchi/compare/v0.12.0...v0.13.0
 [0.12.0]: https://github.com/dm1try/samagotchi/compare/v0.11.0...v0.12.0

data/docs/plugins.md

@@ -479,7 +479,7 @@ full label, `plugin.rb (bundle my-bundle)`.
 | `ctx.cwd` | the session's working directory |
 | `ctx.repo_root` | the git checkout holding `cwd`, or nil |
 | `ctx.settings` | the bundle's settings, frozen |
-| `ctx.data_dir` | `$XDG_STATE_HOME/samagotchi/plugins/<bundle>/`, created on first use |
+| `ctx.data_dir` | `$XDG_STATE_HOME/samagotchi/plugins/<bundle>/`, created on first use. A session's own state goes in `sessions/<id>.json` or `sessions/<id>/` there: chi removes it when the session is deleted, discarded or pruned |
 | `ctx.log` | `ctx.log.info(:event, key: value)`: debug-log records tagged `plugins`, with `bundle=<bundle>` |
 | `ctx.messages` | the conversation, as a frozen copy, without the system prompt. While a turn runs, a session worker's (attached, web) adds that turn so far: its prompt, the model's text and the lines merged into it (no tool calls or thinking); the REPL's is the conversation before that turn |
 | `ctx.messages_partial?` | whether `ctx.messages` leaves out a running turn (the REPL mid-turn), so a plugin can say what its answer is about |
@@ -937,8 +937,8 @@ with a line and carry on unchanged.
 
 `/checkin` (anytime) for this session. What it changes (on/off, the mode,
 the threshold) is saved with the session, in the bundle's data dir
-(`plugins/check-in/sessions/<id>.json`), so it outlasts a worker's restart;
-another session starts from config.yml:
+(`plugins/check-in/sessions/<id>.json`), so it outlasts a worker's restart
+and goes with the session; another session starts from config.yml:
 
 | | |
 |---|---|

data/lib/samagotchi/bundles/system/manifest.yml

@@ -1,6 +1,6 @@
 ---
 name: samagotchi-system
-version: 0.14.0
+version: 0.15.0
 scope: system
 description: Default system memories — identity, self map, config modification protocol, memory guide and the delegated-session rules
 files:

data/lib/samagotchi/engine.rb

@@ -1362,8 +1362,10 @@ module Samagotchi
     # +ended+: the end event is out (what follows is post-turn work).
     # +settings+: the kernel's LLM::TurnSettings, made in #prepare_turn and
     # set on the kernel in #generate.
+    # +id+: names the turn on :turn_started (its metrics record's id) and on
+    # its saved prompt, so a UI pairs the two whatever left the conversation.
     Turn = Struct.new(:session, :prompt, :continue, :on_event, :controller, :origin, :started_at, :messages, :ended,
-                      :settings) do
+                      :settings, :id) do
       # The turn's boundary events carry the origin only when there is one,
       # so payloads stay unchanged for callers that don't pass it.
       def tag(event) = origin ? event.merge(origin: origin) : event
@@ -1478,7 +1480,8 @@ module Samagotchi
       @guardrail_wiring.begin_turn(origin)
 
       Turn.new(session: session, prompt: continue ? nil : prompt, continue: continue, on_event: on_event,
-               controller: effective_controller, origin: origin, started_at: Process.clock_gettime(Process::CLOCK_MONOTONIC))
+               controller: effective_controller, origin: origin, started_at: Process.clock_gettime(Process::CLOCK_MONOTONIC),
+               id: SecureRandom.uuid)
     end
     private :begin_turn
 
@@ -1492,7 +1495,7 @@ module Samagotchi
       image_refs, image_error = turn_image_refs(session, images)
       # Emit turn_started event
       bind_metrics(session)
-      turn_started = { type: :turn_started, session_id: session.id, prompt: turn.prompt }
+      turn_started = { type: :turn_started, session_id: session.id, prompt: turn.prompt, turn_id: turn.id }
       turn_started[:continue] = true if turn.continue
       turn_started[:images] = image_refs unless image_refs.empty?
       emit_event(turn.on_event, turn.tag(turn_started))
@@ -1595,7 +1598,7 @@ module Samagotchi
 
       return if turn.continue
 
-      user_message = { role: "user", content: turn.prompt }
+      user_message = { role: "user", content: turn.prompt, turn_id: turn.id }
       user_message[:images] = image_refs unless image_refs.empty?
       turn.messages << user_message
       session.last_prompt = turn.prompt

data/lib/samagotchi/llm/chat_loop.rb

@@ -193,9 +193,10 @@ module Samagotchi
       # The shape the engine persists: role and content (parts stay an
       # Array), plus a model turn's tool_calls and thinking (the host's
       # reasoning, never sent back), a result's tool_call_id, the image
-      # refs of a user message or a tool result, and a plugin tool result's
-      # tool_params and tool_labels (the live row's params line and label,
-      # never sent back), and an edit/write result's tool_diffs (never sent).
+      # refs of a user message or a tool result, a prompt's turn_id (Engine,
+      # never sent), and a plugin tool result's tool_params and tool_labels
+      # (the live row's params line and label, never sent back), and an
+      # edit/write result's tool_diffs (never sent).
       def plain(conversation)
         conversation.map do |entry|
           content = entry[:content].is_a?(Array) ? entry[:content] : entry[:content].to_s
@@ -203,6 +204,7 @@ module Samagotchi
           message[:tool_calls] = entry[:tool_calls] if entry[:tool_calls].is_a?(Array) && !entry[:tool_calls].empty?
           message[:tool_call_id] = entry[:tool_call_id] if entry[:tool_call_id]
           message[:images] = entry[:images] if entry[:images].is_a?(Array) && !entry[:images].empty?
+          message[:turn_id] = entry[:turn_id] if entry[:turn_id]
           message[:thinking] = entry[:thinking] if entry[:thinking].is_a?(String) && !entry[:thinking].empty?
           ToolResponse::SAVED_KEYS.each { |key| message[key] = entry[key] if entry[key] }
           message[TurnNote::RETRY_NUDGE] = true if TurnNote.retry_nudge?(entry)

data/lib/samagotchi/plugin_session_state.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require "fileutils"
+require_relative "paths"
+require_relative "session"
+
+module Samagotchi
+  # A plugin's state for one session, by convention under its data dir
+  # (ctx.data_dir): sessions/<id>.json or sessions/<id>/. It goes when the
+  # session does (SessionManager.delete_session: the CLI, the web, a
+  # discarded empty session; SessionRetention's prune), so no bundle keeps
+  # state for sessions that are gone (check-in's /checkin settings).
+  module PluginSessionState
+    module_function
+
+    # @return [Array<String>] the paths removed
+    def remove(session_id, env: ENV)
+      id = session_id.to_s
+      # Only a plain id: anything else could name a path outside the dir.
+      return [] unless Session.valid_id?(id)
+
+      Dir.glob(File.join(Paths.state_dir(env: env), "plugins", "*", "sessions")).flat_map do |dir|
+        [File.join(dir, "#{id}.json"), File.join(dir, id)].select { |path| File.exist?(path) }
+                                                         .each { |path| FileUtils.rm_rf(path) }
+      end
+    rescue SystemCallError
+      []
+    end
+  end
+end

data/lib/samagotchi/self_report.rb

@@ -56,7 +56,7 @@ module Samagotchi
         ["profile", model ? profile_for(model, env) : "-"],
         ["thinking", model ? thinking_for(model, env) : "-"],
         ["served model", model ? served_model_for(model, env) : "-"],
-        ["context window", context_window(env)],
+        ["context window", context_window(env, model)],
         ["bundles", bundles_summary],
         ["desktop", desktop_summary(env)],
         ["chi web", web_summary]
@@ -100,9 +100,29 @@ module Samagotchi
     def hooks_dir(env) = Hooks::Loader.hooks_dir(env)
 
     # Offline, so only the fallback: the running server's n_ctx wins at runtime.
-    def context_window(env)
-      window = ContextWindow.configured(env: env)
-      "#{window.tokens} (#{window.source}; the server's n_ctx wins at runtime)"
+    # The window config gives the current model (ContextWindow: its
+    # models.<key>.window_tokens, its host's, then context.window_tokens or
+    # the default) and which of them, as a turn resolves it offline.
+    def context_window(env, model = nil)
+      tokens, where = model_window(env, model) || ContextWindow.configured(env: env).to_h.values_at(:tokens, :source)
+      "#{tokens} (#{where}; the server's n_ctx wins at runtime)"
+    end
+
+    # [tokens, "models: KEY" | "hosts.NAME"], or nil when neither is set.
+    def model_window(env, model)
+      return nil unless model
+
+      registry = HostRegistry.new(env: env)
+      target = registry.resolve(model)
+      names = registry.lookup_names(model, target: target)
+      models = ConfigFile.model_settings(env: env)
+      window = ContextWindow.setting(target, names: names, models: models)
+      return nil unless window
+      return [window.tokens, "hosts.#{target.entry.name}"] if window.source == :host_setting
+
+      [window.tokens, "models: #{ConfigFile.model_setting(names, :window_tokens, models: models).first}"]
+    rescue StandardError
+      nil
     end
 
     def model_name

data/lib/samagotchi/session_manager.rb

@@ -23,6 +23,7 @@ require_relative "installed_gem"
 require_relative "recap_store"
 require_relative "archive_store"
 require_relative "image_store"
+require_relative "plugin_session_state"
 require_relative "terminal_ui"
 
 module Samagotchi
@@ -598,6 +599,7 @@ module Samagotchi
         FileUtils.rm_rf(dir)
         removed << dir
       end
+      PluginSessionState.remove(id)
       { id: id, removed: removed, stopped: !owner.nil? }
     end
 

data/lib/samagotchi/session_metrics.rb

@@ -284,7 +284,7 @@ module Samagotchi
           token_sources: [],
           retries: 0,
           model: nil,
-          id: SecureRandom.uuid,
+          id: event[:turn_id] || SecureRandom.uuid,
           started_at: now.iso8601(3),
           started_monotonic: monotonic_time,
           tool_calls_by_id: {}

data/lib/samagotchi/session_retention.rb

@@ -8,6 +8,7 @@ require_relative "config"
 require_relative "log"
 require_relative "model_profile"
 require_relative "session_manager"
+require_relative "plugin_session_state"
 
 module Samagotchi
   # Which sessions go: `chi sessions prune` / `clean` (.prune) and the lazy
@@ -79,7 +80,10 @@ module Samagotchi
         next unless Time.now - File.mtime(dir) > EMPTY_GRACE_SECONDS && SessionManager.empty_session_dir?(dir)
         next if SessionManager.session_owner(name, state_dir: state_dir)
 
-        FileUtils.rm_rf(dir) unless dry_run
+        unless dry_run
+          FileUtils.rm_rf(dir)
+          PluginSessionState.remove(name)
+        end
         name
       rescue SystemCallError
         nil
@@ -246,6 +250,7 @@ module Samagotchi
             FileUtils.rm_f(path)
             sidecar = File.join(state_dir, session.id)
             FileUtils.rm_rf(sidecar) if File.exist?(sidecar)
+            PluginSessionState.remove(session.id)
             deleted << session.id
           rescue StandardError
             skipped << session.id

data/lib/samagotchi/terminal_ui/attached_loop.rb

@@ -21,6 +21,8 @@ require_relative "../output_formatter"
 require_relative "../session_commands"
 require_relative "../session_manager"
 require_relative "../guardrails/parent_approvals"
+require_relative "../tool_activity"
+require_relative "../web/message_parts"
 
 module Samagotchi
   class TerminalUI
@@ -937,9 +939,7 @@ module Samagotchi
 
         @screen.commit(prompt_line(nil, exchange[last_user][:content]))
         Array(exchange[last_user][:images]).each { |ref| @screen.commit(format_image_line(ref)) }
-        exchange[(last_user + 1)..].select { |m| Steer.steer?(m) }.each do |m|
-          @screen.commit(format_steer_line(source: m[:source], text: m[:content]))
-        end
+        render_join_steps(messages, messages.index { |m| m.equal?(exchange[last_user]) })
         # The saved answer is raw: the latest keeps its thinking, and one may
         # be only a tool call.
         answer = exchange[(last_user + 1)..].reverse_each
@@ -949,6 +949,31 @@ module Samagotchi
         render_join_notes(messages, after_exchange: true)
       end
 
+      # What the last exchange did, as the live turn drew it: each saved
+      # call's tool row (action, params, status from its result; no
+      # duration, which the session doesn't keep) and a plugin's steer
+      # where it came. The step texts stay out, as live (the ticker's).
+      def render_join_steps(messages, from)
+        messages.each_with_index.drop(from + 1).each do |m, i|
+          if Steer.steer?(m)
+            @screen.commit(format_steer_line(source: m[:source], text: m[:content]))
+          elsif %w[model assistant].include?(m[:role].to_s)
+            responses = messages.drop(i + 1).take_while { |r| r[:role].to_s == "tool_response" }
+            Array(Web::MessageParts.for_message(m, responses)&.dig(:tools)).each { |part| @screen.commit(join_tool_line(part)) }
+          end
+        end
+      end
+
+      # A saved call's row; "no result" for a call the turn never answered
+      # (it ended first).
+      def join_tool_line(part)
+        output = part[:output]
+        status = output.nil? ? "no result" : ToolActivity.tool_activity_status(output, part[:tool])
+        activity = { action: part[:label] || ToolActivity.tool_activity_action(part[:tool]), tool: part[:tool],
+                     params: part[:params], status: status }
+        "#{format_tool_activity_line(activity)}#{format_tool_image_suffix(part[:images])}#{format_tool_diff_suffix(part[:diff])}"
+      end
+
       # The context notes that came since the last prompt (all of them in a
       # session with none), after the exchange the header shows.
       def render_join_notes(messages, after_exchange: false)

data/lib/samagotchi/terminal_ui.rb

@@ -14,6 +14,7 @@ require_relative "llm/errors"
 require_relative "host_registry"
 require_relative "session"
 require_relative "owner_lock"
+require_relative "bridge/card_store"
 require_relative "engine"
 require_relative "guardrails/parent_approvals"
 require_relative "tools/memory"
@@ -223,6 +224,7 @@ module Samagotchi
         scratch: @scratch
       ))
       claim_session!(session.id) unless @owner_lock
+      keep_cards(session)
       # Saved at once, so a process killed before its first turn leaves a
       # file the sweep knows to delete.
       session.save if @scratch
@@ -345,6 +347,15 @@ module Samagotchi
       @surface.commit("Session #{session.id} was not archived (#{e.message}): chi sessions archive #{session.id}")
     end
 
+    # The session's cards.json, kept as a worker's Bridge keeps it (it owns
+    # the session as a worker would): this REPL's kept turns count on from
+    # the saved count, so a card an earlier worker showed stays that many
+    # turns back, and its own cards and notices are saved for the next.
+    def keep_cards(session)
+      path = File.join(Session.session_dir(session.id), Bridge::CardStore::FILE)
+      @cards_handle ||= @engine.subscribe(observer: Bridge::CardStore.new(path: path))
+    end
+
     # Take the session's OwnerLock for this process's lifetime: the TUI runs
     # its own Engine, so no worker may run the session meanwhile.
     # @raise [SessionBusy] when a worker or another TUI owns it

data/lib/samagotchi/version.rb

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

data/lib/samagotchi/web/app.rb

@@ -1269,6 +1269,10 @@ module Samagotchi
           # Merged into the running turn (Steer::INPUT_KIND): part of it,
           # read by step +step+.
           message.merge!(merged: true, step: steer_step(list, index)) if norm_role == "user" && Samagotchi::Steer.input?(m)
+          # The turn it started (Engine): the page pairs it with that turn's
+          # record by this, not by its place.
+          turn_id = m[:turn_id] || m["turn_id"]
+          message[:turn_id] = turn_id.to_s if norm_role == "user" && turn_id
           images = m[:images] || m["images"]
           message[:images] = Array(images).map { |ref| ImageStore.symbolize(ref).slice(:file, :name, :width, :height) } if norm_role == "user" && images.is_a?(Array) && !images.empty?
           if norm_role == "assistant"

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

@@ -38,7 +38,7 @@ import { ALL_SESSIONS_HASH, sessionHash, sessionIdFromHash } from "./route.js";
 import { allScopeHref, cardFolder, projectScopeHref, scopeDir } from "./scope.js";
 import { shouldFollowScroll, keepFollowing } from "./scroll.js";
 import { stripColumns, stripShowParts } from "./strip.js";
-import { applySessionEvent, heldOrder, listedSessions, sortedByUpdated, waitingBadge, waitingFirst, withChildrenAfterParents } from "./sessions_list.js";
+import { applySessionEvent, heldOrder, listedSessions, sortedByUpdated, waitingBadge, waitingFirst, waitingSearchText, withChildrenAfterParents } from "./sessions_list.js";
 import { createNotifications } from "./notifications.js";
 import {
   appendAboveLiveTiming, cancelLineText, elapsedSince, formatDuration, normalizeTiming, turnTimingText,
@@ -262,7 +262,8 @@ function filteredSessions(list) {
       (s.first_preview || "").toLowerCase().includes(q) ||
       s.short_id.toLowerCase().includes(q) ||
       s.id.toLowerCase().includes(q) ||
-      s.status.toLowerCase().includes(q),
+      s.status.toLowerCase().includes(q) ||
+      waitingSearchText(s).includes(q),
   );
 }
 
@@ -385,11 +386,13 @@ function renderTop(sessions) {
   $("#stripHide").addEventListener("click", () => setStripHidden(true));
 }
 
-// The hidden strip's pill: "▾ 5 sessions · ● 1 live", following the list.
+// The hidden strip's pill: "▾ 5 sessions · ● 1 live · ● 1 waiting",
+// following the list.
 function renderStripShow() {
-  const { count, live } = stripShowParts(shownSessions());
+  const { count, live, waiting } = stripShowParts(shownSessions());
   const liveHtml = live ? ` · <span class="live"><span class="live-dot" aria-hidden="true"></span>${escapeHtml(live)}</span>` : "";
-  $("#stripShow").innerHTML = `<span class="pill-arrow" aria-hidden="true">\u25BE</span> ${escapeHtml(count)}${liveHtml}`;
+  const waitingHtml = waiting ? ` · <span class="waiting"><span class="waiting-dot" aria-hidden="true"></span>${escapeHtml(waiting)}</span>` : "";
+  $("#stripShow").innerHTML = `<span class="pill-arrow" aria-hidden="true">\u25BE</span> ${escapeHtml(count)}${liveHtml}${waitingHtml}`;
 }
 
 // A delegated session sits right after its parent: applied on every

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

@@ -636,6 +636,8 @@ body.has-session #scope .scope-where{display:none}
 #stripShow{display:none;white-space:nowrap;flex-shrink:0}
 #stripShow .live{color:var(--ok-text);white-space:nowrap}
 #stripShow .live-dot{display:inline-block;width:7px;height:7px;border-radius:50%;background:var(--ok);margin-right:4px;vertical-align:1px}
+#stripShow .waiting{color:var(--warn-text);white-space:nowrap}
+#stripShow .waiting-dot{display:inline-block;width:7px;height:7px;border-radius:50%;background:var(--warn);margin-right:4px;vertical-align:1px}
 #stripHide{align-self:flex-end;border:0;padding:0 2px;border-radius:4px}
 #stripHide:hover{text-decoration:underline;color:var(--text-2)}
 body.strip-hidden #stripShow{display:block}

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

@@ -81,6 +81,14 @@ export function waitingBadge(summary) {
   return waiting ? { kind: waiting.reason, ...WAITING_BADGES[waiting.reason] } : null;
 }
 
+// What the all view's search matches for a session that waits on the user:
+// "waiting" and its badge's word ("question", "approval", "needs you");
+// "" for one that doesn't.
+export function waitingSearchText(summary) {
+  const badge = waitingBadge(summary);
+  return badge ? `waiting ${badge.text}` : "";
+}
+
 // The sessions that wait on the user (waitingOn) first, the rest after,
 // each part in the list's order: an answered one goes back to its place.
 // A delegated session moves with its parent when both are listed (a

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

@@ -1,3 +1,5 @@
+import { waitingOn } from "./notify.js";
+
 // How many session cards the top strip shows for its width in px: a card
 // needs about 360 px plus a 12 px gap next to the 150 px "All sessions" tile;
 // never fewer than 3 (narrow screens scroll them), never more than 6.
@@ -13,13 +15,18 @@ export function stripColumns(width) {
 // The hidden strip's "▾ sessions" pill carries the list's count, and how
 // many of those sessions a worker runs (the cards' green "live" badge), so a
 // user who hid the strip still sees there is a live session to go back to.
-// Plain text parts; live is "" when none. Zero sessions keep the bare label.
+// And how many wait on the user (notify.js waitingOn: a question, an
+// approval, a card), so a hidden strip still says one needs an answer.
+// Plain text parts; live and waiting are "" when none. Zero sessions keep
+// the bare label.
 export function stripShowParts(sessions) {
   const list = sessions || [];
   const n = list.length;
   const liveN = list.filter((s) => s && s.owner === "worker").length;
+  const waitingN = list.filter((s) => waitingOn(s)).length;
   return {
     count: n ? `${n} ${n === 1 ? "session" : "sessions"}` : "sessions",
     live: liveN ? `${liveN} live` : "",
+    waiting: waitingN ? `${waitingN} waiting` : "",
   };
 }

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

@@ -105,7 +105,7 @@ export function turnGroups(items, timing) {
       turn.merged.push(i);
     } else if (item?.role === "user") {
       turnIndex += 1;
-      turn = { kind: "turn", turnIndex, user: i, texts: [], steers: [], merged: [] };
+      turn = { kind: "turn", turnIndex, turnId: item.turn_id, user: i, texts: [], steers: [], merged: [] };
       groups.push(turn);
     } else if (item?.role === "assistant") {
       if (turn) turn.texts.push(i);
@@ -138,8 +138,17 @@ function withSteers(group, steerIndexes, items) {
   return { ...group, steps, steers: left };
 }
 
+// A prompt's turn record: the one with its turn id (the engine saves it
+// on the prompt), so a turn whose prompt left the conversation (a failed
+// one's went back to the user, !rollback) shifts no other; a prompt saved
+// before turn ids pairs by its place among the prompts.
+function promptRecord(timing, g) {
+  if (typeof g.turnId !== "string" || !g.turnId) return turnRecordAt(timing, g.turnIndex);
+  return (timing?.turnRecords || []).find((r) => r.id === g.turnId) || null;
+}
+
 function turnGroup(g, items, timing) {
-  const record = turnRecordAt(timing, g.turnIndex);
+  const record = promptRecord(timing, g);
   const tools = record ? (timing?.toolRecords || []).filter((r) => r.turn_id === record.id) : [];
   const stepsOnly = canceledSteps(g, record, tools);
   if (g.texts.some((i) => items[i].parts)) return partsTurn(g, items, record, tools, stepsOnly);

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

@@ -687,8 +687,11 @@ function reloadRowHtml(r, thumbs) {
 export function turnHistoryHtml(items, timing, { thumbs }) {
   const timingHtml = (group) => {
     const record = group.record;
+    // Numbered by its place in the turn records, as live (a failed turn
+    // whose prompt went back still counts).
+    const at = (timing?.turnRecords || []).indexOf(record);
     return record && formatDuration(record.duration_ms)
-      ? `<div class="turn-timing">${escapeHtml(turnTimingText(group.turnIndex + 1, record.duration_ms, { canceled: record.status === "canceled" }))}</div>`
+      ? `<div class="turn-timing">${escapeHtml(turnTimingText(at >= 0 ? at + 1 : group.turnIndex + 1, record.duration_ms, { canceled: record.status === "canceled" }))}</div>`
       : "";
   };
   // The timing line after the bubble, not in it: where the live view

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -301,6 +301,7 @@ files:
 - lib/samagotchi/plugin/sessions.rb
 - lib/samagotchi/plugin/side_question.rb
 - lib/samagotchi/plugin/tool_result.rb
+- lib/samagotchi/plugin_session_state.rb
 - lib/samagotchi/plugin_tasks.rb
 - lib/samagotchi/project_scope.rb
 - lib/samagotchi/prompt.rb