autotel-terminal 17.0.3 → 17.0.5

package/dist/cli.cjs

@@ -111,6 +111,25 @@ function createTerminalSpanStream(processor) {
         const startTime = timeToMs(span.startTime);
         const endTime = timeToMs(span.endTime);
         const durationMs = endTime - startTime;
+        const resourceAttrs = span.resource?.attributes ?? {};
+        const spanAttrs = span.attributes;
+        const mergedAttrs = {};
+        for (const [k, v] of Object.entries(resourceAttrs)) {
+          mergedAttrs[k] = v;
+        }
+        for (const [k, v] of Object.entries(spanAttrs)) {
+          mergedAttrs[k] = v;
+        }
+        const spanEvents = span.events?.length ? span.events.map((e) => ({
+          name: e.name,
+          timeMs: timeToMs(e.time),
+          attributes: e.attributes
+        })) : void 0;
+        const spanLinks = span.links?.length ? span.links.map((l) => ({
+          traceId: l.context.traceId,
+          spanId: l.context.spanId,
+          attributes: l.attributes
+        })) : void 0;
         const event = {
           name: span.name,
           spanId: spanContext.spanId,
@@ -121,7 +140,9 @@ function createTerminalSpanStream(processor) {
           durationMs,
           status: mapStatus(span.status.code),
           kind: mapKind(span.kind),
-          attributes: span.attributes
+          attributes: mergedAttrs,
+          ...spanEvents ? { events: spanEvents } : {},
+          ...spanLinks ? { links: spanLinks } : {}
         };
         callback(event);
       });
@@ -130,6 +151,10 @@ function createTerminalSpanStream(processor) {
 }
 
 // src/lib/trace-model.ts
