samagotchi 0.54.0 → 0.56.0

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

@@ -30,6 +30,32 @@ export function newActivity() {
   return { rows: [] };
 }
 
+// A row's fields beyond its params, as the server's ToolRowFields lists
+// them; each list is copied in one place per path (addStarted, addCompleted's
+// synthesized row, turn_events.js snapshotEvents), so a new field is added
+// here. ACTIVITY_FIELDS: top-level on tool_call_started, inside `activity`
+// on tool_call_completed. EVENT_FIELDS: top-level on both.
+//   title: what the call did in a few words (the server's tool title: a
+//     project-relative path, a command without its "cd … &&"); rows show
+//     it in place of the params when there is one.
+//   called_as: the name the model called the tool by when it was an
+//     alias's ("bash" run as execute); the row says so.
+//   view: the call's full arguments for the expanded row and the hovers
+//     (the server's ToolView: an execute/task_create's command, its cwd).
+//   ref: what the row traces to (the server's FileRef: {kind: "file",
+//     path, line?, end_line?}, the file a file tool touched), which
+//     refs.js makes the row's title and diff lines open.
+export const ACTIVITY_FIELDS = Object.freeze(["title", "called_as"]);
+export const EVENT_FIELDS = Object.freeze(["view", "ref"]);
+const ROW_FIELDS = Object.freeze([...ACTIVITY_FIELDS, ...EVENT_FIELDS]);
+
+// The +fields+ of +source+ that are set, as an object (for a spread).
+export function pickFields(source, fields) {
+  const picked = {};
+  for (const field of fields) if (source?.[field]) picked[field] = source[field];
+  return picked;
+}
+
 // Stable key for a call within a turn. iteration + call_index are both present
 // on :tool_call_started and :tool_call_completed, so the same key links a
 // "running" row to its completion.
@@ -52,9 +78,7 @@ export function addStarted(model, event = {}, now = null) {
     row.tool = event.tool || row.tool;
     row.label = event.label || row.label;
     row.params = event.params || row.params;
-    row.title = event.title || row.title;
-    row.called_as = event.called_as || row.called_as;
-    row.view = event.view || row.view;
+    for (const field of ROW_FIELDS) row[field] = event[field] || row[field];
     markStart(row, event, now);
     return { row, created: false };
   }
@@ -65,16 +89,8 @@ export function addStarted(model, event = {}, now = null) {
     tool: event.tool || "tool",
     label: event.label || null,
     params: event.params || "",
-    // What the call did in a few words (the server's tool title: a
-    // project-relative path, a command without its "cd … &&"); rows show it
-    // in place of the params when there is one.
-    title: event.title || null,
-    // The name the model called the tool by when it was an alias's ("bash"
-    // run as execute); the row says so.
-    called_as: event.called_as || null,
-    // The call's full arguments for the expanded row and the hovers (the
-    // server's ToolView: an execute/task_create's command, its cwd).
-    view: event.view || null,
+    // ACTIVITY_FIELDS and EVENT_FIELDS (above), null when unset.
+    ...Object.fromEntries(ROW_FIELDS.map((field) => [field, event[field] || null])),
     status: ROW_STATUS.RUNNING,
     output: "",
     output_truncated: false,
@@ -107,9 +123,8 @@ export function addCompleted(model, event = {}, now = null) {
       tool: event.tool,
       label: event.label,
       params: event.activity?.params || "",
-      title: event.activity?.title,
-      called_as: event.activity?.called_as,
-      view: event.view,
+      ...pickFields(event.activity, ACTIVITY_FIELDS),
+      ...pickFields(event, EVENT_FIELDS),
     });
     row = synthesized.row;
   }
@@ -117,8 +132,8 @@ export function addCompleted(model, event = {}, now = null) {
   row.output = event.output || "";
   row.output_truncated = !!event.output_truncated;
   if (event.activity?.params) row.params = event.activity.params;
-  if (event.activity?.title) row.title = event.activity.title;
-  if (event.activity?.called_as) row.called_as = event.activity.called_as;
+  // The completed event carries the title (ACTIVITY_FIELDS) in its activity.
+  Object.assign(row, pickFields(event.activity, ACTIVITY_FIELDS));
   // A grep that found nothing (status ok): the row says "no match".
   if (event.activity?.no_match) row.no_match = true;
   // The images the tool returned (a reload in the turn view draws them from