cleaned up what is returned from EventRepository.getSpan

Author: ericallam

apps/webapp/app/presenters/v3/SpanPresenter.server.ts

@@ -451,11 +451,7 @@ export class SpanPresenter extends BasePresenter {
         spanId: true,
         createdAt: true,
         number: true,
-        lockedToVersion: {
-          select: {
-            version: true,
-          },
-        },
+        taskVersion: true,
       },
       where: {
         parentSpanId: spanId,

apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.$runParam.spans.$spanParam/route.tsx

@@ -1081,7 +1081,7 @@ function SpanEntity({ span }: { span: Span }) {
                             {run.taskIdentifier}
                           </TableCell>
                           <TableCell to={path} actionClassName="py-1.5" rowHoverStyle="bright">
-                            {run.lockedToVersion?.version ?? "–"}
+                            {run.taskVersion ?? "–"}
                           </TableCell>
                           <TableCell to={path} actionClassName="py-1.5" rowHoverStyle="bright">
                             <DateTime date={run.createdAt} />

apps/webapp/app/v3/clickhouseEventRepository.server.ts

@@ -11,6 +11,7 @@ import type {
   RunPreparedEvent,
   TaskEventRecord,
   ExceptionEventProperties,
+  SpanDetail,
 } from "./eventRepository.types";
 import type { TaskEventStoreTable } from "./taskEventStore.server";
 import type { DynamicFlushScheduler } from "./dynamicFlushScheduler.server";
@@ -155,7 +156,7 @@ export class ClickhouseEventRepository implements IEventRepository {
     startCreatedAt: Date,
     endCreatedAt?: Date,
     options?: { includeDebugLogs?: boolean }
-  ): Promise<any> {
+  ): Promise<SpanDetail | undefined> {
     throw new Error("ClickhouseEventRepository.getSpan not implemented");
   }
 

apps/webapp/app/v3/eventRepository.server.ts

@@ -57,6 +57,7 @@ import type {
   SpanDetailedSummary,
   TraceDetailedSummary,
   UpdateEventOptions,
+  SpanDetail,
 } from "./eventRepository.types";
 import { DetailedTraceEvent, TaskEventStore, TaskEventStoreTable } from "./taskEventStore.server";
 import { startActiveSpan } from "./tracer.server";
@@ -827,50 +828,10 @@ export class EventRepository implements IEventRepository {
         endCreatedAt
       );
 
-      const output = rehydrateJson(spanEvent.output);
-      const payload = rehydrateJson(spanEvent.payload);
-
       const show = rehydrateShow(spanEvent.properties);
 
       const properties = sanitizedAttributes(spanEvent.properties);
 
-      const messagingEvent = SpanMessagingEvent.optional().safeParse(
-        (properties as any)?.messaging
-      );
-
-      const links: SpanLink[] = [];
-
-      if (messagingEvent.success && messagingEvent.data) {
-        if (messagingEvent.data.message && "id" in messagingEvent.data.message) {
-          if (messagingEvent.data.message.id.startsWith("run_")) {
-            links.push({
-              type: "run",
-              icon: "runs",
-              title: `Run ${messagingEvent.data.message.id}`,
-              runId: messagingEvent.data.message.id,
-            });
-          }
-        }
-      }
-
-      const backLinks = spanEvent.links as any as Link[] | undefined;
-
-      if (backLinks && backLinks.length > 0) {
-        backLinks.forEach((l) => {
-          const title = String(
-            l.attributes?.[SemanticInternalAttributes.LINK_TITLE] ?? "Triggered by"
-          );
-
-          links.push({
-            type: "span",
-            icon: "trigger",
-            title,
-            traceId: l.context.traceId,
-            spanId: l.context.spanId,
-          });
-        });
-      }
-
       const spanEvents = transformEvents(
         span.data.events,
         spanEvent.metadata as Attributes,
@@ -891,16 +852,41 @@ export class EventRepository implements IEventRepository {
       };
 
       return {
-        ...spanEvent,
-        ...span.data,
-        payload,
-        output,
-        properties,
+        // Core Identity & Structure
+        spanId: spanEvent.spanId,
+        parentId: spanEvent.parentId,
+        message: spanEvent.message,
+
+        // Status & State
+        isError: span.data.isError,
+        isPartial: span.data.isPartial,
+        isCancelled: span.data.isCancelled,
+        level: spanEvent.level,
+        kind: spanEvent.kind,
+
+        // Timing
+        startTime: span.data.startTime,
+        duration: nanosecondsToMilliseconds(span.data.duration),
+
+        // Content & Display
         events: spanEvents,
-        show,
-        links,
-        originalRun,
+        style: span.data.style,
+        properties: properties,
+
+        // Context (Used in Span Details)
+        idempotencyKey: spanEvent.idempotencyKey,
+        taskSlug: spanEvent.taskSlug,
+        workerVersion: spanEvent.workerVersion,
+
+        // Entity & Relationships
         entity,
+        triggeredRuns: [], // Will be populated by SpanPresenter
+        showActionBar: show?.actions === true,
+
+        // Additional Properties (Used by SpanPresenter)
+        originalRun,
+        show,
+        metadata: spanEvent.metadata,
       };
     });
   }