+function spanServiceName(span) {
+  const svc = span.attributes?.["service.name"];
+  return typeof svc === "string" ? svc : "unknown";
+}
 function buildTraceMap(spans, maxTraces = 50) {
   const byTrace = /* @__PURE__ */ new Map();
   for (const s of spans) {
@@ -153,6 +178,7 @@ function buildTraceSummaries(traceMap) {
     const durationMs = root ? root.durationMs : 0;
     const hasError = traceSpans.some((s) => s.status === "ERROR");
     const lastEndTime = Math.max(...traceSpans.map((s) => s.endTime));
+    const services = [...new Set(traceSpans.map((s) => spanServiceName(s)))];
     summaries.push({
       traceId,
       rootName: root?.name ?? "unknown",
@@ -160,7 +186,8 @@ function buildTraceSummaries(traceMap) {
       hasError,
       spanCount: traceSpans.length,
       lastEndTime,
-      spans: traceSpans
+      spans: traceSpans,
+      services
     });
   }
   return summaries;
@@ -276,6 +303,45 @@ function buildWaterfallBar(spanStart, spanDuration, traceStart, traceDuration, w
   const trailing = Math.max(0, width - clampedStart - clampedLen);
   return " ".repeat(clampedStart) + "\u2588".repeat(clampedLen) + " ".repeat(trailing);
 }
+function buildTimeRuler(totalMs, width) {
+  const left = "0ms";
+  const right = formatDurationMs(totalMs);
+  const mid = formatDurationMs(totalMs / 2);
+  const midPos = Math.floor(width / 2) - Math.floor(mid.length / 2);
+  const rightPos = width - right.length;
+  const chars = Array.from({ length: width }).fill(" ");
+  for (let i = 0; i < left.length && i < width; i++) chars[i] = left[i];
+  if (midPos > left.length + 1 && midPos + mid.length < rightPos - 1) {
+    for (let i = 0; i < mid.length; i++) chars[midPos + i] = mid[i];
+  }
+  for (let i = 0; i < right.length; i++) chars[rightPos + i] = right[i];
+  return chars.join("");
+}
+
+// src/lib/service-colors.ts
+var SERVICE_COLORS = [
+  "cyan",
+  "magenta",
+  "blue",
+  "yellow",
+  "green",
+  "redBright",
+  "cyanBright",
+  "magentaBright",
+  "blueBright",
+  "yellowBright",
+  "greenBright"
+];
+function hashString(s) {
+  let hash = 0;
+  for (let i = 0; i < s.length; i++) {
+    hash = Math.trunc((hash << 5) - hash + s.codePointAt(i));
+  }
+  return Math.abs(hash);
+}
+function getServiceColor(serviceName) {
+  return SERVICE_COLORS[hashString(serviceName) % SERVICE_COLORS.length];
+}
 
 // src/lib/log-model.ts
 function filterLogsBySearch(logs, searchQuery, minLevel) {
@@ -516,6 +582,123 @@ function buildErrorSummaries(traceSummaries) {
   return out;
 }
 
+// src/lib/topology-model.ts
+function getServiceName2(span) {
+  const attrs = span.attributes ?? {};
+  const serviceName = attrs["service.name"] ?? attrs["resource.service.name"];
+  return serviceName || "unknown";
+}
+function getPeerService(span) {
+  const attrs = span.attributes ?? {};
+  const peerService = attrs["peer.service"] ?? attrs["db.system"] ?? attrs["messaging.system"] ?? attrs["http.host"];
+  return peerService ?? null;
+}
+function buildServiceGraph(spans) {
+  const byService = /* @__PURE__ */ new Map();
+  for (const span of spans) {
+    const svc = getServiceName2(span);
+    const entry = byService.get(svc) ?? {
+      durations: [],
+      spanCount: 0,
+      errorCount: 0
+    };
+    entry.spanCount += 1;
+    entry.durations.push(span.durationMs);
+    if (span.status === "ERROR") entry.errorCount += 1;
+    byService.set(svc, entry);
+  }
+  const services = [];
+  for (const [serviceName, { durations, spanCount, errorCount }] of byService) {
+    if (spanCount === 0) continue;
+    const avgDurationMs = durations.reduce((acc, d) => acc + d, 0) / durations.length;
+    const sorted = durations.toSorted((a, b) => a - b);
+    const p95Index = Math.floor(sorted.length * 0.95);
+    const p95DurationMs = sorted[p95Index] ?? sorted.at(-1) ?? 0;
+    services.push({
+      serviceName,
+      spanCount,
+      errorCount,
+      avgDurationMs,
+      p95DurationMs
+    });
+  }
+  const byEdge = /* @__PURE__ */ new Map();
+  for (const span of spans) {
+    const to = getPeerService(span);
+    if (!to) continue;
+    const from = getServiceName2(span);
+    const key = `${from}\u2192${to}`;
+    const entry = byEdge.get(key) ?? { spanCount: 0, errorCount: 0 };
+    entry.spanCount += 1;
+    if (span.status === "ERROR") entry.errorCount += 1;
+    byEdge.set(key, entry);
+  }
+  const edges = [];
+  for (const [key, { spanCount, errorCount }] of byEdge) {
+    const [fromService, toService] = key.split("\u2192");
+    edges.push({ fromService, toService, spanCount, errorCount });
+  }
+  services.sort((a, b) => b.spanCount - a.spanCount);
+  edges.sort((a, b) => b.spanCount - a.spanCount);
+  return { services, edges };
+}
+
+// src/lib/topology-render.ts
+function renderTopologyAscii(graph) {
+  if (graph.services.length === 0) {
+    return ["  No services detected yet."];
+  }
+  const targetServices = new Set(graph.edges.map((e) => e.toService));
+  const roots = graph.services.filter(
+    (s) => !targetServices.has(s.serviceName)
+  );
+  const rootList = roots.length > 0 ? roots : [...graph.services];
+  const lines = [];
+  for (const root of rootList) {
+    renderNode(graph, root.serviceName, "", true, lines, /* @__PURE__ */ new Set());
+  }
+  return lines;
+}
+function renderNode(graph, serviceName, prefix, isRoot, lines, ancestors) {
+  const svc = graph.services.find((s) => s.serviceName === serviceName);
+  const label = svc ? formatServiceLine(svc) : `[${serviceName}]`;
+  if (isRoot) {
+    lines.push(label);
+  }
+  if (ancestors.has(serviceName)) return;
+  const pathAncestors = new Set(ancestors);
+  pathAncestors.add(serviceName);
+  const outgoing = graph.edges.filter((e) => e.fromService === serviceName);
+  for (let i = 0; i < outgoing.length; i++) {
+    const edge = outgoing[i];
+    const isLast = i === outgoing.length - 1;
+    const connector = isLast ? "\u2514" : "\u251C";
+    const childPrefix = isLast ? "    " : "\u2502   ";
+    const downstream = graph.services.find(
+      (s) => s.serviceName === edge.toService
+    );
+    const edgeLabel = formatEdgeLabel(edge);
+    const downstreamLabel = downstream ? formatServiceLine(downstream) : `[${edge.toService}]`;
+    lines.push(`${prefix}    ${connector}\u2500\u2500${edgeLabel}\u2500\u2500\u2192 ${downstreamLabel}`);
+    renderNode(
+      graph,
+      edge.toService,
+      prefix + "    " + childPrefix,
+      false,
+      lines,
+      pathAncestors
+    );
+  }
+}
+function formatServiceLine(svc) {
+  const errPart = svc.errorCount > 0 ? ` \xB7 ${svc.errorCount} err` : "";
+  return `[${svc.serviceName}] ${svc.spanCount} spans${errPart} \xB7 p95 ${formatDurationMs(svc.p95DurationMs)}`;
+}
+function formatEdgeLabel(edge) {
+  const errPart = edge.errorCount > 0 ? `, ${edge.errorCount} err` : "";
+  return `(${edge.spanCount}${errPart})`;
+}
+
 // src/lib/export-model.ts
 function exportTraceToJson(trace, logs) {
   const exported = {
@@ -1033,6 +1216,8 @@ function Dashboard({
     [spansForSelectedService]
   );
   const selectedTraceSummary = drilldownTraceId == null ? filteredSummaries[selected] ?? null : filteredSummaries.find((t2) => t2.traceId === drilldownTraceId) ?? null;
+  const serviceGraph = react.useMemo(() => buildServiceGraph(spans), [spans]);
+  const topologyLines = react.useMemo(() => renderTopologyAscii(serviceGraph), [serviceGraph]);
   const errorSummaries = react.useMemo(
     () => buildErrorSummaries(traceSummaries),
     [traceSummaries]
@@ -1439,6 +1624,13 @@ Currently viewing trace ${drilldownTraceId}. This trace has ${drilldownSpans.len
         setDrilldownSelectedIndex(0);
         setDrilldownScrollOffset(0);
       }
+      if (input === "G") {
+        setViewMode((m) => m === "topology" ? "trace" : "topology");
+        setSelected(0);
+        setDrilldownTraceId(null);
+        setDrilldownSelectedIndex(0);
+        setDrilldownScrollOffset(0);
+      }
       if (input === "c") {
         setSpans([]);
         setLogs([]);
@@ -1580,20 +1772,31 @@ ${json}
     { isActive: isRawModeSupported }
   );
   const headerRight = recording ? "[Recording]" : paused ? "[Paused]" : "[Live]";
-  const headerModeLabel = viewMode === "trace" ? "traces" : viewMode === "span" ? "spans" : viewMode === "log" ? "logs" : viewMode === "service-summary" ? "services" : "errors";
+  const headerModeLabel = viewMode === "trace" ? "traces" : viewMode === "span" ? "spans" : viewMode === "log" ? "logs" : viewMode === "service-summary" ? "services" : viewMode === "topology" ? "topology" : "errors";
   const showNewError = newErrorCount > 0;
   function renderTreeRow(node, index) {
     const isSel = drilldownTraceId != null && index === drilldownSelectedIndex;
     const prefix = node.depth === 0 ? "" : "  ".repeat(node.depth) + (node.children.length > 0 ? "\u251C\u2500\u2500 " : "\u2514\u2500\u2500 ");
+    const svcName = spanServiceName(node.span);
+    const svcColor = getServiceColor(svcName);
     const statusColor = node.span.status === "ERROR" ? "red" : node.span.durationMs > 500 ? "yellow" : "green";
     return /* @__PURE__ */ jsxRuntime.jsxs(
       ink.Box,
       {
         flexDirection: "row",
         children: [
-          /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { color: isSel ? "cyan" : void 0, children: isSel ? "\u203A " : "  " }),
+          /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { backgroundColor: isSel ? "blue" : void 0, color: isSel ? "white" : void 0, children: isSel ? "\u25B8 " : "  " }),
+          /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { color: node.span.status === "ERROR" ? "red" : void 0, children: node.span.status === "ERROR" ? "\u2717" : " " }),
           /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { dimColor: true, children: prefix }),
-          /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { color: colors ? statusColor : void 0, children: truncate(node.span.name, 24) }),
+          /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { color: colors ? statusColor : void 0, children: truncate(node.span.name, 23) }),
+          /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { color: svcColor, children: [
+            " ",
+            truncate(svcName, 10)
+          ] }),
+          /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { dimColor: true, children: [
+            " ",
+            node.span.kind ?? ""
+          ] }),
           /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { dimColor: true, children: [
             " ",
             formatDurationMs(node.span.durationMs)
@@ -1651,18 +1854,323 @@ ${json}
             ] })
           ] }) : /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { flexDirection: "row", justifyContent: "space-between", children: [
             /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { dimColor: true, children: drilldownTraceId == null ? "\u2191/\u2193 select \u2022 Enter open \u2022 Tab cycle tabs \u2022 Esc back \u2022 T trace \u2022 L logs \u2022 a AI \u2022 ? help" : "\u2191/\u2193 select \u2022 Tab cycle tabs \u2022 Esc back \u2022 T trace \u2022 L logs \u2022 a AI \u2022 ? help" }),
-            /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { dimColor: true, children: viewMode === "trace" ? `traces ${filteredSummaries.length}/${traceSummaries.length}` : viewMode === "span" ? `spans ${filteredSpans.length}/${spans.length}` : viewMode === "service-summary" ? `services ${serviceStats.length}` : viewMode === "errors" ? `errors ${filteredErrorSummaries.length}/${errorSummaries.length}` : `logs ${filteredLogs.length}/${logs.length}` })
+            /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { dimColor: true, children: viewMode === "trace" ? `traces ${filteredSummaries.length}/${traceSummaries.length}` : viewMode === "span" ? `spans ${filteredSpans.length}/${spans.length}` : viewMode === "service-summary" ? `services ${serviceStats.length}` : viewMode === "errors" ? `errors ${filteredErrorSummaries.length}/${errorSummaries.length}` : viewMode === "topology" ? `services ${serviceGraph.services.length} \xB7 edges ${serviceGraph.edges.length}` : `logs ${filteredLogs.length}/${logs.length}` })
           ] }),
