samagotchi 0.63.0 → 0.65.0

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

@@ -7,7 +7,8 @@
 // Rules:
 // - turn_started opens the first gen (no iteration yet).
 // - generation_started(n) opens a new gen unless the current one is still
-//   empty (then it takes n).
+//   empty (then it takes n); either way the gen's startedAt is the page's
+//   clock at it (null for a replay).
 // - a chunk goes to the gen of its iteration (opening one when none has it);
 //   a chunk with no iteration goes to the current gen, unless that one is
 //   textDone or already has tool rows (an older server's replay), which
@@ -45,7 +46,7 @@ function isEmpty(gen) {
 
 function openGen(turn, iteration) {
   const closed = closeCurrent(turn);
-  const gen = { iteration: iteration ?? null, thinking: "", text: "", activity: newActivity(), textDone: false, closed: false, notices: [] };
+  const gen = { iteration: iteration ?? null, thinking: "", text: "", activity: newActivity(), textDone: false, closed: false, notices: [], startedAt: null, thinkingAt: null };
   gen.tools = gen.activity.rows;
   turn.gens.push(gen);
   return { gen, opened: true, closed };
@@ -81,16 +82,21 @@ export function turnStarted(turn) {
   return openGen(turn, null);
 }
 
-export function generationStarted(turn, iteration = null) {
+// +now+ (ms): when the page saw the generation start, its startedAt (the
+// composer's delivery line clocks the step from it); null for a replayed
+// start (a join: the snapshot's generation age stands in).
+export function generationStarted(turn, iteration = null, now = null) {
   const current = currentGen(turn);
-  if (current && isEmpty(current)) {
-    current.iteration = iteration ?? current.iteration;
-    return { gen: current, opened: false, closed: null };
-  }
-  return openGen(turn, iteration);
+  const r = current && isEmpty(current) ? { gen: current, opened: false, closed: null } : openGen(turn, iteration);
+  if (!r.opened) r.gen.iteration = iteration ?? r.gen.iteration;
+  r.gen.startedAt = now;
+  return r;
 }
 
-export function chunk(turn, { text = "", thinking = "", iteration = null } = {}) {
+// +now+ (ms): when the page got the chunk (null for a replay): a gen's
+// first thinking delta stamps its thinkingAt, the clock the worker's cut
+// counts from too (GenerationPhase).
+export function chunk(turn, { text = "", thinking = "", iteration = null, now = null } = {}) {
   let r;
   if (iteration == null) {
     const current = currentGen(turn);
@@ -102,6 +108,7 @@ export function chunk(turn, { text = "", thinking = "", iteration = null } = {})
   // Leading whitespace (the "\n" after <think>, or after a closed
   // think/tool_call block) would render as an empty first line; trim it at
   // the start of a gen's thinking and text only.
+  if (thinking && !gen.thinking && now != null) gen.thinkingAt = now;
   if (thinking) gen.thinking += leadTrimmed(gen.thinking, thinking);
   if (text) gen.text += leadTrimmed(gen.text, text);
   return r;
@@ -222,13 +229,23 @@ export function genLabelParts(gen) {
   if (line) return { head: cut(line), calls, repeats: true };
   if (first?.title) return { head: cut(`${toolName(first)} ${first.title}`), calls, repeats: true };
   if (gen.tools.length) {
-    const names = [...new Set(gen.tools.map(toolName))];
-    const head = `working with ${names.slice(0, LABEL_TOOLS).join(", ")}${names.length > LABEL_TOOLS ? ", …" : ""}`;
-    return { head, calls, repeats: false };
+    // A plugin label that is a verb ("echoing", the default "calling
+    // tool") is the head itself when every call has one; among other
+    // tools it gives way to its tool's name ("working with read, echo").
+    const verbs = gen.tools.every(isVerbLabel);
+    const names = [...new Set(gen.tools.map((r) => (verbs || !isVerbLabel(r) ? toolName(r) : r.tool || "tool")))];
+    const list = `${names.slice(0, LABEL_TOOLS).join(", ")}${names.length > LABEL_TOOLS ? ", …" : ""}`;
+    return { head: verbs ? list : `working with ${list}`, calls, repeats: false };
   }
   return { head: "thinking", calls: "", repeats: false };
 }
 
+// A plugin tool's label that reads as a verb (its first word ends in
+// "ing": "echoing", "calling tool"), not as a name ("chrome: screenshot").
+function isVerbLabel(row) {
+  return /^[a-z]+ing\b/i.test(String(row?.label || ""));
+}
+
 // A step that said something (its text is not the turn's answer): a row of
 // its own in a finished block's outline.
 export function isNarrated(gen) {

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

@@ -700,14 +700,16 @@ export function createTurnView({
         draw(entry);
       }
     },
-    generationStarted(data) {
+    // +now+: the page's clock at a live start (stream_handlers.js), null
+    // for a replayed one.
+    generationStarted(data, now = null) {
       if (!turn) this.turnStarted({});
-      apply(model.generationStarted(turn, data.iteration ?? null));
+      apply(model.generationStarted(turn, data.iteration ?? null, now));
     },
-    chunk({ text, thinking, iteration }) {
+    chunk({ text, thinking, iteration, now = null }) {
       if (!text && !thinking) return;
       if (!turn) this.turnStarted({});
-      const r = model.chunk(turn, { text, thinking, iteration });
+      const r = model.chunk(turn, { text, thinking, iteration, now });
       apply(r);
       scheduleFlush(r.gen);
     },

data/lib/samagotchi/worker.rb

@@ -900,7 +900,7 @@ module Samagotchi
       @reporting_turn = reports_to_parent?(turn_args[:origin])
       restores = @turn_flow.restores
       begin
-        @checkpoint.begin_turn(prompt: prompt)
+        @checkpoint.begin_turn(prompt: prompt, enqueued_id: turn_args[:origin]&.dig(:enqueued_id))
         @session.status = Session::STATUS_RUNNING
         # A continue that moved this session to the chain's new link wrote
         # the new parent beside it (Session::PARENT_FILE): this turn's
@@ -929,7 +929,7 @@ module Samagotchi
       # no reply: its text is what came before its last tool calls, and a
       # wait (chi send --wait) gets the question instead.
       unless response.nil? || response.strip.empty? || @continue_offer.awaiting?
-        SessionInbox.write_output(@session_dir, response)
+        SessionInbox.write_output(@session_dir, response, enqueued_id: turn_args[:origin]&.dig(:enqueued_id))
       end
       save_or_log(:turn) { save_session }
       # The reports the turn merged were read unless its end took the turn
@@ -1045,10 +1045,12 @@ module Samagotchi
       @pending_input_drain ||= lambda do
         # An iteration boundary: tell whoever sent a command now that it waits.
         refuse_queued_commands(mid_turn: true)
-        # 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.
+        # A queued line or one with images runs as its own turn after this
+        # one (steering merges text only): skipped here, not a barrier, so a
+        # line sent after it still goes in at this boundary. Only the files
+        # claimed below reach @merged_this_turn and the checkpoint.
         files = SessionInbox.find_new_input_files(@session_dir).sort
-                            .take_while { |input_file| !SessionInbox.waits_for_turn_end?(input_file) }
+                            .reject { |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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.63.0
+  version: 0.65.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -235,6 +235,7 @@ files:
 - lib/samagotchi/client_id.rb
 - lib/samagotchi/command_steps.rb
 - lib/samagotchi/commands/registry.rb
+- lib/samagotchi/composer_route.rb
 - lib/samagotchi/config.rb
 - lib/samagotchi/config_text_edit.rb
 - lib/samagotchi/context_absorber.rb
@@ -320,11 +321,17 @@ files:
 - lib/samagotchi/last_turn.rb
 - lib/samagotchi/launch_mode.rb
 - lib/samagotchi/live_versions.rb
+- lib/samagotchi/llm/adapters.rb
+- lib/samagotchi/llm/anthropic_assembly.rb
+- lib/samagotchi/llm/anthropic_messages.rb
+- lib/samagotchi/llm/anthropic_wire.rb
 - lib/samagotchi/llm/api_key.rb
 - lib/samagotchi/llm/backend.rb
 - lib/samagotchi/llm/chat_loop.rb
+- lib/samagotchi/llm/dialect.rb
 - lib/samagotchi/llm/errors.rb
 - lib/samagotchi/llm/http.rb
+- lib/samagotchi/llm/model_listing.rb
 - lib/samagotchi/llm/model_result.rb
 - lib/samagotchi/llm/native_backend.rb
 - lib/samagotchi/llm/native_tool_normalizer.rb
@@ -554,6 +561,7 @@ files:
 - lib/samagotchi/web/public/copy.js
 - lib/samagotchi/web/public/ctx.js
 - lib/samagotchi/web/public/data.js
+- lib/samagotchi/web/public/delivery_line.js
 - lib/samagotchi/web/public/diff_view.js
 - lib/samagotchi/web/public/families_view.js
 - lib/samagotchi/web/public/favicon.svg