agent-inspect 6.31.30 → 6.31.31

package/packages/cli/dist/index.mjs

@@ -14,7 +14,7 @@ import { createServer } from 'http';
 import { createRequire } from 'module';
 
 // package.json
-var version = "6.31.30";
+var version = "6.31.31";
 
 // packages/cli/src/trace-dir-scale.ts
 var TRACE_COUNT_WARN = 1e3;
@@ -2178,6 +2178,16 @@ function stepIdOf(event) {
   const value = event.attributes?.stepId;
   return typeof value === "string" && value.trim() !== "" ? value : void 0;
 }
+function attemptIdOf(event) {
+  const direct = event.attributes?.attemptId;
+  if (typeof direct === "string" && direct.trim() !== "") return direct;
+  const meta = event.attributes?.metadata;
+  if (meta && typeof meta === "object" && !Array.isArray(meta)) {
+    const nested = meta.attemptId;
+    if (typeof nested === "string" && nested.trim() !== "") return nested;
+  }
+  return void 0;
+}
 function lifecycleKey(event) {
   if (event.kind === "RUN") return `run:${event.runId}`;
   const stepId = stepIdOf(event);
@@ -2187,6 +2197,9 @@ function lifecycleKey(event) {
 function isTerminal(status) {
   return status === "ok" || status === "error";
 }
+function eventTime(event) {
+  return typeof event.timestamp === "number" ? event.timestamp : 0;
+}
 function cloneNode(node) {
   return {
     event: {
@@ -2197,37 +2210,87 @@ function cloneNode(node) {
     depth: node.depth
   };
 }
+function joinOnePair(start, terminal) {
+  const childMap = /* @__PURE__ */ new Map();
+  if (start) {
+    for (const child of start.children) {
+      childMap.set(child.event.eventId, child);
+    }
+  }
+  for (const child of terminal.children) {
+    childMap.set(child.event.eventId, child);
+  }
+  return {
+    event: {
+      ...terminal.event,
+      name: start?.event.name ?? terminal.event.name,
+      kind: start?.event.kind ?? terminal.event.kind,
+      ...start && attemptIdOf(terminal.event) === void 0 && attemptIdOf(start.event) ? {
+        attributes: {
+          ...terminal.event.attributes,
+          attemptId: attemptIdOf(start.event)
+        }
+      } : {}
+    },
+    children: presentSiblingNodes([...childMap.values()]),
+    depth: terminal.depth
+  };
+}
 function joinSiblingGroup(group) {
   if (group.length <= 1) return group;
-  const terminals = group.filter((n) => isTerminal(n.event.status));
-  const runnings = group.filter((n) => n.event.status === "running");
+  const terminals = group.filter((n) => isTerminal(n.event.status)).sort((a, b) => eventTime(a.event) - eventTime(b.event));
+  const runnings = group.filter((n) => n.event.status === "running").sort((a, b) => eventTime(a.event) - eventTime(b.event));
+  const others = group.filter(
+    (n) => !isTerminal(n.event.status) && n.event.status !== "running"
+  );
   const terminalStatuses = new Set(terminals.map((n) => n.event.status));
   if (terminalStatuses.size > 1) {
     return group;
   }
-  if (terminals.length >= 1) {
-    const terminal = terminals[terminals.length - 1];
-    const start = runnings[0];
-    const childMap = /* @__PURE__ */ new Map();
-    for (const n of group) {
-      for (const child of n.children) {
-        childMap.set(child.event.eventId, child);
-      }
+  if (terminals.length > 1 && terminals.every((t) => attemptIdOf(t.event) === void 0) && runnings.every((r) => attemptIdOf(r.event) === void 0)) {
+    return group;
+  }
+  const usedRunning = /* @__PURE__ */ new Set();
+  const out = [];
+  for (const terminal of terminals) {
+    const terminalAttempt = attemptIdOf(terminal.event);
+    const terminalTs = eventTime(terminal.event);
+    const candidate = runnings.find((r) => {
+      if (usedRunning.has(r.event.eventId)) return false;
+      if (eventTime(r.event) > terminalTs) return false;
+      const runningAttempt = attemptIdOf(r.event);
+      if (terminalAttempt !== void 0) {
+        return runningAttempt === terminalAttempt;
+      }
+      if (runningAttempt !== void 0) {
+        return true;
+      }
+      return true;
+    });
+    if (candidate) {
+      usedRunning.add(candidate.event.eventId);
+      out.push(joinOnePair(candidate, terminal));
+    } else {
+      out.push({
+        ...terminal,
+        children: presentSiblingNodes(terminal.children)
+      });
     }
-    return [
-      {
-        event: {
-          ...terminal.event,
-          name: start?.event.name ?? terminal.event.name,
-          kind: start?.event.kind ?? terminal.event.kind,
-          ...start?.event.timestamp !== void 0 && terminal.event.durationMs === void 0 ? {} : {}
-        },
-        children: presentSiblingNodes([...childMap.values()]),
-        depth: terminal.depth
-      }
-    ];
   }
-  return group;
+  for (const running of runnings) {
+    if (usedRunning.has(running.event.eventId)) continue;
+    out.push({
+      ...running,
+      children: presentSiblingNodes(running.children)
+    });
+  }
+  for (const other of others) {
+    out.push({
+      ...other,
+      children: presentSiblingNodes(other.children)
+    });
+  }
+  return out;
 }
 function presentSiblingNodes(nodes) {
   const prepared = nodes.map((n) => ({