-          showHelp && /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { dimColor: true, children: "Views: t/l/v/E \u2022 Search: / \u2022 Filters: e/S/R/H/f/x \u2022 Capture: p/r/J \u2022 AI: a \u2022 Clear: c" })
+          showHelp && /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { dimColor: true, children: "Views: t/l/v/E/G \u2022 Search: / \u2022 Filters: e/S/R/H/f/x \u2022 Capture: p/r/J \u2022 AI: a \u2022 Clear: c" })
         ] }),
         /* @__PURE__ */ jsxRuntime.jsx(ink.Box, { marginBottom: 0, children: /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { dimColor: true, children: spanFilters.serviceName || spanFilters.route || spanFilters.statusGroup !== "all" || spanFilters.traceId ? `filters:${spanFilters.serviceName ? ` service=${spanFilters.serviceName}` : ""}${spanFilters.route ? ` route=${spanFilters.route}` : ""}${spanFilters.statusGroup && spanFilters.statusGroup !== "all" ? ` status=${spanFilters.statusGroup}` : ""}${spanFilters.traceId ? ` trace=${spanFilters.traceId.slice(0, 8)}\u2026` : ""}` : "filters: none" }) }),
-        /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { flexDirection: "row", gap: 2, children: [
+        viewMode === "topology" && /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { flexDirection: "column", borderStyle: "round", borderColor: "gray", paddingX: 1, children: [
+          /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { bold: true, children: "Service Topology" }),
+          /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { dimColor: true, children: "Press G to toggle \xB7 Shows service dependencies from span data" }),
+          /* @__PURE__ */ jsxRuntime.jsx(ink.Box, { flexDirection: "column", marginTop: 1, children: topologyLines.map((line, i) => {
+            const hasErr = line.includes(" err");
+            return /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { color: hasErr ? "red" : void 0, children: line }, `topo-${i}`);
+          }) })
+        ] }),
+        viewMode !== "topology" && (drilldownTraceId != null ? /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { flexDirection: "column", borderStyle: "round", borderColor: "gray", paddingX: 1, paddingY: 0, children: [
+          /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { marginBottom: 0, flexDirection: "column", children: [
+            /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { bold: true, children: [
+              "Trace ",
+              drilldownTraceId.slice(0, 16),
+              "\u2026"
+            ] }),
+            /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { flexDirection: "row", gap: 1, children: [
+              drilldownSummary?.services?.map((svc) => /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { color: getServiceColor(svc), children: svc }, svc)),
+              /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { dimColor: true, children: "\xB7" }),
+              /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { children: drilldownSummary?.rootName ?? "unknown" }),
+              /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { dimColor: true, children: "\xB7" }),
+              /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { dimColor: true, children: [
+                drilldownSpans.length,
+                " spans"
+              ] }),
+              /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { dimColor: true, children: "\xB7" }),
+              /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { dimColor: true, children: [
+                drilldownSummary?.services?.length ?? 0,
+                " services"
+              ] }),
+              drilldownSummary?.hasError && /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { color: "red", children: [
+                " ",
+                "ERROR"
+              ] })
+            ] }),
+            /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { flexDirection: "row", gap: 2, children: [
+              /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { dimColor: true, children: "Duration: " }),
+              /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { color: "green", children: formatDurationMs(drilldownSummary?.durationMs ?? 0) })
+            ] })
+          ] }),
+          /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { marginBottom: 0, flexDirection: "row", gap: 2, children: [
+            /* @__PURE__ */ jsxRuntime.jsx(
+              ink.Text,
+              {
+                color: drilldownTab === "timeline" ? "blue" : void 0,
+                dimColor: drilldownTab !== "timeline",
+                bold: drilldownTab === "timeline",
+                children: "Timeline"
+              }
+            ),
+            /* @__PURE__ */ jsxRuntime.jsxs(
+              ink.Text,
+              {
+                color: drilldownTab === "spans" ? "blue" : void 0,
+                dimColor: drilldownTab !== "spans",
+                bold: drilldownTab === "spans",
+                children: [
+                  "Spans (",
+                  drilldownSpans.length,
+                  ")"
+                ]
+              }
+            ),
+            /* @__PURE__ */ jsxRuntime.jsxs(
+              ink.Text,
+              {
+                color: drilldownTab === "logs" ? "blue" : void 0,
+                dimColor: drilldownTab !== "logs",
+                bold: drilldownTab === "logs",
+                children: [
+                  "Logs (",
+                  drilldownLogs.length,
+                  ")"
+                ]
+              }
+            )
+          ] }),
+          drilldownTab === "timeline" && (() => {
+            const NAME_COL = 28;
+            const SERVICE_COL = 12;
+            const KIND_COL = 10;
+            let traceStartMs = Infinity;
+            for (const s of drilldownSummary?.spans ?? []) {
+              if (s.startTime < traceStartMs) traceStartMs = s.startTime;
+            }
+            if (traceStartMs === Infinity) traceStartMs = 0;
+            const traceDurMs = drilldownSummary?.durationMs ?? 1;
+            const WATERFALL_WIDTH = 44;
+            const items = drilldownTimeline.slice(drilldownScrollOffset, drilldownScrollOffset + LIST_HEIGHT);
+            return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+              /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { flexDirection: "row", children: [
+                /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { dimColor: true, children: "".padEnd(NAME_COL + SERVICE_COL + KIND_COL + 2) }),
+                /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { dimColor: true, children: buildTimeRuler(traceDurMs, WATERFALL_WIDTH) })
+              ] }),
+              items.map((item, i) => {
+                const isSel = i + drilldownScrollOffset === drilldownSelectedIndex;
+                if (item.type === "span" && item.span) {
+                  const s = item.span;
+                  const node = drilldownTree.find(
+                    (n) => n.span.spanId === s.spanId
+                  );
+                  const depth = node?.depth ?? 0;
+                  const indent = "  ".repeat(Math.min(depth, 4));
+                  const nameWidth = NAME_COL - Math.min(depth, 4) * 2 - 1;
+                  const svcName = spanServiceName(s);
+                  const svcColor = getServiceColor(svcName);
+                  const kindStr = (s.kind ?? "").padEnd(KIND_COL);
+                  const svcStr = truncate(svcName, SERVICE_COL - 2).padEnd(SERVICE_COL);
+                  const errorMark = s.status === "ERROR" ? "\u2717" : " ";
+                  const namePart = `${indent}${truncate(s.name, nameWidth - 1)}`.padEnd(NAME_COL - 1);
+                  const bar = buildWaterfallBar(
+                    s.startTime,
+                    s.durationMs,
+                    traceStartMs,
+                    traceDurMs,
+                    WATERFALL_WIDTH
+                  );
+                  return /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { flexDirection: "row", children: [
+                    /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { backgroundColor: isSel ? "blue" : void 0, color: isSel ? "white" : void 0, children: [
+                      isSel ? "\u25B8" : " ",
+                      /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { color: s.status === "ERROR" ? "red" : void 0, children: errorMark }),
+                      namePart
+                    ] }),
+                    /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { color: svcColor, children: [
+                      " ",
+                      svcStr
+                    ] }),
+                    /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { dimColor: true, children: kindStr }),
+                    /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { color: s.status === "ERROR" ? "red" : svcColor, children: bar }),
+                    /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { color: s.status === "ERROR" ? "red" : svcColor, children: [
+                      " ",
+                      formatDurationMs(s.durationMs)
+                    ] })
+                  ] }, `${s.spanId}-${i}`);
+                } else if (item.type === "log" && item.log) {
+                  const l = item.log;
+                  const levelColor = l.level === "error" ? "red" : l.level === "warn" ? "yellow" : "blue";
+                  const relTime = drilldownSummary ? `+${formatDurationMs(l.time - traceStartMs)}` : "";
+                  const logName = `  ${l.level.toUpperCase()} ${truncate(l.message, NAME_COL - 8)}`.padEnd(NAME_COL);
+                  const logOffset = drilldownSummary ? Math.floor((l.time - traceStartMs) / traceDurMs * WATERFALL_WIDTH) : 0;
+                  const clampedOffset = Math.max(0, Math.min(logOffset, WATERFALL_WIDTH - 1));
+                  const logBar = " ".repeat(clampedOffset) + "\xB7" + " ".repeat(WATERFALL_WIDTH - clampedOffset - 1);
+                  return /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { flexDirection: "row", children: [
+                    /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { backgroundColor: isSel ? "blue" : void 0, color: isSel ? "white" : void 0, children: [
+                      isSel ? "\u25B8" : " ",
+                      /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { color: levelColor, children: logName })
+                    ] }),
+                    /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { dimColor: true, children: " ".padEnd(SERVICE_COL + KIND_COL + 1) }),
+                    /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { dimColor: true, children: logBar }),
+                    /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { dimColor: true, children: [
+                      " ",
+                      relTime
+                    ] })
+                  ] }, `log-${i}`);
+                }
+                return null;
+              }),
+              Array.from({ length: Math.max(0, LIST_HEIGHT - items.length) }).map((_, i) => /* @__PURE__ */ jsxRuntime.jsx(ink.Box, { children: /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { children: " " }) }, `pad-${i}`))
+            ] });
+          })(),
+          drilldownTab === "spans" && drilldownTree.slice(drilldownScrollOffset, drilldownScrollOffset + LIST_HEIGHT).map((node, i) => renderTreeRow(node, i + drilldownScrollOffset)),
+          drilldownTab === "spans" && Array.from({ length: Math.max(0, LIST_HEIGHT - Math.min(drilldownTree.length, LIST_HEIGHT)) }).map((_, i) => /* @__PURE__ */ jsxRuntime.jsx(ink.Box, { children: /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { children: " " }) }, `pad-${i}`)),
+          drilldownTab === "logs" && drilldownLogs.slice(drilldownScrollOffset, drilldownScrollOffset + LIST_HEIGHT).map((log, i) => {
+            const isSel = i + drilldownScrollOffset === drilldownSelectedIndex;
+            const levelColor = log.level === "error" ? "red" : log.level === "warn" ? "yellow" : log.level === "info" ? "green" : void 0;
+            return /* @__PURE__ */ jsxRuntime.jsx(ink.Box, { children: /* @__PURE__ */ jsxRuntime.jsxs(
+              ink.Text,
+              {
+                backgroundColor: isSel ? "blue" : void 0,
+                color: isSel ? "white" : void 0,
+                children: [
+                  isSel ? "\u25B8" : " ",
+                  /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { color: levelColor, children: [
+                    " ",
+                    log.level.toUpperCase()
+                  ] }),
+                  " ",
+                  /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { dimColor: true, children: [
+                    "[",
+                    truncate(log.message, 50),
+                    "]"
+                  ] })
+                ]
+              }
+            ) }, `log-${i}`);
+          }),
+          drilldownTab === "logs" && Array.from({ length: Math.max(0, LIST_HEIGHT - Math.min(drilldownLogs.length, LIST_HEIGHT)) }).map((_, i) => /* @__PURE__ */ jsxRuntime.jsx(ink.Box, { children: /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { children: " " }) }, `pad-${i}`)),
+          drilldownSelectedItem?.type === "span" && drilldownSelectedItem.span && (() => {
+            const span = drilldownSelectedItem.span;
+            const { key: keyAttrs, rest: restAttrs } = keyAttrsAndRest(span.attributes);
+            return /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { marginTop: 1, flexDirection: "column", borderStyle: "single", borderColor: "gray", paddingX: 1, children: [
+              /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { flexDirection: "row", gap: 2, children: [
+                /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { bold: true, children: span.name }),
+                /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { color: getServiceColor(spanServiceName(span)), children: spanServiceName(span) }),
+                /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { dimColor: true, children: span.kind ?? "" }),
+                /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { color: span.status === "ERROR" ? "red" : "green", children: span.status }),
+                /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { children: formatDurationMs(span.durationMs) })
+              ] }),
+              /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { flexDirection: "row", gap: 2, children: [
+                /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { dimColor: true, children: [
+                  "Trace: ",
+                  span.traceId
+                ] }),
+                /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { dimColor: true, children: [
+                  "Span: ",
+                  span.spanId
+                ] }),
+                span.parentSpanId && /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { dimColor: true, children: [
+                  "Parent: ",
+                  span.parentSpanId
+                ] })
+              ] }),
+              keyAttrs.length > 0 && /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { marginTop: 1, flexDirection: "column", children: [
+                /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { bold: true, children: "Key attributes" }),
+                keyAttrs.slice(0, 6).map(([k, v]) => /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { dimColor: true, children: [
+                  truncate(k, 18),
+                  ": ",
+                  truncate(String(v), 28)
+                ] }, k))
+              ] }),
+              restAttrs.length > 0 && /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { marginTop: 1, flexDirection: "column", children: [
+                /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { bold: true, children: "Attributes" }),
+                restAttrs.slice(0, 8).map(([k, v]) => /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { dimColor: true, children: [
+                  truncate(k, 18),
+                  ": ",
+                  truncate(String(v), 28)
+                ] }, k))
+              ] }),
+              span.events && span.events.length > 0 && /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { flexDirection: "column", marginTop: 0, children: [
+                /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { bold: true, dimColor: true, children: [
+                  "Events (",
+                  span.events.length,
+                  ")"
+                ] }),
+                span.events.slice(0, 5).map((ev, i) => /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { flexDirection: "row", children: [
+                  /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { color: ev.name === "exception" ? "red" : "yellow", children: [
+                    "  ",
+                    "\u25C6",
+                    " ",
+                    truncate(ev.name, 20)
+                  ] }),
+                  /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { dimColor: true, children: [
+                    " ",
+                    "+",
+                    formatDurationMs(ev.timeMs - span.startTime)
+                  ] }),
+                  ev.attributes && Object.keys(ev.attributes).length > 0 && /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { dimColor: true, children: [
+                    " ",
+                    Object.entries(ev.attributes).slice(0, 2).map(([k, v]) => `${k}=${String(v)}`).join(" ")
+                  ] })
+                ] }, `ev-${i}`))
+              ] }),
+              span.links && span.links.length > 0 && /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { flexDirection: "column", marginTop: 0, children: [
+                /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { bold: true, dimColor: true, children: [
+                  "Links (",
+                  span.links.length,
+                  ")"
+                ] }),
+                span.links.slice(0, 5).map((lnk, i) => /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { flexDirection: "row", children: [
+                  /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { color: "cyan", children: [
+                    "  ",
+                    "\u2192",
+                    " trace:",
+                    lnk.traceId.slice(0, 8),
+                    "\u2026",
+                    " span:",
+                    lnk.spanId.slice(0, 8),
+                    "\u2026"
+                  ] }),
+                  lnk.attributes && Object.keys(lnk.attributes).length > 0 && /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { dimColor: true, children: [
+                    " ",
+                    Object.entries(lnk.attributes).slice(0, 2).map(([k, v]) => `${k}=${String(v)}`).join(" ")
+                  ] })
+                ] }, `lnk-${i}`))
+              ] })
+            ] });
+          })(),
+          drilldownSelectedItem?.type === "log" && drilldownSelectedItem.log && (() => {
+            const log = drilldownSelectedItem.log;
+            return /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { marginTop: 1, flexDirection: "column", borderStyle: "single", borderColor: "gray", paddingX: 1, children: [
+              /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { flexDirection: "row", gap: 2, children: [
+                /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { bold: true, children: log.level.toUpperCase() }),
+                /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { children: log.message })
+              ] }),
+              /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { children: [
+                /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { dimColor: true, children: "Time: " }),
+                /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { children: new Date(log.time).toISOString() })
+              ] }),
+              log.traceId && /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { dimColor: true, children: [
+                "Trace: ",
+                log.traceId
+              ] }),
+              log.spanId && /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { dimColor: true, children: [
+                "Span: ",
+                log.spanId
+              ] }),
+              log.attributes && Object.keys(log.attributes).length > 0 && /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { marginTop: 1, flexDirection: "column", children: [
+                /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { bold: true, children: "Attributes" }),
+                Object.entries(log.attributes).slice(0, 10).map(([k, v]) => /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { dimColor: true, children: [
+                  truncate(k, 18),
+                  ": ",
+                  truncate(String(v), 40)
+                ] }, k))
+              ] })
+            ] });
+          })()
+        ] }) : /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { flexDirection: "row", gap: 2, children: [
           /* @__PURE__ */ jsxRuntime.jsxs(
             ink.Box,
             {
               flexDirection: "column",
               width: "55%",
-              borderStyle: "single",
+              borderStyle: "round",
               borderColor: "gray",
               paddingX: 1,
               paddingY: 0,
@@ -1679,156 +2187,7 @@ ${json}
                     searchQuery
                   ] }, "search-label")
                 ] }),