apps/webapp/app/v3/eventRepository.types.ts

@@ -12,6 +12,7 @@ import type {
   Prisma,
   TaskEvent,
   TaskEventKind,
+  TaskEventLevel,
   TaskEventStatus,
   TaskRun,
 } from "@trigger.dev/database";
@@ -181,6 +182,70 @@ export type RunPreparedEvent = PreparedEvent & {
   taskSlug?: string;
 };
 
+export type SpanDetail = {
+  // ============================================================================
+  // Core Identity & Structure
+  // ============================================================================
+  spanId: string; // Tree structure, span identification
+  parentId: string | null; // Tree hierarchy
+  message: string; // Displayed as span title
+
+  // ============================================================================
+  // Status & State
+  // ============================================================================
+  isError: boolean; // Error status display, filtering, status icons
+  isPartial: boolean; // In-progress status display, timeline calculations
+  isCancelled: boolean; // Cancelled status display, status determination
+  level: TaskEventLevel; // Text styling, timeline rendering decisions
+  kind: TaskEventKind; // Filter "UNSPECIFIED" events, determine debug status
+
+  // ============================================================================
+  // Timing
+  // ============================================================================
+  startTime: Date; // Timeline calculations, display
+  duration: number; // Timeline width, duration display, calculations
+
+  // ============================================================================
+  // Content & Display
+  // ============================================================================
+  events: SpanEvents; // Timeline events, SpanEvents component
+  style: TaskEventStyle; // Icons, variants, accessories (RunIcon, SpanTitle)
+  properties: Record<string, unknown> | string | number | boolean | null | undefined; // Displayed as JSON in span properties (CodeBlock)
+
+  // ============================================================================
+  // Context (Used in Span Details)
+  // ============================================================================
+  idempotencyKey: string | null; // Displayed in span detail properties (conditional)
+  taskSlug: string; // Displayed in span details, task filtering
+  workerVersion: string | null; // Displayed in span version field
+
+  // ============================================================================
+  // Entity & Relationships
+  // ============================================================================
+  entity: {
+    // Used for entity type switching in SpanEntity
+    type: string | undefined;
+    id: string | undefined;
+  };
+  triggeredRuns: Array<{
+    // Used in triggered runs table
+    friendlyId: string;
+    taskIdentifier: string;
+    spanId: string;
+    createdAt: Date;
+    number: number;
+    lockedToVersion?: { version: string };
+  }>;
+  showActionBar: boolean; // Computed from show.actions, used for action display
+
+  // ============================================================================
+  // Additional Properties (Used by SpanPresenter)
+  // ============================================================================
+  originalRun: string | undefined; // Used by SpanPresenter for run lookup
+  show: { actions?: boolean } | undefined; // Used by SpanPresenter to compute showActionBar
+  metadata: any; // Used by SpanPresenter for entity processing
+};
+
 // ============================================================================
 // Span and Link Types
 // ============================================================================
@@ -344,7 +409,7 @@ export interface IEventRepository {
     startCreatedAt: Date,
     endCreatedAt?: Date,
     options?: { includeDebugLogs?: boolean }
-  ): Promise<any>;
+  ): Promise<SpanDetail | undefined>;
 
   // Event recording methods
   recordEvent(