samagotchi 0.34.0 → 0.35.0

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

@@ -39,8 +39,10 @@ export function rowKey(iteration, callIndex) {
 
 // Upsert a row from a :tool_call_started event. Returns { row, created }.
 // If a row with the same key already exists (duplicate start), it is reset to
-// running and updated rather than duplicated.
-export function addStarted(model, event = {}) {
+// running and updated rather than duplicated. +now+ (ms): when the page saw
+// the call start, for its duration; none for an event a re-render replays
+// (`replayed`: the call started before the page looked).
+export function addStarted(model, event = {}, now = null) {
   const iteration = event.iteration ?? 0;
   const callIndex = event.call_index ?? 0;
   const key = rowKey(iteration, callIndex);
@@ -52,6 +54,7 @@ export function addStarted(model, event = {}) {
     row.params = event.params || row.params;
     row.title = event.title || row.title;
     row.view = event.view || row.view;
+    markStart(row, event, now);
     return { row, created: false };
   }
   row = {
@@ -72,14 +75,23 @@ export function addStarted(model, event = {}) {
     output: "",
     output_truncated: false,
   };
+  markStart(row, event, now);
   model.rows.push(row);
   return { row, created: true };
 }
 
+function markStart(row, event, now) {
+  if (now !== null && !event.replayed) row.startedAt = now;
+  else delete row.startedAt;
+}
+
 // Update (or synthesize) a row from a :tool_call_completed event. Returns the row.
 // If no matching :tool_call_started was seen (e.g. a replay gap), a row is
-// created on the fly so the completion is never lost.
-export function addCompleted(model, event = {}) {
+// created on the fly so the completion is never lost. Its duration
+// (duration_ms, as a reloaded row has it from the tool record): a
+// snapshot's own, else from the start the page saw to +now+, less the time
+// the call waited for an approval (waited_ms), as the worker times it.
+export function addCompleted(model, event = {}, now = null) {
   const iteration = event.iteration ?? 0;
   const callIndex = event.call_index ?? 0;
   const key = rowKey(iteration, callIndex);
@@ -102,14 +114,22 @@ export function addCompleted(model, event = {}) {
   if (event.activity?.params) row.params = event.activity.params;
   if (event.activity?.title) row.title = event.activity.title;
   // The images the tool returned (a reload in the turn view draws them from
-  // the saved parts, turn_view.js reloadRowHtml).
+  // the saved parts, turn_html.js toolRowHtml).
   if (event.images?.length) row.images = event.images;
   // What an edit/write changed in its file (a reload draws it from the
-  // saved parts, turn_view.js reloadRowHtml).
+  // saved parts, turn_html.js toolRowHtml).
   if (event.diff) row.diff = event.diff;
+  const duration = callDuration(row, event, now);
+  if (duration !== null) row.duration_ms = duration;
   return row;
 }
 
+function callDuration(row, event, now) {
+  if (event.duration_ms != null) return event.duration_ms;
+  if (row.startedAt == null || now === null || event.replayed) return null;
+  return Math.max(0, now - row.startedAt - (Number(event.waited_ms) || 0));
+}
+
 // A completed call's row status from the server's: error, stopped,
 // blocked, else ok.
 export function completedStatus(status) {