samagotchi 0.154.0 → 0.154.1

data/lib/samagotchi/turn_flow.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "securerandom"
 require_relative "output_formatter"
 require_relative "turn_note"
 require_relative "context_note"
@@ -175,9 +176,13 @@ module Samagotchi
     # Answer the offer with no (Stop): the interrupted turn stays, as
     # after a Ctrl-C or a new prompt (!rollback still erases it), and the
     # model reads that it wasn't continued: a note, or the user's reason
-    # (with a summary of that turn).
+    # (with a summary of that turn). The reason's line opens a turn on the
+    # page (Steer.turn_opening?) that no turn runs: it carries an
+    # +opening_id+ of its own, never a turn_id (a claim link, a fold, Revise
+    # and Apply read a turn_id as a turn), so a card shown after it finds its
+    # place by that id (Bridge::CardPlaces#opening_of).
     def abort_continue!(reason: nil)
-      message = reason ? { role: "user", content: reason_message(reason) } : TurnNote.not_continued
+      message = reason ? { role: "user", content: reason_message(reason), opening_id: SecureRandom.uuid } : TurnNote.not_continued
       @engine.append_messages([message])
       @offer = nil
     end

data/lib/samagotchi/version.rb

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

data/lib/samagotchi/web/app.rb

@@ -1558,10 +1558,12 @@ module Samagotchi
       def handle_stream(req, id)
         # Validate session exists
         begin
-          @session_class.load(id, state_dir: default_state_dir)
+          session = @session_class.load(id, state_dir: default_state_dir)
         rescue ArgumentError
           return error_response(404, "not_found", "Session not found: #{id}")
         end
+        # Its terminal's alone: a tab's stream would keep its worker up.
+        return scratch_refused(id) if session.scratch
 
         link = worker_link(id)
         if link.is_a?(WorkerLink::Starting)

data/lib/samagotchi/web/message_display.rb

@@ -134,6 +134,9 @@ module Samagotchi
           end
           next if role == "system"
           next if role == "tool_response"
+          # KernelLoop's recovery line: a row of its turn the page showed as
+          # nothing live (no turn opens with it, Steer.recovery?).
+          next if Samagotchi::Steer.recovery?(m)
 
           stripped = Samagotchi::OutputFormatter.strip_markup(content)
           did = parts && %w[model assistant].include?(role) ? message_parts(list, index, cwd, marks) : nil
@@ -165,6 +168,10 @@ module Samagotchi
           # 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
+          # An opening no turn ran (TurnFlow#abort_continue!'s reason): its own
+          # id, which a card's stamp names (Bridge::CardPlaces#opening_of).
+          opening_id = m[:opening_id] || m["opening_id"]
+          message[:opening_id] = opening_id.to_s if norm_role == "user" && opening_id && !turn_id && !message[:merged]
           # The turn it revised (a Revise stack, Engine#stamp_opening), and
           # whether it was a Verify turn (the page offers no Revise on its
           # answer).

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

@@ -0,0 +1,27 @@
+// Where a snapshot's card or notice goes by its stamp: the id of the turn
+// opening it comes after (+opening_id+, Bridge::CardPlaces#opening_of: a
+// prompt's turn_id, a wake note's, /continue no's reason line's own id). The
+// page finds that opening's bubble (data-turn-id on a prompt, data-opening-id
+// on a wake note or a reason line, turn_html.js) and the entry goes before
+// the next turn's opening, or at the end. No counting, so the page and the
+// worker can't disagree on which bubbles open turns. An entry with no stamp
+// (an older worker's, one before every opening), or whose opening the page
+// doesn't draw, falls back to its count (card.js cardPlace, turns_since).
+// A new module: the static JS is unversioned (docs/internals/web-frontend.md).
+import { cardPlace } from "./card.js";
+
+// The opening bubble +id+ names among the turns' openings (oldest first,
+// bubbles.js turnPromptBubbles), or -1.
+export function stampedOpening(userBubbles, id) {
+  if (!id) return -1;
+  const stamp = String(id);
+  return userBubbles.findIndex((el) => el.dataset?.turnId === stamp || el.dataset?.openingId === stamp);
+}
+
+// The element +entry+ goes before: the opening after its stamped one (null:
+// the end), else what its count says (null: the end too).
+export function snapshotPlace(userBubbles, entry) {
+  const at = stampedOpening(userBubbles, entry?.opening_id);
+  if (at < 0) return cardPlace(userBubbles, entry);
+  return userBubbles[at + 1] || null;
+}

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