-                drilldownTraceId != null && /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
-                  /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { marginBottom: 0, flexDirection: "row", gap: 2, children: [
-                    /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { color: "yellow", children: drilldownSummary?.rootName ?? "unknown" }),
-                    /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { dimColor: true, children: [
-                      drilldownTraceId.slice(0, 16),
-                      "\u2026"
-                    ] }),
-                    /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { color: "green", children: drilldownSummary ? formatDurationMs(drilldownSummary.durationMs) : "?" }),
-                    /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { dimColor: true, children: [
-                      drilldownSpans.length,
-                      " spans \u2022 ",
-                      drilldownLogs.length,
-                      " logs"
-                    ] })
-                  ] }),
-                  /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { marginBottom: 0, flexDirection: "row", gap: 2, children: [
-                    /* @__PURE__ */ jsxRuntime.jsx(
-                      ink.Text,
-                      {
-                        color: drilldownTab === "timeline" ? "yellow" : void 0,
-                        dimColor: drilldownTab !== "timeline",
-                        underline: drilldownTab === "timeline",
-                        children: "Timeline"
-                      }
-                    ),
-                    /* @__PURE__ */ jsxRuntime.jsxs(
-                      ink.Text,
-                      {
-                        color: drilldownTab === "spans" ? "yellow" : void 0,
-                        dimColor: drilldownTab !== "spans",
-                        underline: drilldownTab === "spans",
-                        children: [
-                          "Spans (",
-                          drilldownSpans.length,
-                          ")"
-                        ]
-                      }
-                    ),
-                    /* @__PURE__ */ jsxRuntime.jsxs(
-                      ink.Text,
-                      {
-                        color: drilldownTab === "logs" ? "yellow" : void 0,
-                        dimColor: drilldownTab !== "logs",
-                        underline: drilldownTab === "logs",
-                        children: [
-                          "Logs (",
-                          drilldownLogs.length,
-                          ")"
-                        ]
-                      }
-                    )
-                  ] })
-                ] }),
-                drilldownTraceId != null && drilldownTab === "timeline" && (() => {
-                  let traceStartMs = Infinity;
-                  for (const s of drilldownSummary?.spans ?? []) {
-                    if (s.startTime < traceStartMs) traceStartMs = s.startTime;
-                  }
-                  if (traceStartMs === Infinity) traceStartMs = 0;
-                  const traceDurMs = drilldownSummary?.durationMs ?? 1;
-                  const WATERFALL_WIDTH = 24;
-                  const items = drilldownTimeline.slice(drilldownScrollOffset, drilldownScrollOffset + LIST_HEIGHT);
-                  return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
-                    items.map((item, i) => {
-                      const isSel = i + drilldownScrollOffset === drilldownSelectedIndex;
-                      if (item.type === "span" && item.span) {
-                        const s = item.span;
-                        const node = drilldownTree.find(
-                          (n) => n.span.spanId === s.spanId
-                        );
-                        const depth = node?.depth ?? 0;
-                        const indent = "  ".repeat(Math.min(depth, 4));
-                        const nameWidth = 24 - Math.min(depth, 4) * 2;
-                        const bar = buildWaterfallBar(
-                          s.startTime,
-                          s.durationMs,
-                          traceStartMs,
-                          traceDurMs,
-                          WATERFALL_WIDTH
-                        );
-                        return /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { flexDirection: "row", children: [
-                          /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { backgroundColor: isSel ? "gray" : void 0, color: isSel ? "white" : void 0, children: [
-                            isSel ? "\u25B8" : " ",
-                            indent,
-                            truncate(s.name, nameWidth)
-                          ] }),
-                          /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { children: "  " }),
-                          /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { color: s.status === "ERROR" ? "red" : "green", children: bar }),
-                          /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { dimColor: true, children: [
-                            "  ",
-                            formatDurationMs(s.durationMs),
-                            s.kind ? ` ${s.kind}` : ""
-                          ] })
-                        ] }, `${s.spanId}-${i}`);
-                      } else if (item.type === "log" && item.log) {
-                        const l = item.log;
-                        const levelColor = l.level === "error" ? "red" : l.level === "warn" ? "yellow" : "blue";
-                        const relTime = drilldownSummary ? `+${formatDurationMs(l.time - traceStartMs)}` : "";
-                        const logOffset = drilldownSummary ? Math.floor((l.time - traceStartMs) / traceDurMs * WATERFALL_WIDTH) : 0;
-                        const clampedOffset = Math.max(0, Math.min(logOffset, WATERFALL_WIDTH - 1));
-                        const logBar = " ".repeat(clampedOffset) + "\xB7" + " ".repeat(WATERFALL_WIDTH - clampedOffset - 1);
-                        return /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { flexDirection: "row", children: [
-                          /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { backgroundColor: isSel ? "gray" : void 0, color: isSel ? "white" : void 0, children: [
-                            isSel ? "\u25B8" : " ",
-                            "  ",
-                            /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { color: levelColor, children: l.level.toUpperCase() }),
-                            " ",
-                            truncate(l.message, 18)
-                          ] }),
-                          /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { children: "  " }),
-                          /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { dimColor: true, children: logBar }),
-                          /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { dimColor: true, children: [
-                            "  ",
-                            relTime
-                          ] })
-                        ] }, `log-${i}`);
-                      }
-                      return null;
-                    }),
-                    Array.from({ length: Math.max(0, LIST_HEIGHT - items.length) }).map((_, i) => /* @__PURE__ */ jsxRuntime.jsx(ink.Box, { children: /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { children: " " }) }, `pad-${i}`))
-                  ] });
-                })(),
-                drilldownTraceId != null && drilldownTab === "spans" && drilldownTree.slice(drilldownScrollOffset, drilldownScrollOffset + LIST_HEIGHT).map((node, i) => renderTreeRow(node, i + drilldownScrollOffset)),
-                drilldownTraceId != null && drilldownTab === "spans" && Array.from({ length: Math.max(0, LIST_HEIGHT - Math.min(drilldownTree.length, LIST_HEIGHT)) }).map((_, i) => /* @__PURE__ */ jsxRuntime.jsx(ink.Box, { children: /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { children: " " }) }, `pad-${i}`)),
-                drilldownTraceId != null && drilldownTab === "logs" && drilldownLogs.slice(drilldownScrollOffset, drilldownScrollOffset + LIST_HEIGHT).map((log, i) => {
-                  const isSel = i + drilldownScrollOffset === drilldownSelectedIndex;
-                  const levelColor = log.level === "error" ? "red" : log.level === "warn" ? "yellow" : log.level === "info" ? "green" : void 0;
-                  return /* @__PURE__ */ jsxRuntime.jsx(ink.Box, { children: /* @__PURE__ */ jsxRuntime.jsxs(
-                    ink.Text,
-                    {
-                      backgroundColor: isSel ? "gray" : void 0,
-                      color: isSel ? "white" : void 0,
-                      children: [
-                        isSel ? "\u25B8" : " ",
-                        /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { color: levelColor, children: [
-                          " ",
-                          log.level.toUpperCase()
-                        ] }),
-                        " ",
-                        /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { dimColor: true, children: [
-                          "[",
-                          truncate(log.message, 50),
-                          "]"
-                        ] })
-                      ]
-                    }
-                  ) }, `log-${i}`);
-                }),
-                drilldownTraceId != null && drilldownTab === "logs" && Array.from({ length: Math.max(0, LIST_HEIGHT - Math.min(drilldownLogs.length, LIST_HEIGHT)) }).map((_, i) => /* @__PURE__ */ jsxRuntime.jsx(ink.Box, { children: /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { children: " " }) }, `pad-${i}`)),
-                drilldownTraceId == null && /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: viewMode === "trace" ? filteredSummaries.length === 0 ? /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+                /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: viewMode === "trace" ? filteredSummaries.length === 0 ? /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
                   /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { flexDirection: "column", children: [
                     /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { dimColor: true, children: "No traces yet. Call a traced function or hit an endpoint to see them here." }),
                     /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { dimColor: true, children: "Tip: trace() your handlers with autotel to get spans." })
