samagotchi 0.15.0 → 0.17.0

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

@@ -88,7 +88,9 @@ export function timedTurnIndexes(items) {
 // the last, in order; a text-less iteration leaves no message, so a text
 // can sit one step early: inspection, not truth) and its answer (the last
 // assistant message). Assistant messages before any prompt are answers on
-// their own. The turn index counts prompts, as timedTurnIndexes does. The
+// their own. A turn that ended with no answer (the server's empty_answer
+// item) has no answer: its texts are steps, and `emptyAnswer` is that
+// item's index. The turn index counts prompts, as timedTurnIndexes does. The
 // user's lines merged into the running turn (`merged`, the server's
 // Steer::INPUT_KIND) stay in it: the turn's `merged` list.
 export function turnGroups(items, timing) {
@@ -110,13 +112,18 @@ export function turnGroups(items, timing) {
     } else if (item?.role === "assistant") {
       if (turn) turn.texts.push(i);
       else groups.push({ kind: "answer", answer: i });
+    } else if (item?.role === "empty_answer" && turn) {
+      turn.emptyAnswer = i;
     }
   });
   return groups.map((g) => {
     if (g.kind !== "turn") return g;
     const group = withSteers(turnGroup(g, items, timing), g.steers, items);
+    // A turn that ended with no answer: its notice (the item's index) in
+    // the answer's place.
+    const ended = g.emptyAnswer == null ? group : { ...group, emptyAnswer: g.emptyAnswer };
     // A turn with no merged lines keeps its shape.
-    return g.merged.length ? { ...group, merged: g.merged } : group;
+    return g.merged.length ? { ...ended, merged: g.merged } : ended;
   });
 }
 