@@ -8,7 +8,8 @@
 // above the first turn after them, a finished turn's notice in its step, a
 // finished turn's question resolved where it was asked.
 import { getSession, sendCommand } from "./data.js";
-import { cardPlace, drawCard, isCard, isNoticeCard, refreshCardBody, turnNoticePlace } from "./card.js";
+import { drawCard, isCard, isNoticeCard, refreshCardBody, turnNoticePlace } from "./card.js";
+import { snapshotPlace } from "./card_stamps.js";
 import { elementOf } from "./turn_html.js";
 import { stepText } from "./turn_block.js";
 import { llmContextNotice, noticeLine } from "./turn_events.js";
@@ -83,14 +84,15 @@ export function createCardsPlace({
     bubbles.placeFollowing(el, before);
   }
 
-  // A snapshot's cards and notices, each above the first turn after it; a
+  // A snapshot's cards and notices, each above the first turn after it (the
+  // one after its stamped opening, card_stamps.js; else by its count); a
   // 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; one shown after that prompt went back stays below it.
   function placeSnapshotCards(entries, { before: end = null } = {}) {
     const users = turnPromptBubbles(historyEl);
     for (const entry of entries) {
-      const before = cardPlace(users, entry) || (entry.after_failed ? null : end);
+      const before = snapshotPlace(users, entry) || (entry.after_failed ? null : 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/composer_mode.js

@@ -51,7 +51,7 @@ export function composerMode({ selected, owner, running, narrow }) {
   if (tui) {
     return {
       ...base,
-      placeholder: pick("A terminal chi owns this session · its one-turn run (chi --non-interactive) lets go as it ends", "A terminal chi owns this session"),
+      placeholder: pick("A terminal chi owns this session · a one-turn chi --non-interactive run or an older chi's terminal", "A terminal chi owns this session"),
       hint: "", button: "Send", disabled: true,
     };
   }

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

@@ -97,13 +97,14 @@ export function deleteConfirmText(session) {
 }
 
 // The badge on a session a process holds right now (the list's `owner`):
-// a worker (every UI can send), or a terminal chi's one-turn run (--non-interactive).
+// a worker (every UI can send), or a terminal chi: a one-turn --non-interactive
+// run or an older chi's terminal, in OwnerLock::TUI_BUSY's words.
 export function ownerBadge(owner, id) {
   if (owner === "worker") {
     return { kind: "worker", text: "live", title: `A worker runs this session; a terminal joins with: chi --attach ${id}` };
   }
   if (owner === "tui") {
-    return { kind: "tui", text: "terminal", title: "A terminal chi runs one turn in this session (chi --non-interactive) and lets go as it ends" };
+    return { kind: "tui", text: "terminal", title: "In use by a one-turn chi --non-interactive run or an older chi's terminal" };
   }
   return null;
 }

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

@@ -285,9 +285,11 @@ export function noteBubbleTemplate(note) {
   if (note?.objectives) return objectivesEntryTemplate(note, timeTitle(note.at));
   const from = note?.label ? `note from ${note.label}` : "note";
   // A wake turn's note opens that turn (TURN_PROMPT, bubbles.js); a class, not
-  // data-turn-id, which marks a claim's anchor (claim_link.js).
+  // data-turn-id, which marks a claim's anchor (claim_link.js). Its turn's id
+  // is its data-opening-id: a card's stamp finds it (card_stamps.js).
   const cls = note?.turn_start ? "bubble note turn-start" : "bubble note";
-  return html`<div class=${cls} title=${timeTitle(note?.at)}><div class="note-line">${from}</div><div class="note-text">${note?.content ?? ""}</div></div>`;
+  const opening = note?.turn_start && note?.turn_id ? String(note.turn_id) : nothing;
+  return html`<div class=${cls} title=${timeTitle(note?.at)} data-opening-id=${opening}><div class="note-line">${from}</div><div class="note-text">${note?.content ?? ""}</div></div>`;
 }
 
 // A plugin's steer (a nudge put into the running turn): one line that
@@ -311,7 +313,9 @@ export function steerRowTemplate({ source, text } = {}, { bubble = false } = {})
 // participant's badge (participant_names.js authorBadge: their name and
 // colour) in place of +label+. A turn's opening carries its Revise stamp
 // (+message.revises+: data-revises, revise_stack.js) and whether it was a
-// Verify turn (+message.verify+: data-verify, no Revise on its answer).
+// Verify turn (+message.verify+: data-verify, no Revise on its answer). An
+// opening no turn ran (/continue no's reason) has +message.opening_id+
+// instead of a turn id: data-opening-id, a card's stamp (card_stamps.js).
 // +message.source+ (a delegate report's "delegate_report") is its
 // data-source; +lineKey+, a merged line's fold key (answer_fold.js:
 // data-line-key, the reload's "<turn id>:input:<place>").
@@ -320,7 +324,7 @@ export function userBubbleTemplate(message, { label = null, state = null, step =
   const from = author
     ? html`<span class="origin-label author-badge" title=${authorBadgeTitle(author.name, author.mode)} data-unnamed=${author.unnamed ? "1" : nothing}>${authorBadgeText(author.name, author.mode)}</span>`
     : label ? html`<span class="origin-label">${label}</span>` : nothing;
-  return html`<div class=${`bubble user${named ? ` ${named}` : ""}${author ? " by-participant" : ""}`} title=${timeTitle(message?.at)} style=${author ? `--author-color:${author.color}` : nothing} data-author=${author?.author || nothing} data-participant-mode=${author?.mode || nothing} data-user-state=${named || nothing} data-step=${step ? Number(step) : nothing} data-copy-source=${copySource({ ...message, role: "user" })} data-user-content=${key !== null ? key : nothing} data-turn-id=${message?.turn_id || nothing} data-revises=${(message?.turn_id && message?.revises?.turn_id) || nothing} data-verify=${message?.turn_id && message?.verify ? "1" : nothing} data-own=${own ? "1" : nothing} data-enqueued-id=${enqueuedId || nothing} data-delivery=${delivery || nothing} data-source=${message?.source || nothing} data-line-key=${lineKey || nothing}>${from}${userMessageTemplate(message, thumbs)}${stateBadgeTemplate(named, delivery)}</div>`;
+  return html`<div class=${`bubble user${named ? ` ${named}` : ""}${author ? " by-participant" : ""}`} title=${timeTitle(message?.at)} style=${author ? `--author-color:${author.color}` : nothing} data-author=${author?.author || nothing} data-participant-mode=${author?.mode || nothing} data-user-state=${named || nothing} data-step=${step ? Number(step) : nothing} data-copy-source=${copySource({ ...message, role: "user" })} data-user-content=${key !== null ? key : nothing} data-turn-id=${message?.turn_id || nothing} data-opening-id=${(!message?.turn_id && message?.opening_id) || nothing} data-revises=${(message?.turn_id && message?.revises?.turn_id) || nothing} data-verify=${message?.turn_id && message?.verify ? "1" : nothing} data-own=${own ? "1" : nothing} data-enqueued-id=${enqueuedId || nothing} data-delivery=${delivery || nothing} data-source=${message?.source || nothing} data-line-key=${lineKey || nothing}>${from}${userMessageTemplate(message, thumbs)}${stateBadgeTemplate(named, delivery)}</div>`;
 }
 
 // A user line's text: plain (its quotes set apart), or the server's

data/lib/samagotchi/web/session_access_routes.rb

@@ -54,6 +54,14 @@ module Samagotchi
         json_response(status, { error: code, detail: detail, message: error.message, **fields }.compact)
       end
 
+      # 409 scratch for a chi scratch session +id+, which only its terminal
+      # uses (Session::SCRATCH_REFUSED): the session page's read and stream
+      # (a tab opened at its id by hand: the hub never lists it), as
+      # POST …/wake refuses it.
+      def scratch_refused(id)
+        refusal_response(409, "scratch", SessionManager::ScratchSession.new(id), session_id: id)
+      end
+
       # The body as a Hash ({} when there is none), or nil when it isn't one.
       def body_hash(req)
         raw = request_body(req)

data/lib/samagotchi/web/session_show.rb

@@ -40,6 +40,10 @@ module Samagotchi
         return handle_brief_read(id) if req.params["brief"] == "1"
 
         session = @session_class.load(id, state_dir: default_state_dir)
+        # A tab opened at a chi scratch session's id: its terminal's alone.
+        # (The light re-reads come after a full read only.)
+        return scratch_refused(id) if session.scratch
+
         # Read-only preview: selecting a session never spawns a worker.
         # The worker is woken only on POST /turn (handle_turn) via
         # SessionManager.resume_session + write_turn_input. This avoids

data/lib/samagotchi/worker.rb

@@ -1608,14 +1608,17 @@ module Samagotchi
     SCRATCH_GONE_AFTER = 2 * BridgeClient::EventStream::REDISCOVER_DELAYS.sum
 
     # Whether this is a `chi scratch` session's worker whose terminal is
-    # gone: no stream open for SCRATCH_GONE_AFTER, after one was (a killed
-    # TUI's closes as its writer reads the hang-up), or none came within
-    # SCRATCH_JOIN_GRACE. Its terminal deletes it on every way out it sees;
-    # this is for the ones it doesn't (kill -9, a closed terminal window).
+    # gone: no terminal stream (a tui: client id's) open for
+    # SCRATCH_GONE_AFTER, after a stream was (a killed TUI's closes as its
+    # writer reads the hang-up), or none came within SCRATCH_JOIN_GRACE.
+    # Any other stream (a web tab's, which chi web refuses for a scratch
+    # session anyway) never keeps it. Its terminal deletes it on every way
+    # out it sees; this is for the ones it doesn't (kill -9, a closed
+    # terminal window).
     def scratch_unattended?
       return false unless @session&.scratch && @bridge
 
-      if @bridge.open_streams.positive?
+      if @bridge.open_streams_of(ClientId::TUI_PREFIX).positive?
         @unattended_since = nil
         return false
       end

data/lib/samagotchi.rb

@@ -7,7 +7,6 @@ require_relative "samagotchi/prompt"
 require_relative "samagotchi/client"
 require_relative "samagotchi/debug_log"
 require_relative "samagotchi/delivery"
-require_relative "samagotchi/pending_input_queue"
 require_relative "samagotchi/kernel_loop"
 require_relative "samagotchi/session"
 require_relative "samagotchi/terminal_ui"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.154.0
+  version: 0.154.1
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -563,7 +563,6 @@ files:
 - lib/samagotchi/participants_watch.rb
 - lib/samagotchi/paths.rb
 - lib/samagotchi/peer_sources.rb
-- lib/samagotchi/pending_input_queue.rb
 - lib/samagotchi/pending_question.rb
 - lib/samagotchi/plugin/api.rb
 - lib/samagotchi/plugin/attached_context.rb
@@ -670,6 +669,7 @@ files:
 - lib/samagotchi/steer.rb
 - lib/samagotchi/steer_cut.rb
 - lib/samagotchi/steer_cut_after.rb
+- lib/samagotchi/stream_event.rb
 - lib/samagotchi/system_one.rb
 - lib/samagotchi/system_one/answer.rb
 - lib/samagotchi/system_one/approval_label.rb
@@ -867,6 +867,7 @@ files:
 - lib/samagotchi/web/public/block_source.js
 - lib/samagotchi/web/public/bubbles.js
 - lib/samagotchi/web/public/card.js
+- lib/samagotchi/web/public/card_stamps.js
 - lib/samagotchi/web/public/cards_place.js
 - lib/samagotchi/web/public/chains.js
 - lib/samagotchi/web/public/chip_popover.js

data/lib/samagotchi/pending_input_queue.rb

@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-
-module Samagotchi
-  # Thread-safe FIFO of user steering messages submitted while a turn is
-  # running. UIs (TUI, web, background workers) are push-only producers;
-  # KernelLoop drains the queue at iteration boundaries and injects the
-  # messages into the conversation. True mid-stream injection is impossible
-  # with llama.cpp's /completion API, so draining only happens between full
-  # LLM responses / tool dispatches.
-  #
-  # Usage:
-  #   queue = PendingInputQueue.new
-  #   queue.push("please also check the specs")
-  #   kernel.run(messages, pending_input: queue.method(:drain))
-  class PendingInputQueue
-    def initialize
-      @mutex = Mutex.new
-      @messages = []
-    end
-
-    # Append a message to the queue. Nil/empty strings are ignored.
-    # +seq+ is the sender's own order number for it (a sender that numbers
-    # every line it takes during a turn, so its leftovers keep send order across
-    # this queue and its after-turn list: #drain_entries).
-    def push(text, seq: nil)
-      text = text.to_s
-      return if text.empty?
-
-      @mutex.synchronize { @messages << [seq, text] }
-      nil
-    end
-
-    # Remove and return all queued messages in FIFO order. Non-blocking.
-    # @return [Array<String>]
-    def drain = drain_entries.map(&:last)
-
-    # #drain with each message's +seq+ (nil when pushed without one).
-    # @return [Array(Integer|nil, String)]
-    def drain_entries
-      @mutex.synchronize do
-        drained = @messages
-        @messages = []
-        drained
-      end
-    end
-
-    def empty?
-      @mutex.synchronize { @messages.empty? }
-    end
-
-    def size
-      @mutex.synchronize { @messages.size }
-    end
-  end
-end