@@ -1853,6 +2212,11 @@ ${json}
                         "  ",
                         formatRelative(t2.lastEndTime)
                       ] }),
+                      /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { dimColor: true, children: [
+                        "  ",
+                        t2.traceId.slice(0, 12),
+                        "\u2026"
+                      ] }),
                       t2.hasError && /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { color: "red", children: " \u25CF" })
                     ] }, t2.traceId);
                   }),
@@ -1866,6 +2230,8 @@ ${json}
                 ] }) : /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
                   filteredSpans.slice(0, 20).map((s, i) => {
                     const isSel = i === selected;
+                    const svcName = spanServiceName(s);
+                    const svcColor = getServiceColor(svcName);
                     const statusColor = s.status === "ERROR" ? "red" : s.durationMs > 500 ? "yellow" : "green";
                     return /* @__PURE__ */ jsxRuntime.jsxs(
                       ink.Box,
@@ -1874,6 +2240,10 @@ ${json}
                         children: [
                           /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { color: isSel ? "cyan" : void 0, children: isSel ? "\u203A " : "  " }),
                           /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { color: colors ? statusColor : void 0, children: truncate(s.name, 26) }),
+                          /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { color: svcColor, children: [
+                            " ",
+                            truncate(svcName, 10)
+                          ] }),
                           /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { dimColor: true, children: [
                             " ",
                             formatDurationMs(s.durationMs)
@@ -1972,7 +2342,7 @@ ${json}
             {
               flexDirection: "column",
               width: "45%",
-              borderStyle: "single",
+              borderStyle: "round",
               borderColor: "gray",
               paddingX: 1,
               paddingY: 0,
@@ -2020,92 +2390,7 @@ ${json}
                 ] })
               ] }) : /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
                 /* @__PURE__ */ jsxRuntime.jsx(ink.Box, { marginBottom: 1, children: /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { bold: true, children: "Details" }) }),
