samagotchi 0.49.0 → 0.51.0

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

@@ -370,6 +370,17 @@ export function commandView(event, myId) {
   };
 }
 
+// Whether a command_ran that re-read the conversation (`resync`) needs its
+// own bubble: the redrawn history ends with a command bubble for its line
+// (a `!cmd` appends its "!(<command>)\n<output>" message, which renders as
+// one), so a second bubble would show the output twice. +historyBubbles+:
+// the `.bubble.command` elements in document order; +line+: the event's
+// line. Only the last one counts: it is the redrawn history's end.
+export function historyHasCommandBubble(historyBubbles, line) {
+  const last = historyBubbles[historyBubbles.length - 1];
+  return !!last && last.querySelector(":scope > .command-line")?.textContent === line;
+}
+
 // What a prompt_restored (the worker rolled a failed turn back and handed its
 // prompt back) does in this tab: `refill` is the text for an empty composer,
 // only for a prompt this page sent (`sentIds`, its acks' enqueued_ids), so a
@@ -547,8 +558,9 @@ export function snapshotEvents({ current_turn: turn = null, queued = [], queued_
           const call = { iteration: part.iteration, call_index: part.call_index, tool: part.tool };
           if (part.label) call.label = part.label;
           const title = part.title ? { title: part.title } : {};
+          const alias = part.called_as ? { called_as: part.called_as } : {};
           const view = part.view ? { view: part.view } : {};
-          events.push({ type: "tool_call_started", ...call, params: part.params, ...title, ...view });
+          events.push({ type: "tool_call_started", ...call, params: part.params, ...title, ...alias, ...view });
           if (part.status !== "running") {
             // The activity as the live event had it; action and duration_ms
             // only in snapshots from a worker that keeps them (the TUI's
@@ -556,7 +568,7 @@ export function snapshotEvents({ current_turn: turn = null, queued = [], queued_
             const action = part.action ? { action: part.action } : {};
             const completed = {
               type: "tool_call_completed", ...call, output: part.output, output_truncated: !!part.output_truncated,
-              activity: { ...action, tool: part.tool, status: part.status, params: part.params, ...title },
+              activity: { ...action, tool: part.tool, status: part.status, params: part.params, ...title, ...alias },
             };
             if (part.duration_ms != null) completed.duration_ms = part.duration_ms;
             if (part.diff) completed.diff = part.diff;

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

@@ -78,13 +78,15 @@ export function toolRowInnerHtml(row, { thumbs = () => "" } = {}) {
   const shown = row.title || row.params;
   const hover = rowHover(row) ? ` title="${escapeHtml(rowHover(row))}"` : "";
   const params = shown ? `<span class="activity-params"${hover}>${escapeHtml(shown)}</span>` : "";
+  // The name the model called the tool by when it was an alias's, dim.
+  const alias = row.called_as ? `<span class="activity-alias">(called as ${escapeHtml(row.called_as)})</span>` : "";
   const duration = formatDuration(row.duration_ms);
   const full = row.status === "running" ? "" : String(row.output || "").replace(/^\[[^\]]*\]\s*/, "");
   const output = full
     ? `<div class="activity-output" title="${escapeHtml(full)}">${escapeHtml(full.length > 300 ? `${full.slice(0, 300)}…` : full)}</div>`
     : "";
   const status = statusParts(row.status);
-  return `${statusMarkHtml(status)}<span class="activity-tool">${escapeHtml(toolName(row))}</span>${params}${statusWordHtml(status)}` +
+  return `${statusMarkHtml(status)}<span class="activity-tool">${escapeHtml(toolName(row))}</span>${params}${alias}${statusWordHtml(status)}` +
     `${duration ? `<span class="activity-duration">${escapeHtml(duration)}</span>` : ""}` +
     `${commandBlockHtml(row.view, row.title)}${llmEditHtml(row)}${output}` +
     `${row.images?.length ? thumbs(row.images) : ""}${row.diff ? activityDiffHtml(row.diff) : ""}`;
@@ -99,6 +101,27 @@ export function stateBadgeHtml(state) {
   return BADGES[state] ? `<span class="state-badge">${escapeHtml(BADGES[state])}</span>` : "";
 }
 
+// A `!cmd`'s saved user message (the worker appends "!(<command>)\n<output>"
+// for the next turn): its command line and its output, or null when the
+// content is any other message. The command sits on the first line inside
+// `!(` `)`; the output is everything after that first newline. A message
+// that merely starts with "!" or "!(" without the newline shape is a plain
+// message.
+export function shellCommandMessage(content) {
+  const text = String(content ?? "");
+  const match = text.match(/^!\((.*)\)\n([\s\S]*)$/);
+  if (!match) return null;
+  return { line: `!${match[1]}`, text: match[2] };
+}
+
+// A `!cmd`'s history bubble: the same markup the live page draws for a
+// command (app.js's drawCommandBubble): the line, the output in a
+// pre.command-output.
+export function commandBubbleHtml({ line, text }) {
+  const body = text ? `<pre class="command-output">${escapeHtml(text)}</pre>` : "";
+  return `<div class="bubble command"><div class="command-line">${escapeHtml(line)}</div>${body}</div>`;
+}
+
 // A user's line: who sent it (+label+, a delegate report's or another
 // client's), its body (`>` lines as quotes) and +thumbs+ (its images'
 // markup), its state's badge. +message+: { content, display } (the copy

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

@@ -15,7 +15,7 @@ import { escapeHtml, failedTurnText, messageBodyHtml, noteHtml, normalize, sourc
 import { thumbsHtml } from "./images.js";
 import { shouldFollowScroll } from "./scroll.js";
 import { hookNoticeLabel } from "./turn_events.js";
-import { emptyAnswerHtml, htmlElement, toolRowHtml, toolRowInnerHtml, userBubbleHtml } from "./turn_html.js";
+import { commandBubbleHtml, emptyAnswerHtml, htmlElement, shellCommandMessage, toolRowHtml, toolRowInnerHtml, userBubbleHtml } from "./turn_html.js";
 import { cancelLineHtml, formatDuration, turnGroups, turnTimingText } from "./timing.js";
 import { createSentenceFeed } from "./sentences.js";
 import { createTicker } from "./thinking_ticker.js";
@@ -755,8 +755,14 @@ export function turnHistoryHtml(items, timing, { thumbs }) {
     const { body, renderedMarkdown } = messageBodyHtml(m);
     return `<div class="bubble output${renderedMarkdown ? " markdown" : ""}"${copySourceAttr(m, renderedMarkdown)}>${body}</div>${timing}`;
   };
-  // A user's line, labelled when chi brought it in (a delegate report).
-  const userHtml = (m, opts = {}) => userBubbleHtml(m, { label: sourceLabel(m?.source), thumbs: thumbs(m.images), ...opts });
+  // A user's line, labelled when chi brought it in (a delegate report). A
+  // `!cmd`'s saved message (the worker's "!(<command>)\n<output>") renders
+  // as its command bubble, as live does — not as a user bubble.
+  const userHtml = (m, opts = {}) => {
+    const shell = shellCommandMessage(m?.content);
+    if (shell) return commandBubbleHtml(shell);
+    return userBubbleHtml(m, { label: sourceLabel(m?.source), thumbs: thumbs(m.images), ...opts });
+  };
   // The first text after a delegate report merged mid-turn, unless it is
   // the turn's answer (shown anyway).
   const reportReplyHtml = (i, group) => {

data/lib/samagotchi/web/session_hub.rb

@@ -307,12 +307,20 @@ module Samagotchi
         emit("session", session: summary)
       end
 
-      # One HostRegistry for the hub's lifetime: every session's ctx_pct may
+      # One HostRegistry kept across scans: every session's ctx_pct may
       # need its llm_context budget resolved, and the registry's config read
       # is what would otherwise repeat per scan and per session. Built on
-      # the first summary that needs it.
+      # the first summary that needs it, and built again when config.yml's
+      # hosts: changed (compared as read, like App#host_registry: the YAML
+      # read is mtime-cached), so a host added or a window changed while
+      # chi web runs is picked up on the next refresh of a card.
       def hub_registry
-        @hub_registry ||= HostRegistry.new
+        hosts = ConfigFile.hosts_config
+        if @hub_registry.nil? || hosts != @hub_registry_hosts
+          @hub_registry = HostRegistry.new(hosts_config: hosts)
+          @hub_registry_hosts = hosts
+        end
+        @hub_registry
       end
 
       def drop(id)

data/lib/samagotchi/worker.rb

@@ -953,7 +953,7 @@ module Samagotchi
         # A line with images runs as its own next turn (steering merges text
         # only), and so does anything queued after it, to keep the order.
         files = SessionInbox.find_new_input_files(@session_dir).sort
-                            .take_while { |input_file| !SessionInbox.input_has_images?(input_file) }
+                            .take_while { |input_file| !SessionInbox.waits_for_turn_end?(input_file) }
         merged = files.filter_map do |input_file|
           claimed_file = SessionInbox.claim_input_file(input_file)
           next unless claimed_file

data/lib/samagotchi/worker_inbound.rb

@@ -31,9 +31,11 @@ module Samagotchi
 
     # A prompt to run a turn for: an input file's, or the first prompt.
     # +no_interrupt+: an offer its turn makes keeps it for its continue
-    # turn; +images+: its image refs ({file:, name:}).
-    Prompt = Data.define(:text, :origin, :no_interrupt, :images) do
-      def initialize(text:, origin: nil, no_interrupt: false, images: []) = super
+    # turn; +images+: its image refs ({file:, name:}); +delivery+: the wire
+    # value the sender asked for ("queue", or nil for the default
+    # next_step).
+    Prompt = Data.define(:text, :origin, :no_interrupt, :images, :delivery) do
+      def initialize(text:, origin: nil, no_interrupt: false, images: [], delivery: nil) = super
     end
 
     # A context wake turn to run: the ContextAbsorber::Delivery that woke
@@ -181,11 +183,12 @@ module Samagotchi
       return unless claimed_file
 
       begin
-        message, origin, no_interrupt, images = SessionInbox.read_input(claimed_file)
+        message, origin, no_interrupt, images, delivery = SessionInbox.read_input(claimed_file)
         return if message.to_s.strip.empty?
         return if Array(images).empty? && queue_as_command(message, origin, File.basename(input_file))
 
-        yield Prompt.new(text: message, origin: origin, no_interrupt: !!no_interrupt, images: images || [])
+        yield Prompt.new(text: message, origin: origin, no_interrupt: !!no_interrupt, images: images || [],
+                         delivery: delivery)
       ensure
         FileUtils.rm_f(claimed_file)
       end

data/lib/samagotchi.rb

@@ -6,6 +6,7 @@ require_relative "samagotchi/model_profile"
 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"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.49.0
+  version: 0.51.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -238,6 +238,7 @@ files:
 - lib/samagotchi/continue_offer.rb
 - lib/samagotchi/cut_policy.rb
 - lib/samagotchi/debug_log.rb
+- lib/samagotchi/delivery.rb
 - lib/samagotchi/desktop.rb
 - lib/samagotchi/desktop/macos.rb
 - lib/samagotchi/desktop/macos/App.swift
@@ -533,6 +534,7 @@ files:
 - lib/samagotchi/web/public/scroll.js
 - lib/samagotchi/web/public/sentences.js
 - lib/samagotchi/web/public/session_state.js
+- lib/samagotchi/web/public/session_title.js
 - lib/samagotchi/web/public/sessions_list.js
 - lib/samagotchi/web/public/shown_texts.js
 - lib/samagotchi/web/public/stable_html.js