@@ -150,7 +157,8 @@ function promptRecord(timing, g) {
 function turnGroup(g, items, timing) {
   const record = promptRecord(timing, g);
   const tools = record ? (timing?.toolRecords || []).filter((r) => r.turn_id === record.id) : [];
-  const stepsOnly = canceledSteps(g, record, tools);
+  // A turn with no answer has none of its texts as one: they are steps.
+  const stepsOnly = canceledSteps(g, record, tools) || g.emptyAnswer != null;
   if (g.texts.some((i) => items[i].parts)) return partsTurn(g, items, record, tools, stepsOnly);
   const maxIteration = tools.reduce((m, r) => Math.max(m, Number(r.iteration) || 0), 0);
   const stepTexts = stepsOnly ? g.texts : g.texts.slice(0, -1);
@@ -177,37 +185,51 @@ function recordRows(tools, iteration) {
 }
 
 // A turn whose saved messages carry their parts (the server's ?parts=1):
-// every assistant message is one generation, so the k-th is iteration k
-// and its calls pair with that iteration's records by position. The last
-// message is the answer when it has text and made no call (and the turn
-// is no canceled multi-step one); its thinking stays behind as a step, as
-// it does live.
+// every assistant message is one step. Its calls take the turn's records by
+// tool, in call order (each the next record of its tool, consumed with the
+// ones it skipped), not by iteration: an empty retry spends an iteration
+// that left no message (as the TUI's join, attached_loop.rb join_duration).
+// The last message is the answer when it has text and made no call (and the
+// turn is no canceled multi-step one); its thinking stays behind as a step,
+// as it does live.
 function partsTurn(g, items, record, tools, stepsOnly = false) {
   const last = g.texts[g.texts.length - 1];
   const lastItem = items[last];
   const answer = !stepsOnly && String(lastItem.content ?? "") !== "" && !lastItem.parts?.tools?.length ? last : null;
+  const pool = [...tools].sort((a, b) =>
+    (Number(a.iteration) || 0) - (Number(b.iteration) || 0) || (Number(a.call_index) || 0) - (Number(b.call_index) || 0));
   const steps = g.texts.map((i, k) => {
     const iteration = k + 1;
     const parts = items[i].parts || {};
-    const records = recordRows(tools, iteration);
     const rows = Array.isArray(parts.tools)
       ? parts.tools.map((call, j) => {
-        const r = records.find((row) => row.key === `${iteration}:${j + 1}`);
+        const r = takeRecord(pool, call.tool);
         return { key: `${iteration}:${j + 1}`, status: r?.status || "ok", duration_ms: r?.duration_ms, ...call };
       })
-      : records;
+      : [];
     const thinking = String(parts.thinking || "");
     if (i === answer) return thinking ? { i: null, iteration, thinking, tools: [] } : null;
     return { i, iteration, thinking, tools: rows };
   }).filter(Boolean);
-  // Records past the saved messages (a generation that saved nothing).
-  const maxIteration = tools.reduce((m, r) => Math.max(m, Number(r.iteration) || 0), 0);
-  for (let iteration = g.texts.length + 1; iteration <= maxIteration; iteration += 1) {
-    steps.push({ i: null, iteration, thinking: "", tools: recordRows(tools, iteration) });
+  // Records no saved message took (a generation that saved nothing): a
+  // step per iteration of theirs, after the messages'.
+  let iteration = g.texts.length;
+  for (const n of [...new Set(pool.map((r) => Number(r.iteration) || 0))]) {
+    iteration += 1;
+    const rows = recordRows(pool, n).map((row) => ({ ...row, key: `${iteration}:${row.key.split(":")[1]}` }));
+    steps.push({ i: null, iteration, thinking: "", tools: rows });
   }
   return { kind: "turn", turnIndex: g.turnIndex, user: g.user, answer, record, steps };
 }
 
+// The next record of +tool+ in +pool+ (call order), removed with the ones
+// before it; undefined when there is none (the pool stays as it was).
+function takeRecord(pool, tool) {
+  const at = pool.findIndex((r) => String(r.tool) === String(tool));
+  if (at < 0) return undefined;
+  return pool.splice(0, at + 1)[at];
+}
+
 // Append +el+ to the history, above +timingEl+ while it is a running turn's
 // live timing line, so that line stays under the turn's activity, thinking
 // and answer.

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

@@ -64,6 +64,15 @@ export function emptyRetryLine({ attempt, of, stopped_by: stoppedBy } = {}) {
   return `↻ ${what}, asking again (${attempt}/${of})`;
 }
 
+// The one muted line for a turn that ended with no answer (turn_completed's
+// turn_summary.empty_answer, or a reloaded turn's marker): the TUI words
+// it the same (TurnNote.empty_answer_line; spec/shared/labels_matrix.json).
+export function emptyAnswerLine({ retries = 0 } = {}) {
+  const count = Number(retries) || 0;
+  const after = count > 0 ? ` (after ${count} ${count === 1 ? "retry" : "retries"})` : "";
+  return `no answer: the model returned nothing${after}`;
+}
+
 // The text of a turn's row from a snapshot entry (CardStore): a hook's
 // notice as "<label>: text", the loop's asking-again row as its line.
 export function noticeLine(entry = {}) {
@@ -88,9 +97,19 @@ export function initWaitLine({ tasks } = {}) {
   return `waiting for ${labels.length ? labels.join(" · ") : "plugins"}…`;
 }
 
-// A composer line for the worker's command route rather than a prompt.
-export function isCommandLine(text) {
-  return /^[/!]/.test(String(text || "").trim());
+// Whether a composer line in an open session is one of its commands
+// (+commands+: the session GET's listing), as the terminals decide
+// (Commands::Registry#lookup): a "!" line with something after the "!", or
+// a listed name alone or followed by a space; a terminal's own (/stats,
+// /exit) too, which the page answers itself (webLocalReply). An unknown
+// "/word" (a path, a typo) goes to the model as a prompt, as in a terminal.
+export function sessionCommandLine(text, commands) {
+  const line = String(text || "").trim();
+  if (/^!\s*\S/.test(line)) return true;
+  if (!line.startsWith("/")) return false;
+  if (webLocalReply(line)) return true;
+  return (Array.isArray(commands) ? commands : [])
+    .some((c) => c && typeof c.name === "string" && (line === c.name || line.startsWith(`${c.name} `)));
 }
 
 // The terminal's own commands (a button in the web, or none yet): the

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

@@ -16,7 +16,7 @@ import { activityDiffHtml } from "./diff_view.js";
 import { escapeHtml, messageBodyHtml, noteHtml, normalize, steerRowHtml } from "./format.js";
 import { thumbsHtml } from "./images.js";
 import { shouldFollowScroll } from "./scroll.js";
-import { hookNoticeLabel } from "./turn_events.js";
+import { emptyAnswerLine, hookNoticeLabel } from "./turn_events.js";
 import { cancelLineHtml, formatDuration, turnGroups, turnTimingText } from "./timing.js";
 import { createSentenceFeed } from "./sentences.js";
 import { createTicker } from "./thinking_ticker.js";
@@ -465,11 +465,15 @@ export function createTurnView({
   // +heldHeight+ (the live box's height, measured before the step closed) the
   // bubble is held at that height, scrolled to its tail, until answerReady()
   // (the rendered markdown landed) or 1.5 s reveals it.
-  function promote(gen, { heldHeight = 0 } = {}) {
+  // +endNote+: the notice of a turn that ended with no answer (app.js
+  // builds it), placed where the answer bubble would go.
+  function promote(gen, { heldHeight = 0, endNote = null } = {}) {
     const entry = genEls.get(gen);
     const bubble = entry.text;
-    bubble.className = "bubble output";
-    if (!gen.text) bubble.textContent = "";
+    // No text (an empty answer): no bubble, not even an empty one left in
+    // the step.
+    if (gen.text) bubble.className = "bubble output";
+    else bubble.remove();
     // A hidden tab gets no pop: nobody sees it, and its timers are throttled.
     const holding = useHold && heldHeight > 0 && !!gen.text && !document.hidden;
     let holdHeight = 0;
@@ -512,11 +516,12 @@ export function createTurnView({
       }
       pieces.push(...cards);
       if (gen.text) pieces.push(bubble);
+      else if (endNote) pieces.push(endNote);
       placeAnswer(pieces, { plain: true, blockEl });
       blockEl = null;
       blockSummaryEl = null;
     } else {
-      placeAnswer(gen.text ? [...cards, bubble] : cards, { plain: false, blockEl });
+      placeAnswer(gen.text ? [...cards, bubble] : [...cards, ...(endNote ? [endNote] : [])], { plain: false, blockEl });
       // The last step, left with its thinking only, reads "thinking" once.
       if (!gen.tools.length && gen.thinking) unwrapThinking(entry);
     }
@@ -524,8 +529,10 @@ export function createTurnView({
   }
 
   // Returns the cards that left the block (card.js leavesBlock), detached:
-  // app.js puts them after the turn's end line.
-  function turnEnded({ kind }) {
+  // app.js puts them after the turn's end line. +endNote+ (a completed turn
+  // with no answer): its notice, in the answer's place; left unplaced
+  // with no turn to end (app.js then shows it itself).
+  function turnEnded({ kind, endNote = null }) {
     // Once per turn: a second end (a re-dispatched event) would promote again.
     if (!turn || turn.ended) return [];
     const last = model.currentGen(turn);
@@ -541,7 +548,8 @@ export function createTurnView({
     const heldHeight = box ? box.getBoundingClientRect().height : 0;
     if (pendingSteers.length) flushSteers();
     apply(model.turnEnded(turn));
-    if (promoting) promote(last, { heldHeight });
+    if (promoting) promote(last, { heldHeight, endNote });
+    else if (endNote) placeAnswer([endNote], { plain: false, blockEl });
     const kept = [];
     if (blockEl) {
       updateBlockSummary();
@@ -678,6 +686,13 @@ function reloadRowHtml(r, thumbs) {
     `${r.images?.length ? thumbs(r.images) : ""}${r.diff ? activityDiffHtml(r.diff) : ""}</div>`;
 }
 
+// The notice of a turn that ended with no answer: a muted row like the
+// loop's retry row, where the answer would be (live: promote()).
+export const EMPTY_ANSWER_CLASS = "bubble hook-notice empty-answer";
+function emptyAnswerHtml(item) {
+  return `<div class="${EMPTY_ANSWER_CLASS}">${escapeHtml(emptyAnswerLine(item))}</div>`;
+}
+
 // A reloaded history in the turn view (renderHistory's object path): per
 // turn the prompt, a collapsed block of its steps when it had any (texts,
 // and with the server's parts the thinking, params and output, from the
@@ -708,9 +723,13 @@ export function turnHistoryHtml(items, timing, { thumbs }) {
     const prompt = items[group.user];
     const parts = [`<div class="bubble user"${copySourceAttr(prompt, false)}><div class="user-message">${messageBodyHtml(prompt).body}${thumbs(prompt.images)}</div></div>`];
     const [only] = group.steps;
-    const noBlock = !group.steps.length ||
-      (group.steps.length === 1 && group.answer !== null && only.i === null && !only.tools.length && only.thinking);
-    if (group.steps.length === 1 && group.answer !== null && only.i === null && !only.tools.length && only.thinking) {
+    const ended = group.answer !== null || group.emptyAnswer != null;
+    const textless = only && (only.i === null || !String(items[only.i].content ?? ""));
+    // A lone thinking step before an answer (or the notice of a turn with
+    // none): no block, as live.
+    const plainThinking = group.steps.length === 1 && ended && textless && !only.tools.length && only.thinking;
+    const noBlock = !group.steps.length || plainThinking;
+    if (plainThinking) {
       // A plain answer with thinking: the collapsed thinking block, as live.
       parts.push(`<details class="bubble thinking"><summary>thinking</summary><div class="thinking-body">${escapeHtml(only.thinking)}</div></details>`);
     } else if (group.steps.length) {
@@ -736,9 +755,12 @@ export function turnHistoryHtml(items, timing, { thumbs }) {
     // after its steps and before its answer.
     parts.push((group.merged || []).map((i) =>
       `<div class="bubble user steered" data-user-state="steered"${items[i].step ? ` data-step="${Number(items[i].step)}"` : ""}${copySourceAttr(items[i], false)}><div class="user-message">${messageBodyHtml(items[i]).body}${thumbs(items[i].images)}</div><span class="state-badge">steered</span></div>`).join(""));
+    // A turn that ended with no answer: chi's muted notice where the answer
+    // would be, before the timing, as live.
+    if (group.emptyAnswer != null) parts.push(`${emptyAnswerHtml(items[group.emptyAnswer])}${timingHtml(group)}`);
     // A turn with no answer (canceled, or running: no record yet) shows its
     // timing after its prompt and steps, where the live view leaves it.
-    if (group.answer === null) parts.push(timingHtml(group));
+    else if (group.answer === null) parts.push(timingHtml(group));
     else parts.push(answerHtml(items[group.answer], timingHtml(group)));
     // A canceled turn ends with its cancel line, as the live view left it.
     parts.push(cancelLineHtml(group.record, escapeHtml));

data/lib/samagotchi/worker.rb

@@ -173,7 +173,7 @@ module Samagotchi
           absorb_notes
 
           if (prompt = take_initial_prompt)
-            run_prompt(prompt, nil)
+            run_prompt(prompt, nil) unless initial_command(prompt)
             next
           end
 
@@ -269,6 +269,29 @@ module Samagotchi
       prompt
     end
 
+    # A session command sent as a message (chi send -m "/model x", a web
+    # page's first message) runs as the command, as the Bridge does for a
+    # POST /turn; an unknown /word stays a prompt. Queued: the loop's next
+    # pass runs it.
+    # @return [Boolean] whether +text+ was one
+    def queue_as_command(text, origin)
+      return false unless @engine.command_registry.command?(text.to_s)
+
+      @bridge.queue_command(text, client_id: origin&.dig(:client_id))
+      true
+    end
+
+    # The first prompt as a command: the session was saved as running for a
+    # turn that won't run.
+    # @return [Boolean] whether it was one
+    def initial_command(prompt)
+      return false unless queue_as_command(prompt, nil)
+
+      @session.status = Session::STATUS_IDLE
+      save_session
+      true
+    end
+
     # Add the queued context notes to the conversation (between turns only,
     # on this thread), save, then delete their files: a crash before the
     # delete leaves them claimed, and Engine#add_context_note skips a note
@@ -293,7 +316,10 @@ module Samagotchi
 
       begin
         message, origin, no_interrupt, images = SessionInbox.read_input(claimed_file)
-        run_prompt(message, origin, no_interrupt: !!no_interrupt, images: images || []) unless message.to_s.strip.empty?
+        return if message.to_s.strip.empty?
+        return if Array(images).empty? && queue_as_command(message, origin)
+
+        run_prompt(message, origin, no_interrupt: !!no_interrupt, images: images || [])
       ensure
         FileUtils.rm_f(claimed_file)
       end

data/lib/samagotchi/worker_sidecar.rb

@@ -42,7 +42,10 @@ module Samagotchi
       return nil unless sidecar&.port&.positive?
 
       begin
-        Socket.tcp(host, sidecar.port, connect_timeout: timeout).close
+        # Not Socket.tcp: with connect_timeout (Ruby 3.4, macOS 26) it hands
+        # back the socket of a refused connect (SO_ERROR set), so a dead
+        # worker's port read as live. TCPSocket raises ECONNREFUSED.
+        TCPSocket.new(host, sidecar.port, connect_timeout: timeout).close
         sidecar
       rescue StandardError
         FileUtils.rm_f(path(session_dir)) if unlink

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -137,6 +137,7 @@ files:
 - docs/releasing.md
 - docs/sessions.md
 - docs/sub-agent.md
+- docs/testing.md
 - lib/samagotchi.rb
 - lib/samagotchi/answer_command.rb
 - lib/samagotchi/answer_display.rb
@@ -280,6 +281,7 @@ files:
 - lib/samagotchi/memory_bundle/source.rb
 - lib/samagotchi/memory_bundle/status.rb
 - lib/samagotchi/memory_bundle/system_bundle.rb
+- lib/samagotchi/memory_bundle/trash.rb
 - lib/samagotchi/memory_bundle/uninstaller.rb
 - lib/samagotchi/memory_paths.rb
 - lib/samagotchi/model_catalog.rb
@@ -310,6 +312,10 @@ files:
 - lib/samagotchi/question_desk.rb
 - lib/samagotchi/recap_setup.rb
 - lib/samagotchi/recap_store.rb
+- lib/samagotchi/relay.rb
+- lib/samagotchi/relay_desk.rb
+- lib/samagotchi/relay_verifier.rb
+- lib/samagotchi/relay_watcher.rb
 - lib/samagotchi/reminder_queue.rb
 - lib/samagotchi/reminder_store.rb
 - lib/samagotchi/reply_wait.rb
@@ -366,6 +372,7 @@ files:
 - lib/samagotchi/tools/builtins.rb
 - lib/samagotchi/tools/cancel_reminder.rb
 - lib/samagotchi/tools/delegate.rb
+- lib/samagotchi/tools/delegate_relay.rb
 - lib/samagotchi/tools/delegate_result.rb
 - lib/samagotchi/tools/delegate_wait.rb
 - lib/samagotchi/tools/edit.rb