-                drilldownTraceId != null && drilldownSelectedItem?.type === "span" && drilldownSelectedItem.span ? (() => {
-                  const span = drilldownSelectedItem.span;
-                  const { key: keyAttrs, rest: restAttrs } = keyAttrsAndRest(
-                    span.attributes
-                  );
-                  return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
-                    /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { children: [
-                      /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { dimColor: true, children: "Name: " }),
-                      /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { children: span.name })
-                    ] }),
-                    /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { children: [
-                      /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { dimColor: true, children: "Status: " }),
-                      /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { color: span.status === "ERROR" ? "red" : "green", children: span.status })
-                    ] }),
-                    /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { children: [
-                      /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { dimColor: true, children: "Duration: " }),
-                      /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { children: formatDurationMs(span.durationMs) })
-                    ] }),
-                    /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { dimColor: true, children: [
-                      "Trace: ",
-                      span.traceId
-                    ] }),
-                    /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { dimColor: true, children: [
-                      "Span: ",
-                      span.spanId
-                    ] }),
-                    span.parentSpanId && /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { dimColor: true, children: [
-                      "Parent: ",
-                      span.parentSpanId
-                    ] }),
-                    span.kind && /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { dimColor: true, children: [
-                      "Kind: ",
-                      span.kind
-                    ] }),
-                    keyAttrs.length > 0 && /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { marginTop: 1, flexDirection: "column", children: [
-                      /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { bold: true, children: "Key attributes" }),
-                      keyAttrs.slice(0, 6).map(([k, v]) => /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { dimColor: true, children: [
-                        truncate(k, 18),
-                        ": ",
-                        truncate(String(v), 28)
-                      ] }, k))
-                    ] }),
-                    restAttrs.length > 0 && /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { marginTop: 1, flexDirection: "column", children: [
-                      /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { bold: true, children: "Attributes" }),
-                      restAttrs.slice(0, 8).map(([k, v]) => /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { dimColor: true, children: [
-                        truncate(k, 18),
-                        ": ",
-                        truncate(String(v), 28)
-                      ] }, k))
-                    ] }),
-                    keyAttrs.length === 0 && restAttrs.length === 0 && /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { dimColor: true, children: "(no attributes)" })
-                  ] });
-                })() : drilldownTraceId != null && drilldownSelectedItem?.type === "log" && drilldownSelectedItem.log ? (() => {
-                  const log = drilldownSelectedItem.log;
-                  return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
-                    /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { children: [
-                      /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { dimColor: true, children: "Level: " }),
-                      /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { children: log.level.toUpperCase() })
-                    ] }),
-                    /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { children: [
-                      /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { dimColor: true, children: "Time: " }),
-                      /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { children: new Date(log.time).toISOString() })
-                    ] }),
-                    /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { children: [
-                      /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { dimColor: true, children: "Message: " }),
-                      /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { children: log.message })
-                    ] }),
-                    log.traceId && /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { dimColor: true, children: [
-                      "Trace: ",
-                      log.traceId
-                    ] }),
-                    log.spanId && /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { dimColor: true, children: [
-                      "Span: ",
-                      log.spanId
-                    ] }),
-                    log.attributes && Object.keys(log.attributes).length > 0 && /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { marginTop: 1, flexDirection: "column", children: [
-                      /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { bold: true, children: "Attributes" }),
-                      Object.entries(log.attributes).slice(0, 10).map(([k, v]) => /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { dimColor: true, children: [
-                        truncate(k, 18),
-                        ": ",
-                        truncate(String(v), 40)
-                      ] }, k))
-                    ] })
-                  ] });
-                })() : drilldownTraceId == null ? null : /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { dimColor: true, children: "Select an item to view details." }),
-                drilldownTraceId == null && (viewMode === "errors" ? (() => {
+                viewMode === "errors" ? (() => {
                   const e = filteredErrorSummaries[selected] ?? null;
                   if (!e)
                     return /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { dimColor: true, children: "Select an error to view details." });
@@ -2323,12 +2608,12 @@ ${json}
                       ] }, w.span.spanId);
                     })
                   ] })
