samagotchi 0.64.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;

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);
     },

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.64.0
+  version: 0.65.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -321,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
@@ -555,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