Refactor

Author: the-krafty-koder

e2e/dashboard.spec.ts

@@ -307,6 +307,22 @@ function buildDashboardInteractionSessionDetailResponse(sessionId?: string) {
             filesModified: [] as string[],
             checkpointId: null,
             toolUses: [] as Array<Record<string, unknown>>,
+            transcriptEntries: [
+              {
+                entryId: 'stub-turn-01-e0',
+                sessionId: 'sess-01',
+                turnId: 'turn-01',
+                order: 0,
+                timestamp: '2025-02-14T10:12:00.000Z',
+                actor: 'USER',
+                variant: 'CHAT',
+                source: 'TRANSCRIPT',
+                text: FIRST_SESSION_TURN_ONE_PROMPT,
+                toolUseId: null,
+                toolKind: null,
+                isError: false,
+              },
+            ],
           },
           {
             turnId: 'turn-02',
@@ -323,6 +339,22 @@ function buildDashboardInteractionSessionDetailResponse(sessionId?: string) {
             filesModified: [] as string[],
             checkpointId: null,
             toolUses: [] as Array<Record<string, unknown>>,
+            transcriptEntries: [
+              {
+                entryId: 'stub-turn-02-e0',
+                sessionId: 'sess-01',
+                turnId: 'turn-02',
+                order: 0,
+                timestamp: '2025-02-14T10:28:00.000Z',
+                actor: 'USER',
+                variant: 'CHAT',
+                source: 'TRANSCRIPT',
+                text: FIRST_SESSION_TURN_TWO_PROMPT,
+                toolUseId: null,
+                toolKind: null,
+                isError: false,
+              },
+            ],
           },
         ]
       : ([] as Array<Record<string, unknown>>)
@@ -333,6 +365,7 @@ function buildDashboardInteractionSessionDetailResponse(sessionId?: string) {
             summary,
             turns,
             rawEvents: [] as Array<Record<string, unknown>>,
+            sessionTranscriptEntries: [] as Array<Record<string, unknown>>,
           }
         : null,
     },
@@ -1051,7 +1084,7 @@ test.describe('Session detail', () => {
     await expect(page.getByText(FIRST_SESSION_PROMPT).last()).toBeVisible()
   })
 
-  test('sidebar turns tab falls back to turn prompts when transcript fragments are unavailable', async ({
+  test('sidebar turns tab renders canonical transcript entries per turn', async ({
     page,
   }) => {
     await stubApiRoutes(page)

src/features/dashboard/components/session-detail-sidebar.tsx

@@ -112,7 +112,17 @@ function SessionSummaryView({
       <Separator />
       <div>
         <h3 className='mb-2 text-sm font-semibold'>Token Usage</h3>
-        {summary.token_usage ? (
+        {/*
+          Cursor does not expose reliable per-session token counts through its
+          transcript or hooks, so any numbers we would otherwise show are
+          incomplete. Treat Cursor sessions as having no token data regardless
+          of what's stored.
+        */}
+        {summary.agent_type === 'cursor' ? (
+          <p className='text-sm text-muted-foreground'>
+            No token information available.
+          </p>
+        ) : summary.token_usage ? (
           <Suspense
             fallback={
               <div className='h-40 animate-pulse rounded-md bg-muted/30' />

src/features/dashboard/utils/transcript-entries.test.ts

@@ -0,0 +1,43 @@
+import type { DashboardTranscriptEntryDto } from '@/features/dashboard/api-types'
+import { describe, expect, it } from 'vitest'
+import { transcriptEntriesToMessages } from './transcript-entries'
+
+function makeEntry(
+  overrides: Partial<DashboardTranscriptEntryDto> & {
+    entry_id: string
+    order: number
+    text: string
+  },
+): DashboardTranscriptEntryDto {
+  return {
+    session_id: 's1',
+    turn_id: null,
+    timestamp: null,
+    actor: 'USER',
+    variant: 'CHAT',
+    source: 'TRANSCRIPT',
+    tool_use_id: null,
+    tool_kind: null,
+    is_error: false,
+    ...overrides,
+  }
+}
+
+describe('transcriptEntriesToMessages', () => {
+  it('sorts by order then entry_id when the API returns rows out of sequence', () => {
+    const messages = transcriptEntriesToMessages([
+      makeEntry({ entry_id: 'b', order: 1, text: 'second' }),
+      makeEntry({ entry_id: 'a', order: 0, text: 'first' }),
+      makeEntry({ entry_id: 'c', order: 2, text: 'third' }),
+    ])
+    expect(messages.map((m) => m.text)).toEqual(['first', 'second', 'third'])
+  })
+
+  it('uses entry_id as a stable tie-breaker when order matches', () => {
+    const messages = transcriptEntriesToMessages([
+      makeEntry({ entry_id: 'z-same', order: 0, text: 'z' }),
+      makeEntry({ entry_id: 'a-same', order: 0, text: 'a' }),
+    ])
+    expect(messages.map((m) => m.text)).toEqual(['a', 'z'])
+  })
+})

src/features/dashboard/utils/transcript-entries.ts

@@ -55,8 +55,21 @@ export function toTranscriptMessage(
   }
 }
 
+function compareTranscriptEntriesByStreamOrder(
+  a: DashboardTranscriptEntryDto,
+  b: DashboardTranscriptEntryDto,
+): number {
+  if (a.order !== b.order) {
+    return a.order - b.order
+  }
+  return a.entry_id.localeCompare(b.entry_id)
+}
+
 /**
- * Convert a list of canonical entries to legacy messages, preserving order.
+ * Convert a list of canonical entries to legacy messages.
+ *
+ * Entries are sorted by ascending `order`, then `entry_id`, so rendering stays
+ * correct if the API returns rows out of sequence.
  *
  * Returns an empty array for empty input so callers can use length-based
  * branching for dual-read:
@@ -70,7 +83,9 @@ export function toTranscriptMessage(
 export function transcriptEntriesToMessages(
   entries: ReadonlyArray<DashboardTranscriptEntryDto>,
 ): TranscriptMessage[] {
-  return entries.map(toTranscriptMessage)
+  return [...entries]
+    .sort(compareTranscriptEntriesByStreamOrder)
+    .map(toTranscriptMessage)
 }
 
 /**