-                ] }) : /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { dimColor: true, children: "Select a trace or span to view details." }))
+                ] }) : /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { dimColor: true, children: "Select a trace or span to view details." })
               ] })
             }
           )
-        ] }),
-        showStats && /* @__PURE__ */ jsxRuntime.jsx(ink.Box, { marginTop: 1, borderStyle: "single", borderColor: "gray", paddingX: 1, children: /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { dimColor: true, children: [
+        ] })),
+        showStats && /* @__PURE__ */ jsxRuntime.jsx(ink.Box, { marginTop: 1, borderStyle: "round", borderColor: "gray", paddingX: 1, children: /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { dimColor: true, children: [
           "Spans: ",
           stats.total,
           " | Span errors: ",
@@ -2523,6 +2808,8 @@ function* extractSpans(payload) {
   if (!Array.isArray(resourceSpans)) return;
   for (const resourceSpan of resourceSpans) {
     if (!resourceSpan || typeof resourceSpan !== "object") continue;
+    const resource = resourceSpan.resource;
+    const resourceAttrs = attrsToRecord(resource?.attributes);
     const scopeSpans = resourceSpan.scopeSpans;
     if (!Array.isArray(scopeSpans)) continue;
     for (const scopeSpan of scopeSpans) {
@@ -2531,15 +2818,33 @@ function* extractSpans(payload) {
       if (!Array.isArray(spans)) continue;
       for (const span of spans) {
         if (span && typeof span === "object") {
-          yield span;
+          yield { span, resourceAttrs };
         }
       }
     }
   }
 }
-function otlpSpanToTerminalEvent(span) {
+function otlpSpanToTerminalEvent(span, resourceAttrs = {}) {
   const startTime = toMs(span.startTimeUnixNano);
   const endTime = toMs(span.endTimeUnixNano);
+  const spanAttrs = attrsToRecord(span.attributes);
+  const mergedAttrs = {};
+  for (const [k, v] of Object.entries(resourceAttrs)) {
+    mergedAttrs[k] = v;
+  }
+  for (const [k, v] of Object.entries(spanAttrs)) {
+    mergedAttrs[k] = v;
+  }
+  const parsedEvents = span.events?.length ? span.events.map((e) => ({
+    name: e.name || "",
+    timeMs: toMs(e.timeUnixNano),
+    attributes: attrsToRecord(e.attributes)
+  })) : void 0;
+  const parsedLinks = span.links?.length ? span.links.map((l) => ({
+    traceId: normalizeHexId(l.traceId, 32),
+    spanId: normalizeHexId(l.spanId, 16),
+    attributes: attrsToRecord(l.attributes)
+  })) : void 0;
   return {
     name: span.name || "unnamed",
     spanId: normalizeHexId(span.spanId, 16),
@@ -2550,7 +2855,9 @@ function otlpSpanToTerminalEvent(span) {
     durationMs: Math.max(0, endTime - startTime),
     status: mapStatus2(span.status?.code),
     kind: mapKind2(span.kind),
-    attributes: attrsToRecord(span.attributes)
+    attributes: mergedAttrs,
+    ...parsedEvents ? { events: parsedEvents } : {},
+    ...parsedLinks ? { links: parsedLinks } : {}
   };
 }
 async function readJsonBody(req) {
@@ -2575,8 +2882,8 @@ function sendJson(res, status, data) {
 }
 function parseOtlpEvents(payload) {
   const events = [];
-  for (const span of extractSpans(payload)) {
-    events.push(otlpSpanToTerminalEvent(span));
+  for (const { span, resourceAttrs } of extractSpans(payload)) {
+    events.push(otlpSpanToTerminalEvent(span, resourceAttrs));
   }
   return events;
 }