From 919acc745165ed9c715e90e21f6f0315403dfd6b Mon Sep 17 00:00:00 2001
From: Brian Newsom <brnewsom@nvidia.com>
Date: Wed, 27 May 2026 14:51:36 -0600
Subject: [PATCH 1/3] feat(nemo-studio): Move intake to span based model

Signed-off-by: Brian Newsom <brnewsom@nvidia.com>
---
 web/packages/common/src/constants/query.ts    |   7 +-
 web/packages/common/src/utils/chat.ts         |  68 ---
 web/packages/common/src/utils/query.ts        |  12 +-
 .../studio/src/api/intake/constants.ts        |  15 -
 web/packages/studio/src/api/intake/utils.ts   |  68 ---
 .../components/DatasetFileSelect/constants.ts |   7 +-
 .../components/DatasetFileSelect/index.tsx    |   6 +-
 .../IntakeAnnotationPanel/index.tsx           |  90 ---
 .../IntakeAnnotationsPanel/index.spec.tsx     |  55 ++
 .../IntakeAnnotationsPanel/index.tsx          | 302 ++++++++++
 .../EntryBulkDeleteModal.spec.tsx             | 127 ----
 .../EntryBulkDeleteModal.tsx                  |  99 ---
 .../EntryBulkExportModal.spec.tsx             | 148 -----
 .../EntryBulkExportModal.tsx                  | 279 ---------
 .../IntakeEntriesTable/EntryRatingCell.tsx    |  25 -
 .../IntakeEntriesTable/EntryStatusCell.tsx    |  31 -
 .../IntakeEntriesTable/EntryThumbCell.tsx     |  40 --
 .../IntakeEntriesTable.stories.tsx            |  65 --
 .../IntakeEntriesTable/index.spec.tsx         |  93 ---
 .../components/IntakeEntriesTable/index.tsx   | 381 ------------
 .../IntakeEntriesTable/utils.spec.ts          | 133 ----
 .../components/IntakeEntriesTable/utils.ts    |  89 ---
 .../IntakeEntryConversation/README.md         |  67 --
 .../components/Annotation.test.tsx            | 144 -----
 .../components/Annotation.tsx                 |  46 --
 .../components/AssistantResponse.test.tsx     | 128 ----
 .../components/AssistantResponse.tsx          |  57 --
 .../components/ChatView.tsx                   |  58 --
 .../components/JSONView.tsx                   |  29 -
 .../components/LastUserMessage.tsx            |  42 --
 .../components/SystemPrompt.test.tsx          |  87 ---
 .../components/SystemPrompt.tsx               |  66 --
 .../components/ThumbStatus.test.tsx           | 105 ----
 .../components/ThumbStatus.tsx                |  62 --
 .../IntakeEntryConversation/index.spec.tsx    |  72 ---
 .../IntakeEntryConversation/index.tsx         | 100 ---
 .../src/components/IntakeEventsList/README.md |  21 -
 .../components/EventListItem.test.tsx         | 223 -------
 .../components/EventListItem.tsx              |  40 --
 .../components/EventListItemLayout.test.tsx   | 170 ------
 .../components/EventListItemLayout.tsx        | 104 ----
 .../ReviewerAnnotationEvent.test.tsx          | 243 --------
 .../components/ReviewerAnnotationEvent.tsx    | 114 ----
 .../components/ThumbTag.test.tsx              |  33 -
 .../IntakeEventsList/components/ThumbTag.tsx  |  27 -
 .../components/UserActionEvent.test.tsx       | 150 -----
 .../components/UserActionEvent.tsx            |  63 --
 .../components/UserFeedbackEvent.test.tsx     | 209 -------
 .../components/UserFeedbackEvent.tsx          |  97 ---
 .../src/components/IntakeEventsList/index.tsx |  46 --
 .../IntakeSpansTable/index.spec.tsx           |  26 +
 .../src/components/IntakeSpansTable/index.tsx | 351 +++++++++++
 .../IntakeTelemetryDataView/index.tsx         | 280 +++++++++
 .../IntakeTelemetryStatusBadge/index.spec.tsx |  19 +
 .../IntakeTelemetryStatusBadge/index.tsx      |  52 ++
 .../components/AssistantMessageBubble.tsx     | 130 ----
 .../components/SystemMessageBubble.tsx        |  45 --
 .../components/ThreadConversation.tsx         | 104 ----
 .../components/ToolResponseBubble.tsx         |  37 --
 .../components/UserMessageBubble.tsx          |  31 -
 .../components/IntakeThreadPanel/index.tsx    |  63 --
 .../IntakeThreadsTable.stories.tsx            | 188 ------
 .../components/IntakeThreadsTable/index.tsx   | 317 ----------
 .../IntakeTracesTable/index.spec.tsx          |  25 +
 .../components/IntakeTracesTable/index.tsx    | 209 +++++++
 .../ExportEntriesButton/index.spec.tsx        | 123 ----
 .../buttons/ExportEntriesButton/index.tsx     | 100 ---
 .../FeedbackRatingPieChart/constants.ts       |   5 -
 .../charts/FeedbackRatingPieChart/index.tsx   |  84 ---
 .../FeedbackSentimentLineChart/index.tsx      | 106 ----
 .../FeedbackSentimentLineChart/utils.spec.ts  |  76 ---
 .../FeedbackSentimentLineChart/utils.ts       |  42 --
 .../dataViews/CustomModelsDataView/index.tsx  |   6 +-
 .../ExportJobsDataView.stories.tsx            |  53 --
 .../ExportJobsDataView/index.spec.tsx         | 175 ------
 .../dataViews/ExportJobsDataView/index.tsx    | 167 -----
 .../AnnotationForm/AnnotationErrorMessage.tsx |  20 -
 .../form/AnnotationForm/constants.ts          |  24 -
 .../components/form/AnnotationForm/index.tsx  | 120 ----
 .../useCreateReviewerAnnotation.tsx           |  36 --
 .../form/AnnotationForm/utils.spec.ts         |  42 --
 .../components/form/AnnotationForm/utils.ts   |  37 --
 .../form/NewExportJobForm/constants.tsx       | 153 -----
 .../form/NewExportJobForm/index.spec.tsx      | 268 --------
 .../form/NewExportJobForm/index.tsx           | 254 --------
 .../modals/AnnotationModal/index.tsx          |  88 ---
 .../sidePanels/ExportJobPanel/index.tsx       |  76 ---
 .../studio/src/constants/intakeJobs.ts        |  12 -
 web/packages/studio/src/constants/routes.ts   |  14 +-
 web/packages/studio/src/mocks/handlers.ts     |  77 ++-
 .../studio/src/mocks/intake/entries.ts        | 122 ----
 .../studio/src/mocks/intake/exportJobs.ts     |  48 --
 .../studio/src/mocks/intake/telemetry.ts      | 292 +++++++++
 .../CustomizationJobListRoute/index.tsx       |   6 +-
 .../src/routes/IntakeEntriesRoute/index.tsx   |  24 -
 .../routes/IntakeEntryEventsRoute/index.tsx   |  88 ---
 .../src/routes/IntakeEntryLayout/index.tsx    | 135 -----
 .../routes/IntakeEntryMessagesRoute/index.tsx |  64 --
 .../routes/IntakeEntryMetadataRoute/index.tsx | 237 --------
 .../routes/IntakeExportJobsRoute/index.tsx    |   9 -
 .../studio/src/routes/IntakeLayout/index.tsx  |  48 +-
 .../routes/IntakeSpanDetailRoute/index.tsx    | 331 ++++++++++
 .../src/routes/IntakeThreadsRoute/index.tsx   |  23 -
 .../IntakeTraceDetailRoute/index.spec.tsx     |  36 ++
 .../routes/IntakeTraceDetailRoute/index.tsx   | 265 ++++++++
 .../WorkspaceLayout/WorkspaceSideNav.tsx      |   4 +-
 web/packages/studio/src/routes/index.spec.tsx |  11 +-
 web/packages/studio/src/routes/index.tsx      | 100 ++-
 web/packages/studio/src/routes/utils.ts       |  45 +-
 .../studio/src/tests/title-change.spec.tsx    |   3 +-
 web/packages/studio/src/util/entries.spec.ts  | 570 ------------------
 web/packages/studio/src/util/entries.ts       | 251 --------
 .../studio/src/util/intakeTelemetry.spec.ts   | 117 ++++
 .../studio/src/util/intakeTelemetry.ts        | 158 +++++
 114 files changed, 2690 insertions(+), 9075 deletions(-)
 delete mode 100644 web/packages/studio/src/api/intake/constants.ts
 delete mode 100644 web/packages/studio/src/api/intake/utils.ts
 delete mode 100644 web/packages/studio/src/components/IntakeAnnotationPanel/index.tsx
 create mode 100644 web/packages/studio/src/components/IntakeAnnotationsPanel/index.spec.tsx
 create mode 100644 web/packages/studio/src/components/IntakeAnnotationsPanel/index.tsx
 delete mode 100644 web/packages/studio/src/components/IntakeEntriesTable/EntryBulkDeleteModal.spec.tsx
 delete mode 100644 web/packages/studio/src/components/IntakeEntriesTable/EntryBulkDeleteModal.tsx
 delete mode 100644 web/packages/studio/src/components/IntakeEntriesTable/EntryBulkExportModal.spec.tsx
 delete mode 100644 web/packages/studio/src/components/IntakeEntriesTable/EntryBulkExportModal.tsx
 delete mode 100644 web/packages/studio/src/components/IntakeEntriesTable/EntryRatingCell.tsx
 delete mode 100644 web/packages/studio/src/components/IntakeEntriesTable/EntryStatusCell.tsx
 delete mode 100644 web/packages/studio/src/components/IntakeEntriesTable/EntryThumbCell.tsx
 delete mode 100644 web/packages/studio/src/components/IntakeEntriesTable/IntakeEntriesTable.stories.tsx
 delete mode 100644 web/packages/studio/src/components/IntakeEntriesTable/index.spec.tsx
 delete mode 100644 web/packages/studio/src/components/IntakeEntriesTable/index.tsx
 delete mode 100644 web/packages/studio/src/components/IntakeEntriesTable/utils.spec.ts
 delete mode 100644 web/packages/studio/src/components/IntakeEntriesTable/utils.ts
 delete mode 100644 web/packages/studio/src/components/IntakeEntryConversation/README.md
 delete mode 100644 web/packages/studio/src/components/IntakeEntryConversation/components/Annotation.test.tsx
 delete mode 100644 web/packages/studio/src/components/IntakeEntryConversation/components/Annotation.tsx
 delete mode 100644 web/packages/studio/src/components/IntakeEntryConversation/components/AssistantResponse.test.tsx
 delete mode 100644 web/packages/studio/src/components/IntakeEntryConversation/components/AssistantResponse.tsx
 delete mode 100644 web/packages/studio/src/components/IntakeEntryConversation/components/ChatView.tsx
 delete mode 100644 web/packages/studio/src/components/IntakeEntryConversation/components/JSONView.tsx
 delete mode 100644 web/packages/studio/src/components/IntakeEntryConversation/components/LastUserMessage.tsx
 delete mode 100644 web/packages/studio/src/components/IntakeEntryConversation/components/SystemPrompt.test.tsx
 delete mode 100644 web/packages/studio/src/components/IntakeEntryConversation/components/SystemPrompt.tsx
 delete mode 100644 web/packages/studio/src/components/IntakeEntryConversation/components/ThumbStatus.test.tsx
 delete mode 100644 web/packages/studio/src/components/IntakeEntryConversation/components/ThumbStatus.tsx
 delete mode 100644 web/packages/studio/src/components/IntakeEntryConversation/index.spec.tsx
 delete mode 100644 web/packages/studio/src/components/IntakeEntryConversation/index.tsx
 delete mode 100644 web/packages/studio/src/components/IntakeEventsList/README.md
 delete mode 100644 web/packages/studio/src/components/IntakeEventsList/components/EventListItem.test.tsx
 delete mode 100644 web/packages/studio/src/components/IntakeEventsList/components/EventListItem.tsx
 delete mode 100644 web/packages/studio/src/components/IntakeEventsList/components/EventListItemLayout.test.tsx
 delete mode 100644 web/packages/studio/src/components/IntakeEventsList/components/EventListItemLayout.tsx
 delete mode 100644 web/packages/studio/src/components/IntakeEventsList/components/ReviewerAnnotationEvent.test.tsx
 delete mode 100644 web/packages/studio/src/components/IntakeEventsList/components/ReviewerAnnotationEvent.tsx
 delete mode 100644 web/packages/studio/src/components/IntakeEventsList/components/ThumbTag.test.tsx
 delete mode 100644 web/packages/studio/src/components/IntakeEventsList/components/ThumbTag.tsx
 delete mode 100644 web/packages/studio/src/components/IntakeEventsList/components/UserActionEvent.test.tsx
 delete mode 100644 web/packages/studio/src/components/IntakeEventsList/components/UserActionEvent.tsx
 delete mode 100644 web/packages/studio/src/components/IntakeEventsList/components/UserFeedbackEvent.test.tsx
 delete mode 100644 web/packages/studio/src/components/IntakeEventsList/components/UserFeedbackEvent.tsx
 delete mode 100644 web/packages/studio/src/components/IntakeEventsList/index.tsx
 create mode 100644 web/packages/studio/src/components/IntakeSpansTable/index.spec.tsx
 create mode 100644 web/packages/studio/src/components/IntakeSpansTable/index.tsx
 create mode 100644 web/packages/studio/src/components/IntakeTelemetryDataView/index.tsx
 create mode 100644 web/packages/studio/src/components/IntakeTelemetryStatusBadge/index.spec.tsx
 create mode 100644 web/packages/studio/src/components/IntakeTelemetryStatusBadge/index.tsx
 delete mode 100644 web/packages/studio/src/components/IntakeThreadPanel/components/AssistantMessageBubble.tsx
 delete mode 100644 web/packages/studio/src/components/IntakeThreadPanel/components/SystemMessageBubble.tsx
 delete mode 100644 web/packages/studio/src/components/IntakeThreadPanel/components/ThreadConversation.tsx
 delete mode 100644 web/packages/studio/src/components/IntakeThreadPanel/components/ToolResponseBubble.tsx
 delete mode 100644 web/packages/studio/src/components/IntakeThreadPanel/components/UserMessageBubble.tsx
 delete mode 100644 web/packages/studio/src/components/IntakeThreadPanel/index.tsx
 delete mode 100644 web/packages/studio/src/components/IntakeThreadsTable/IntakeThreadsTable.stories.tsx
 delete mode 100644 web/packages/studio/src/components/IntakeThreadsTable/index.tsx
 create mode 100644 web/packages/studio/src/components/IntakeTracesTable/index.spec.tsx
 create mode 100644 web/packages/studio/src/components/IntakeTracesTable/index.tsx
 delete mode 100644 web/packages/studio/src/components/buttons/ExportEntriesButton/index.spec.tsx
 delete mode 100644 web/packages/studio/src/components/buttons/ExportEntriesButton/index.tsx
 delete mode 100644 web/packages/studio/src/components/charts/FeedbackRatingPieChart/constants.ts
 delete mode 100644 web/packages/studio/src/components/charts/FeedbackRatingPieChart/index.tsx
 delete mode 100644 web/packages/studio/src/components/charts/FeedbackSentimentLineChart/index.tsx
 delete mode 100644 web/packages/studio/src/components/charts/FeedbackSentimentLineChart/utils.spec.ts
 delete mode 100644 web/packages/studio/src/components/charts/FeedbackSentimentLineChart/utils.ts
 delete mode 100644 web/packages/studio/src/components/dataViews/ExportJobsDataView/ExportJobsDataView.stories.tsx
 delete mode 100644 web/packages/studio/src/components/dataViews/ExportJobsDataView/index.spec.tsx
 delete mode 100644 web/packages/studio/src/components/dataViews/ExportJobsDataView/index.tsx
 delete mode 100644 web/packages/studio/src/components/form/AnnotationForm/AnnotationErrorMessage.tsx
 delete mode 100644 web/packages/studio/src/components/form/AnnotationForm/constants.ts
 delete mode 100644 web/packages/studio/src/components/form/AnnotationForm/index.tsx
 delete mode 100644 web/packages/studio/src/components/form/AnnotationForm/useCreateReviewerAnnotation.tsx
 delete mode 100644 web/packages/studio/src/components/form/AnnotationForm/utils.spec.ts
 delete mode 100644 web/packages/studio/src/components/form/AnnotationForm/utils.ts
 delete mode 100644 web/packages/studio/src/components/form/NewExportJobForm/constants.tsx
 delete mode 100644 web/packages/studio/src/components/form/NewExportJobForm/index.spec.tsx
 delete mode 100644 web/packages/studio/src/components/form/NewExportJobForm/index.tsx
 delete mode 100644 web/packages/studio/src/components/modals/AnnotationModal/index.tsx
 delete mode 100644 web/packages/studio/src/components/sidePanels/ExportJobPanel/index.tsx
 delete mode 100644 web/packages/studio/src/constants/intakeJobs.ts
 delete mode 100644 web/packages/studio/src/mocks/intake/entries.ts
 delete mode 100644 web/packages/studio/src/mocks/intake/exportJobs.ts
 create mode 100644 web/packages/studio/src/mocks/intake/telemetry.ts
 delete mode 100644 web/packages/studio/src/routes/IntakeEntriesRoute/index.tsx
 delete mode 100644 web/packages/studio/src/routes/IntakeEntryEventsRoute/index.tsx
 delete mode 100644 web/packages/studio/src/routes/IntakeEntryLayout/index.tsx
 delete mode 100644 web/packages/studio/src/routes/IntakeEntryMessagesRoute/index.tsx
 delete mode 100644 web/packages/studio/src/routes/IntakeEntryMetadataRoute/index.tsx
 delete mode 100644 web/packages/studio/src/routes/IntakeExportJobsRoute/index.tsx
 create mode 100644 web/packages/studio/src/routes/IntakeSpanDetailRoute/index.tsx
 delete mode 100644 web/packages/studio/src/routes/IntakeThreadsRoute/index.tsx
 create mode 100644 web/packages/studio/src/routes/IntakeTraceDetailRoute/index.spec.tsx
 create mode 100644 web/packages/studio/src/routes/IntakeTraceDetailRoute/index.tsx
 delete mode 100644 web/packages/studio/src/util/entries.spec.ts
 delete mode 100644 web/packages/studio/src/util/entries.ts
 create mode 100644 web/packages/studio/src/util/intakeTelemetry.spec.ts
 create mode 100644 web/packages/studio/src/util/intakeTelemetry.ts

diff --git a/web/packages/common/src/constants/query.ts b/web/packages/common/src/constants/query.ts
index 8fd8a57f1d..4ea46440b5 100644
--- a/web/packages/common/src/constants/query.ts
+++ b/web/packages/common/src/constants/query.ts
@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { JobStatus as IJobStatus, PlatformJobStatus } from '@nemo/sdk/generated/platform/schema';
+import { PlatformJobStatus } from '@nemo/sdk/generated/platform/schema';
 
 // Customizer uses Platform SDK status
 export const CJobCancellableStatuses: PlatformJobStatus[] = [
@@ -16,11 +16,6 @@ export const CJobTerminalStatuses: PlatformJobStatus[] = [
   PlatformJobStatus.error, // was 'failed'
   PlatformJobStatus.cancelled,
 ];
-export const IJobTerminalStatuses: IJobStatus[] = [
-  IJobStatus.completed,
-  IJobStatus.failed,
-  IJobStatus.cancelled,
-];
 export const PlatformJobTerminalStatuses: PlatformJobStatus[] = [
   PlatformJobStatus.completed,
   PlatformJobStatus.cancelled,
diff --git a/web/packages/common/src/utils/chat.ts b/web/packages/common/src/utils/chat.ts
index 0d75bed77a..35c95043b3 100644
--- a/web/packages/common/src/utils/chat.ts
+++ b/web/packages/common/src/utils/chat.ts
@@ -1,7 +1,6 @@
 // SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { FlexibleMessage } from '@nemo/sdk/generated/platform/schema';
 import {
   ChatCompletion,
   ChatCompletionChunk,
@@ -71,70 +70,3 @@ export const maybeInsertSystemMessage = (
     ...parsedMessages,
   ];
 };
-
-/**
- * Safely extracts string content from a FlexibleMessage.
- * Returns empty string if content is undefined, null, or not a string.
- */
-const getStringContent = (content: unknown): string => {
-  if (typeof content === 'string') return content;
-  if (content === null || content === undefined) return '';
-  // Handle array content (OpenAI multi-part messages) by joining text parts
-  if (Array.isArray(content)) {
-    return content
-      .filter(
-        (part): part is { type: 'text'; text: string } =>
-          typeof part === 'object' && part?.type === 'text' && typeof part?.text === 'string'
-      )
-      .map((part) => part.text)
-      .join(' ');
-  }
-  return '';
-};
-
-/**
- * Converts a FlexibleMessage (intake API) to ChatCompletionMessageParam (OpenAI).
- * FlexibleMessage is provider-agnostic; this maps it to the OpenAI standard.
- */
-export const toOpenAIMessage = (message: FlexibleMessage): ChatCompletionMessageParam => {
-  const { role, content, name, tool_calls, tool_call_id } = message;
-  const stringContent = getStringContent(content);
-
-  switch (role) {
-    case 'user':
-      return {
-        role: 'user',
-        content: stringContent,
-        ...(typeof name === 'string' && { name }),
-      };
-    case 'assistant':
-      return {
-        role: 'assistant',
-        content: stringContent || null,
-        ...(Array.isArray(tool_calls) && { tool_calls }),
-      };
-    case 'system':
-      return {
-        role: 'system',
-        content: stringContent,
-        ...(typeof name === 'string' && { name }),
-      };
-    case 'tool':
-      return {
-        role: 'tool',
-        content: stringContent,
-        tool_call_id: typeof tool_call_id === 'string' ? tool_call_id : '',
-      };
-    case 'function':
-      // Map legacy 'function' role to 'tool' for OpenAI compatibility
-      return {
-        role: 'tool',
-        content: stringContent,
-        tool_call_id: typeof tool_call_id === 'string' ? tool_call_id : '',
-      };
-    case 'developer':
-      return { role: 'developer', content: stringContent };
-    default:
-      return { role: 'user', content: stringContent };
-  }
-};
diff --git a/web/packages/common/src/utils/query.ts b/web/packages/common/src/utils/query.ts
index d5d57e8759..9d9b13c356 100644
--- a/web/packages/common/src/utils/query.ts
+++ b/web/packages/common/src/utils/query.ts
@@ -1,18 +1,14 @@
 // SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { JobStatus as IJobStatus, PlatformJobStatus } from '@nemo/sdk/generated/platform/schema';
+import { PlatformJobStatus } from '@nemo/sdk/generated/platform/schema';
 
 import * as DataView from '../components/DataView/internal';
 import { JOB_POLLING_INTERVAL_MS } from '../constants';
-import { CJobTerminalStatuses, IJobTerminalStatuses } from '../constants/query';
+import { CJobTerminalStatuses } from '../constants/query';
 
-export const getJobRefetchInterval = (status?: PlatformJobStatus | IJobStatus) => {
-  if (
-    !status ||
-    (!CJobTerminalStatuses.includes(status as PlatformJobStatus) &&
-      !IJobTerminalStatuses.includes(status as IJobStatus))
-  ) {
+export const getJobRefetchInterval = (status?: PlatformJobStatus) => {
+  if (!status || !CJobTerminalStatuses.includes(status)) {
     return JOB_POLLING_INTERVAL_MS;
   }
   return false;
diff --git a/web/packages/studio/src/api/intake/constants.ts b/web/packages/studio/src/api/intake/constants.ts
deleted file mode 100644
index 9498b1990e..0000000000
--- a/web/packages/studio/src/api/intake/constants.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-export const FEEDBACK_CATEGORY_KEY = 'studio_feedback';
-export const FEEDBACK_CATEGORIES = [
-  'Too much information',
-  'Not enough information',
-  'Not factually correct',
-  "Didn't fully follow instructions",
-];
-
-export enum FeedbackAddToDatasetFileSource {
-  New = 'Create new',
-  Existing = 'Add to existing',
-}
diff --git a/web/packages/studio/src/api/intake/utils.ts b/web/packages/studio/src/api/intake/utils.ts
deleted file mode 100644
index 31eecfdd29..0000000000
--- a/web/packages/studio/src/api/intake/utils.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import type { EntryFilter } from '@nemo/sdk/generated/platform/schema';
-import { QUERY_PARAMETERS } from '@studio/routes/constants';
-import { ChatCompletionMessageParam } from 'openai/resources/index.mjs';
-
-/**
- * Recursively processes a filter object and adds its properties to URLSearchParams.
- * Handles nested objects, arrays with operators (like 'in'), and primitive values.
- *
- * @param obj - The object to process
- * @param params - The URLSearchParams instance to populate
- * @param prefix - The current key prefix for nested properties (e.g., 'context', 'created_at')
- */
-const processFilterObject = (obj: EntryFilter, params: URLSearchParams, prefix = ''): void => {
-  for (const [key, value] of Object.entries(obj)) {
-    // Skip undefined and null values
-    if (value === undefined || value === null) {
-      continue;
-    }
-
-    // Build the parameter key (e.g., 'context.app', 'created_at.gte')
-    const paramKey = prefix ? `${prefix}.${key}` : key;
-
-    // Handle array values with operators (e.g., {in: ['id1', 'id2']})
-    if (Array.isArray(value)) {
-      value.forEach((item) => {
-        if (item !== undefined && item !== null) {
-          params.append(paramKey, String(item));
-        }
-      });
-    }
-    // Handle nested objects recursively
-    else if (typeof value === 'object' && value !== null) {
-      processFilterObject(value, params, paramKey);
-    }
-    // Handle primitive values (string, number, boolean)
-    else {
-      params.set(paramKey, String(value));
-    }
-  }
-};
-
-export const generateFilterParam = (filter?: EntryFilter): string => {
-  if (!filter) {
-    return '';
-  }
-  const params = new URLSearchParams();
-
-  // Special handling for 'project' field to use QUERY_PARAMETERS constant
-  if (filter.project && typeof filter.project === 'string') {
-    params.set(QUERY_PARAMETERS.project, filter.project);
-    const withoutProject = { ...filter, project: undefined };
-    processFilterObject(withoutProject, params);
-  } else {
-    processFilterObject(filter, params);
-  }
-
-  return params.toString();
-};
-
-export const isToolCallMessage = (message: ChatCompletionMessageParam) => {
-  return (
-    message.role === 'tool' ||
-    ('tool_calls' in message && Array.isArray(message.tool_calls) && message.tool_calls.length > 0)
-  );
-};
diff --git a/web/packages/studio/src/components/DatasetFileSelect/constants.ts b/web/packages/studio/src/components/DatasetFileSelect/constants.ts
index 2edfa8ec15..d646599b16 100644
--- a/web/packages/studio/src/components/DatasetFileSelect/constants.ts
+++ b/web/packages/studio/src/components/DatasetFileSelect/constants.ts
@@ -1,10 +1,15 @@
 // SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { MultiselectOption } from '@studio/constants/mutliselect';
+import type { MultiselectOption } from '@studio/constants/mutliselect';
 
 export const LOADING_FILES_OPTION: MultiselectOption = {
   label: 'Loading files...',
   value: 'loading',
   isDisabled: true,
 };
+
+export enum FeedbackAddToDatasetFileSource {
+  New = 'Create new',
+  Existing = 'Add to existing',
+}
diff --git a/web/packages/studio/src/components/DatasetFileSelect/index.tsx b/web/packages/studio/src/components/DatasetFileSelect/index.tsx
index 643eaa3e5d..0ed036ab0b 100644
--- a/web/packages/studio/src/components/DatasetFileSelect/index.tsx
+++ b/web/packages/studio/src/components/DatasetFileSelect/index.tsx
@@ -15,8 +15,10 @@ import {
   SelectRoot,
   SelectTrigger,
 } from '@nvidia/foundations-react-core';
-import { FeedbackAddToDatasetFileSource } from '@studio/api/intake/constants';
-import { LOADING_FILES_OPTION } from '@studio/components/DatasetFileSelect/constants';
+import {
+  FeedbackAddToDatasetFileSource,
+  LOADING_FILES_OPTION,
+} from '@studio/components/DatasetFileSelect/constants';
 import { MultiselectOption } from '@studio/constants/mutliselect';
 import { Plus } from 'lucide-react';
 import { FC, ReactNode, useMemo } from 'react';
diff --git a/web/packages/studio/src/components/IntakeAnnotationPanel/index.tsx b/web/packages/studio/src/components/IntakeAnnotationPanel/index.tsx
deleted file mode 100644
index 19383f7d84..0000000000
--- a/web/packages/studio/src/components/IntakeAnnotationPanel/index.tsx
+++ /dev/null
@@ -1,90 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { zodResolver } from '@hookform/resolvers/zod';
-import { LoadingButton } from '@nemo/common/src/components/LoadingButton';
-import { useToast } from '@nemo/common/src/providers/toast/useToast';
-import { Entry } from '@nemo/sdk/generated/platform/schema';
-import { Flex, Panel, Stack } from '@nvidia/foundations-react-core';
-import { AnnotationForm } from '@studio/components/form/AnnotationForm';
-import { AnnotationErrorMessage } from '@studio/components/form/AnnotationForm/AnnotationErrorMessage';
-import { annotationFormFields } from '@studio/components/form/AnnotationForm/constants';
-import { useCreateReviewerAnnotation } from '@studio/components/form/AnnotationForm/useCreateReviewerAnnotation';
-import { formToReviewerAnnotationEvent } from '@studio/components/form/AnnotationForm/utils';
-import { getEntryResponseContent } from '@studio/components/IntakeEntriesTable/utils';
-import { useWorkspaceFromPath } from '@studio/hooks/useWorkspaceFromPath';
-import { handleFormErrorsGeneric } from '@studio/util/forms/error';
-import { ComponentProps, FC } from 'react';
-import { FormProvider, useForm } from 'react-hook-form';
-import { z } from 'zod';
-
-interface Props {
-  entry: Entry;
-  attributes?: {
-    Panel?: ComponentProps<typeof Panel>;
-  };
-}
-
-export const IntakeAnnotationPanel: FC<Props> = ({ entry, attributes }) => {
-  const toast = useToast();
-  const workspace = useWorkspaceFromPath();
-  const form = useForm<z.infer<typeof annotationFormFields>>({
-    resolver: zodResolver(annotationFormFields),
-    mode: 'onChange',
-    values: {
-      modelResponse: getEntryResponseContent(entry),
-    },
-  });
-
-  const { mutateAsync: createAnnotation, isPending: isCreatingAnnotation } =
-    useCreateReviewerAnnotation({ workspace, entryId: entry.id });
-  const onSubmit = async (data: z.infer<typeof annotationFormFields>) => {
-    if (!entry.id) {
-      toast.error('Cannot create annotation without an existing entry.');
-      return;
-    }
-    await createAnnotation({
-      workspace,
-      name: entry.id,
-      data: { events: [formToReviewerAnnotationEvent(data)] },
-    });
-  };
-
-  const errorMessage = form.formState.errors.hasChanges?.message ? (
-    <AnnotationErrorMessage message={form.formState.errors.hasChanges.message} />
-  ) : undefined;
-  const flexJustify = errorMessage ? 'between' : 'end';
-
-  return (
-    <Panel elevation="high" {...attributes?.Panel}>
-      <Stack justify="between" gap="6">
-        <FormProvider {...form}>
-          <form
-            onSubmit={form.handleSubmit(
-              onSubmit,
-              handleFormErrorsGeneric({ title: 'Annotation Form Errors' })
-            )}
-          >
-            <AnnotationForm
-              slotFooter={
-                <Flex justify={flexJustify}>
-                  {errorMessage}
-                  <LoadingButton
-                    className="self-end"
-                    kind="primary"
-                    color="brand"
-                    type="submit"
-                    disabled={isCreatingAnnotation}
-                    loading={isCreatingAnnotation}
-                  >
-                    Submit
-                  </LoadingButton>
-                </Flex>
-              }
-            />
-          </form>
-        </FormProvider>
-      </Stack>
-    </Panel>
-  );
-};
diff --git a/web/packages/studio/src/components/IntakeAnnotationsPanel/index.spec.tsx b/web/packages/studio/src/components/IntakeAnnotationsPanel/index.spec.tsx
new file mode 100644
index 0000000000..8d7743f89b
--- /dev/null
+++ b/web/packages/studio/src/components/IntakeAnnotationsPanel/index.spec.tsx
@@ -0,0 +1,55 @@
+// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { IntakeAnnotationsPanel } from '@studio/components/IntakeAnnotationsPanel';
+import { resetMockAnnotations } from '@studio/mocks/intake/telemetry';
+import { renderRoute, screen, waitFor, within } from '@studio/tests/util/render';
+import userEvent from '@testing-library/user-event';
+
+const spanId = 'span-root-001';
+const sessionId = 'session-agent-run-001';
+
+describe('IntakeAnnotationsPanel', () => {
+  beforeEach(() => {
+    resetMockAnnotations();
+  });
+
+  it('lists and creates span annotations through the generated client', async () => {
+    const user = userEvent.setup();
+
+    renderRoute(
+      <IntakeAnnotationsPanel workspace="default" spanId={spanId} sessionId={sessionId} />,
+      { history: '/workspaces/default/intake/spans/span-root-001' }
+    );
+
+    expect(
+      await screen.findByText('Good final response, but verify policy citations.')
+    ).toBeInTheDocument();
+
+    await user.click(screen.getByRole('button', { name: /Negative/i }));
+    expect(await screen.findByText('Negative feedback')).toBeInTheDocument();
+
+    await user.type(screen.getByPlaceholderText('Add a note about this span.'), 'Needs review.');
+    await user.click(screen.getByRole('button', { name: /Add Note/i }));
+
+    expect(await screen.findByText('Needs review.')).toBeInTheDocument();
+  });
+
+  it('deletes span annotations through the generated client', async () => {
+    const user = userEvent.setup();
+
+    renderRoute(
+      <IntakeAnnotationsPanel workspace="default" spanId={spanId} sessionId={sessionId} />,
+      { history: '/workspaces/default/intake/spans/span-root-001' }
+    );
+
+    const note = await screen.findByRole('article', { name: 'Note annotation' });
+    await user.click(within(note).getByRole('button', { name: /Delete/i }));
+
+    await waitFor(() => {
+      expect(
+        screen.queryByText('Good final response, but verify policy citations.')
+      ).not.toBeInTheDocument();
+    });
+  });
+});
diff --git a/web/packages/studio/src/components/IntakeAnnotationsPanel/index.tsx b/web/packages/studio/src/components/IntakeAnnotationsPanel/index.tsx
new file mode 100644
index 0000000000..3d84ed31aa
--- /dev/null
+++ b/web/packages/studio/src/components/IntakeAnnotationsPanel/index.tsx
@@ -0,0 +1,302 @@
+// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { formatAbsoluteTimestamp } from '@nemo/common/src/components/RelativeTime/util';
+import {
+  getListAnnotationsQueryKey,
+  useCreateAnnotation,
+  useDeleteAnnotation,
+  useListAnnotations,
+} from '@nemo/sdk/generated/platform/api';
+import {
+  AnnotationSortField,
+  FeedbackAnnotationInputKind,
+  FeedbackAnnotationInputValue,
+  NoteAnnotationInputKind,
+  type Annotation,
+  type FeedbackAnnotationInputValue as FeedbackAnnotationInputValueType,
+} from '@nemo/sdk/generated/platform/schema';
+import {
+  Button,
+  CodeSnippet,
+  Flex,
+  FormField,
+  Panel,
+  Stack,
+  Text,
+  TextArea,
+} from '@nvidia/foundations-react-core';
+import { getErrorMessage } from '@studio/api/common/utils';
+import { ThumbButton } from '@studio/components/buttons/ThumbButton';
+import { useQueryClient } from '@tanstack/react-query';
+import { MessageSquarePlus, NotebookPen, Trash2 } from 'lucide-react';
+import { ChangeEvent, FC, FormEvent, useMemo, useState } from 'react';
+
+const getAnnotationErrorMessage = (error: unknown, fallback: string): string =>
+  error instanceof Error ? getErrorMessage(error, fallback) : fallback;
+
+const formatAnnotationTitle = (annotation: Annotation): string => {
+  switch (annotation.kind) {
+    case 'feedback':
+      return annotation.value === 'positive' ? 'Positive feedback' : 'Negative feedback';
+    case 'note':
+      return 'Note';
+    case 'label':
+      return annotation.name ? `Label: ${annotation.name}` : 'Label';
+    case 'metadata':
+      return 'Metadata';
+  }
+};
+
+const renderAnnotationBody = (annotation: Annotation) => {
+  switch (annotation.kind) {
+    case 'feedback':
+      return (
+        <Text kind="body/regular/sm" className="capitalize">
+          {annotation.value}
+        </Text>
+      );
+    case 'note':
+      return (
+        <Text kind="body/regular/sm" className="whitespace-pre-wrap break-words">
+          {annotation.text}
+        </Text>
+      );
+    case 'label':
+      return (
+        <Text kind="body/regular/sm" className="break-words">
+          {String(annotation.value)}
+        </Text>
+      );
+    case 'metadata':
+      return (
+        <CodeSnippet
+          value={JSON.stringify(annotation.metadata, null, 2)}
+          language="json"
+          kind="block"
+          collapsible
+          defaultOpen={false}
+          attributes={{
+            CodeSnippetCode: {
+              className:
+                'max-h-[220px] [&_code]:whitespace-pre-wrap [&_code]:break-words [&_pre]:whitespace-pre-wrap',
+            },
+          }}
+        />
+      );
+  }
+};
+
+export interface IntakeAnnotationsPanelProps {
+  workspace: string;
+  spanId: string;
+  sessionId: string;
+}
+
+export const IntakeAnnotationsPanel: FC<IntakeAnnotationsPanelProps> = ({
+  workspace,
+  spanId,
+  sessionId,
+}) => {
+  const queryClient = useQueryClient();
+  const [noteText, setNoteText] = useState('');
+  const [mutationError, setMutationError] = useState<string | undefined>();
+
+  const listParams = useMemo(
+    () => ({
+      page: 1,
+      page_size: 100,
+      sort: AnnotationSortField['-created_at'],
+      filter: {
+        span_id: spanId,
+      },
+    }),
+    [spanId]
+  );
+
+  const {
+    data: annotationsResponse,
+    error: listError,
+    isLoading,
+  } = useListAnnotations(workspace, listParams);
+  const createAnnotation = useCreateAnnotation();
+  const deleteAnnotation = useDeleteAnnotation();
+
+  const annotations = annotationsResponse?.data ?? [];
+  const activeFeedback = annotations.find((annotation) => annotation.kind === 'feedback');
+  const isMutating = createAnnotation.isPending || deleteAnnotation.isPending;
+
+  const refreshAnnotations = async (): Promise<void> => {
+    await queryClient.invalidateQueries({
+      queryKey: getListAnnotationsQueryKey(workspace),
+    });
+  };
+
+  const handleFeedback = async (value: FeedbackAnnotationInputValueType): Promise<void> => {
+    setMutationError(undefined);
+    try {
+      await createAnnotation.mutateAsync({
+        workspace,
+        data: {
+          kind: FeedbackAnnotationInputKind.feedback,
+          value,
+          session_id: sessionId,
+          span_id: spanId,
+        },
+      });
+      await refreshAnnotations();
+    } catch (error) {
+      setMutationError(getAnnotationErrorMessage(error, 'Failed to save feedback.'));
+    }
+  };
+
+  const handleNoteChange = (event: ChangeEvent<HTMLDivElement>): void => {
+    if (!(event.target instanceof HTMLTextAreaElement)) return;
+    setNoteText(event.target.value);
+  };
+
+  const handleNoteSubmit = async (event: FormEvent<HTMLFormElement>): Promise<void> => {
+    event.preventDefault();
+    const text = noteText.trim();
+    if (!text) return;
+
+    setMutationError(undefined);
+    try {
+      await createAnnotation.mutateAsync({
+        workspace,
+        data: {
+          kind: NoteAnnotationInputKind.note,
+          text,
+          session_id: sessionId,
+          span_id: spanId,
+        },
+      });
+      setNoteText('');
+      await refreshAnnotations();
+    } catch (error) {
+      setMutationError(getAnnotationErrorMessage(error, 'Failed to save note.'));
+    }
+  };
+
+  const handleDelete = async (annotationId: string): Promise<void> => {
+    setMutationError(undefined);
+    try {
+      await deleteAnnotation.mutateAsync({
+        workspace,
+        annotationId,
+      });
+      await refreshAnnotations();
+    } catch (error) {
+      setMutationError(getAnnotationErrorMessage(error, 'Failed to delete annotation.'));
+    }
+  };
+
+  return (
+    <Panel
+      elevation="high"
+      slotIcon={<NotebookPen />}
+      slotHeading="Annotations"
+      className="min-w-0 overflow-hidden"
+    >
+      <Stack gap="density-xl" className="min-w-0">
+        <Stack gap="density-sm">
+          <Text kind="label/bold/sm">Feedback</Text>
+          <Flex gap="density-sm" wrap="wrap">
+            <ThumbButton
+              direction="up"
+              selected={activeFeedback?.value === 'positive'}
+              disabled={isMutating}
+              onClick={() => void handleFeedback(FeedbackAnnotationInputValue.positive)}
+            >
+              Positive
+            </ThumbButton>
+            <ThumbButton
+              direction="down"
+              selected={activeFeedback?.value === 'negative'}
+              disabled={isMutating}
+              onClick={() => void handleFeedback(FeedbackAnnotationInputValue.negative)}
+            >
+              Negative
+            </ThumbButton>
+          </Flex>
+        </Stack>
+
+        <form onSubmit={(event) => void handleNoteSubmit(event)}>
+          <Stack gap="density-sm">
+            <FormField name="annotation-note" slotLabel="Note">
+              <TextArea
+                value={noteText}
+                onChange={handleNoteChange}
+                placeholder="Add a note about this span."
+                disabled={isMutating}
+                resizeable="manual"
+                attributes={{
+                  TextAreaElement: {
+                    rows: 3,
+                  },
+                }}
+              />
+            </FormField>
+            <Flex justify="end">
+              <Button type="submit" disabled={isMutating || noteText.trim().length === 0}>
+                <MessageSquarePlus />
+                Add Note
+              </Button>
+            </Flex>
+          </Stack>
+        </form>
+
+        {(mutationError || listError) && (
+          <Text kind="body/regular/sm" className="text-danger">
+            {mutationError ?? getAnnotationErrorMessage(listError, 'Failed to load annotations.')}
+          </Text>
+        )}
+
+        <Stack gap="density-md" className="min-w-0">
+          <Text kind="label/bold/sm">History</Text>
+          {isLoading ? (
+            <Text kind="body/regular/sm" className="text-secondary">
+              Loading annotations...
+            </Text>
+          ) : annotations.length === 0 ? (
+            <Text kind="body/regular/sm" className="text-secondary">
+              No annotations yet.
+            </Text>
+          ) : (
+            annotations.map((annotation) => (
+              <div
+                key={annotation.annotation_id}
+                role="article"
+                aria-label={`${formatAnnotationTitle(annotation)} annotation`}
+                className="min-w-0 rounded-md border border-base bg-surface-raised p-density-lg"
+              >
+                <Stack gap="density-sm" className="min-w-0">
+                  <Flex align="start" justify="between" gap="density-md">
+                    <Stack gap="density-xxs" className="min-w-0">
+                      <Text kind="label/bold/sm" className="break-words">
+                        {formatAnnotationTitle(annotation)}
+                      </Text>
+                      <Text kind="body/regular/xs" className="text-secondary">
+                        {formatAbsoluteTimestamp(annotation.created_at)}
+                      </Text>
+                    </Stack>
+                    <Button
+                      size="small"
+                      kind="tertiary"
+                      disabled={isMutating}
+                      onClick={() => void handleDelete(annotation.annotation_id)}
+                    >
+                      <Trash2 />
+                      Delete
+                    </Button>
+                  </Flex>
+                  {renderAnnotationBody(annotation)}
+                </Stack>
+              </div>
+            ))
+          )}
+        </Stack>
+      </Stack>
+    </Panel>
+  );
+};
diff --git a/web/packages/studio/src/components/IntakeEntriesTable/EntryBulkDeleteModal.spec.tsx b/web/packages/studio/src/components/IntakeEntriesTable/EntryBulkDeleteModal.spec.tsx
deleted file mode 100644
index 2a2b50f6bb..0000000000
--- a/web/packages/studio/src/components/IntakeEntriesTable/EntryBulkDeleteModal.spec.tsx
+++ /dev/null
@@ -1,127 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { EntryBulkDeleteModal } from '@studio/components/IntakeEntriesTable/EntryBulkDeleteModal';
-import { render } from '@studio/tests/util/render';
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-
-// Mock brand assets icons
-vi.mock('lucide-react', () => ({
-  Trash: () => <span data-testid="trash-icon" />,
-}));
-
-const mockEntry = {
-  id: 'entry-123',
-  name: 'test-entry',
-  workspace: 'default',
-  data: {
-    request: {
-      messages: [{ role: 'user' as const, content: 'Hello' }],
-      model: 'test-model',
-    },
-    response: {
-      choices: [{ message: { role: 'assistant' as const, content: 'Hi!' } }],
-    },
-  },
-  context: {
-    app: 'default/test-app',
-    task: 'test-task',
-  },
-  events: [],
-};
-
-describe('EntryBulkDeleteModal', () => {
-  const user = userEvent.setup();
-
-  it('renders the trigger button', () => {
-    render(
-      <EntryBulkDeleteModal
-        workspace="default"
-        selectedEntries={[mockEntry]}
-        onConfirmSuccess={vi.fn()}
-      />
-    );
-
-    expect(screen.getByTestId('bulk-delete-modal-trigger-button')).toBeInTheDocument();
-    expect(screen.getByText('Delete')).toBeInTheDocument();
-  });
-
-  it('opens modal when trigger button is clicked', async () => {
-    render(
-      <EntryBulkDeleteModal
-        workspace="default"
-        selectedEntries={[mockEntry]}
-        onConfirmSuccess={vi.fn()}
-      />
-    );
-
-    const triggerButton = screen.getByTestId('bulk-delete-modal-trigger-button');
-    await user.click(triggerButton);
-
-    // Check modal content is visible
-    expect(await screen.findByText(/Delete.*Entry/)).toBeInTheDocument();
-    expect(screen.getByText(/Are you sure you want to delete/)).toBeInTheDocument();
-  });
-
-  it('shows correct singular form for single entry', async () => {
-    render(
-      <EntryBulkDeleteModal
-        workspace="default"
-        selectedEntries={[mockEntry]}
-        onConfirmSuccess={vi.fn()}
-      />
-    );
-
-    const triggerButton = screen.getByTestId('bulk-delete-modal-trigger-button');
-    await user.click(triggerButton);
-
-    // Should show "1 entry" in singular form
-    expect(await screen.findByText(/1 entry/)).toBeInTheDocument();
-  });
-
-  it('shows correct plural form for multiple entries', async () => {
-    const entries = [
-      mockEntry,
-      { ...mockEntry, id: 'entry-456' },
-      { ...mockEntry, id: 'entry-789' },
-    ];
-    render(
-      <EntryBulkDeleteModal
-        workspace="default"
-        selectedEntries={entries}
-        onConfirmSuccess={vi.fn()}
-      />
-    );
-
-    const triggerButton = screen.getByTestId('bulk-delete-modal-trigger-button');
-    await user.click(triggerButton);
-
-    // Should show "3 entries" in plural form
-    expect(await screen.findByText(/3 entries/)).toBeInTheDocument();
-  });
-
-  it('closes modal when cancel button is clicked', async () => {
-    render(
-      <EntryBulkDeleteModal
-        workspace="default"
-        selectedEntries={[mockEntry]}
-        onConfirmSuccess={vi.fn()}
-      />
-    );
-
-    const triggerButton = screen.getByTestId('bulk-delete-modal-trigger-button');
-    await user.click(triggerButton);
-
-    // Modal should be open
-    expect(await screen.findByText(/Delete.*Entry/)).toBeInTheDocument();
-
-    // Click cancel button
-    const cancelButton = screen.getByRole('button', { name: 'Cancel' });
-    await user.click(cancelButton);
-
-    // Modal should be closed (heading should not be visible)
-    // Note: The modal might still be in DOM but hidden
-    expect(screen.queryByText(/Are you sure you want to delete/)).not.toBeInTheDocument();
-  });
-});
diff --git a/web/packages/studio/src/components/IntakeEntriesTable/EntryBulkDeleteModal.tsx b/web/packages/studio/src/components/IntakeEntriesTable/EntryBulkDeleteModal.tsx
deleted file mode 100644
index 3a0c81b817..0000000000
--- a/web/packages/studio/src/components/IntakeEntriesTable/EntryBulkDeleteModal.tsx
+++ /dev/null
@@ -1,99 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { LoadingButton } from '@nemo/common/src/components/LoadingButton';
-import { useToast } from '@nemo/common/src/providers/toast/useToast';
-import { useDeleteEntry } from '@nemo/sdk/generated/platform/api';
-import { Entry } from '@nemo/sdk/generated/platform/schema';
-import { Button, Flex, Modal } from '@nvidia/foundations-react-core';
-import { useMutateMany } from '@studio/api/common/useMutateMany';
-import { websiteLogger } from '@studio/util/logger';
-import { getTextWithCount } from '@studio/util/strings';
-import { useQueryClient } from '@tanstack/react-query';
-import { Trash } from 'lucide-react';
-import { FC, useState } from 'react';
-
-interface EntryBulkDeleteModalProps {
-  workspace: string;
-  selectedEntries: Entry[];
-  onConfirmSuccess: () => void;
-}
-
-export const EntryBulkDeleteModal: FC<EntryBulkDeleteModalProps> = ({
-  workspace,
-  selectedEntries,
-  onConfirmSuccess,
-}) => {
-  const [open, setOpen] = useState<boolean>(false);
-  const toast = useToast();
-  const queryClient = useQueryClient();
-
-  const { mutateAsync: deleteEntry } = useDeleteEntry();
-  const { mutateAsync: deleteEntries, isPending } = useMutateMany(deleteEntry);
-
-  const handleDelete = async () => {
-    try {
-      const entriesToDelete = selectedEntries.filter((entry) => entry.id);
-
-      await deleteEntries(entriesToDelete.map((entry) => ({ workspace, name: entry.id! })));
-
-      const count = entriesToDelete.length;
-      toast.success(`Successfully deleted ${getTextWithCount('entry', count, 'entries')}`);
-
-      queryClient.invalidateQueries({
-        queryKey: [`/apis/intake/v2/workspaces/${workspace}/entries`],
-      });
-
-      onConfirmSuccess();
-      setOpen(false);
-    } catch (error) {
-      websiteLogger.error(error instanceof Error ? error.message : 'Failed to delete entries');
-      toast.error('Failed to delete entries. Please try again.');
-    }
-  };
-
-  const handleOpenChange = (shouldOpen: boolean) => {
-    if (!isPending) {
-      setOpen(shouldOpen);
-    }
-  };
-
-  const entryCount = selectedEntries.length;
-
-  return (
-    <Modal
-      open={open}
-      onOpenChange={handleOpenChange}
-      slotTrigger={
-        <Button kind="tertiary" data-testid="bulk-delete-modal-trigger-button">
-          <Trash />
-          Delete
-        </Button>
-      }
-      slotHeading={
-        <>
-          <Trash />
-          Delete {getTextWithCount('Entry', entryCount, 'Entries')}
-        </>
-      }
-      slotFooter={
-        <Flex justify="end" gap="density-xs" align="center" className="w-full">
-          <Button
-            onClick={() => setOpen(false)}
-            kind="tertiary"
-            color="neutral"
-            disabled={isPending}
-          >
-            Cancel
-          </Button>
-          <LoadingButton onClick={handleDelete} loading={isPending}>
-            Delete
-          </LoadingButton>
-        </Flex>
-      }
-    >
-      Are you sure you want to delete {getTextWithCount('entry', entryCount, 'entries')}? This
-      action cannot be undone.
-    </Modal>
-  );
-};
diff --git a/web/packages/studio/src/components/IntakeEntriesTable/EntryBulkExportModal.spec.tsx b/web/packages/studio/src/components/IntakeEntriesTable/EntryBulkExportModal.spec.tsx
deleted file mode 100644
index 0f2861287f..0000000000
--- a/web/packages/studio/src/components/IntakeEntriesTable/EntryBulkExportModal.spec.tsx
+++ /dev/null
@@ -1,148 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { EntryBulkExportModal } from '@studio/components/IntakeEntriesTable/EntryBulkExportModal';
-import { PLATFORM_BASE_URL } from '@studio/constants/environment';
-import { workspace1 } from '@studio/mocks/entity-store/projects';
-import { server } from '@studio/mocks/node';
-import { mockUseParams } from '@studio/tests/util/mockUseParams';
-import { render } from '@studio/tests/util/render';
-import { screen, waitFor } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import { http, HttpResponse } from 'msw';
-
-// Mock brand assets icons using partial mock pattern
-vi.mock('lucide-react', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('lucide-react')>();
-  return {
-    ...actual,
-    Database: () => <span data-testid="db-icon" />,
-  };
-});
-
-const mockEntry = {
-  id: 'entry-123',
-  name: 'test-entry',
-  workspace: 'default',
-  data: {
-    request: {
-      messages: [{ role: 'user' as const, content: 'Hello' }],
-      model: 'test-model',
-    },
-    response: {
-      choices: [{ message: { role: 'assistant' as const, content: 'Hi!' } }],
-    },
-  },
-  context: {
-    app: 'default/test-app',
-    task: 'test-task',
-  },
-  events: [],
-};
-
-describe('EntryBulkExportModal', () => {
-  const user = userEvent.setup();
-
-  beforeEach(() => {
-    mockUseParams({
-      workspace: workspace1.workspace,
-    });
-  });
-
-  it('queries filesets with purpose filter set to dataset', async () => {
-    const requestUrls: string[] = [];
-    server.use(
-      http.get(
-        `${PLATFORM_BASE_URL}/apis/files/v2/workspaces/:workspace/filesets`,
-        ({ request }) => {
-          requestUrls.push(request.url);
-          return HttpResponse.json({
-            data: [],
-            pagination: {
-              page: 1,
-              page_size: 25,
-              current_page_size: 0,
-              total_pages: 1,
-              total_results: 0,
-            },
-          });
-        }
-      )
-    );
-
-    render(<EntryBulkExportModal selectedEntries={[mockEntry]} onSuccess={vi.fn()} />);
-
-    const triggerButton = screen.getByTestId('entry-bulk-export-modal-trigger');
-    await userEvent.click(triggerButton);
-
-    await waitFor(() => {
-      expect(requestUrls.length).toBeGreaterThan(0);
-    });
-
-    const url = new URL(requestUrls[0]);
-    expect(url.searchParams.get('filter[purpose]')).toBe('dataset');
-  });
-
-  it('renders the trigger button', () => {
-    render(<EntryBulkExportModal selectedEntries={[mockEntry]} onSuccess={vi.fn()} />);
-
-    expect(screen.getByTestId('entry-bulk-export-modal-trigger')).toBeInTheDocument();
-    expect(screen.getByText('Export to Dataset')).toBeInTheDocument();
-  });
-
-  it('opens modal when trigger button is clicked', async () => {
-    render(<EntryBulkExportModal selectedEntries={[mockEntry]} onSuccess={vi.fn()} />);
-
-    const triggerButton = screen.getByTestId('entry-bulk-export-modal-trigger');
-    await user.click(triggerButton);
-
-    // Check modal title is visible
-    expect(await screen.findByText('Export Records to Dataset')).toBeInTheDocument();
-
-    // Check form fields
-    expect(screen.getByText('Destination Dataset')).toBeInTheDocument();
-    expect(screen.getByText('Limit')).toBeInTheDocument();
-    expect(screen.getByText('Row Transformation')).toBeInTheDocument();
-  });
-
-  it('shows correct entry count in info panel', async () => {
-    const entries = [mockEntry, { ...mockEntry, id: 'entry-456' }];
-    render(<EntryBulkExportModal selectedEntries={entries} onSuccess={vi.fn()} />);
-
-    const triggerButton = screen.getByTestId('entry-bulk-export-modal-trigger');
-    await user.click(triggerButton);
-
-    // Check the info panel shows correct count
-    expect(await screen.findByText('2 entries will be exported')).toBeInTheDocument();
-  });
-
-  it('disables confirm button until dataset is selected', async () => {
-    render(<EntryBulkExportModal selectedEntries={[mockEntry]} onSuccess={vi.fn()} />);
-
-    const triggerButton = screen.getByTestId('entry-bulk-export-modal-trigger');
-    await user.click(triggerButton);
-
-    // Find the confirm button - it should be disabled initially
-    const confirmButton = await screen.findByRole('button', { name: 'Confirm' });
-    expect(confirmButton).toBeDisabled();
-  });
-
-  it('renders in controlled mode without trigger button', async () => {
-    const onClose = vi.fn();
-    render(
-      <EntryBulkExportModal
-        selectedEntries={[mockEntry]}
-        onSuccess={vi.fn()}
-        showTrigger={false}
-        open
-        onClose={onClose}
-      />
-    );
-
-    // Trigger button should not be present
-    expect(screen.queryByTestId('entry-bulk-export-modal-trigger')).not.toBeInTheDocument();
-
-    // Modal should be open
-    expect(await screen.findByText('Export Records to Dataset')).toBeInTheDocument();
-  });
-});
diff --git a/web/packages/studio/src/components/IntakeEntriesTable/EntryBulkExportModal.tsx b/web/packages/studio/src/components/IntakeEntriesTable/EntryBulkExportModal.tsx
deleted file mode 100644
index 6168313f1c..0000000000
--- a/web/packages/studio/src/components/IntakeEntriesTable/EntryBulkExportModal.tsx
+++ /dev/null
@@ -1,279 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { zodResolver } from '@hookform/resolvers/zod';
-import { useFilesetsInfinite } from '@nemo/common/src/api/entity-store/useDatasets';
-import { ControlledCheckbox } from '@nemo/common/src/components/form/ControlledCheckbox';
-import {
-  ControlledSearchableSelect,
-  SelectItemOption,
-} from '@nemo/common/src/components/form/ControlledSearchableSelect';
-import { ZodFormField } from '@nemo/common/src/components/form/ZodFormField';
-import { FormModal } from '@nemo/common/src/components/FormModal';
-import { getEntityReference } from '@nemo/common/src/namedEntity';
-import { useToast } from '@nemo/common/src/providers/toast/useToast';
-import { getListExportJobsQueryKey, useCreateExportJob } from '@nemo/sdk/generated/platform/api';
-import { Entry } from '@nemo/sdk/generated/platform/schema';
-import { Block, Button, Flex, Grid, GridItem, Stack, Text } from '@nvidia/foundations-react-core';
-import { getDefaultExportFileName } from '@studio/components/form/NewExportJobForm/constants';
-import { useWorkspaceFromPathIfExists } from '@studio/hooks/useWorkspaceFromPath';
-import { handleFormErrorsGeneric } from '@studio/util/forms/error';
-import { useBoolean } from '@studio/util/hooks/useBoolean';
-import { websiteLogger } from '@studio/util/logger';
-import { getTextWithCount } from '@studio/util/strings';
-import { useQueryClient } from '@tanstack/react-query';
-import { Database } from 'lucide-react';
-import { FC, useCallback, useMemo } from 'react';
-import { FormProvider, useForm } from 'react-hook-form';
-import { z } from 'zod';
-
-// Form schema for bulk export
-const exportRecordsFormSchema = z
-  .object({
-    dataset: z.object({
-      name: z.string().min(1, 'Dataset is required'),
-      files_url: z.string().optional(),
-    }),
-    config: z.object({
-      limit: z
-        .preprocess(
-          (val) => (val === '' || val === undefined ? undefined : Number(val)),
-          z.number().optional()
-        )
-        .describe('Maximum number of entries to export'),
-      format_options: z
-        .object({
-          row_transformation: z.boolean().optional(),
-        })
-        .optional(),
-    }),
-  })
-  .refine((data) => data.dataset.name && data.dataset.name.length > 0, {
-    message: 'Dataset is required',
-    path: ['dataset.name'],
-  });
-
-type ExportRecordsFormData = z.infer<typeof exportRecordsFormSchema>;
-
-interface EntryBulkExportModalProps {
-  /** Workspace identifier. Falls back to the `:workspace` route param when not provided. */
-  workspace?: string;
-  /** Entries to export */
-  selectedEntries: Entry[];
-  /** Callback when export succeeds */
-  onSuccess: () => void;
-  /** Whether to show a trigger button (default: true) */
-  showTrigger?: boolean;
-  /** Controlled open state (use with showTrigger=false) */
-  open?: boolean;
-  /** Callback when modal closes (use with showTrigger=false) */
-  onClose?: () => void;
-}
-
-export const EntryBulkExportModal: FC<EntryBulkExportModalProps> = ({
-  workspace: workspaceProp,
-  selectedEntries,
-  onSuccess,
-  showTrigger = true,
-  open: controlledOpen,
-  onClose: controlledOnClose,
-}) => {
-  const toast = useToast();
-  const queryClient = useQueryClient();
-  const routeWorkspace = useWorkspaceFromPathIfExists();
-  const workspace = workspaceProp ?? routeWorkspace ?? '';
-  const [internalOpen, openModal, closeModalInternal] = useBoolean(false);
-
-  // Support both controlled and uncontrolled modes
-  const isOpen = showTrigger ? internalOpen : (controlledOpen ?? false);
-  const closeModal = useMemo(
-    () => (showTrigger ? closeModalInternal : (controlledOnClose ?? (() => {}))),
-    [showTrigger, closeModalInternal, controlledOnClose]
-  );
-
-  const { mutateAsync: createExportJob, isPending: isCreatingExportJob } = useCreateExportJob();
-
-  const form = useForm<ExportRecordsFormData>({
-    resolver: zodResolver(exportRecordsFormSchema),
-    defaultValues: {
-      dataset: { name: '', files_url: '' },
-      config: { limit: 1000 },
-    },
-  });
-
-  const { control, setValue, watch } = form;
-  const datasetName = watch('dataset.name');
-
-  // Query datasets for the select dropdown
-  const {
-    data: datasetsPages,
-    fetchNextPage,
-    hasNextPage,
-    isFetchingNextPage,
-    isLoading,
-  } = useFilesetsInfinite({
-    query: {
-      sort: '-created_at',
-      filter: { purpose: 'dataset' },
-    },
-    workspace,
-  });
-
-  // Flatten all pages into a single array of options
-  const datasetOptions: SelectItemOption[] = useMemo(() => {
-    const allDatasets = datasetsPages?.pages.flatMap((page) => page.data) ?? [];
-    return allDatasets.map((dataset) => ({
-      value: dataset.name ?? '',
-      label: dataset.name ?? '',
-    }));
-  }, [datasetsPages]);
-
-  const handleLoadMore = useCallback(async () => {
-    if (hasNextPage && !isFetchingNextPage) {
-      await fetchNextPage();
-    }
-  }, [fetchNextPage, hasNextPage, isFetchingNextPage]);
-
-  const resetAndClose = useCallback(() => {
-    closeModal();
-    form.reset();
-  }, [closeModal, form]);
-
-  const submitForm = async (data: ExportRecordsFormData) => {
-    try {
-      // Build the export job request with selected entry IDs
-      const entryIds = selectedEntries.map((entry) => entry.id).filter(Boolean) as string[];
-
-      // Generate export file name
-      const exportFileName = getDefaultExportFileName();
-
-      // Construct output_file_url from dataset.files_url + export_file_name
-      const outputFileUrl = data.dataset.files_url
-        ? `${data.dataset.files_url}/${exportFileName}`
-        : undefined;
-
-      if (!outputFileUrl) {
-        toast.error('Dataset files URL is required. Please select a valid dataset.');
-        return;
-      }
-
-      await createExportJob({
-        workspace,
-        data: {
-          output_file_url: outputFileUrl,
-          config: {
-            limit: data.config.limit,
-            filters: {
-              id: { in: entryIds },
-            },
-            format_options: data.config.format_options,
-          },
-        },
-      });
-
-      resetAndClose();
-      toast.success('Export job created successfully!');
-      queryClient.resetQueries({ queryKey: getListExportJobsQueryKey(workspace) });
-      onSuccess();
-    } catch (error) {
-      websiteLogger.error(error instanceof Error ? error.message : 'Failed to create export job');
-      toast.error('Failed to create export job. Please try again.');
-    }
-  };
-
-  const entryCount = selectedEntries.length;
-
-  return (
-    <>
-      {showTrigger && (
-        <Button kind="tertiary" onClick={openModal} data-testid="entry-bulk-export-modal-trigger">
-          <Database />
-          Export to Dataset
-        </Button>
-      )}
-
-      <FormModal
-        open={isOpen}
-        className="w-auto min-w-[500px] max-w-[600px]"
-        title="Export Records to Dataset"
-        submitButtonText="Confirm"
-        disabled={isCreatingExportJob}
-        loading={isCreatingExportJob}
-        submitDisabled={!datasetName}
-        onSubmit={form.handleSubmit(
-          submitForm,
-          handleFormErrorsGeneric({ title: 'Export Records Form Errors' })
-        )}
-        onClose={resetAndClose}
-      >
-        <FormProvider {...form}>
-          <Stack gap="6" className="overflow-auto">
-            <Text kind="body/regular/md">
-              Export selected entries to a Dataset for downstream training or evaluation.
-            </Text>
-
-            <ControlledSearchableSelect
-              options={datasetOptions}
-              onLoadMore={handleLoadMore}
-              onChange={(value) => {
-                const datasets = datasetsPages?.pages.flatMap((page) => page.data) ?? [];
-                const foundDataset = datasets.find((dataset) => dataset.name === value);
-                if (foundDataset) {
-                  setValue('dataset.files_url', getEntityReference(foundDataset) ?? '');
-                }
-              }}
-              hasMore={hasNextPage ?? false}
-              isLoading={isLoading}
-              isLoadingMore={isFetchingNextPage}
-              searchPlaceholder="Search datasets..."
-              triggerPlaceholder="No Dataset Selected"
-              emptyMessage="No datasets found"
-              doneLoadingMessage="All datasets loaded"
-              renderValue={(value) =>
-                value ? (
-                  <Flex align="center" gap="2">
-                    <Database className="flex-none" />
-                    <Text kind="body/regular/md">{value}</Text>
-                  </Flex>
-                ) : null
-              }
-              formFieldProps={{ slotLabel: 'Destination Dataset' }}
-              useControllerProps={{ name: 'dataset.name', control }}
-            />
-
-            <Grid cols={2}>
-              <GridItem>
-                <ZodFormField
-                  schema={z
-                    .preprocess(
-                      (val) => (val === '' || val === undefined ? undefined : Number(val)),
-                      z.number().optional()
-                    )
-                    .describe('Maximum number of records to export')}
-                  useControllerProps={{ name: 'config.limit', control }}
-                  formFieldProps={{
-                    slotLabel: 'Limit',
-                    slotInfo: 'Maximum number of records to export',
-                  }}
-                />
-              </GridItem>
-            </Grid>
-
-            <ControlledCheckbox
-              slotLabel="Use annotation rewrites (when available)"
-              formFieldProps={{ slotLabel: 'Row Transformation' }}
-              useControllerProps={{ name: 'config.format_options.row_transformation', control }}
-            />
-
-            {/* Info panel showing selection count */}
-            <Block className="bg-surface-raised rounded-lg p-6">
-              <Text kind="body/regular/md">
-                {getTextWithCount('entry', entryCount, 'entries')} will be exported
-              </Text>
-            </Block>
-          </Stack>
-        </FormProvider>
-      </FormModal>
-    </>
-  );
-};
diff --git a/web/packages/studio/src/components/IntakeEntriesTable/EntryRatingCell.tsx b/web/packages/studio/src/components/IntakeEntriesTable/EntryRatingCell.tsx
deleted file mode 100644
index 178a212eb3..0000000000
--- a/web/packages/studio/src/components/IntakeEntriesTable/EntryRatingCell.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { Entry } from '@nemo/sdk/generated/platform/schema';
-import { Text } from '@nvidia/foundations-react-core';
-import { getEventOrUserRating } from '@studio/components/IntakeEntriesTable/utils';
-import { FC } from 'react';
-
-export interface EntryRatingCellProps {
-  entry: Entry;
-}
-
-/**
- * Displays the numeric rating for an entry.
- * Shows the rating value if present, otherwise shows em dash (—).
- */
-export const EntryRatingCell: FC<EntryRatingCellProps> = ({ entry }) => {
-  const rating = getEventOrUserRating(entry);
-
-  if (rating === undefined || rating === null) {
-    return <Text>—</Text>;
-  }
-
-  return <Text>{rating}</Text>;
-};
diff --git a/web/packages/studio/src/components/IntakeEntriesTable/EntryStatusCell.tsx b/web/packages/studio/src/components/IntakeEntriesTable/EntryStatusCell.tsx
deleted file mode 100644
index 0f4a45e97a..0000000000
--- a/web/packages/studio/src/components/IntakeEntriesTable/EntryStatusCell.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { Entry } from '@nemo/sdk/generated/platform/schema';
-import { Flex, StatusIndicator, Text } from '@nvidia/foundations-react-core';
-import { isEntryAnnotated } from '@studio/components/IntakeEntriesTable/utils';
-import { FC } from 'react';
-
-export interface EntryStatusCellProps {
-  entry: Entry;
-}
-
-/**
- * Displays the annotation status of an entry with a colored indicator dot.
- * - Annotated: Green StatusIndicator
- * - Unannotated: Gray StatusIndicator (via className override)
- */
-export const EntryStatusCell: FC<EntryStatusCellProps> = ({ entry }) => {
-  const isAnnotated = isEntryAnnotated(entry);
-
-  return (
-    <Flex gap="density-sm" align="center">
-      <StatusIndicator
-        color="green"
-        size="small"
-        className={isAnnotated ? undefined : '!bg-accent-gray-subtle'}
-      />
-      <Text>{isAnnotated ? 'Annotated' : 'Unannotated'}</Text>
-    </Flex>
-  );
-};
diff --git a/web/packages/studio/src/components/IntakeEntriesTable/EntryThumbCell.tsx b/web/packages/studio/src/components/IntakeEntriesTable/EntryThumbCell.tsx
deleted file mode 100644
index 6368ffbb49..0000000000
--- a/web/packages/studio/src/components/IntakeEntriesTable/EntryThumbCell.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import type { Entry } from '@nemo/sdk/generated/platform/schema';
-import { Tag, Text } from '@nvidia/foundations-react-core';
-import { getEventOrUserThumb } from '@studio/components/IntakeEntriesTable/utils';
-import { ThumbsDown, ThumbsUp } from 'lucide-react';
-import { FC } from 'react';
-
-export interface EntryThumbCellProps {
-  entry: Entry;
-}
-
-/**
- * Displays the thumb feedback for an entry.
- * - Up: Green thumbs up icon
- * - Down: Red thumbs down icon
- * - Not set: Em dash (—)
- */
-export const EntryThumbCell: FC<EntryThumbCellProps> = ({ entry }) => {
-  const thumb = getEventOrUserThumb(entry);
-
-  if (!thumb) {
-    return <Text>—</Text>;
-  }
-
-  if (thumb === 'up') {
-    return (
-      <Tag color="green">
-        <ThumbsUp size="20" color="var(--text-color-feedback-success)" />
-      </Tag>
-    );
-  }
-
-  return (
-    <Tag color="red">
-      <ThumbsDown size="20" color="var(--text-color-feedback-danger)" />
-    </Tag>
-  );
-};
diff --git a/web/packages/studio/src/components/IntakeEntriesTable/IntakeEntriesTable.stories.tsx b/web/packages/studio/src/components/IntakeEntriesTable/IntakeEntriesTable.stories.tsx
deleted file mode 100644
index 09c60b9aa0..0000000000
--- a/web/packages/studio/src/components/IntakeEntriesTable/IntakeEntriesTable.stories.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { ToastProvider } from '@nemo/common/src/providers/toast/ToastProvider';
-import type { EntrysPage } from '@nemo/sdk/generated/platform/schema';
-import type { Meta, StoryObj } from '@storybook/react';
-import { IntakeEntriesTable } from '@studio/components/IntakeEntriesTable';
-import { entriesPage1 } from '@studio/mocks/intake/entries';
-import { http, HttpResponse } from 'msw';
-
-const ENTRIES_API = '/apis/intake/v2/workspaces/default/entries';
-
-const meta = {
-  component: IntakeEntriesTable,
-  title: 'DataViews/IntakeEntriesTable',
-  decorators: [
-    (Story) => (
-      <ToastProvider>
-        <Story />
-      </ToastProvider>
-    ),
-  ],
-  args: {
-    workspace: 'default',
-    enableSelection: true,
-    enableActions: true,
-    attributes: { Stack: { className: 'h-[600px]' } },
-  },
-} satisfies Meta<typeof IntakeEntriesTable>;
-
-export default meta;
-type Story = StoryObj<typeof meta>;
-
-const emptyEntriesPage: EntrysPage = {
-  data: [],
-  pagination: {
-    page: 1,
-    page_size: 50,
-    current_page_size: 0,
-    total_pages: 0,
-    total_results: 0,
-  },
-};
-
-export const Empty: Story = {
-  parameters: {
-    msw: {
-      handlers: [
-        http.get<never, never, EntrysPage>(ENTRIES_API, () => HttpResponse.json(emptyEntriesPage)),
-      ],
-    },
-  },
-};
-
-export const WithData: Story = {
-  parameters: {
-    msw: {
-      handlers: [
-        http.get<never, never, EntrysPage>(ENTRIES_API, () =>
-          HttpResponse.json(entriesPage1 as unknown as EntrysPage)
-        ),
-      ],
-    },
-  },
-};
diff --git a/web/packages/studio/src/components/IntakeEntriesTable/index.spec.tsx b/web/packages/studio/src/components/IntakeEntriesTable/index.spec.tsx
deleted file mode 100644
index 2bf1c3d76a..0000000000
--- a/web/packages/studio/src/components/IntakeEntriesTable/index.spec.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { IntakeEntriesTable } from '@studio/components/IntakeEntriesTable';
-import { server } from '@studio/mocks/node';
-import { renderRoute } from '@studio/tests/util/render';
-import { waitFor } from '@testing-library/react';
-import { http, HttpResponse } from 'msw';
-
-vi.mock('use-debounce', () => ({
-  useDebounce: (value: unknown) => [value, { cancel: () => {}, flush: () => {} }],
-}));
-
-const ENTRIES_URL = '*/apis/intake/v2/workspaces/:workspace/entries';
-
-const emptyEntriesPage = {
-  object: 'list',
-  data: [],
-  pagination: {
-    page: 1,
-    page_size: 50,
-    current_page_size: 0,
-    total_pages: 0,
-    total_results: 0,
-  },
-};
-
-const captureRequests = () => {
-  const requestUrls: string[] = [];
-  server.use(
-    http.get(ENTRIES_URL, ({ request }) => {
-      requestUrls.push(request.url);
-      return HttpResponse.json(emptyEntriesPage);
-    })
-  );
-  return requestUrls;
-};
-
-const renderTable = (initialEntry: string) =>
-  renderRoute(<IntakeEntriesTable workspace="default" />, {
-    history: initialEntry,
-    routes: [
-      {
-        path: '/workspaces/:workspace/intake/entries',
-        element: <IntakeEntriesTable workspace="default" />,
-      },
-    ],
-  });
-
-describe('IntakeEntriesTable filter query params', () => {
-  afterEach(() => {
-    server.resetHandlers();
-  });
-
-  it('always scopes requests to the workspace project', async () => {
-    const requestUrls = captureRequests();
-    renderTable('/workspaces/default/intake/entries');
-
-    await waitFor(() => expect(requestUrls.length).toBeGreaterThan(0));
-
-    const url = new URL(requestUrls.at(-1)!);
-    expect(url.pathname).toBe('/apis/intake/v2/workspaces/default/entries');
-  });
-
-  it('sends filter[external_id] (exact match) when search is active', async () => {
-    const requestUrls = captureRequests();
-    renderTable('/workspaces/default/intake/entries?s=entry-123');
-
-    await waitFor(() => {
-      expect(requestUrls.some((u) => new URL(u).searchParams.has('filter[external_id]'))).toBe(
-        true
-      );
-    });
-
-    const url = new URL(requestUrls.at(-1)!);
-    expect(url.searchParams.get('filter[external_id]')).toBe('entry-123');
-    // Exact match — must NOT be wrapped in $like
-    expect(url.searchParams.has('filter[external_id][$like]')).toBe(false);
-  });
-
-  it('never emits a top-level search or search[ key', async () => {
-    const requestUrls = captureRequests();
-    renderTable('/workspaces/default/intake/entries?s=foo');
-
-    await waitFor(() => expect(requestUrls.length).toBeGreaterThan(0));
-
-    for (const raw of requestUrls) {
-      const params = new URL(raw).searchParams;
-      expect(params.has('search')).toBe(false);
-      expect(Array.from(params.keys()).some((k) => k.startsWith('search['))).toBe(false);
-    }
-  });
-});
diff --git a/web/packages/studio/src/components/IntakeEntriesTable/index.tsx b/web/packages/studio/src/components/IntakeEntriesTable/index.tsx
deleted file mode 100644
index 2506bcb12d..0000000000
--- a/web/packages/studio/src/components/IntakeEntriesTable/index.tsx
+++ /dev/null
@@ -1,381 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { dateTimeFilter } from '@nemo/common/src/components/DataView/dateTimeFilter';
-import * as DataView from '@nemo/common/src/components/DataView/internal';
-import {
-  ROW_ACTIONS_COLUMN_SIZE,
-  ROW_SELECTION_COLUMN_SIZE,
-  StudioDataView,
-} from '@nemo/common/src/components/DataView/StudioDataView';
-import { ErrorMessage } from '@nemo/common/src/components/ErrorMessage';
-import { RelativeTime } from '@nemo/common/src/components/RelativeTime';
-import { TableEmptyState } from '@nemo/common/src/components/TableEmptyState';
-import { useDeferredUnmount } from '@nemo/common/src/hooks/useDeferredUnmount';
-import { useSetTimeout } from '@nemo/common/src/hooks/useSetTimeout';
-import { useStudioDataViewState } from '@nemo/common/src/hooks/useStudioDataViewState';
-import { getSortParamWithWhitelist } from '@nemo/common/src/utils/query';
-import { useListEntries } from '@nemo/sdk/generated/platform/api';
-import { Entry, EntrySortField } from '@nemo/sdk/generated/platform/schema';
-import { Anchor, Button, Flex, Stack, Text } from '@nvidia/foundations-react-core';
-import { getErrorMessage } from '@studio/api/common/utils';
-import { EntryBulkDeleteModal } from '@studio/components/IntakeEntriesTable/EntryBulkDeleteModal';
-import { EntryBulkExportModal } from '@studio/components/IntakeEntriesTable/EntryBulkExportModal';
-import { EntryRatingCell } from '@studio/components/IntakeEntriesTable/EntryRatingCell';
-import { EntryStatusCell } from '@studio/components/IntakeEntriesTable/EntryStatusCell';
-import { EntryThumbCell } from '@studio/components/IntakeEntriesTable/EntryThumbCell';
-import { getEntryResponseContent } from '@studio/components/IntakeEntriesTable/utils';
-import { IntakeThreadPanel } from '@studio/components/IntakeThreadPanel';
-import { Loading } from '@studio/components/Layouts/Loading';
-import { AnnotationModal } from '@studio/components/modals/AnnotationModal';
-import { useWorkspaceFromPathIfExists } from '@studio/hooks/useWorkspaceFromPath';
-import { getIntakeEntryRoute } from '@studio/routes/utils';
-import { getLastUserMessageContent } from '@studio/util/entries';
-import { keepPreviousData } from '@tanstack/react-query';
-import { MessagesSquare, X, Upload, Search, Pencil } from 'lucide-react';
-import { ComponentProps, FC, ReactNode, useMemo, useState } from 'react';
-import { Link, useNavigate } from 'react-router-dom';
-
-type EntryWithId = Entry & { id: string };
-
-export interface IntakeEntriesTableProps {
-  /** Workspace identifier. Falls back to the `:workspace` route param when not provided. */
-  workspace?: string;
-  /** Callback when a row is clicked */
-  onRowClick?: (entry: Entry) => void;
-  /** Enable row actions (default: true) */
-  enableActions?: boolean;
-  /** Enable checkbox selection (default: true) */
-  enableSelection?: boolean;
-  /** Empty state actions - shown when no entries exist */
-  emptyStateActions?: ReactNode;
-  /** No results actions - shown when filters return no results */
-  noResultsActions?: ReactNode;
-  attributes?: {
-    Stack?: ComponentProps<typeof Stack>;
-    DataViewRoot?: ComponentProps<typeof DataView.Root<EntryWithId>>;
-    DataViewTableContent?: ComponentProps<typeof DataView.TableContent>;
-  };
-}
-
-/**
- * A table that displays a list of intake entries with filtering, search, and bulk operations.
- */
-export const IntakeEntriesTable: FC<IntakeEntriesTableProps> = ({
-  workspace: workspaceProp,
-  onRowClick,
-  enableActions = true,
-  enableSelection,
-  emptyStateActions,
-  noResultsActions,
-  attributes,
-}) => {
-  const navigate = useNavigate();
-  const routeWorkspace = useWorkspaceFromPathIfExists();
-  const workspace = workspaceProp ?? routeWorkspace ?? '';
-
-  const dataViewState = useStudioDataViewState({
-    defaultSort: { id: 'created_at', desc: true },
-  });
-
-  const hasActiveFilters =
-    !!dataViewState.debouncedSearchBar || dataViewState.debouncedColumnFilters.length > 0;
-
-  const [annotatingEntry, setAnnotatingEntry] = useState<Entry | undefined>(undefined);
-
-  // Thread panel state with deferred unmount for close animation
-  const threadPanel = useDeferredUnmount<string>();
-
-  // Export single entry modal state
-  const exportSingleEntryModal = useDeferredUnmount<Entry>();
-
-  const [setAnimationTimeout] = useSetTimeout();
-
-  const {
-    data: entriesResponse,
-    isPending,
-    isFetching,
-    error,
-  } = useListEntries(
-    workspace,
-    {
-      filter: {
-        ...dataViewState.apiFilter.filter,
-        ...(dataViewState.apiFilter.searchText
-          ? { external_id: dataViewState.apiFilter.searchText }
-          : {}),
-      },
-      page: dataViewState.pagination.state.pageIndex + 1,
-      page_size: dataViewState.pagination.state.pageSize,
-      sort: getSortParamWithWhitelist(
-        dataViewState.sorting.state,
-        ['created_at', 'updated_at'],
-        '-created_at'
-      ) as EntrySortField,
-    },
-    {
-      query: {
-        placeholderData: keepPreviousData,
-      },
-    }
-  );
-
-  // Ensure each entry has a unique id for DataView row selection
-  const entries = useMemo<EntryWithId[]>(
-    () =>
-      (entriesResponse?.data || []).map((entry: Entry) => ({
-        ...entry,
-        id: entry.id || `entry-${entry.external_id || Math.random()}`,
-      })),
-    [entriesResponse?.data]
-  );
-
-  // Column definitions
-  const makeColumns: ComponentProps<typeof DataView.Root<EntryWithId>>['makeColumns'] = (
-    { accessor },
-    { rowSelectionColumn, rowActionsColumn }
-  ) =>
-    [
-      enableSelection && rowSelectionColumn({ size: ROW_SELECTION_COLUMN_SIZE }),
-      {
-        id: 'status',
-        header: 'Status',
-        enableSorting: false,
-        size: 130,
-        cell: ({ row }: { row: DataView.TanstackTable.Row<EntryWithId> }) => (
-          <EntryStatusCell entry={row.original} />
-        ),
-      },
-      {
-        id: 'thumb',
-        header: 'Thumb',
-        enableSorting: false,
-        size: 80,
-        cell: ({ row }: { row: DataView.TanstackTable.Row<EntryWithId> }) => (
-          <EntryThumbCell entry={row.original} />
-        ),
-      },
-      {
-        id: 'rating',
-        header: 'Rating',
-        enableSorting: false,
-        size: 80,
-        cell: ({ row }: { row: DataView.TanstackTable.Row<EntryWithId> }) => (
-          <EntryRatingCell entry={row.original} />
-        ),
-      },
-      {
-        id: 'model_name',
-        header: 'Model Name',
-        enableSorting: false,
-        size: 150,
-        cell: ({ row }: { row: DataView.TanstackTable.Row<EntryWithId> }) => {
-          const modelName = row.original?.data?.request?.model;
-          const routeTo = getIntakeEntryRoute(workspace, row.original.id || '');
-          if (routeTo) {
-            return (
-              <Anchor asChild>
-                <Link to={routeTo}>{modelName}</Link>
-              </Anchor>
-            );
-          }
-          return (
-            <Text className="cursor-pointer" onClick={() => onRowClick?.(row.original)}>
-              {modelName}
-            </Text>
-          );
-        },
-      },
-      {
-        id: 'input',
-        header: 'Input',
-        enableSorting: false,
-        cell: ({ row }: { row: DataView.TanstackTable.Row<EntryWithId> }) => {
-          const content = getLastUserMessageContent(row.original);
-          return (
-            <Text className="truncate" title={content}>
-              {content || '—'}
-            </Text>
-          );
-        },
-      },
-      {
-        id: 'output',
-        header: 'Output',
-        enableSorting: false,
-        cell: ({ row }: { row: DataView.TanstackTable.Row<EntryWithId> }) => {
-          const content = getEntryResponseContent(row.original);
-          return (
-            <Text className="truncate" title={content}>
-              {content}
-            </Text>
-          );
-        },
-      },
-      accessor('created_at', {
-        id: 'created_at',
-        header: 'Created',
-        enableSorting: true,
-        size: 150,
-        maxSize: 150,
-        minSize: 150,
-        meta: {
-          filter: dateTimeFilter('Created At'),
-        },
-        cell({ row }) {
-          return row.original?.created_at ? (
-            <RelativeTime datetime={row.original.created_at} />
-          ) : null;
-        },
-      }),
-      enableActions &&
-        rowActionsColumn({
-          size: ROW_ACTIONS_COLUMN_SIZE,
-          enableResizing: false,
-          rowActions: (entry: EntryWithId) => {
-            const actions = [
-              {
-                slotLeft: <Search />,
-                children: 'View Details',
-                onSelect: () => {
-                  navigate(getIntakeEntryRoute(workspace, entry.id || ''));
-                },
-              },
-              {
-                slotLeft: <Pencil />,
-                children: 'Annotate',
-                onSelect: () => {
-                  setAnnotatingEntry(entry);
-                },
-              },
-              {
-                slotLeft: <Upload />,
-                children: 'Upload Entry',
-                onSelect: () => {
-                  exportSingleEntryModal.open(entry);
-                },
-              },
-            ];
-            // Conditionally add View Thread action
-            if (entry.context?.thread_id) {
-              actions.splice(1, 0, {
-                slotLeft: <MessagesSquare />,
-                children: 'View Thread',
-                onSelect: () => {
-                  threadPanel.open(entry.context!.thread_id!);
-                },
-              });
-            }
-            return actions;
-          },
-        }),
-    ].filter((col): col is DataView.TanstackTable.ColumnDef<EntryWithId> => Boolean(col));
-
-  // Loading state
-  if (isPending) {
-    return (
-      <Stack className="h-full w-full">
-        <Loading description="Loading entries..." />
-      </Stack>
-    );
-  }
-
-  // Error state
-  if (error) {
-    return <ErrorMessage message={getErrorMessage(error)} />;
-  }
-
-  // Default empty state actions
-  const defaultEmptyActions = (
-    <Text kind="body/regular/md">No entries have been recorded yet.</Text>
-  );
-
-  const defaultNoResultsActions = (
-    <Button kind="tertiary" onClick={dataViewState.resetFilters}>
-      <X /> Clear Filters
-    </Button>
-  );
-
-  return (
-    <>
-      <Stack {...attributes?.Stack}>
-        <StudioDataView<EntryWithId>
-          dataViewState={dataViewState}
-          searchField="external_id"
-          makeColumns={makeColumns}
-          renderBulkActions={({ selectedRows }) => {
-            const rows = selectedRows as EntryWithId[];
-            if (rows.length === 0) return null;
-            return (
-              <Flex gap="density-md" align="center">
-                <EntryBulkExportModal
-                  workspace={workspace}
-                  selectedEntries={rows}
-                  onSuccess={() =>
-                    setAnimationTimeout(() => dataViewState.rowSelection.set({}), 300)
-                  }
-                />
-                <EntryBulkDeleteModal
-                  workspace={workspace}
-                  selectedEntries={rows}
-                  onConfirmSuccess={() =>
-                    setAnimationTimeout(() => dataViewState.rowSelection.set({}), 300)
-                  }
-                />
-              </Flex>
-            );
-          }}
-          attributes={{
-            DataViewSearchBar: {
-              placeholder: 'Search entries by external ID',
-            },
-            DataViewRoot: {
-              data: entries,
-              totalCount: entriesResponse?.pagination?.total_results,
-              requestStatus: isFetching ? 'loading' : undefined,
-            },
-            DataViewTableContent: {
-              renderEmptyState: () =>
-                hasActiveFilters ? (
-                  <TableEmptyState
-                    header="No Results Found"
-                    emptyMessage="No entries match your filters"
-                    actions={noResultsActions ?? defaultNoResultsActions}
-                  />
-                ) : (
-                  <TableEmptyState
-                    header="No Entries"
-                    emptyMessage="Get started by recording entries from your LLM application."
-                    actions={emptyStateActions ?? defaultEmptyActions}
-                  />
-                ),
-            },
-          }}
-        />
-      </Stack>
-      <AnnotationModal
-        open={!!annotatingEntry}
-        onClose={() => setAnnotatingEntry(undefined)}
-        entry={annotatingEntry}
-      />
-      {/* Single entry export modal */}
-      {exportSingleEntryModal.value && (
-        <EntryBulkExportModal
-          workspace={workspace}
-          selectedEntries={[exportSingleEntryModal.value]}
-          onSuccess={exportSingleEntryModal.close}
-          showTrigger={false}
-          open={!!exportSingleEntryModal.isOpen}
-          onClose={exportSingleEntryModal.close}
-        />
-      )}
-      {threadPanel.value && (
-        <IntakeThreadPanel
-          threadId={threadPanel.value}
-          open={threadPanel.isOpen}
-          onOpenChange={threadPanel.onOpenChange}
-        />
-      )}
-    </>
-  );
-};
diff --git a/web/packages/studio/src/components/IntakeEntriesTable/utils.spec.ts b/web/packages/studio/src/components/IntakeEntriesTable/utils.spec.ts
deleted file mode 100644
index fb6b027bdb..0000000000
--- a/web/packages/studio/src/components/IntakeEntriesTable/utils.spec.ts
+++ /dev/null
@@ -1,133 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import type { Entry } from '@nemo/sdk/generated/platform/schema';
-import {
-  getEntryResponseContent,
-  getEventOrUserRating,
-  getEventOrUserThumb,
-  getEventOverride,
-  isEntryAnnotated,
-} from '@studio/components/IntakeEntriesTable/utils';
-
-type EntryEventItem = NonNullable<Entry['events']>[number];
-
-const makeEntry = (overrides: Partial<Entry> = {}): Entry =>
-  ({
-    id: 'e1',
-    events: [],
-    data: {},
-    ...overrides,
-  }) as Entry;
-
-const reviewerEvent = (extra: Record<string, unknown> = {}): EntryEventItem =>
-  ({
-    event_type: 'reviewer_annotation',
-    ...extra,
-  }) as unknown as EntryEventItem;
-
-describe('isEntryAnnotated', () => {
-  it('returns false when events is empty', () => {
-    expect(isEntryAnnotated(makeEntry())).toBe(false);
-  });
-
-  it('returns false when events is undefined', () => {
-    expect(isEntryAnnotated(makeEntry({ events: undefined }))).toBe(false);
-  });
-
-  it('returns true when a reviewer_annotation event exists', () => {
-    expect(isEntryAnnotated(makeEntry({ events: [reviewerEvent()] }))).toBe(true);
-  });
-
-  it('returns false when events have a different type', () => {
-    const entry = makeEntry({
-      events: [{ event_type: 'other' } as unknown as EntryEventItem],
-    });
-    expect(isEntryAnnotated(entry)).toBe(false);
-  });
-});
-
-describe('getEntryResponseContent', () => {
-  it('returns undefined for undefined entry', () => {
-    expect(getEntryResponseContent(undefined)).toBeUndefined();
-  });
-
-  it('joins choice contents with newline', () => {
-    const entry = makeEntry({
-      data: {
-        response: {
-          choices: [{ message: { content: 'hello' } }, { message: { content: 'world' } }],
-        },
-      },
-    } as unknown as Partial<Entry>);
-    expect(getEntryResponseContent(entry)).toBe('hello\nworld');
-  });
-
-  it('returns undefined when no response data', () => {
-    expect(getEntryResponseContent(makeEntry())).toBeUndefined();
-  });
-});
-
-describe('getEventOrUserThumb', () => {
-  it('returns undefined for undefined entry', () => {
-    expect(getEventOrUserThumb(undefined)).toBeUndefined();
-  });
-
-  it('returns thumb from latest reviewer event', () => {
-    const entry = makeEntry({
-      events: [reviewerEvent({ thumb: 'up' }), reviewerEvent({ thumb: 'down' })],
-    });
-    // reversed — last event is checked first
-    expect(getEventOrUserThumb(entry)).toBe('down');
-  });
-
-  it('falls back to user_rating.thumb when no reviewer event', () => {
-    const entry = makeEntry({ user_rating: { thumb: 'up' } } as unknown as Partial<Entry>);
-    expect(getEventOrUserThumb(entry)).toBe('up');
-  });
-
-  it('returns undefined when no thumb anywhere', () => {
-    expect(getEventOrUserThumb(makeEntry())).toBeUndefined();
-  });
-});
-
-describe('getEventOrUserRating', () => {
-  it('returns undefined for undefined entry', () => {
-    expect(getEventOrUserRating(undefined)).toBeUndefined();
-  });
-
-  it('returns rating from latest reviewer event', () => {
-    const entry = makeEntry({
-      events: [reviewerEvent({ rating: 3 }), reviewerEvent({ rating: 5 })],
-    });
-    expect(getEventOrUserRating(entry)).toBe(5);
-  });
-
-  it('falls back to user_rating.rating', () => {
-    const entry = makeEntry({ user_rating: { rating: 4 } } as unknown as Partial<Entry>);
-    expect(getEventOrUserRating(entry)).toBe(4);
-  });
-
-  it('returns undefined when no rating anywhere', () => {
-    expect(getEventOrUserRating(makeEntry())).toBeUndefined();
-  });
-});
-
-describe('getEventOverride', () => {
-  it('returns undefined for undefined entry', () => {
-    expect(getEventOverride(undefined)).toBeUndefined();
-  });
-
-  it('returns response_override from latest reviewer event', () => {
-    const override = { content: 'fixed' };
-    const entry = makeEntry({
-      events: [reviewerEvent({ response_override: override })],
-    });
-    expect(getEventOverride(entry)).toEqual(override);
-  });
-
-  it('returns undefined when no response_override', () => {
-    const entry = makeEntry({ events: [reviewerEvent()] });
-    expect(getEventOverride(entry)).toBeUndefined();
-  });
-});
diff --git a/web/packages/studio/src/components/IntakeEntriesTable/utils.ts b/web/packages/studio/src/components/IntakeEntriesTable/utils.ts
deleted file mode 100644
index 75275ba81b..0000000000
--- a/web/packages/studio/src/components/IntakeEntriesTable/utils.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { Entry, FlexibleMessage, ThumbDirection } from '@nemo/sdk/generated/platform/schema';
-
-type EntryEventItem = NonNullable<Entry['events']>[number];
-
-/**
- * Determines if an entry has been annotated by checking for reviewer_annotation events.
- */
-export const isEntryAnnotated = (entry: Entry): boolean => {
-  if (!entry.events || entry.events.length === 0) return false;
-  return entry.events.some(
-    (event: EntryEventItem) => 'event_type' in event && event.event_type === 'reviewer_annotation'
-  );
-};
-
-/**
- * Gets the response content from an entry.
- */
-export const getEntryResponseContent = (entry: Entry | undefined) => {
-  return entry?.data?.response?.choices
-    ?.map((choice) => (choice.message as FlexibleMessage)?.content as string)
-    .join('\n');
-};
-
-/**
- * Gets the thumb direction for an entry from the reviewer annotation event or the user rating in that order.
- * @param entry - The entry to get the thumb for.
- * @returns The thumb direction for the entry.
- */
-export const getEventOrUserThumb = (entry?: Entry): ThumbDirection | undefined => {
-  if (!entry) return undefined;
-  const eventsReverse = [...(entry.events ?? [])]?.reverse();
-  const latestReviewerEvent = eventsReverse?.find(
-    (event: EntryEventItem) =>
-      'event_type' in event &&
-      event.event_type === 'reviewer_annotation' &&
-      typeof event === 'object'
-  );
-  const userRatingThumb = entry.user_rating?.thumb;
-  if (latestReviewerEvent && 'thumb' in latestReviewerEvent) {
-    return latestReviewerEvent.thumb;
-  }
-  if (userRatingThumb) {
-    return userRatingThumb;
-  }
-};
-
-/**
- * Gets the rating for an entry from the reviewer annotation event or the user rating in that order.
- * @param entry - The entry to get the rating for.
- * @returns The rating for the entry.
- */
-export const getEventOrUserRating = (entry?: Entry): number | undefined => {
-  if (!entry) return undefined;
-  const eventsReverse = [...(entry.events ?? [])]?.reverse();
-  const latestReviewerEvent = eventsReverse?.find(
-    (event: EntryEventItem) =>
-      'event_type' in event &&
-      event.event_type === 'reviewer_annotation' &&
-      typeof event === 'object'
-  );
-  const userRatingRating = entry.user_rating?.rating;
-  if (
-    latestReviewerEvent &&
-    'rating' in latestReviewerEvent &&
-    latestReviewerEvent.rating !== undefined
-  ) {
-    return latestReviewerEvent.rating;
-  }
-  if (userRatingRating !== undefined) {
-    return userRatingRating;
-  }
-};
-
-export const getEventOverride = (entry?: Entry): Record<string, unknown> | undefined => {
-  if (!entry) return undefined;
-  const eventsReverse = [...(entry.events ?? [])]?.reverse();
-  const latestReviewerEvent = eventsReverse?.find(
-    (event: EntryEventItem) =>
-      'event_type' in event &&
-      event.event_type === 'reviewer_annotation' &&
-      typeof event === 'object'
-  );
-  if (latestReviewerEvent && 'response_override' in latestReviewerEvent) {
-    return latestReviewerEvent.response_override;
-  }
-};
diff --git a/web/packages/studio/src/components/IntakeEntryConversation/README.md b/web/packages/studio/src/components/IntakeEntryConversation/README.md
deleted file mode 100644
index 1cbacecf93..0000000000
--- a/web/packages/studio/src/components/IntakeEntryConversation/README.md
+++ /dev/null
@@ -1,67 +0,0 @@
-# IntakeEntryConversation
-
-Displays intake entry conversation data with toggleable Chat and JSON view modes.
-
-## Overview
-
-This component renders an intake entry's conversation history in a Panel with a segmented control to switch between two view modes:
-
-- **Chat View**: Interactive chat bubble interface with system prompts, user messages, and assistant responses
-- **JSON View**: Raw entry data displayed as syntax-highlighted JSON
-
-## Usage
-
-```tsx
-import { IntakeEntryConversation } from '@studio/components/IntakeEntryConversation';
-
-<IntakeEntryConversation entry={selectedEntry} />;
-```
-
-## Component Structure
-
-```text
-IntakeEntryConversation/
-├── index.tsx              # Main component with view mode toggle
-├── index.spec.tsx         # Unit tests
-├── README.md              # This file
-└── components/
-    ├── ChatView.tsx       # Renders entry as chat conversation
-    ├── JSONView.tsx       # Renders entry as formatted JSON
-    ├── SystemPrompt.tsx   # Collapsible accordion for system messages
-    ├── LastUserMessage.tsx    # Right-aligned user message bubble
-    ├── AssistantResponse.tsx  # Assistant response with annotations
-    ├── Annotation.tsx     # Rewrite content display
-    └── ThumbStatus.tsx    # Thumb up/down rating indicator
-```
-
-## Subcomponents
-
-### ChatView
-
-Parses and displays the entry as a conversational interface:
-
-- **SystemPrompt**: Collapsible accordion showing system messages with a size indicator (e.g., "225.89kB")
-- **LastUserMessage**: Right-aligned chat bubble for the user's input
-- **AssistantResponse**: Left-aligned chat bubble with optional annotation overlay
-
-### JSONView
-
-Displays the complete entry object as pretty-printed JSON in a collapsible code snippet with syntax highlighting.
-
-## Props
-
-| Prop    | Type    | Required | Description                                   |
-| ------- | ------- | -------- | --------------------------------------------- |
-| `entry` | `Entry` | Yes      | The intake entry containing conversation data |
-
-## Data Flow
-
-```text
-Entry
-├── System messages → SystemPrompt (collapsible accordion)
-├── Last user message → LastUserMessage (right-aligned bubble)
-├── Last assistant message → AssistantResponse (left-aligned bubble)
-│   ├── response_override → Annotation (rewrite content)
-│   └── thumb rating → ThumbStatus (up/down indicator)
-└── Raw data → JSONView (code snippet)
-```
diff --git a/web/packages/studio/src/components/IntakeEntryConversation/components/Annotation.test.tsx b/web/packages/studio/src/components/IntakeEntryConversation/components/Annotation.test.tsx
deleted file mode 100644
index 944f9aaec8..0000000000
--- a/web/packages/studio/src/components/IntakeEntryConversation/components/Annotation.test.tsx
+++ /dev/null
@@ -1,144 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { ReviewerAnnotationEvent } from '@nemo/sdk/generated/platform/schema';
-import { Annotation } from '@studio/components/IntakeEntryConversation/components/Annotation';
-import { render, screen } from '@testing-library/react';
-
-const createAnnotationWithResponseOverride = (content?: string): ReviewerAnnotationEvent => ({
-  thumb: 'down',
-  response_override: content !== undefined ? { choices: [{ message: { content } }] } : undefined,
-});
-
-const createAnnotationWithRewrite = (rewrite?: string): ReviewerAnnotationEvent => ({
-  thumb: 'down',
-  rewrite,
-});
-
-describe('Annotation', () => {
-  describe('null conditions', () => {
-    it('returns null when annotation has no rewrite or response_override', () => {
-      const annotation: ReviewerAnnotationEvent = { thumb: 'up' };
-
-      render(<Annotation annotation={annotation} />);
-
-      expect(screen.queryByText('Rewrite')).not.toBeInTheDocument();
-      expect(screen.queryByTestId('rewrite-content')).not.toBeInTheDocument();
-    });
-
-    it('returns null when response_override has no choices', () => {
-      const annotation: ReviewerAnnotationEvent = {
-        thumb: 'down',
-        response_override: {},
-      };
-
-      render(<Annotation annotation={annotation} />);
-
-      expect(screen.queryByText('Rewrite')).not.toBeInTheDocument();
-      expect(screen.queryByTestId('rewrite-content')).not.toBeInTheDocument();
-    });
-
-    it('returns null when choices is empty array', () => {
-      const annotation: ReviewerAnnotationEvent = {
-        thumb: 'down',
-        response_override: { choices: [] },
-      };
-
-      render(<Annotation annotation={annotation} />);
-
-      expect(screen.queryByText('Rewrite')).not.toBeInTheDocument();
-      expect(screen.queryByTestId('rewrite-content')).not.toBeInTheDocument();
-    });
-
-    it('returns null when response_override content is empty string', () => {
-      const annotation = createAnnotationWithResponseOverride('');
-
-      render(<Annotation annotation={annotation} />);
-
-      expect(screen.queryByText('Rewrite')).not.toBeInTheDocument();
-      expect(screen.queryByTestId('rewrite-content')).not.toBeInTheDocument();
-    });
-
-    it('returns null when response_override content is whitespace only', () => {
-      const annotation = createAnnotationWithResponseOverride('   ');
-
-      render(<Annotation annotation={annotation} />);
-
-      expect(screen.queryByText('Rewrite')).not.toBeInTheDocument();
-      expect(screen.queryByTestId('rewrite-content')).not.toBeInTheDocument();
-    });
-
-    it('returns null when rewrite is empty string', () => {
-      const annotation = createAnnotationWithRewrite('');
-
-      render(<Annotation annotation={annotation} />);
-
-      expect(screen.queryByText('Rewrite')).not.toBeInTheDocument();
-      expect(screen.queryByTestId('rewrite-content')).not.toBeInTheDocument();
-    });
-
-    it('returns null when rewrite is whitespace only', () => {
-      const annotation = createAnnotationWithRewrite('   ');
-
-      render(<Annotation annotation={annotation} />);
-
-      expect(screen.queryByText('Rewrite')).not.toBeInTheDocument();
-      expect(screen.queryByTestId('rewrite-content')).not.toBeInTheDocument();
-    });
-  });
-
-  describe('rendering with response_override', () => {
-    it('renders Rewrite label', () => {
-      const annotation = createAnnotationWithResponseOverride('This is a rewritten response.');
-
-      render(<Annotation annotation={annotation} />);
-
-      expect(screen.getByText('Rewrite')).toBeInTheDocument();
-    });
-
-    it('renders the rewrite content', () => {
-      const annotation = createAnnotationWithResponseOverride('This is a rewritten response.');
-
-      render(<Annotation annotation={annotation} />);
-
-      expect(screen.getByTestId('rewrite-content')).toBeInTheDocument();
-      expect(screen.getByText('This is a rewritten response.')).toBeInTheDocument();
-    });
-  });
-
-  describe('rendering with rewrite field', () => {
-    it('renders Rewrite label', () => {
-      const annotation = createAnnotationWithRewrite('Direct rewrite content.');
-
-      render(<Annotation annotation={annotation} />);
-
-      expect(screen.getByText('Rewrite')).toBeInTheDocument();
-    });
-
-    it('renders the rewrite content', () => {
-      const annotation = createAnnotationWithRewrite('Direct rewrite content.');
-
-      render(<Annotation annotation={annotation} />);
-
-      expect(screen.getByTestId('rewrite-content')).toBeInTheDocument();
-      expect(screen.getByText('Direct rewrite content.')).toBeInTheDocument();
-    });
-  });
-
-  describe('rewrite precedence', () => {
-    it('uses rewrite field over response_override when both present', () => {
-      const annotation: ReviewerAnnotationEvent = {
-        thumb: 'down',
-        rewrite: 'Content from rewrite field',
-        response_override: {
-          choices: [{ message: { content: 'Content from response_override' } }],
-        },
-      };
-
-      render(<Annotation annotation={annotation} />);
-
-      expect(screen.getByText('Content from rewrite field')).toBeInTheDocument();
-      expect(screen.queryByText('Content from response_override')).not.toBeInTheDocument();
-    });
-  });
-});
diff --git a/web/packages/studio/src/components/IntakeEntryConversation/components/Annotation.tsx b/web/packages/studio/src/components/IntakeEntryConversation/components/Annotation.tsx
deleted file mode 100644
index c93a066f71..0000000000
--- a/web/packages/studio/src/components/IntakeEntryConversation/components/Annotation.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { MessageContent } from '@nemo/common/src/components/Chat/MessageContent';
-import { ReviewerAnnotationEvent } from '@nemo/sdk/generated/platform/schema';
-import { Block, Divider, Stack, Text } from '@nvidia/foundations-react-core';
-import { getRewriteFromAnnotation } from '@studio/util/entries';
-import { FC } from 'react';
-
-interface AnnotationProps {
-  /** The annotation containing potential rewrite content */
-  annotation: ReviewerAnnotationEvent;
-}
-
-/**
- * Displays annotation feedback as a footer section below an assistant message.
- *
- * When a reviewer provides a rewrite for the assistant's response, this component
- * renders it with a "Rewrite" label and markdown formatting. The footer is
- * separated from the original message by a divider.
- *
- * @param props - Component props
- * @param props.annotation - The reviewer annotation containing potential rewrite content
- * @returns A footer section with rewrite content, or null if no rewrite exists
- */
-export const Annotation: FC<AnnotationProps> = ({ annotation }) => {
-  const rewriteContent = getRewriteFromAnnotation(annotation);
-
-  if (!rewriteContent) {
-    return null;
-  }
-
-  return (
-    <Stack>
-      <Divider />
-      <Stack gap="density-xs" className="p-density-xl">
-        <Text kind="body/regular/sm" color="secondary">
-          Rewrite
-        </Text>
-        <Block className="self-start" data-testid="rewrite-content">
-          <MessageContent content={rewriteContent} renderAsMarkdown />
-        </Block>
-      </Stack>
-    </Stack>
-  );
-};
diff --git a/web/packages/studio/src/components/IntakeEntryConversation/components/AssistantResponse.test.tsx b/web/packages/studio/src/components/IntakeEntryConversation/components/AssistantResponse.test.tsx
deleted file mode 100644
index 77295a0739..0000000000
--- a/web/packages/studio/src/components/IntakeEntryConversation/components/AssistantResponse.test.tsx
+++ /dev/null
@@ -1,128 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { FlexibleMessage, ReviewerAnnotationEvent } from '@nemo/sdk/generated/platform/schema';
-import { AssistantResponse } from '@studio/components/IntakeEntryConversation/components/AssistantResponse';
-import { render, screen } from '@testing-library/react';
-
-const createAssistantMessage = (content: string): FlexibleMessage => ({
-  role: 'assistant',
-  content,
-});
-
-describe('AssistantResponse', () => {
-  describe('basic rendering (no annotation)', () => {
-    it('renders the Assistant label', () => {
-      const message = createAssistantMessage('Hello, how can I help?');
-
-      render(<AssistantResponse message={message} />);
-
-      expect(screen.getByText('Assistant')).toBeInTheDocument();
-    });
-
-    it('renders the message content', () => {
-      const message = createAssistantMessage('Hello, how can I help?');
-
-      render(<AssistantResponse message={message} />);
-
-      expect(screen.getByText('Hello, how can I help?')).toBeInTheDocument();
-    });
-
-    it('does not apply disabled background styling', () => {
-      const message = createAssistantMessage('Hello, how can I help?');
-
-      render(<AssistantResponse message={message} />);
-
-      expect(screen.getByTestId('message-content-block')).not.toHaveClass(
-        'bg-interaction-disabled'
-      );
-    });
-
-    it('does not render ThumbStatus when no annotation', () => {
-      const message = createAssistantMessage('Hello, how can I help?');
-
-      render(<AssistantResponse message={message} />);
-
-      expect(screen.queryByTestId('thumb-up-icon')).not.toBeInTheDocument();
-      expect(screen.queryByTestId('thumb-down-icon')).not.toBeInTheDocument();
-    });
-  });
-
-  describe('rendering with annotation', () => {
-    const annotationWithThumbUp: ReviewerAnnotationEvent = {
-      thumb: 'up',
-    };
-
-    const annotationWithRewrite: ReviewerAnnotationEvent = {
-      thumb: 'down',
-      response_override: {
-        choices: [{ message: { content: 'Rewritten response' } }],
-      },
-    };
-
-    it('applies disabled background styling when annotation is present', () => {
-      const message = createAssistantMessage('Original response');
-
-      render(<AssistantResponse message={message} annotation={annotationWithThumbUp} />);
-
-      expect(screen.getByTestId('message-content-block')).toHaveClass('bg-interaction-disabled');
-    });
-
-    it('renders ThumbStatus when annotation is present', () => {
-      const message = createAssistantMessage('Original response');
-
-      render(<AssistantResponse message={message} annotation={annotationWithThumbUp} />);
-
-      expect(screen.getByTestId('thumb-up-icon')).toBeInTheDocument();
-      expect(screen.getByTestId('thumb-down-icon')).toBeInTheDocument();
-    });
-
-    it('renders Annotation with rewrite content when present', () => {
-      const message = createAssistantMessage('Original response');
-
-      render(<AssistantResponse message={message} annotation={annotationWithRewrite} />);
-
-      expect(screen.getByTestId('rewrite-content')).toBeInTheDocument();
-      expect(screen.getByText('Rewritten response')).toBeInTheDocument();
-    });
-
-    it('highlights thumb based on annotation rating', () => {
-      const message = createAssistantMessage('Original response');
-
-      render(<AssistantResponse message={message} annotation={annotationWithThumbUp} />);
-
-      expect(screen.getByTestId('thumb-up-icon')).toHaveClass('text-accent-green');
-      expect(screen.getByTestId('thumb-down-icon')).not.toHaveClass('text-accent-red');
-    });
-  });
-
-  describe('message content extraction', () => {
-    it('extracts and displays string content from FlexibleMessage', () => {
-      const message = createAssistantMessage('This is a test message');
-
-      render(<AssistantResponse message={message} />);
-
-      expect(screen.getByText('This is a test message')).toBeInTheDocument();
-    });
-
-    it('handles array content format (OpenAI multi-part messages)', () => {
-      const message: FlexibleMessage = {
-        role: 'assistant',
-        content: [{ type: 'text', text: 'Multi-part content' }],
-      };
-
-      render(<AssistantResponse message={message} />);
-
-      expect(screen.getByText('Multi-part content')).toBeInTheDocument();
-    });
-
-    it('renders empty content gracefully', () => {
-      const message = createAssistantMessage('');
-
-      render(<AssistantResponse message={message} />);
-
-      expect(screen.getByText('Assistant')).toBeInTheDocument();
-      expect(screen.getByTestId('chat-message')).toBeInTheDocument();
-    });
-  });
-});
diff --git a/web/packages/studio/src/components/IntakeEntryConversation/components/AssistantResponse.tsx b/web/packages/studio/src/components/IntakeEntryConversation/components/AssistantResponse.tsx
deleted file mode 100644
index a71767be80..0000000000
--- a/web/packages/studio/src/components/IntakeEntryConversation/components/AssistantResponse.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { MessageContent } from '@nemo/common/src/components/Chat/MessageContent';
-import { getContentFromMessage, toOpenAIMessage } from '@nemo/common/src/utils/chat';
-import { FlexibleMessage, ReviewerAnnotationEvent } from '@nemo/sdk/generated/platform/schema';
-import { Block, Stack, Text } from '@nvidia/foundations-react-core';
-import { Annotation } from '@studio/components/IntakeEntryConversation/components/Annotation';
-import { ThumbStatus } from '@studio/components/IntakeEntryConversation/components/ThumbStatus';
-import { FC } from 'react';
-
-interface AssistantResponseProps {
-  /** The assistant's response message */
-  message: FlexibleMessage;
-  /** Optional reviewer annotation with feedback and potential rewrite */
-  annotation?: ReviewerAnnotationEvent;
-}
-
-/**
- * Displays an assistant response message in a chat bubble format.
- *
- * Renders the assistant's message with an "Assistant" label and styled chat bubble.
- * When an annotation is present:
- * - The message bubble has a disabled background to indicate it was reviewed
- * - An {@link Annotation} is shown with any rewrite content
- * - A {@link ThumbStatus} indicator appears below showing the rating
- *
- * @param props - Component props
- * @param props.message - The assistant's response message to display
- * @param props.annotation - Optional reviewer annotation with feedback data
- * @returns A styled assistant message with optional annotation feedback
- */
-export const AssistantResponse: FC<AssistantResponseProps> = ({ message, annotation }) => {
-  const content = getContentFromMessage(toOpenAIMessage(message));
-  return (
-    <Stack gap="density-xl">
-      <Text kind="body/regular/sm" className="text-start">
-        Assistant
-      </Text>
-      <Block
-        data-testid="chat-message"
-        data-testspeaker="assistant"
-        className="rounded-xl rounded-bl-none bg-surface-overlay overflow-hidden whitespace-pre-wrap w-auto self-start"
-      >
-        <Block
-          data-testid="message-content-block"
-          className={`p-density-xl ${annotation ? 'bg-interaction-disabled' : ''}`}
-        >
-          <MessageContent content={content} renderAsMarkdown />
-        </Block>
-
-        {annotation && <Annotation annotation={annotation} />}
-      </Block>
-      {annotation && <ThumbStatus annotation={annotation} />}
-    </Stack>
-  );
-};
diff --git a/web/packages/studio/src/components/IntakeEntryConversation/components/ChatView.tsx b/web/packages/studio/src/components/IntakeEntryConversation/components/ChatView.tsx
deleted file mode 100644
index 66a511d282..0000000000
--- a/web/packages/studio/src/components/IntakeEntryConversation/components/ChatView.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import type { Entry } from '@nemo/sdk/generated/platform/schema';
-import { Banner, Stack } from '@nvidia/foundations-react-core';
-import { AssistantResponse } from '@studio/components/IntakeEntryConversation/components/AssistantResponse';
-import { LastUserMessage } from '@studio/components/IntakeEntryConversation/components/LastUserMessage';
-import { SystemPrompt } from '@studio/components/IntakeEntryConversation/components/SystemPrompt';
-import {
-  getAnnotationFromEntry,
-  getLastInputOutputPair,
-  getSystemContextFromEntry,
-} from '@studio/util/entries';
-import { FC } from 'react';
-
-interface ChatViewProps {
-  /** The intake entry to display as a conversation */
-  entry: Entry;
-}
-
-/**
- * Renders an intake entry as a conversational chat interface.
- *
- * Parses the entry to extract and display:
- * - **System prompt**: Shown in a collapsible accordion via {@link SystemPrompt}
- * - **User message**: The last user input, right-aligned via {@link LastUserMessage}
- * - **Assistant response**: The last assistant output with annotations via {@link AssistantResponse}
- *
- * If no messages are found, displays a warning banner.
- *
- * @param props - Component props
- * @param props.entry - The intake entry containing conversation data
- * @returns A chat-style view of the conversation, or a warning if no messages exist
- */
-export const ChatView: FC<ChatViewProps> = ({ entry }) => {
-  const systemContext = getSystemContextFromEntry(entry);
-  const lastInputOutput = getLastInputOutputPair(entry);
-  const annotation = getAnnotationFromEntry(entry);
-
-  const userMessage = lastInputOutput.find((m) => m.role === 'user');
-  const assistantMessage = lastInputOutput.find((m) => m.role === 'assistant');
-
-  if (!userMessage && !assistantMessage) {
-    return (
-      <Banner kind="header" slotSubheading="No messages found in this entry" status="warning">
-        Chat History Unavailable
-      </Banner>
-    );
-  }
-
-  return (
-    <Stack gap="density-xl">
-      <SystemPrompt systemMessages={systemContext} />
-      {userMessage && <LastUserMessage message={userMessage} />}
-      {assistantMessage && <AssistantResponse message={assistantMessage} annotation={annotation} />}
-    </Stack>
-  );
-};
diff --git a/web/packages/studio/src/components/IntakeEntryConversation/components/JSONView.tsx b/web/packages/studio/src/components/IntakeEntryConversation/components/JSONView.tsx
deleted file mode 100644
index d0c08aa754..0000000000
--- a/web/packages/studio/src/components/IntakeEntryConversation/components/JSONView.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { Entry } from '@nemo/sdk/generated/platform/schema';
-import { CodeSnippet } from '@nvidia/foundations-react-core';
-import { FC } from 'react';
-
-interface JSONViewProps {
-  /** The intake entry to display as JSON */
-  entry: Entry;
-}
-
-/**
- * Displays an intake entry as formatted JSON in a code snippet.
- *
- * Renders the complete entry object as pretty-printed JSON with syntax
- * highlighting. The code snippet is collapsible and shows 20 rows by default.
- *
- * @param props - Component props
- * @param props.entry - The intake entry to serialize and display
- * @returns A collapsible code snippet with formatted JSON
- */
-export const JSONView: FC<JSONViewProps> = ({ entry }) => {
-  const jsonData = JSON.stringify(entry, null, 2);
-
-  return (
-    <CodeSnippet value={jsonData} language="json" kind="block" collapsible rows={20} defaultOpen />
-  );
-};
diff --git a/web/packages/studio/src/components/IntakeEntryConversation/components/LastUserMessage.tsx b/web/packages/studio/src/components/IntakeEntryConversation/components/LastUserMessage.tsx
deleted file mode 100644
index f287f8409a..0000000000
--- a/web/packages/studio/src/components/IntakeEntryConversation/components/LastUserMessage.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { MessageContent } from '@nemo/common/src/components/Chat/MessageContent';
-import { getContentFromMessage, toOpenAIMessage } from '@nemo/common/src/utils/chat';
-import { FlexibleMessage } from '@nemo/sdk/generated/platform/schema';
-import { Block, Stack, Text } from '@nvidia/foundations-react-core';
-import { FC } from 'react';
-
-interface LastUserMessageProps {
-  /** The user's message to display */
-  message: FlexibleMessage;
-}
-
-/**
- * Displays the user's message in a chat bubble format.
- *
- * Renders the message with a "User" label aligned to the right and a styled
- * chat bubble with rounded corners (except bottom-right). The bubble is
- * positioned on the right side to distinguish it from assistant messages.
- *
- * @param props - Component props
- * @param props.message - The user's message to display
- * @returns A right-aligned styled user message bubble
- */
-export const LastUserMessage: FC<LastUserMessageProps> = ({ message }) => {
-  const content = getContentFromMessage(toOpenAIMessage(message));
-  return (
-    <Stack gap="density-xl">
-      <Text kind="body/regular/sm" className="text-end">
-        User
-      </Text>
-      <Block
-        data-testid="chat-message"
-        data-testspeaker="user"
-        className="rounded-xl rounded-br-none bg-surface-sunken p-density-xl whitespace-pre-wrap w-auto self-end"
-      >
-        <MessageContent content={content} renderAsMarkdown />
-      </Block>
-    </Stack>
-  );
-};
diff --git a/web/packages/studio/src/components/IntakeEntryConversation/components/SystemPrompt.test.tsx b/web/packages/studio/src/components/IntakeEntryConversation/components/SystemPrompt.test.tsx
deleted file mode 100644
index 79b7da87ed..0000000000
--- a/web/packages/studio/src/components/IntakeEntryConversation/components/SystemPrompt.test.tsx
+++ /dev/null
@@ -1,87 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { FlexibleMessage } from '@nemo/sdk/generated/platform/schema';
-import { SystemPrompt } from '@studio/components/IntakeEntryConversation/components/SystemPrompt';
-import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-
-const createSystemMessage = (content: FlexibleMessage['content']): FlexibleMessage => ({
-  role: 'system',
-  content,
-});
-
-describe('SystemPrompt', () => {
-  describe('rendering', () => {
-    it('renders accordion with system content', async () => {
-      const user = userEvent.setup();
-      const messages = [createSystemMessage('You are a helpful assistant.')];
-
-      render(<SystemPrompt systemMessages={messages} />);
-
-      expect(screen.getByText('System Prompt')).toBeInTheDocument();
-
-      // Expand accordion to see content
-      await user.click(screen.getByTestId('nv-accordion-trigger'));
-      expect(screen.getByText('You are a helpful assistant.')).toBeInTheDocument();
-    });
-
-    it('displays file size in accordion trigger', () => {
-      // "Hello" = 5 bytes
-      const messages = [createSystemMessage('Hello')];
-
-      render(<SystemPrompt systemMessages={messages} />);
-
-      expect(screen.getByText('(5B)')).toBeInTheDocument();
-    });
-
-    it('combines multiple system messages with double newlines', async () => {
-      const user = userEvent.setup();
-      const messages = [
-        createSystemMessage('First message'),
-        createSystemMessage('Second message'),
-      ];
-
-      render(<SystemPrompt systemMessages={messages} />);
-
-      // Expand accordion to see content
-      await user.click(screen.getByTestId('nv-accordion-trigger'));
-
-      // Both messages should be visible
-      expect(screen.getByText(/First message/)).toBeInTheDocument();
-      expect(screen.getByText(/Second message/)).toBeInTheDocument();
-    });
-  });
-
-  describe('null conditions', () => {
-    it('returns null when systemMessages is empty array', () => {
-      render(<SystemPrompt systemMessages={[]} />);
-
-      expect(screen.queryByTestId('nv-accordion-root')).not.toBeInTheDocument();
-    });
-
-    it('returns null when content is empty string', () => {
-      const messages = [createSystemMessage('')];
-
-      render(<SystemPrompt systemMessages={messages} />);
-
-      expect(screen.queryByTestId('nv-accordion-root')).not.toBeInTheDocument();
-    });
-
-    it('returns null when content is whitespace only', () => {
-      const messages = [createSystemMessage('   ')];
-
-      render(<SystemPrompt systemMessages={messages} />);
-
-      expect(screen.queryByTestId('nv-accordion-root')).not.toBeInTheDocument();
-    });
-
-    it('returns null when content is single newline', () => {
-      const messages = [createSystemMessage('\n')];
-
-      render(<SystemPrompt systemMessages={messages} />);
-
-      expect(screen.queryByTestId('nv-accordion-root')).not.toBeInTheDocument();
-    });
-  });
-});
diff --git a/web/packages/studio/src/components/IntakeEntryConversation/components/SystemPrompt.tsx b/web/packages/studio/src/components/IntakeEntryConversation/components/SystemPrompt.tsx
deleted file mode 100644
index 5037b0f4fc..0000000000
--- a/web/packages/studio/src/components/IntakeEntryConversation/components/SystemPrompt.tsx
+++ /dev/null
@@ -1,66 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { MessageContent } from '@nemo/common/src/components/Chat/MessageContent';
-import { FlexibleMessage } from '@nemo/sdk/generated/platform/schema';
-import { Accordion, Flex } from '@nvidia/foundations-react-core';
-import { getHumanReadableFileSize, getTextSizeInBytes } from '@studio/util/files';
-import { MessageSquare } from 'lucide-react';
-import { FC } from 'react';
-
-interface SystemPromptProps {
-  /** Array of system-role messages to display */
-  systemMessages: FlexibleMessage[];
-}
-
-/**
- * Displays system prompt content in a collapsible accordion.
- *
- * Combines all system messages into a single block of content and renders it
- * within an expandable accordion. The accordion header shows:
- * - A chat message icon
- * - "System Prompt" label
- * - The combined content size (e.g., "225.89kB")
- *
- * Returns null if there's no meaningful content to display.
- *
- * @param props - Component props
- * @param props.systemMessages - Array of system-role messages to combine and display
- * @returns A collapsible accordion with system prompt content, or null if empty
- */
-export const SystemPrompt: FC<SystemPromptProps> = ({ systemMessages }) => {
-  const systemContent = systemMessages
-    .map((m) => (typeof m.content === 'string' ? m.content : ''))
-    .filter(Boolean)
-    .join('\n\n');
-
-  // Don't render if no meaningful content
-  if (!systemContent || systemContent.trim() === '') {
-    return null;
-  }
-
-  const systemPromptSize = getHumanReadableFileSize(getTextSizeInBytes(systemContent));
-
-  return (
-    <Accordion
-      multiple
-      items={[
-        {
-          value: 'system-prompt',
-          attributes: {
-            AccordionTrigger: { className: 'rounded-lg' },
-            AccordionItem: { className: 'border-b-0 bg-surface-sunken rounded-lg' },
-          },
-          slotTrigger: (
-            <Flex align="center" gap="density-xs" className="whitespace-nowrap">
-              <MessageSquare />
-              <span>System Prompt</span>
-              <span className="text-content-secondary">({systemPromptSize})</span>
-            </Flex>
-          ),
-          slotContent: <MessageContent content={systemContent} renderAsMarkdown />,
-        },
-      ]}
-    />
-  );
-};
diff --git a/web/packages/studio/src/components/IntakeEntryConversation/components/ThumbStatus.test.tsx b/web/packages/studio/src/components/IntakeEntryConversation/components/ThumbStatus.test.tsx
deleted file mode 100644
index 599c055743..0000000000
--- a/web/packages/studio/src/components/IntakeEntryConversation/components/ThumbStatus.test.tsx
+++ /dev/null
@@ -1,105 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { ReviewerAnnotationEvent } from '@nemo/sdk/generated/platform/schema';
-import { ThumbStatus } from '@studio/components/IntakeEntryConversation/components/ThumbStatus';
-import { render, screen } from '@testing-library/react';
-
-describe('ThumbStatus', () => {
-  it('renders both thumb icons', () => {
-    const annotation: ReviewerAnnotationEvent = {};
-
-    render(<ThumbStatus annotation={annotation} />);
-
-    expect(screen.getByTestId('thumb-up-icon')).toBeInTheDocument();
-    expect(screen.getByTestId('thumb-down-icon')).toBeInTheDocument();
-  });
-
-  it('highlights ThumbUp green when thumb is up', () => {
-    const annotation: ReviewerAnnotationEvent = { thumb: 'up' };
-
-    render(<ThumbStatus annotation={annotation} />);
-
-    expect(screen.getByTestId('thumb-up-icon')).toHaveClass('text-accent-green');
-    expect(screen.getByTestId('thumb-down-icon')).not.toHaveClass('text-accent-red');
-  });
-
-  it('highlights ThumbDown red when thumb is down', () => {
-    const annotation: ReviewerAnnotationEvent = { thumb: 'down' };
-
-    render(<ThumbStatus annotation={annotation} />);
-
-    expect(screen.getByTestId('thumb-up-icon')).not.toHaveClass('text-accent-green');
-    expect(screen.getByTestId('thumb-down-icon')).toHaveClass('text-accent-red');
-  });
-
-  it('does not highlight either icon when thumb is undefined', () => {
-    const annotation: ReviewerAnnotationEvent = {};
-
-    render(<ThumbStatus annotation={annotation} />);
-
-    expect(screen.getByTestId('thumb-up-icon')).not.toHaveClass('text-accent-green');
-    expect(screen.getByTestId('thumb-down-icon')).not.toHaveClass('text-accent-red');
-  });
-
-  describe('accessibility', () => {
-    it('has appropriate aria-label for thumbs up rating', () => {
-      const annotation: ReviewerAnnotationEvent = { thumb: 'up' };
-
-      render(<ThumbStatus annotation={annotation} />);
-
-      expect(screen.getByLabelText('Reviewer rating: thumbs up')).toBeInTheDocument();
-    });
-
-    it('has appropriate aria-label for thumbs down rating', () => {
-      const annotation: ReviewerAnnotationEvent = { thumb: 'down' };
-
-      render(<ThumbStatus annotation={annotation} />);
-
-      expect(screen.getByLabelText('Reviewer rating: thumbs down')).toBeInTheDocument();
-    });
-
-    it('has appropriate aria-label when no rating provided', () => {
-      const annotation: ReviewerAnnotationEvent = {};
-
-      render(<ThumbStatus annotation={annotation} />);
-
-      expect(screen.getByLabelText('Reviewer rating: no rating provided')).toBeInTheDocument();
-    });
-
-    it('uses status role for screen reader announcements', () => {
-      const annotation: ReviewerAnnotationEvent = { thumb: 'up' };
-
-      render(<ThumbStatus annotation={annotation} />);
-
-      expect(screen.getByRole('status')).toBeInTheDocument();
-    });
-
-    it('hides inactive icon from screen readers when thumbs up', () => {
-      const annotation: ReviewerAnnotationEvent = { thumb: 'up' };
-
-      render(<ThumbStatus annotation={annotation} />);
-
-      expect(screen.getByTestId('thumb-up-icon')).toHaveAttribute('aria-hidden', 'false');
-      expect(screen.getByTestId('thumb-down-icon')).toHaveAttribute('aria-hidden', 'true');
-    });
-
-    it('hides inactive icon from screen readers when thumbs down', () => {
-      const annotation: ReviewerAnnotationEvent = { thumb: 'down' };
-
-      render(<ThumbStatus annotation={annotation} />);
-
-      expect(screen.getByTestId('thumb-up-icon')).toHaveAttribute('aria-hidden', 'true');
-      expect(screen.getByTestId('thumb-down-icon')).toHaveAttribute('aria-hidden', 'false');
-    });
-
-    it('hides both icons from screen readers when no rating', () => {
-      const annotation: ReviewerAnnotationEvent = {};
-
-      render(<ThumbStatus annotation={annotation} />);
-
-      expect(screen.getByTestId('thumb-up-icon')).toHaveAttribute('aria-hidden', 'true');
-      expect(screen.getByTestId('thumb-down-icon')).toHaveAttribute('aria-hidden', 'true');
-    });
-  });
-});
diff --git a/web/packages/studio/src/components/IntakeEntryConversation/components/ThumbStatus.tsx b/web/packages/studio/src/components/IntakeEntryConversation/components/ThumbStatus.tsx
deleted file mode 100644
index e36ab6ac18..0000000000
--- a/web/packages/studio/src/components/IntakeEntryConversation/components/ThumbStatus.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { ReviewerAnnotationEvent } from '@nemo/sdk/generated/platform/schema';
-import { Block, Flex } from '@nvidia/foundations-react-core';
-import { ThumbsDown, ThumbsUp } from 'lucide-react';
-import { FC } from 'react';
-
-interface ThumbStatusProps {
-  /** The annotation containing thumb rating data */
-  annotation: ReviewerAnnotationEvent;
-}
-
-/**
- * Displays thumb up/down indicators based on the annotation's rating.
- *
- * Shows two thumb icons side by side - the active one (up or down) is highlighted
- * with an accent color (green for up, red for down).
- *
- * @param props - Component props
- * @param props.annotation - The reviewer annotation containing the thumb rating
- * @returns A pill-shaped indicator with thumb up/down icons
- */
-export const ThumbStatus: FC<ThumbStatusProps> = ({ annotation }) => {
-  const { thumb } = annotation;
-
-  // Generate accessible label based on current rating
-  const getAriaLabel = () => {
-    if (thumb === 'up') return 'Reviewer rating: thumbs up';
-    if (thumb === 'down') return 'Reviewer rating: thumbs down';
-    return 'Reviewer rating: no rating provided';
-  };
-
-  return (
-    <Flex
-      direction="row"
-      gap="density-xs"
-      paddingX="density-md"
-      paddingY="density-xs"
-      className="w-fit rounded-md border border-base"
-      aria-label={getAriaLabel()}
-      role="status"
-    >
-      <Block
-        padding="density-xs"
-        className={thumb === 'up' ? 'text-accent-green' : ''}
-        data-testid="thumb-up-icon"
-        aria-hidden={thumb !== 'up'}
-      >
-        <ThumbsUp width={16} height={16} />
-      </Block>
-      <Block
-        padding="density-xs"
-        className={thumb === 'down' ? 'text-accent-red' : ''}
-        data-testid="thumb-down-icon"
-        aria-hidden={thumb !== 'down'}
-      >
-        <ThumbsDown width={16} height={16} />
-      </Block>
-    </Flex>
-  );
-};
diff --git a/web/packages/studio/src/components/IntakeEntryConversation/index.spec.tsx b/web/packages/studio/src/components/IntakeEntryConversation/index.spec.tsx
deleted file mode 100644
index 264a45ab94..0000000000
--- a/web/packages/studio/src/components/IntakeEntryConversation/index.spec.tsx
+++ /dev/null
@@ -1,72 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { Entry } from '@nemo/sdk/generated/platform/schema';
-import { IntakeEntryConversation } from '@studio/components/IntakeEntryConversation/index';
-import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-
-const createMockEntry = (overrides: Partial<Entry> = {}): Entry =>
-  ({
-    id: 'test-entry-id',
-    data: {
-      request: {
-        messages: [
-          { role: 'system', content: 'You are a helpful assistant.' },
-          { role: 'user', content: 'What is the capital of France?' },
-        ],
-        model: 'test-model',
-      },
-      response: {
-        choices: [
-          {
-            message: {
-              role: 'assistant',
-              content: 'The capital of France is Paris.',
-            },
-            index: 0,
-            finish_reason: 'stop',
-          },
-        ],
-      },
-    },
-    context: {
-      app: 'test-app',
-      task: 'test-task',
-    },
-    ...overrides,
-  }) as Entry;
-
-describe('IntakeEntryConversation', () => {
-  it('renders conversation with user and assistant messages', () => {
-    const entry = createMockEntry();
-    render(<IntakeEntryConversation entry={entry} />);
-
-    expect(screen.getByText('Conversation')).toBeInTheDocument();
-    expect(screen.getByText('What is the capital of France?')).toBeInTheDocument();
-    expect(screen.getByText('The capital of France is Paris.')).toBeInTheDocument();
-  });
-
-  it('shows warning banner when no messages exist', () => {
-    const entry = createMockEntry({
-      data: {
-        request: { messages: [], model: 'test' },
-        response: { choices: [] },
-      },
-    });
-    render(<IntakeEntryConversation entry={entry} />);
-
-    expect(screen.getByText('Chat History Unavailable')).toBeInTheDocument();
-  });
-
-  it('toggles to JSON view when clicking JSON button', async () => {
-    const user = userEvent.setup();
-    const entry = createMockEntry();
-    render(<IntakeEntryConversation entry={entry} />);
-
-    const jsonButton = screen.getByRole('radio', { name: /json/i });
-    await user.click(jsonButton);
-
-    expect(screen.getByTestId('nv-code-snippet-root')).toBeInTheDocument();
-  });
-});
diff --git a/web/packages/studio/src/components/IntakeEntryConversation/index.tsx b/web/packages/studio/src/components/IntakeEntryConversation/index.tsx
deleted file mode 100644
index c12c1aa6d2..0000000000
--- a/web/packages/studio/src/components/IntakeEntryConversation/index.tsx
+++ /dev/null
@@ -1,100 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { Entry } from '@nemo/sdk/generated/platform/schema';
-import { Flex, Panel, SegmentedControl, Stack, Text } from '@nvidia/foundations-react-core';
-import { ChatView } from '@studio/components/IntakeEntryConversation/components/ChatView';
-import { JSONView } from '@studio/components/IntakeEntryConversation/components/JSONView';
-import { MessagesSquare } from 'lucide-react';
-import { ComponentProps, FC, useState } from 'react';
-
-/**
- * Available view modes for displaying intake entry data.
- * - `chat`: Renders the entry as an interactive chat conversation with styled bubbles
- * - `json`: Displays the raw entry data as formatted JSON in a code snippet
- */
-type ViewMode = 'chat' | 'json';
-
-/**
- * Props for the IntakeEntryConversation component.
- */
-interface IntakeEntryConversationProps {
-  /**
-   * The intake entry containing conversation data to display.
-   * Expected to contain messages with roles (system, user, assistant)
-   * and optional reviewer annotations with ratings and rewrites.
-   */
-  entry: Entry;
-  attributes?: {
-    Panel?: ComponentProps<typeof Panel>;
-  };
-}
-
-/**
- * Displays the conversation history from an intake entry with toggleable view modes.
- *
- * This component provides a panel interface for viewing intake entry data in two formats:
- *
- * **Chat View** ({@link ChatView}):
- * - System prompt in a collapsible accordion with size indicator
- * - User messages displayed as right-aligned bubbles
- * - Assistant responses as left-aligned bubbles with optional annotation overlays
- * - Thumb up/down rating indicators for reviewed responses
- *
- * **JSON View** ({@link JSONView}):
- * - Complete entry data as pretty-printed JSON
- * - Syntax highlighting and collapsible code snippet
- *
- * @example
- * ```tsx
- * import { IntakeEntryConversation } from '@studio/components/IntakeEntryConversation';
- *
- * <IntakeEntryConversation entry={selectedEntry} />
- * ```
- *
- * @param props - Component props
- * @param props.entry - The intake entry containing conversation messages and annotations
- * @returns A Panel with a segmented control to toggle between chat and JSON views
- *
- * @see {@link ChatView} for the chat bubble rendering implementation
- * @see {@link JSONView} for the JSON code snippet rendering
- */
-export const IntakeEntryConversation: FC<IntakeEntryConversationProps> = ({
-  entry,
-  attributes,
-}) => {
-  const [viewMode, setViewMode] = useState<ViewMode>('chat');
-
-  const handleViewModeChange = (value: string) => {
-    // Type guard to ensure value is a valid ViewMode
-    if (value === 'chat' || value === 'json') {
-      setViewMode(value);
-    }
-  };
-
-  return (
-    <Panel
-      elevation="high"
-      slotIcon={<MessagesSquare />}
-      slotHeading={
-        <Flex align="center" justify="between" className="flex-1">
-          <Text kind="label/bold/xl">Conversation</Text>
-          <SegmentedControl
-            size="tiny"
-            value={viewMode}
-            onValueChange={handleViewModeChange}
-            items={[
-              { value: 'chat', children: 'Chat' },
-              { value: 'json', children: 'JSON' },
-            ]}
-          />
-        </Flex>
-      }
-      {...attributes?.Panel}
-    >
-      <Stack gap="density-md" className="h-full">
-        {viewMode === 'chat' ? <ChatView entry={entry} /> : <JSONView entry={entry} />}
-      </Stack>
-    </Panel>
-  );
-};
diff --git a/web/packages/studio/src/components/IntakeEventsList/README.md b/web/packages/studio/src/components/IntakeEventsList/README.md
deleted file mode 100644
index 03ede6ebfd..0000000000
--- a/web/packages/studio/src/components/IntakeEventsList/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# IntakeEventsList Component
-
-Displays a timeline-based activity feed of events (annotations, actions, feedback) for an intake entry.
-
-## Overview
-
-This component renders all events associated with an intake entry using a **timeline layout** with:
-
-- **Timeline icons** with connecting vertical lines
-- **Actor and action text** in "{Actor} {action verb}" format
-- **Relative timestamps**
-- **Overflow menu** for actions (e.g., Delete)
-- **Remaining data** displaying event data based on event type
-
-## Event Types
-
-| Event Type            | Icon         | Action Text          |
-| --------------------- | ------------ | -------------------- |
-| `reviewer_annotation` | Pencil       | "annotated."         |
-| `user_action`         | AccountCheck | "made an action."    |
-| `user_feedback`       | ChatNew      | "provided feedback." |
diff --git a/web/packages/studio/src/components/IntakeEventsList/components/EventListItem.test.tsx b/web/packages/studio/src/components/IntakeEventsList/components/EventListItem.test.tsx
deleted file mode 100644
index c06463f523..0000000000
--- a/web/packages/studio/src/components/IntakeEventsList/components/EventListItem.test.tsx
+++ /dev/null
@@ -1,223 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import type {
-  Entry,
-  ReviewerAnnotationEvent,
-  UserActionEvent,
-  UserFeedbackEvent,
-} from '@nemo/sdk/generated/platform/schema';
-import { EventListItem } from '@studio/components/IntakeEventsList/components/EventListItem';
-import { TestProviders } from '@studio/tests/util/TestProviders';
-import { render, screen } from '@testing-library/react';
-
-type EntryEventItem = NonNullable<Entry['events']>[number];
-
-describe('EventListItem', () => {
-  describe('event type routing', () => {
-    it('renders UserFeedbackEvent for user_feedback event type', () => {
-      const event: UserFeedbackEvent = {
-        id: 'event-1',
-        event_type: 'user_feedback',
-        created_at: '2024-01-15T10:30:00Z',
-        created_by: { name: 'User' },
-        thumb: 'up',
-      };
-
-      render(
-        <TestProviders>
-          <EventListItem event={event} isLast={false} />
-        </TestProviders>
-      );
-
-      expect(screen.getByTestId('activity-feed-item-user-feedback')).toBeInTheDocument();
-      expect(screen.getByText('provided feedback')).toBeInTheDocument();
-    });
-
-    it('renders UserActionEvent for user_action event type', () => {
-      const event: UserActionEvent = {
-        id: 'event-2',
-        event_type: 'user_action',
-        created_at: '2024-01-15T10:30:00Z',
-        created_by: { name: 'User' },
-        action: 'button_clicked',
-      };
-
-      render(
-        <TestProviders>
-          <EventListItem event={event} isLast={false} />
-        </TestProviders>
-      );
-
-      expect(screen.getByTestId('activity-feed-item-user-action')).toBeInTheDocument();
-      expect(screen.getByText('made an action')).toBeInTheDocument();
-    });
-
-    it('renders ReviewerAnnotationEvent for reviewer_annotation event type', () => {
-      const event: ReviewerAnnotationEvent = {
-        id: 'event-3',
-        event_type: 'reviewer_annotation',
-        created_at: '2024-01-15T10:30:00Z',
-        created_by: { name: 'Reviewer' },
-        rating: 5,
-      };
-
-      render(
-        <TestProviders>
-          <EventListItem event={event} isLast={false} />
-        </TestProviders>
-      );
-
-      expect(screen.getByTestId('activity-feed-item-reviewer-annotation')).toBeInTheDocument();
-      expect(screen.getByText('annotated')).toBeInTheDocument();
-    });
-
-    it('returns null for unsupported event types', () => {
-      // Create an event with an unknown type
-      const event = {
-        id: 'event-4',
-        event_type: 'unknown_type',
-        created_at: '2024-01-15T10:30:00Z',
-      } as unknown as EntryEventItem;
-
-      render(
-        <TestProviders>
-          <EventListItem event={event} isLast={false} />
-        </TestProviders>
-      );
-
-      // Should not render any of the event type components
-      expect(screen.queryByTestId('activity-feed-item-user-feedback')).not.toBeInTheDocument();
-      expect(screen.queryByTestId('activity-feed-item-user-action')).not.toBeInTheDocument();
-      expect(
-        screen.queryByTestId('activity-feed-item-reviewer-annotation')
-      ).not.toBeInTheDocument();
-    });
-  });
-
-  describe('onDelete handling', () => {
-    it('passes onDelete to child component when event has id', () => {
-      const onDelete = vi.fn();
-      const event: UserFeedbackEvent = {
-        id: 'event-1',
-        event_type: 'user_feedback',
-        created_at: '2024-01-15T10:30:00Z',
-        created_by: { name: 'User' },
-      };
-
-      render(
-        <TestProviders>
-          <EventListItem event={event} isLast={false} onDelete={onDelete} />
-        </TestProviders>
-      );
-
-      // The delete menu should be present
-      expect(screen.getByLabelText('Event actions')).toBeInTheDocument();
-    });
-
-    it('does not pass onDelete to child component when event has no id', () => {
-      const onDelete = vi.fn();
-      const event: UserFeedbackEvent = {
-        // No id
-        event_type: 'user_feedback',
-        created_at: '2024-01-15T10:30:00Z',
-        created_by: { name: 'User' },
-      };
-
-      render(
-        <TestProviders>
-          <EventListItem event={event} isLast={false} onDelete={onDelete} />
-        </TestProviders>
-      );
-
-      // The delete menu should not be present
-      expect(screen.queryByLabelText('Event actions')).not.toBeInTheDocument();
-    });
-
-    it('does not pass onDelete when onDelete prop is undefined', () => {
-      const event: UserFeedbackEvent = {
-        id: 'event-1',
-        event_type: 'user_feedback',
-        created_at: '2024-01-15T10:30:00Z',
-        created_by: { name: 'User' },
-      };
-
-      render(
-        <TestProviders>
-          <EventListItem event={event} isLast={false} />
-        </TestProviders>
-      );
-
-      // The delete menu should not be present
-      expect(screen.queryByLabelText('Event actions')).not.toBeInTheDocument();
-    });
-
-    it('calls onDelete with event id when delete is triggered', async () => {
-      const { default: userEvent } = await import('@testing-library/user-event');
-      const user = userEvent.setup();
-      const onDelete = vi.fn();
-      const event: UserFeedbackEvent = {
-        id: 'event-123',
-        event_type: 'user_feedback',
-        created_at: '2024-01-15T10:30:00Z',
-        created_by: { name: 'User' },
-      };
-
-      render(
-        <TestProviders>
-          <EventListItem event={event} isLast={false} onDelete={onDelete} />
-        </TestProviders>
-      );
-
-      const menuButton = screen.getByLabelText('Event actions');
-      await user.click(menuButton);
-
-      const deleteOption = await screen.findByText('Delete Annotation');
-      await user.click(deleteOption);
-
-      expect(onDelete).toHaveBeenCalledWith('event-123');
-    });
-  });
-
-  describe('isLast prop', () => {
-    it('passes isLast=false to child component', () => {
-      const event: UserFeedbackEvent = {
-        id: 'event-1',
-        event_type: 'user_feedback',
-        created_at: '2024-01-15T10:30:00Z',
-        created_by: { name: 'User' },
-      };
-
-      render(
-        <TestProviders>
-          <EventListItem event={event} isLast={false} />
-        </TestProviders>
-      );
-
-      // Connecting line should be visible
-      expect(
-        screen.getByTestId('activity-feed-item-user-feedback-connecting-line')
-      ).toBeInTheDocument();
-    });
-
-    it('passes isLast=true to child component', () => {
-      const event: UserFeedbackEvent = {
-        id: 'event-1',
-        event_type: 'user_feedback',
-        created_at: '2024-01-15T10:30:00Z',
-        created_by: { name: 'User' },
-      };
-
-      render(
-        <TestProviders>
-          <EventListItem event={event} isLast />
-        </TestProviders>
-      );
-
-      // Connecting line should not be visible
-      expect(
-        screen.queryByTestId('activity-feed-item-user-feedback-connecting-line')
-      ).not.toBeInTheDocument();
-    });
-  });
-});
diff --git a/web/packages/studio/src/components/IntakeEventsList/components/EventListItem.tsx b/web/packages/studio/src/components/IntakeEventsList/components/EventListItem.tsx
deleted file mode 100644
index b5803782a6..0000000000
--- a/web/packages/studio/src/components/IntakeEventsList/components/EventListItem.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import type { Entry } from '@nemo/sdk/generated/platform/schema';
-import { ReviewerAnnotationEvent } from '@studio/components/IntakeEventsList/components/ReviewerAnnotationEvent';
-import { UserActionEvent } from '@studio/components/IntakeEventsList/components/UserActionEvent';
-import { UserFeedbackEvent } from '@studio/components/IntakeEventsList/components/UserFeedbackEvent';
-import { FC } from 'react';
-
-type EntryEventItem = NonNullable<Entry['events']>[number];
-
-interface EventListItemProps {
-  /** The event to display */
-  event: EntryEventItem;
-  /** Whether this is the last item in the list (hides the connecting line) */
-  isLast: boolean;
-  /** Callback when delete action is triggered */
-  onDelete?: (eventId: string) => void;
-}
-
-/**
- * Maps an event to the appropriate event type component based on event_type.
- * Acts as a simple routing component that delegates rendering to specialized components.
- */
-export const EventListItem: FC<EventListItemProps> = ({ event, isLast, onDelete }) => {
-  // Wrap onDelete in closure so child components don't need to know about event id
-  const handleDelete = event.id && onDelete ? () => onDelete(event.id!) : undefined;
-
-  switch (event.event_type) {
-    case 'user_feedback':
-      return <UserFeedbackEvent event={event} isLast={isLast} onDelete={handleDelete} />;
-    case 'user_action':
-      return <UserActionEvent event={event} isLast={isLast} onDelete={handleDelete} />;
-    case 'reviewer_annotation':
-      return <ReviewerAnnotationEvent event={event} isLast={isLast} onDelete={handleDelete} />;
-    default:
-      // Don't render unsupported event types
-      return null;
-  }
-};
diff --git a/web/packages/studio/src/components/IntakeEventsList/components/EventListItemLayout.test.tsx b/web/packages/studio/src/components/IntakeEventsList/components/EventListItemLayout.test.tsx
deleted file mode 100644
index 08d423dbce..0000000000
--- a/web/packages/studio/src/components/IntakeEventsList/components/EventListItemLayout.test.tsx
+++ /dev/null
@@ -1,170 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { EventListItemLayout } from '@studio/components/IntakeEventsList/components/EventListItemLayout';
-import { TestProviders } from '@studio/tests/util/TestProviders';
-import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-
-describe('EventListItemLayout', () => {
-  const defaultProps = {
-    icon: <span data-testid="test-icon">Icon</span>,
-    slotHeader: <span data-testid="header-content">Header Content</span>,
-    isLast: false,
-    children: <div data-testid="content">Content</div>,
-  };
-
-  it('renders the icon', () => {
-    render(
-      <TestProviders>
-        <EventListItemLayout {...defaultProps} />
-      </TestProviders>
-    );
-
-    expect(screen.getByTestId('test-icon')).toBeInTheDocument();
-  });
-
-  it('renders the header content', () => {
-    render(
-      <TestProviders>
-        <EventListItemLayout {...defaultProps} />
-      </TestProviders>
-    );
-
-    expect(screen.getByTestId('header-content')).toBeInTheDocument();
-  });
-
-  it('renders children content', () => {
-    render(
-      <TestProviders>
-        <EventListItemLayout {...defaultProps} />
-      </TestProviders>
-    );
-
-    expect(screen.getByTestId('content')).toBeInTheDocument();
-  });
-
-  it('renders timestamp when provided', () => {
-    const timestamp = '2024-01-15T10:30:00Z';
-
-    render(
-      <TestProviders>
-        <EventListItemLayout {...defaultProps} timestamp={timestamp} />
-      </TestProviders>
-    );
-
-    // RelativeTime component will render something like "X days ago"
-    // We check for the time element it creates
-    expect(screen.getByRole('time')).toBeInTheDocument();
-  });
-
-  it('does not render timestamp when not provided', () => {
-    render(
-      <TestProviders>
-        <EventListItemLayout {...defaultProps} />
-      </TestProviders>
-    );
-
-    expect(screen.queryByRole('time')).not.toBeInTheDocument();
-  });
-
-  it('renders connecting line when not last item', () => {
-    render(
-      <TestProviders>
-        <EventListItemLayout {...defaultProps} isLast={false} />
-      </TestProviders>
-    );
-
-    // Check for the connecting line element
-    expect(screen.getByTestId('activity-feed-item-event-connecting-line')).toBeInTheDocument();
-  });
-
-  it('hides connecting line when last item', () => {
-    render(
-      <TestProviders>
-        <EventListItemLayout {...defaultProps} isLast />
-      </TestProviders>
-    );
-
-    // The connecting line should not be rendered
-    expect(
-      screen.queryByTestId('activity-feed-item-event-connecting-line')
-    ).not.toBeInTheDocument();
-  });
-
-  it('renders delete menu when onDelete is provided', async () => {
-    const onDelete = vi.fn();
-
-    render(
-      <TestProviders>
-        <EventListItemLayout {...defaultProps} onDelete={onDelete} />
-      </TestProviders>
-    );
-
-    // Find the menu button by aria-label
-    const menuButton = screen.getByLabelText('Event actions');
-    expect(menuButton).toBeInTheDocument();
-  });
-
-  it('does not render delete menu when onDelete is not provided', () => {
-    render(
-      <TestProviders>
-        <EventListItemLayout {...defaultProps} />
-      </TestProviders>
-    );
-
-    expect(screen.queryByLabelText('Event actions')).not.toBeInTheDocument();
-  });
-
-  it('calls onDelete when delete option is clicked', async () => {
-    const user = userEvent.setup();
-    const onDelete = vi.fn();
-
-    render(
-      <TestProviders>
-        <EventListItemLayout {...defaultProps} onDelete={onDelete} />
-      </TestProviders>
-    );
-
-    // Click the menu button
-    const menuButton = screen.getByLabelText('Event actions');
-    await user.click(menuButton);
-
-    // Click the delete option
-    const deleteOption = await screen.findByText('Delete Annotation');
-    await user.click(deleteOption);
-
-    expect(onDelete).toHaveBeenCalledTimes(1);
-  });
-
-  it('applies custom testIdSuffix', () => {
-    render(
-      <TestProviders>
-        <EventListItemLayout {...defaultProps} testIdSuffix="custom-event" />
-      </TestProviders>
-    );
-
-    expect(screen.getByTestId('activity-feed-item-custom-event')).toBeInTheDocument();
-  });
-
-  it('uses default testIdSuffix when not provided', () => {
-    render(
-      <TestProviders>
-        <EventListItemLayout {...defaultProps} />
-      </TestProviders>
-    );
-
-    expect(screen.getByTestId('activity-feed-item-event')).toBeInTheDocument();
-  });
-
-  it('does not render content wrapper when children is null', () => {
-    render(
-      <TestProviders>
-        <EventListItemLayout {...defaultProps} children={null} />
-      </TestProviders>
-    );
-
-    // The content wrapper should not be present
-    expect(screen.queryByTestId('activity-feed-item-event-content')).not.toBeInTheDocument();
-  });
-});
diff --git a/web/packages/studio/src/components/IntakeEventsList/components/EventListItemLayout.tsx b/web/packages/studio/src/components/IntakeEventsList/components/EventListItemLayout.tsx
deleted file mode 100644
index c52485bb7f..0000000000
--- a/web/packages/studio/src/components/IntakeEventsList/components/EventListItemLayout.tsx
+++ /dev/null
@@ -1,104 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { RelativeTime } from '@nemo/common/src/components/RelativeTime';
-import { Dropdown, Flex, Stack, Text } from '@nvidia/foundations-react-core';
-import { EllipsisVertical, Trash } from 'lucide-react';
-import { FC, ReactNode } from 'react';
-
-interface EventListItemLayoutProps {
-  /** Icon to display in the timeline circle */
-  icon: ReactNode;
-  /** Content for the header row (actor name, action text, etc.) */
-  slotHeader: ReactNode;
-  /** ISO timestamp for the event */
-  timestamp?: string;
-  /** Whether this is the last item in the list (hides the connecting line) */
-  isLast: boolean;
-  /** Callback when delete action is triggered */
-  onDelete?: () => void;
-  /** Content slot for event-specific rendering */
-  children: ReactNode;
-  /** Test ID suffix for the container */
-  testIdSuffix?: string;
-}
-
-/**
- * Shared layout component for timeline events.
- * Renders the timeline structure (icon circle, connecting line) and header row.
- * Event-specific content is passed via children.
- */
-export const EventListItemLayout: FC<EventListItemLayoutProps> = ({
-  icon,
-  slotHeader,
-  timestamp,
-  isLast,
-  onDelete,
-  children,
-  testIdSuffix,
-}) => {
-  return (
-    <Flex gap="6" className="w-full" data-testid={`activity-feed-item-${testIdSuffix ?? 'event'}`}>
-      {/* Timeline column - self-stretch ensures it fills the full height including content padding */}
-      <div className="flex flex-col items-center w-8 shrink-0 self-stretch">
-        {/* Icon circle */}
-        <div className="flex items-center justify-center p-2 rounded-full bg-gray-700">{icon}</div>
-        {/* Connecting line */}
-        {!isLast && (
-          <div
-            className="flex-1 w-[2px] bg-gray-700 min-h-[24px]"
-            data-testid={`activity-feed-item-${testIdSuffix ?? 'event'}-connecting-line`}
-          />
-        )}
-      </div>
-
-      {/* Content column */}
-      <Stack gap="density-xs" className="flex-1 pb-6">
-        {/* Header row - h-8 matches the icon circle height (32px) for alignment */}
-        <Flex align="center" className="w-full h-8">
-          {/* Left side: header content from consumer */}
-          <Flex gap="density-xs" align="center" wrap="wrap" className="flex-1">
-            {slotHeader}
-          </Flex>
-
-          {/* Right side: timestamp + menu */}
-          <Flex gap="density-sm" align="center" className="shrink-0">
-            {timestamp && (
-              <Text color="secondary" className="text-right">
-                <RelativeTime datetime={timestamp} />
-              </Text>
-            )}
-
-            {/* Overflow menu */}
-            {onDelete && (
-              <Dropdown
-                items={[
-                  {
-                    children: 'Delete Annotation',
-                    slotLeft: <Trash size="16" />,
-                    onSelect: onDelete,
-                    danger: true,
-                  },
-                ]}
-                align="end"
-                showChevron={false}
-              >
-                <EllipsisVertical size="16" aria-label="Event actions" />
-              </Dropdown>
-            )}
-          </Flex>
-        </Flex>
-
-        {/* Content slot - only rendered if there's content */}
-        {children && (
-          <div
-            className="bg-gray-900 rounded-lg p-3 w-full"
-            data-testid={`activity-feed-item-${testIdSuffix ?? 'event'}-content`}
-          >
-            {children}
-          </div>
-        )}
-      </Stack>
-    </Flex>
-  );
-};
diff --git a/web/packages/studio/src/components/IntakeEventsList/components/ReviewerAnnotationEvent.test.tsx b/web/packages/studio/src/components/IntakeEventsList/components/ReviewerAnnotationEvent.test.tsx
deleted file mode 100644
index ea10ae6eb8..0000000000
--- a/web/packages/studio/src/components/IntakeEventsList/components/ReviewerAnnotationEvent.test.tsx
+++ /dev/null
@@ -1,243 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import type { ReviewerAnnotationEvent as ReviewerAnnotationEventType } from '@nemo/sdk/generated/platform/schema';
-import { ReviewerAnnotationEvent } from '@studio/components/IntakeEventsList/components/ReviewerAnnotationEvent';
-import { TestProviders } from '@studio/tests/util/TestProviders';
-import { render, screen } from '@testing-library/react';
-
-describe('ReviewerAnnotationEvent', () => {
-  const baseEvent: ReviewerAnnotationEventType = {
-    id: 'event-1',
-    event_type: 'reviewer_annotation',
-    created_at: '2024-01-15T10:30:00Z',
-    created_by: { name: 'John Doe' },
-  };
-
-  it('renders the annotated action text', () => {
-    render(
-      <TestProviders>
-        <ReviewerAnnotationEvent event={baseEvent} isLast={false} />
-      </TestProviders>
-    );
-
-    expect(screen.getByText('annotated')).toBeInTheDocument();
-  });
-
-  it('renders the actor name from created_by string', () => {
-    render(
-      <TestProviders>
-        <ReviewerAnnotationEvent event={baseEvent} isLast={false} />
-      </TestProviders>
-    );
-
-    expect(screen.getByText('John Doe')).toBeInTheDocument();
-  });
-
-  it('renders actor name from created_by object with name property', () => {
-    const event: ReviewerAnnotationEventType = {
-      ...baseEvent,
-      created_by: { name: 'Jane Smith' },
-    };
-
-    render(
-      <TestProviders>
-        <ReviewerAnnotationEvent event={event} isLast={false} />
-      </TestProviders>
-    );
-
-    expect(screen.getByText('Jane Smith')).toBeInTheDocument();
-  });
-
-  it('renders thumbs up tag when thumb is "up"', () => {
-    const event: ReviewerAnnotationEventType = {
-      ...baseEvent,
-      thumb: 'up',
-    };
-
-    render(
-      <TestProviders>
-        <ReviewerAnnotationEvent event={event} isLast={false} />
-      </TestProviders>
-    );
-
-    // The tag should have green color indicator
-    const tag = screen.getByTestId('nv-tag-root');
-    expect(tag).toHaveClass('nv-tag--color-green');
-  });
-
-  it('renders thumbs down tag when thumb is "down"', () => {
-    const event: ReviewerAnnotationEventType = {
-      ...baseEvent,
-      thumb: 'down',
-    };
-
-    render(
-      <TestProviders>
-        <ReviewerAnnotationEvent event={event} isLast={false} />
-      </TestProviders>
-    );
-
-    // The tag should have red color indicator
-    const tag = screen.getByTestId('nv-tag-root');
-    expect(tag).toHaveClass('nv-tag--color-red');
-  });
-
-  it('does not render thumb tag when thumb is not provided', () => {
-    render(
-      <TestProviders>
-        <ReviewerAnnotationEvent event={baseEvent} isLast={false} />
-      </TestProviders>
-    );
-
-    expect(screen.queryByTestId('nv-tag-root')).not.toBeInTheDocument();
-  });
-
-  it('renders rating when provided', () => {
-    const event: ReviewerAnnotationEventType = {
-      ...baseEvent,
-      rating: 4,
-    };
-
-    render(
-      <TestProviders>
-        <ReviewerAnnotationEvent event={event} isLast={false} />
-      </TestProviders>
-    );
-
-    expect(screen.getByText('Rating')).toBeInTheDocument();
-    expect(screen.getByText('4')).toBeInTheDocument();
-  });
-
-  it('renders rating value of 0', () => {
-    const event: ReviewerAnnotationEventType = {
-      ...baseEvent,
-      rating: 0,
-    };
-
-    render(
-      <TestProviders>
-        <ReviewerAnnotationEvent event={event} isLast={false} />
-      </TestProviders>
-    );
-
-    expect(screen.getByText('Rating')).toBeInTheDocument();
-    expect(screen.getByText('0')).toBeInTheDocument();
-  });
-
-  it('renders rewrite when provided', () => {
-    const event: ReviewerAnnotationEventType = {
-      ...baseEvent,
-      rewrite: 'This is a better response.',
-    };
-
-    render(
-      <TestProviders>
-        <ReviewerAnnotationEvent event={event} isLast={false} />
-      </TestProviders>
-    );
-
-    expect(screen.getByText('Rewrite')).toBeInTheDocument();
-    expect(screen.getByText('This is a better response.')).toBeInTheDocument();
-  });
-
-  it('renders opinion when provided', () => {
-    const event: ReviewerAnnotationEventType = {
-      ...baseEvent,
-      opinion: 'The response needs improvement.',
-    };
-
-    render(
-      <TestProviders>
-        <ReviewerAnnotationEvent event={event} isLast={false} />
-      </TestProviders>
-    );
-
-    expect(screen.getByText('Opinion')).toBeInTheDocument();
-    expect(screen.getByText('The response needs improvement.')).toBeInTheDocument();
-  });
-
-  it('renders categories when provided', () => {
-    const event: ReviewerAnnotationEventType = {
-      ...baseEvent,
-      categories: { helpfulness: 5, accuracy: 4 },
-    };
-
-    render(
-      <TestProviders>
-        <ReviewerAnnotationEvent event={event} isLast={false} />
-      </TestProviders>
-    );
-
-    expect(screen.getByText('Categories')).toBeInTheDocument();
-    // Categories are rendered as JSON
-    expect(screen.getByText(/"helpfulness": 5/)).toBeInTheDocument();
-    expect(screen.getByText(/"accuracy": 4/)).toBeInTheDocument();
-  });
-
-  it('does not render categories when empty object', () => {
-    const event: ReviewerAnnotationEventType = {
-      ...baseEvent,
-      categories: {},
-    };
-
-    render(
-      <TestProviders>
-        <ReviewerAnnotationEvent event={event} isLast={false} />
-      </TestProviders>
-    );
-
-    expect(screen.queryByText('Categories')).not.toBeInTheDocument();
-  });
-
-  it('renders response_override when provided', () => {
-    const event: ReviewerAnnotationEventType = {
-      ...baseEvent,
-      response_override: {
-        choices: [{ message: { role: 'assistant', content: 'Corrected response' } }],
-      },
-    };
-
-    render(
-      <TestProviders>
-        <ReviewerAnnotationEvent event={event} isLast={false} />
-      </TestProviders>
-    );
-
-    expect(screen.getByText('Override')).toBeInTheDocument();
-  });
-
-  it('does not render response_override when empty object', () => {
-    const event: ReviewerAnnotationEventType = {
-      ...baseEvent,
-      response_override: {},
-    };
-
-    render(
-      <TestProviders>
-        <ReviewerAnnotationEvent event={event} isLast={false} />
-      </TestProviders>
-    );
-
-    expect(screen.queryByText('Override')).not.toBeInTheDocument();
-  });
-
-  it('renders multiple content sections', () => {
-    const event: ReviewerAnnotationEventType = {
-      ...baseEvent,
-      rating: 3,
-      opinion: 'Needs work',
-      rewrite: 'Better version',
-    };
-
-    render(
-      <TestProviders>
-        <ReviewerAnnotationEvent event={event} isLast={false} />
-      </TestProviders>
-    );
-
-    expect(screen.getByText('Rating')).toBeInTheDocument();
-    expect(screen.getByText('Opinion')).toBeInTheDocument();
-    expect(screen.getByText('Rewrite')).toBeInTheDocument();
-  });
-});
diff --git a/web/packages/studio/src/components/IntakeEventsList/components/ReviewerAnnotationEvent.tsx b/web/packages/studio/src/components/IntakeEventsList/components/ReviewerAnnotationEvent.tsx
deleted file mode 100644
index 77265768fe..0000000000
--- a/web/packages/studio/src/components/IntakeEventsList/components/ReviewerAnnotationEvent.tsx
+++ /dev/null
@@ -1,114 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { ReviewerAnnotationEvent as ReviewerAnnotationEventType } from '@nemo/sdk/generated/platform/schema';
-import { CodeSnippet, Flex, Stack, Text } from '@nvidia/foundations-react-core';
-import { EventListItemLayout } from '@studio/components/IntakeEventsList/components/EventListItemLayout';
-import { ThumbTag } from '@studio/components/IntakeEventsList/components/ThumbTag';
-import { formatEventCreatedBy } from '@studio/util/entries';
-import { Pencil } from 'lucide-react';
-import type { FC, ReactNode } from 'react';
-
-interface ReviewerAnnotationEventProps {
-  /** The reviewer annotation event to display */
-  event: ReviewerAnnotationEventType;
-  /** Whether this is the last item in the list */
-  isLast: boolean;
-  /** Callback when delete action is triggered (event id handled by parent) */
-  onDelete?: () => void;
-}
-
-/**
- * Renders a reviewer_annotation event in the timeline.
- * Displays thumb in header, and rating/rewrite/opinion/categories/response_override as label-value pairs.
- */
-export const ReviewerAnnotationEvent: FC<ReviewerAnnotationEventProps> = ({
-  event,
-  isLast,
-  onDelete,
-}) => {
-  const actor = formatEventCreatedBy(event.created_by);
-
-  // Build content items array - only render content section if there are items
-  const contentItems: ReactNode[] = [];
-
-  if (typeof event.rating === 'number') {
-    contentItems.push(
-      <Stack key="rating" gap="density-md">
-        <Text kind="label/regular/sm" className="text-secondary">
-          Rating
-        </Text>
-        <Text kind="label/semibold/md">{event.rating}</Text>
-      </Stack>
-    );
-  }
-
-  if (event.rewrite) {
-    contentItems.push(
-      <Stack key="rewrite" gap="density-md">
-        <Text kind="label/regular/sm" className="text-secondary">
-          Rewrite
-        </Text>
-        <Text kind="body/semibold/md">{event.rewrite}</Text>
-      </Stack>
-    );
-  }
-
-  if (event.opinion) {
-    contentItems.push(
-      <Stack key="opinion" gap="density-md">
-        <Text kind="label/regular/sm" className="text-secondary">
-          Opinion
-        </Text>
-        <Text kind="body/semibold/md">{event.opinion}</Text>
-      </Stack>
-    );
-  }
-
-  if (event.categories && Object.keys(event.categories).length > 0) {
-    contentItems.push(
-      <Stack key="categories" gap="density-md">
-        <Text kind="label/regular/sm" className="text-secondary">
-          Categories
-        </Text>
-        <pre className="text-xs overflow-x-auto w-0 min-w-full">
-          {JSON.stringify(event.categories, null, 2)}
-        </pre>
-      </Stack>
-    );
-  }
-
-  if (event.response_override && Object.keys(event.response_override).length > 0) {
-    contentItems.push(
-      <Stack key="override" gap="density-md">
-        <Text kind="label/regular/sm" className="text-secondary">
-          Override
-        </Text>
-        <div className="w-0 min-w-full overflow-x-auto">
-          <CodeSnippet value={JSON.stringify(event.response_override, null, 2)} language="json" />
-        </div>
-      </Stack>
-    );
-  }
-
-  return (
-    <EventListItemLayout
-      icon={<Pencil size="16" color="white" />}
-      slotHeader={
-        <Flex gap="density-sm" align="center">
-          {event.thumb && <ThumbTag thumb={event.thumb} />}
-          <Text kind="label/semibold/sm">{actor}</Text>
-          <Text kind="label/regular/sm" className="text-secondary">
-            annotated
-          </Text>
-        </Flex>
-      }
-      timestamp={event.created_at}
-      isLast={isLast}
-      onDelete={onDelete}
-      testIdSuffix="reviewer-annotation"
-    >
-      {contentItems.length > 0 ? <Stack gap="density-lg">{contentItems}</Stack> : null}
-    </EventListItemLayout>
-  );
-};
diff --git a/web/packages/studio/src/components/IntakeEventsList/components/ThumbTag.test.tsx b/web/packages/studio/src/components/IntakeEventsList/components/ThumbTag.test.tsx
deleted file mode 100644
index 92da8ceba7..0000000000
--- a/web/packages/studio/src/components/IntakeEventsList/components/ThumbTag.test.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { ThumbTag } from '@studio/components/IntakeEventsList/components/ThumbTag';
-import { render, screen } from '@testing-library/react';
-
-describe('ThumbTag', () => {
-  it('renders "Positive" text when thumb is up', () => {
-    render(<ThumbTag thumb="up" />);
-
-    expect(screen.getByText('Positive')).toBeInTheDocument();
-  });
-
-  it('renders "Negative" text when thumb is down', () => {
-    render(<ThumbTag thumb="down" />);
-
-    expect(screen.getByText('Negative')).toBeInTheDocument();
-  });
-
-  it('renders green tag when thumb is up', () => {
-    render(<ThumbTag thumb="up" />);
-
-    const tag = screen.getByTestId('nv-tag-root');
-    expect(tag).toHaveClass('nv-tag--color-green');
-  });
-
-  it('renders red tag when thumb is down', () => {
-    render(<ThumbTag thumb="down" />);
-
-    const tag = screen.getByTestId('nv-tag-root');
-    expect(tag).toHaveClass('nv-tag--color-red');
-  });
-});
diff --git a/web/packages/studio/src/components/IntakeEventsList/components/ThumbTag.tsx b/web/packages/studio/src/components/IntakeEventsList/components/ThumbTag.tsx
deleted file mode 100644
index 3b04af181f..0000000000
--- a/web/packages/studio/src/components/IntakeEventsList/components/ThumbTag.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { ThumbDirection } from '@nemo/sdk/generated/platform/schema';
-import { Tag } from '@nvidia/foundations-react-core';
-import { ThumbsDown, ThumbsUp } from 'lucide-react';
-import { FC } from 'react';
-
-export interface ThumbTagProps {
-  thumb: ThumbDirection;
-}
-
-export const ThumbTag: FC<ThumbTagProps> = ({ thumb }) => {
-  return (
-    <Tag color={thumb === 'up' ? 'green' : 'red'} readOnly>
-      {thumb === 'up' ? (
-        <>
-          <ThumbsUp size="12" /> Positive
-        </>
-      ) : (
-        <>
-          <ThumbsDown size="12" /> Negative
-        </>
-      )}
-    </Tag>
-  );
-};
diff --git a/web/packages/studio/src/components/IntakeEventsList/components/UserActionEvent.test.tsx b/web/packages/studio/src/components/IntakeEventsList/components/UserActionEvent.test.tsx
deleted file mode 100644
index d8588381f7..0000000000
--- a/web/packages/studio/src/components/IntakeEventsList/components/UserActionEvent.test.tsx
+++ /dev/null
@@ -1,150 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { UserActionEvent as UserActionEventType } from '@nemo/sdk/generated/platform/schema';
-import { UserActionEvent } from '@studio/components/IntakeEventsList/components/UserActionEvent';
-import { TestProviders } from '@studio/tests/util/TestProviders';
-import { render, screen } from '@testing-library/react';
-
-describe('UserActionEvent', () => {
-  const baseEvent: UserActionEventType = {
-    id: 'event-1',
-    event_type: 'user_action',
-    created_at: '2024-01-15T10:30:00Z',
-    created_by: { name: 'Bob Smith' },
-    action: 'code_copied',
-  };
-
-  it('renders the made an action text', () => {
-    render(
-      <TestProviders>
-        <UserActionEvent event={baseEvent} isLast={false} />
-      </TestProviders>
-    );
-
-    expect(screen.getByText('made an action')).toBeInTheDocument();
-  });
-
-  it('renders the actor name from created_by string', () => {
-    render(
-      <TestProviders>
-        <UserActionEvent event={baseEvent} isLast={false} />
-      </TestProviders>
-    );
-
-    expect(screen.getByText('Bob Smith')).toBeInTheDocument();
-  });
-
-  it('renders actor name from created_by object with name', () => {
-    const event: UserActionEventType = {
-      ...baseEvent,
-      created_by: { name: 'Robert Smith' },
-    };
-
-    render(
-      <TestProviders>
-        <UserActionEvent event={event} isLast={false} />
-      </TestProviders>
-    );
-
-    expect(screen.getByText('Robert Smith')).toBeInTheDocument();
-  });
-
-  it('renders the action label and value', () => {
-    render(
-      <TestProviders>
-        <UserActionEvent event={baseEvent} isLast={false} />
-      </TestProviders>
-    );
-
-    expect(screen.getByText('Action')).toBeInTheDocument();
-    expect(screen.getByText('code_copied')).toBeInTheDocument();
-  });
-
-  it('renders different action names', () => {
-    const event: UserActionEventType = {
-      ...baseEvent,
-      action: 'share_clicked',
-    };
-
-    render(
-      <TestProviders>
-        <UserActionEvent event={event} isLast={false} />
-      </TestProviders>
-    );
-
-    expect(screen.getByText('share_clicked')).toBeInTheDocument();
-  });
-
-  it('renders metadata when provided', () => {
-    const event: UserActionEventType = {
-      ...baseEvent,
-      metadata: {
-        user_id: '12345',
-        item_id: 'product_456',
-      },
-    };
-
-    render(
-      <TestProviders>
-        <UserActionEvent event={event} isLast={false} />
-      </TestProviders>
-    );
-
-    expect(screen.getByText('Metadata')).toBeInTheDocument();
-    expect(screen.getByText(/"user_id": "12345"/)).toBeInTheDocument();
-    expect(screen.getByText(/"item_id": "product_456"/)).toBeInTheDocument();
-  });
-
-  it('does not render metadata section when metadata is empty', () => {
-    const event: UserActionEventType = {
-      ...baseEvent,
-      metadata: {},
-    };
-
-    render(
-      <TestProviders>
-        <UserActionEvent event={event} isLast={false} />
-      </TestProviders>
-    );
-
-    expect(screen.queryByText('Metadata')).not.toBeInTheDocument();
-  });
-
-  it('does not render metadata section when metadata is undefined', () => {
-    const event: UserActionEventType = {
-      ...baseEvent,
-      metadata: undefined,
-    };
-
-    render(
-      <TestProviders>
-        <UserActionEvent event={event} isLast={false} />
-      </TestProviders>
-    );
-
-    expect(screen.queryByText('Metadata')).not.toBeInTheDocument();
-  });
-
-  it('renders metadata with various value types', () => {
-    const event: UserActionEventType = {
-      ...baseEvent,
-      metadata: {
-        count: '42',
-        variant: 'variant_b',
-        enabled: 'true',
-      },
-    };
-
-    render(
-      <TestProviders>
-        <UserActionEvent event={event} isLast={false} />
-      </TestProviders>
-    );
-
-    expect(screen.getByText('Metadata')).toBeInTheDocument();
-    expect(screen.getByText(/"count": "42"/)).toBeInTheDocument();
-    expect(screen.getByText(/"variant": "variant_b"/)).toBeInTheDocument();
-    expect(screen.getByText(/"enabled": "true"/)).toBeInTheDocument();
-  });
-});
diff --git a/web/packages/studio/src/components/IntakeEventsList/components/UserActionEvent.tsx b/web/packages/studio/src/components/IntakeEventsList/components/UserActionEvent.tsx
deleted file mode 100644
index 8c782cf563..0000000000
--- a/web/packages/studio/src/components/IntakeEventsList/components/UserActionEvent.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { UserActionEvent as UserActionEventType } from '@nemo/sdk/generated/platform/schema';
-import { Flex, Stack, Text } from '@nvidia/foundations-react-core';
-import { EventListItemLayout } from '@studio/components/IntakeEventsList/components/EventListItemLayout';
-import { formatEventCreatedBy } from '@studio/util/entries';
-import { UserCheck } from 'lucide-react';
-import { FC } from 'react';
-
-interface UserActionEventProps {
-  /** The user action event to display */
-  event: UserActionEventType;
-  /** Whether this is the last item in the list */
-  isLast: boolean;
-  /** Callback when delete action is triggered (event id handled by parent) */
-  onDelete?: () => void;
-}
-
-/**
- * Renders a user_action event in the timeline.
- * Displays action name and metadata as label-value pairs.
- */
-export const UserActionEvent: FC<UserActionEventProps> = ({ event, isLast, onDelete }) => {
-  const actor = formatEventCreatedBy(event.created_by);
-
-  return (
-    <EventListItemLayout
-      icon={<UserCheck size="16" color="white" />}
-      slotHeader={
-        <Flex gap="density-xs" align="center">
-          <Text kind="label/semibold/sm">{actor}</Text>
-          <Text kind="label/regular/sm" className="text-secondary">
-            made an action
-          </Text>
-        </Flex>
-      }
-      timestamp={event.created_at}
-      isLast={isLast}
-      onDelete={onDelete}
-      testIdSuffix="user-action"
-    >
-      <Stack gap="density-lg">
-        <Stack gap="density-sm">
-          <Text kind="label/regular/sm" className="text-secondary">
-            Action
-          </Text>
-          <Text kind="label/semibold/md">{event.action}</Text>
-        </Stack>
-        {event.metadata && Object.keys(event.metadata).length > 0 && (
-          <Stack gap="density-md">
-            <Text kind="label/regular/sm" className="text-secondary">
-              Metadata
-            </Text>
-            <pre className="text-xs overflow-x-auto w-0 min-w-full">
-              {JSON.stringify(event.metadata, null, 2)}
-            </pre>
-          </Stack>
-        )}
-      </Stack>
-    </EventListItemLayout>
-  );
-};
diff --git a/web/packages/studio/src/components/IntakeEventsList/components/UserFeedbackEvent.test.tsx b/web/packages/studio/src/components/IntakeEventsList/components/UserFeedbackEvent.test.tsx
deleted file mode 100644
index 6a859827e1..0000000000
--- a/web/packages/studio/src/components/IntakeEventsList/components/UserFeedbackEvent.test.tsx
+++ /dev/null
@@ -1,209 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { UserFeedbackEvent as UserFeedbackEventType } from '@nemo/sdk/generated/platform/schema';
-import { UserFeedbackEvent } from '@studio/components/IntakeEventsList/components/UserFeedbackEvent';
-import { TestProviders } from '@studio/tests/util/TestProviders';
-import { render, screen } from '@testing-library/react';
-
-describe('UserFeedbackEvent', () => {
-  const baseEvent: UserFeedbackEventType = {
-    id: 'event-1',
-    event_type: 'user_feedback',
-    created_at: '2024-01-15T10:30:00Z',
-    created_by: { name: 'Alice Johnson' },
-  };
-
-  it('renders the provided feedback action text', () => {
-    render(
-      <TestProviders>
-        <UserFeedbackEvent event={baseEvent} isLast={false} />
-      </TestProviders>
-    );
-
-    expect(screen.getByText('provided feedback')).toBeInTheDocument();
-  });
-
-  it('renders the actor name from created_by string', () => {
-    render(
-      <TestProviders>
-        <UserFeedbackEvent event={baseEvent} isLast={false} />
-      </TestProviders>
-    );
-
-    expect(screen.getByText('Alice Johnson')).toBeInTheDocument();
-  });
-
-  it('renders actor name from created_by object with username', () => {
-    const event: UserFeedbackEventType = {
-      ...baseEvent,
-      created_by: { username: 'alice_j' },
-    };
-
-    render(
-      <TestProviders>
-        <UserFeedbackEvent event={event} isLast={false} />
-      </TestProviders>
-    );
-
-    expect(screen.getByText('alice_j')).toBeInTheDocument();
-  });
-
-  it('renders thumbs up tag when thumb is "up"', () => {
-    const event: UserFeedbackEventType = {
-      ...baseEvent,
-      thumb: 'up',
-    };
-
-    render(
-      <TestProviders>
-        <UserFeedbackEvent event={event} isLast={false} />
-      </TestProviders>
-    );
-
-    const tag = screen.getByTestId('nv-tag-root');
-    expect(tag).toHaveClass('nv-tag--color-green');
-  });
-
-  it('renders thumbs down tag when thumb is "down"', () => {
-    const event: UserFeedbackEventType = {
-      ...baseEvent,
-      thumb: 'down',
-    };
-
-    render(
-      <TestProviders>
-        <UserFeedbackEvent event={event} isLast={false} />
-      </TestProviders>
-    );
-
-    const tag = screen.getByTestId('nv-tag-root');
-    expect(tag).toHaveClass('nv-tag--color-red');
-  });
-
-  it('does not render thumb tag when thumb is not provided', () => {
-    render(
-      <TestProviders>
-        <UserFeedbackEvent event={baseEvent} isLast={false} />
-      </TestProviders>
-    );
-
-    expect(screen.queryByTestId('nv-tag-root')).not.toBeInTheDocument();
-  });
-
-  it('renders rating when provided', () => {
-    const event: UserFeedbackEventType = {
-      ...baseEvent,
-      rating: 5,
-    };
-
-    render(
-      <TestProviders>
-        <UserFeedbackEvent event={event} isLast={false} />
-      </TestProviders>
-    );
-
-    expect(screen.getByText('Rating')).toBeInTheDocument();
-    expect(screen.getByText('5')).toBeInTheDocument();
-  });
-
-  it('renders rating value of 0', () => {
-    const event: UserFeedbackEventType = {
-      ...baseEvent,
-      rating: 0,
-    };
-
-    render(
-      <TestProviders>
-        <UserFeedbackEvent event={event} isLast={false} />
-      </TestProviders>
-    );
-
-    expect(screen.getByText('Rating')).toBeInTheDocument();
-    expect(screen.getByText('0')).toBeInTheDocument();
-  });
-
-  it('renders rewrite when provided', () => {
-    const event: UserFeedbackEventType = {
-      ...baseEvent,
-      rewrite: 'Here is what I expected the response to be.',
-    };
-
-    render(
-      <TestProviders>
-        <UserFeedbackEvent event={event} isLast={false} />
-      </TestProviders>
-    );
-
-    expect(screen.getByText('Rewrite')).toBeInTheDocument();
-    expect(screen.getByText('Here is what I expected the response to be.')).toBeInTheDocument();
-  });
-
-  it('renders opinion when provided', () => {
-    const event: UserFeedbackEventType = {
-      ...baseEvent,
-      opinion: 'This response was very helpful!',
-    };
-
-    render(
-      <TestProviders>
-        <UserFeedbackEvent event={event} isLast={false} />
-      </TestProviders>
-    );
-
-    expect(screen.getByText('Opinion')).toBeInTheDocument();
-    expect(screen.getByText('This response was very helpful!')).toBeInTheDocument();
-  });
-
-  it('renders categories when provided', () => {
-    const event: UserFeedbackEventType = {
-      ...baseEvent,
-      categories: { tone: 'professional', clarity: 5 },
-    };
-
-    render(
-      <TestProviders>
-        <UserFeedbackEvent event={event} isLast={false} />
-      </TestProviders>
-    );
-
-    expect(screen.getByText('Categories')).toBeInTheDocument();
-    expect(screen.getByText(/"tone": "professional"/)).toBeInTheDocument();
-    expect(screen.getByText(/"clarity": 5/)).toBeInTheDocument();
-  });
-
-  it('does not render categories when empty object', () => {
-    const event: UserFeedbackEventType = {
-      ...baseEvent,
-      categories: {},
-    };
-
-    render(
-      <TestProviders>
-        <UserFeedbackEvent event={event} isLast={false} />
-      </TestProviders>
-    );
-
-    expect(screen.queryByText('Categories')).not.toBeInTheDocument();
-  });
-
-  it('renders multiple content sections', () => {
-    const event: UserFeedbackEventType = {
-      ...baseEvent,
-      thumb: 'up',
-      rating: 4,
-      opinion: 'Great response',
-      rewrite: 'Could add more detail here',
-    };
-
-    render(
-      <TestProviders>
-        <UserFeedbackEvent event={event} isLast={false} />
-      </TestProviders>
-    );
-
-    expect(screen.getByText('Rating')).toBeInTheDocument();
-    expect(screen.getByText('Opinion')).toBeInTheDocument();
-    expect(screen.getByText('Rewrite')).toBeInTheDocument();
-  });
-});
diff --git a/web/packages/studio/src/components/IntakeEventsList/components/UserFeedbackEvent.tsx b/web/packages/studio/src/components/IntakeEventsList/components/UserFeedbackEvent.tsx
deleted file mode 100644
index 0b650ac9c7..0000000000
--- a/web/packages/studio/src/components/IntakeEventsList/components/UserFeedbackEvent.tsx
+++ /dev/null
@@ -1,97 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { UserFeedbackEvent as UserFeedbackEventType } from '@nemo/sdk/generated/platform/schema';
-import { Flex, Stack, Text } from '@nvidia/foundations-react-core';
-import { EventListItemLayout } from '@studio/components/IntakeEventsList/components/EventListItemLayout';
-import { ThumbTag } from '@studio/components/IntakeEventsList/components/ThumbTag';
-import { formatEventCreatedBy } from '@studio/util/entries';
-import { MessageSquarePlus } from 'lucide-react';
-import { FC, ReactNode } from 'react';
-
-interface UserFeedbackEventProps {
-  /** The user feedback event to display */
-  event: UserFeedbackEventType;
-  /** Whether this is the last item in the list */
-  isLast: boolean;
-  /** Callback when delete action is triggered (event id handled by parent) */
-  onDelete?: () => void;
-}
-
-/**
- * Renders a user_feedback event in the timeline.
- * Displays thumb in header, and rating/rewrite/opinion/categories as label-value pairs.
- */
-export const UserFeedbackEvent: FC<UserFeedbackEventProps> = ({ event, isLast, onDelete }) => {
-  const actor = formatEventCreatedBy(event.created_by);
-
-  // Build content items array - only render content section if there are items
-  const contentItems: ReactNode[] = [];
-
-  if (typeof event.rating === 'number') {
-    contentItems.push(
-      <Stack key="rating" gap="density-md">
-        <Text kind="label/regular/sm" className="text-secondary">
-          Rating
-        </Text>
-        <Text kind="label/semibold/md">{event.rating}</Text>
-      </Stack>
-    );
-  }
-
-  if (event.rewrite) {
-    contentItems.push(
-      <Stack key="rewrite" gap="density-md">
-        <Text kind="label/regular/sm" className="text-secondary">
-          Rewrite
-        </Text>
-        <Text kind="body/semibold/md">{event.rewrite}</Text>
-      </Stack>
-    );
-  }
-
-  if (event.opinion) {
-    contentItems.push(
-      <Stack key="opinion" gap="density-md">
-        <Text kind="label/regular/sm" className="text-secondary">
-          Opinion
-        </Text>
-        <Text kind="body/semibold/md">{event.opinion}</Text>
-      </Stack>
-    );
-  }
-
-  if (event.categories && Object.keys(event.categories).length > 0) {
-    contentItems.push(
-      <Stack key="categories" gap="density-md">
-        <Text kind="label/regular/sm" className="text-secondary">
-          Categories
-        </Text>
-        <pre className="text-xs overflow-x-auto w-0 min-w-full">
-          {JSON.stringify(event.categories, null, 2)}
-        </pre>
-      </Stack>
-    );
-  }
-
-  return (
-    <EventListItemLayout
-      icon={<MessageSquarePlus size="16" color="white" />}
-      slotHeader={
-        <Flex gap="density-sm" align="center">
-          {event.thumb && <ThumbTag thumb={event.thumb} />}
-          <Text kind="label/semibold/sm">{actor}</Text>
-          <Text kind="label/regular/sm" className="text-secondary">
-            provided feedback
-          </Text>
-        </Flex>
-      }
-      timestamp={event.created_at}
-      isLast={isLast}
-      onDelete={onDelete}
-      testIdSuffix="user-feedback"
-    >
-      {contentItems.length > 0 ? <Stack gap="density-lg">{contentItems}</Stack> : null}
-    </EventListItemLayout>
-  );
-};
diff --git a/web/packages/studio/src/components/IntakeEventsList/index.tsx b/web/packages/studio/src/components/IntakeEventsList/index.tsx
deleted file mode 100644
index e8740047ec..0000000000
--- a/web/packages/studio/src/components/IntakeEventsList/index.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import type { Entry } from '@nemo/sdk/generated/platform/schema';
-import { Stack } from '@nvidia/foundations-react-core';
-import { EventListItem } from '@studio/components/IntakeEventsList/components/EventListItem';
-import { FC } from 'react';
-
-type EntryEventItem = NonNullable<Entry['events']>[number];
-
-interface IntakeEventsListProps {
-  /** Array of events to display */
-  events: EntryEventItem[];
-  /** Entry ID needed for delete operations */
-  entryId?: string;
-  /** Callback when an event is deleted */
-  onDeleteEvent?: (eventId: string) => void;
-}
-
-/**
- * Displays a chronological activity feed of events (annotations, actions, feedback) for an intake entry.
- * Uses a timeline-based layout with icons, sentiment badges, and JSON content display.
- *
- * Note: Empty state is handled by the parent route (IntakeEntryEventsRoute).
- */
-export const IntakeEventsList: FC<IntakeEventsListProps> = ({ events, onDeleteEvent }) => {
-  // Sort events by created_at (newest first)
-  const sortedEvents = [...events].sort((a, b) => {
-    const dateA = a.created_at ? new Date(a.created_at).getTime() : 0;
-    const dateB = b.created_at ? new Date(b.created_at).getTime() : 0;
-    return dateB - dateA;
-  });
-
-  return (
-    <Stack className="w-full">
-      {sortedEvents.map((event, index) => (
-        <EventListItem
-          key={event.id}
-          event={event}
-          isLast={index === sortedEvents.length - 1}
-          onDelete={onDeleteEvent}
-        />
-      ))}
-    </Stack>
-  );
-};
diff --git a/web/packages/studio/src/components/IntakeSpansTable/index.spec.tsx b/web/packages/studio/src/components/IntakeSpansTable/index.spec.tsx
new file mode 100644
index 0000000000..15451624f3
--- /dev/null
+++ b/web/packages/studio/src/components/IntakeSpansTable/index.spec.tsx
@@ -0,0 +1,26 @@
+// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { IntakeSpansTable } from '@studio/components/IntakeSpansTable';
+import { renderRoute, screen } from '@studio/tests/util/render';
+import userEvent from '@testing-library/user-event';
+
+describe('IntakeSpansTable', () => {
+  it('shows explicit span filter facets', async () => {
+    const user = userEvent.setup();
+
+    renderRoute(<IntakeSpansTable workspace="default" />, {
+      history: '/workspaces/default/intake/spans',
+    });
+
+    await screen.findByText('Answer customer policy question');
+    await user.click(await screen.findByTestId('open-filters-button'));
+
+    expect(screen.getAllByText('Status').length).toBeGreaterThan(1);
+    expect(screen.getAllByText('Kind').length).toBeGreaterThan(1);
+    expect(screen.getByText('Trace ID')).toBeInTheDocument();
+    expect(screen.getByText('Started At')).toBeInTheDocument();
+    expect(screen.queryByText('Session ID')).not.toBeInTheDocument();
+    expect(screen.queryByPlaceholderText('Search by span ID')).not.toBeInTheDocument();
+  });
+});
diff --git a/web/packages/studio/src/components/IntakeSpansTable/index.tsx b/web/packages/studio/src/components/IntakeSpansTable/index.tsx
new file mode 100644
index 0000000000..71b7f57beb
--- /dev/null
+++ b/web/packages/studio/src/components/IntakeSpansTable/index.tsx
@@ -0,0 +1,351 @@
+// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { dateTimeFilter } from '@nemo/common/src/components/DataView/dateTimeFilter';
+import * as DataView from '@nemo/common/src/components/DataView/internal';
+import { ErrorMessage } from '@nemo/common/src/components/ErrorMessage';
+import { RelativeTime } from '@nemo/common/src/components/RelativeTime';
+import { TableEmptyState } from '@nemo/common/src/components/TableEmptyState';
+import { useStudioDataViewState } from '@nemo/common/src/hooks/useStudioDataViewState';
+import { getSortParamWithWhitelist } from '@nemo/common/src/utils/query';
+import { useListSpans } from '@nemo/sdk/generated/platform/api';
+import {
+  SpanKind,
+  type ListSpansMode,
+  type SpanFilter,
+  type SpanSortField,
+} from '@nemo/sdk/generated/platform/schema';
+import { Anchor, Button, Text } from '@nvidia/foundations-react-core';
+import { getErrorMessage } from '@studio/api/common/utils';
+import { IntakeTelemetryDataView } from '@studio/components/IntakeTelemetryDataView';
+import { IntakeTelemetryStatusBadge } from '@studio/components/IntakeTelemetryStatusBadge';
+import { useWorkspaceFromPathIfExists } from '@studio/hooks/useWorkspaceFromPath';
+import { getIntakeSpanRoute, getIntakeTraceRoute } from '@studio/routes/utils';
+import {
+  formatCost,
+  formatDurationMs,
+  formatInteger,
+  buildSpanHierarchyRows,
+  getSpanDisplayName,
+  getSpanDurationMs,
+  getSpanSubject,
+  type SpanTableRow,
+} from '@studio/util/intakeTelemetry';
+import { keepPreviousData } from '@tanstack/react-query';
+import { ComponentProps, FC, useMemo, type ReactNode } from 'react';
+import { Link, useNavigate } from 'react-router-dom';
+
+const SPAN_STATUS_FILTER_OPTIONS = [
+  { value: 'success', label: 'Success' },
+  { value: 'error', label: 'Error' },
+  { value: 'cancelled', label: 'Cancelled' },
+  { value: 'unknown', label: 'Unknown' },
+];
+
+const SPAN_KIND_FILTER_OPTIONS = Object.values(SpanKind).map((value) => ({
+  value,
+  label: value,
+}));
+
+type SpanRow = DataView.TanstackTable.Row<SpanTableRow>;
+
+const HIERARCHY_SPACER_LIMIT = 12;
+
+interface SpanNameCellProps {
+  span: SpanTableRow;
+  depth: number;
+  workspace: string;
+  showHierarchy: boolean;
+}
+
+const SpanNameCell: FC<SpanNameCellProps> = ({ span, depth, workspace, showHierarchy }) => {
+  const label = getSpanDisplayName(span);
+  const hierarchyLabel =
+    span.hierarchyStatus === 'parent_outside_page'
+      ? 'Parent outside page'
+      : span.hierarchyStatus === 'cycle_or_unreachable'
+        ? 'Unresolved hierarchy'
+        : undefined;
+
+  return (
+    <div className="flex min-w-0 items-center gap-density-sm">
+      {showHierarchy &&
+        Array.from({ length: Math.min(depth, HIERARCHY_SPACER_LIMIT) }).map((_, index) => (
+          <span
+            key={`${span.span_id}-hierarchy-spacer-${index}`}
+            aria-hidden
+            className="w-[18px] shrink-0"
+          />
+        ))}
+      {showHierarchy && (
+        <span aria-hidden className={depth > 0 ? 'relative h-5 w-5 shrink-0' : 'w-4 shrink-0'}>
+          {depth > 0 && (
+            <>
+              <span className="absolute left-0 top-1/2 w-full border-t border-base" />
+              <span className="absolute left-0 top-0 h-1/2 border-l border-base" />
+            </>
+          )}
+        </span>
+      )}
+      <Anchor asChild>
+        <Link to={getIntakeSpanRoute(workspace, span.span_id)} className="truncate" title={label}>
+          {label}
+        </Link>
+      </Anchor>
+      {hierarchyLabel && (
+        <Text kind="body/regular/xs" className="shrink-0 text-secondary">
+          {hierarchyLabel}
+        </Text>
+      )}
+    </div>
+  );
+};
+
+export interface IntakeSpansTableProps {
+  workspace?: string;
+  filterTogglePortalTargetId?: string;
+  fixedFilter?: SpanFilter;
+  mode?: ListSpansMode;
+  defaultSort?: { id: string; desc: boolean };
+  defaultPageSize?: number;
+  showTraceColumn?: boolean;
+  showHierarchy?: boolean;
+  emptyHeader?: string;
+  emptyMessage?: string;
+  emptyStateActions?: ReactNode;
+  noResultsActions?: ReactNode;
+}
+
+export const IntakeSpansTable: FC<IntakeSpansTableProps> = ({
+  workspace: workspaceProp,
+  filterTogglePortalTargetId,
+  fixedFilter,
+  mode = 'summary',
+  defaultSort = { id: 'started_at', desc: true },
+  defaultPageSize,
+  showTraceColumn = true,
+  showHierarchy = false,
+  emptyHeader = 'No Spans',
+  emptyMessage = 'Spans will appear here after trace data is ingested.',
+  emptyStateActions,
+  noResultsActions,
+}) => {
+  const navigate = useNavigate();
+  const routeWorkspace = useWorkspaceFromPathIfExists();
+  const workspace = workspaceProp ?? routeWorkspace;
+  const hasWorkspace = Boolean(workspace);
+  const requestWorkspace = workspace ?? '';
+
+  const dataViewState = useStudioDataViewState({
+    defaultSort,
+    defaultPageSize,
+  });
+
+  const hasActiveFilters = dataViewState.debouncedColumnFilters.length > 0;
+
+  const {
+    data: spansResponse,
+    isFetching,
+    error,
+  } = useListSpans(
+    requestWorkspace,
+    {
+      filter: {
+        ...((dataViewState.apiFilter.filter ?? {}) as SpanFilter),
+        ...(fixedFilter ?? {}),
+      },
+      mode,
+      page: dataViewState.pagination.state.pageIndex + 1,
+      page_size: dataViewState.pagination.state.pageSize,
+      sort: showHierarchy
+        ? 'started_at'
+        : (getSortParamWithWhitelist(
+            dataViewState.sorting.state,
+            ['started_at'],
+            '-started_at'
+          ) as SpanSortField),
+    },
+    {
+      query: {
+        enabled: hasWorkspace,
+        placeholderData: keepPreviousData,
+      },
+    }
+  );
+
+  const tableData = useMemo(() => {
+    const spans = spansResponse?.data ?? [];
+    return showHierarchy
+      ? buildSpanHierarchyRows(spans)
+      : spans.map((span) => ({ ...span, hierarchyDepth: 0 }));
+  }, [showHierarchy, spansResponse?.data]);
+
+  const makeColumns: ComponentProps<
+    typeof IntakeTelemetryDataView<SpanTableRow>
+  >['makeColumns'] = ({ accessor }) =>
+    [
+      accessor('status', {
+        id: 'status',
+        header: 'Status',
+        size: 130,
+        meta: {
+          filter: {
+            type: 'single-select' as const,
+            label: 'Status',
+            options: SPAN_STATUS_FILTER_OPTIONS,
+          },
+        },
+        cell: ({ row }: { row: SpanRow }) => (
+          <IntakeTelemetryStatusBadge status={row.original.status} />
+        ),
+      }),
+      accessor('kind', {
+        id: 'kind',
+        header: 'Kind',
+        size: 120,
+        meta: {
+          filter: {
+            type: 'single-select' as const,
+            label: 'Kind',
+            options: SPAN_KIND_FILTER_OPTIONS,
+          },
+        },
+        cell: ({ row }: { row: SpanRow }) => row.original.kind,
+      }),
+      accessor('span_id', {
+        id: 'span_id',
+        header: 'Span',
+        size: 280,
+        enableSorting: false,
+        cell: ({ row }: { row: SpanRow }) => {
+          const span = row.original;
+          const depth = showHierarchy ? span.hierarchyDepth : 0;
+          return (
+            <SpanNameCell
+              span={span}
+              depth={depth}
+              workspace={requestWorkspace}
+              showHierarchy={showHierarchy}
+            />
+          );
+        },
+      }),
+      {
+        id: 'subject',
+        header: 'Subject',
+        enableSorting: false,
+        cell: ({ row }: { row: SpanRow }) => {
+          const subject = getSpanSubject(row.original);
+          return (
+            <Text className="truncate" title={subject}>
+              {subject}
+            </Text>
+          );
+        },
+      },
+      showTraceColumn &&
+        accessor('trace_id', {
+          id: 'trace_id',
+          header: 'Trace',
+          enableSorting: false,
+          meta: {
+            filter: {
+              type: 'text' as const,
+              label: 'Trace ID',
+              placeholder: 'Filter by trace ID',
+            },
+          },
+          cell: ({ row }: { row: SpanRow }) =>
+            row.original.trace_id ? (
+              <Anchor asChild>
+                <Link
+                  to={getIntakeTraceRoute(requestWorkspace, row.original.trace_id)}
+                  className="truncate"
+                  title={row.original.trace_id}
+                >
+                  {row.original.trace_id}
+                </Link>
+              </Anchor>
+            ) : (
+              '—'
+            ),
+        }),
+      {
+        id: 'duration',
+        header: 'Duration',
+        size: 120,
+        enableSorting: false,
+        cell: ({ row }: { row: SpanRow }) => formatDurationMs(getSpanDurationMs(row.original)),
+      },
+      {
+        id: 'total_tokens',
+        header: 'Tokens',
+        size: 120,
+        enableSorting: false,
+        cell: ({ row }: { row: SpanRow }) => formatInteger(row.original.total_tokens),
+      },
+      {
+        id: 'cost_total_usd',
+        header: 'Cost',
+        size: 110,
+        enableSorting: false,
+        cell: ({ row }: { row: SpanRow }) => formatCost(row.original.cost_total_usd),
+      },
+      accessor('started_at', {
+        id: 'started_at',
+        header: 'Started',
+        size: 150,
+        enableSorting: true,
+        meta: {
+          filter: dateTimeFilter('Started At'),
+        },
+        cell: ({ row }: { row: SpanRow }) => <RelativeTime datetime={row.original.started_at} />,
+      }),
+    ].filter(Boolean) as DataView.TanstackTable.ColumnDef<SpanTableRow>[];
+
+  if (error) {
+    return <ErrorMessage message={getErrorMessage(error)} />;
+  }
+
+  if (!workspace) {
+    return <ErrorMessage message="Workspace is required to load spans." />;
+  }
+
+  return (
+    <IntakeTelemetryDataView<SpanTableRow>
+      dataViewState={dataViewState}
+      makeColumns={makeColumns}
+      filterTogglePortalTargetId={filterTogglePortalTargetId}
+      onRowClick={(span) => navigate(getIntakeSpanRoute(requestWorkspace, span.span_id))}
+      attributes={{
+        DataViewRoot: {
+          data: tableData,
+          totalCount: spansResponse?.pagination?.total_results,
+          requestStatus: isFetching ? 'loading' : undefined,
+        },
+        DataViewTableContent: {
+          renderEmptyState: () =>
+            hasActiveFilters ? (
+              <TableEmptyState
+                header="No Results Found"
+                emptyMessage="No spans match your filters."
+                actions={
+                  noResultsActions ?? (
+                    <Button kind="tertiary" onClick={dataViewState.resetFilters}>
+                      Clear Filters
+                    </Button>
+                  )
+                }
+              />
+            ) : (
+              <TableEmptyState
+                header={emptyHeader}
+                emptyMessage={emptyMessage}
+                actions={emptyStateActions}
+              />
+            ),
+        },
+      }}
+    />
+  );
+};
diff --git a/web/packages/studio/src/components/IntakeTelemetryDataView/index.tsx b/web/packages/studio/src/components/IntakeTelemetryDataView/index.tsx
new file mode 100644
index 0000000000..71d818a978
--- /dev/null
+++ b/web/packages/studio/src/components/IntakeTelemetryDataView/index.tsx
@@ -0,0 +1,280 @@
+// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { ColumnFilterPanel } from '@nemo/common/src/components/DataView/ColumnFilterPanel';
+import { FilterPanel } from '@nemo/common/src/components/DataView/FilterPanel';
+import { FilterPanelToggle } from '@nemo/common/src/components/DataView/FilterPanelToggle';
+import * as DataView from '@nemo/common/src/components/DataView/internal';
+import '@nemo/common/src/components/DataView/StudioDataView.css';
+import { StudioAppliedFilters } from '@nemo/common/src/components/DataView/StudioAppliedFilters';
+import { useRowClick } from '@nemo/common/src/components/DataView/useRowClick';
+import { TableEmptyState } from '@nemo/common/src/components/TableEmptyState';
+import { DEFAULT_PAGE_SIZE_OPTIONS } from '@nemo/common/src/constants/pagination';
+import {
+  Block,
+  Flex,
+  PaginationArrowButton,
+  PaginationControlsGroup,
+  PaginationDivider,
+  PaginationItemRangeText,
+  PaginationNavigationGroup,
+  PaginationPageCountText,
+  PaginationPageInput,
+  PaginationPageSizeSelect,
+  Stack,
+  Text,
+} from '@nvidia/foundations-react-core';
+import {
+  type ComponentProps,
+  type ReactNode,
+  type RefObject,
+  useEffect,
+  useMemo,
+  useState,
+} from 'react';
+import { createPortal } from 'react-dom';
+
+const PREBUILT_COLUMN_IDS = new Set(['row-selection', 'row-actions', 'row-expansion']);
+
+interface IntakeTelemetryToolbarProps<DataType = unknown> {
+  searchField?: string;
+  showFilters: boolean;
+  onToggleFilters: () => void;
+  filterTogglePortalTargetId?: string;
+  renderBulkActions?: (props: {
+    selectedRows: DataType[];
+    table: DataView.TanstackTable.Table<DataType>;
+  }) => ReactNode;
+  searchBarProps?: ComponentProps<typeof DataView.SearchBar>;
+  slotEnd?: ReactNode;
+}
+
+const IntakeTelemetryToolbar = <DataType,>({
+  searchField,
+  showFilters,
+  onToggleFilters,
+  filterTogglePortalTargetId,
+  renderBulkActions,
+  searchBarProps,
+  slotEnd,
+}: IntakeTelemetryToolbarProps<DataType>) => {
+  const { table } = DataView.useInnerDataViewContext();
+  const hasFilterableColumns = table.getAllLeafColumns().some((col) => col.getCanFilter());
+  const [portalTarget, setPortalTarget] = useState<HTMLElement | null>(null);
+
+  useEffect(() => {
+    setPortalTarget(
+      filterTogglePortalTargetId ? document.getElementById(filterTogglePortalTargetId) : null
+    );
+  }, [filterTogglePortalTargetId]);
+
+  const filterToggle = hasFilterableColumns ? (
+    <FilterPanelToggle showFilters={showFilters} onToggle={onToggleFilters} />
+  ) : null;
+  const shouldPortalToggle = Boolean(filterTogglePortalTargetId);
+  const rendersInlineToggle = Boolean(!filterTogglePortalTargetId && filterToggle);
+  const rendersToolbar = Boolean(searchField || slotEnd || rendersInlineToggle);
+
+  return (
+    <>
+      {shouldPortalToggle && portalTarget && filterToggle
+        ? createPortal(filterToggle, portalTarget)
+        : null}
+      {rendersToolbar && (
+        <DataView.Toolbar
+          slotBulkActions={
+            renderBulkActions ? (
+              <DataView.BulkActions>
+                {({ selectedRows, table }) =>
+                  renderBulkActions({
+                    selectedRows: selectedRows.map((row) => row.original) as DataType[],
+                    table: table as DataView.TanstackTable.Table<DataType>,
+                  })
+                }
+              </DataView.BulkActions>
+            ) : undefined
+          }
+        >
+          {searchField && (
+            <DataView.SearchBar
+              placeholder={searchBarProps?.placeholder ?? 'Search...'}
+              {...searchBarProps}
+            />
+          )}
+          {slotEnd}
+          {rendersInlineToggle ? filterToggle : null}
+        </DataView.Toolbar>
+      )}
+      <StudioAppliedFilters />
+    </>
+  );
+};
+
+export interface IntakeTelemetryDataViewProps<DataType> {
+  dataViewState: DataView.DataViewState;
+  makeColumns: ComponentProps<typeof DataView.Root<DataType>>['makeColumns'];
+  onRowClick?: (row: DataType, index: number) => void;
+  maxTwoLines?: boolean;
+  searchField?: string;
+  renderBulkActions?: (props: {
+    selectedRows: DataType[];
+    table: DataView.TanstackTable.Table<DataType>;
+  }) => ReactNode;
+  children?: ReactNode;
+  toolbarSlotEnd?: ReactNode;
+  filterTogglePortalTargetId?: string;
+  scrollContainerRef?: RefObject<HTMLDivElement | null>;
+  attributes?: {
+    DataViewRoot?: Omit<
+      ComponentProps<typeof DataView.Root<DataType>>,
+      'dataMode' | 'state' | 'makeColumns'
+    >;
+    DataViewTableContent?: ComponentProps<typeof DataView.TableContent>;
+    DataViewPagination?: ComponentProps<typeof DataView.Pagination>;
+    DataViewSearchBar?: ComponentProps<typeof DataView.SearchBar>;
+  };
+}
+
+export const IntakeTelemetryDataView = <DataType,>({
+  attributes,
+  children,
+  makeColumns,
+  dataViewState,
+  onRowClick,
+  maxTwoLines = true,
+  renderBulkActions,
+  scrollContainerRef,
+  searchField,
+  toolbarSlotEnd,
+  filterTogglePortalTargetId,
+}: IntakeTelemetryDataViewProps<DataType>) => {
+  const [showFilters, setShowFilters] = useState(false);
+  const toggleFilters = useMemo(() => () => setShowFilters((prev) => !prev), []);
+  const data = attributes?.DataViewRoot?.data ?? [];
+  const totalCount = attributes?.DataViewRoot?.totalCount ?? data.length;
+  const isEmpty = totalCount === 0;
+  const {
+    wrapColumns,
+    onClick: rowClickHandler,
+    className: rowClickClassName,
+  } = useRowClick(onRowClick, data);
+
+  const effectiveMakeColumns: typeof makeColumns = useMemo(() => {
+    const withRowClick = wrapColumns(makeColumns);
+    if (!maxTwoLines) return withRowClick;
+
+    return (helper, prebuilt) => {
+      const columns = withRowClick(helper, prebuilt);
+
+      return columns.map((col) => {
+        if (PREBUILT_COLUMN_IDS.has(col.id ?? '')) return col;
+
+        const originalCell = col.cell;
+        return {
+          ...col,
+          cell: (context: DataView.TanstackTable.CellContext<DataType, unknown>) => {
+            const content =
+              typeof originalCell === 'function'
+                ? originalCell(context)
+                : typeof originalCell === 'string'
+                  ? originalCell
+                  : context.renderValue();
+
+            return (
+              <div className="line-clamp-[2] [&_span]:whitespace-normal" data-testid="line-clamp">
+                {content}
+              </div>
+            );
+          },
+        };
+      });
+    };
+  }, [makeColumns, maxTwoLines, wrapColumns]);
+
+  return (
+    <DataView.Root
+      dataMode="manual"
+      state={dataViewState}
+      data={data}
+      makeColumns={effectiveMakeColumns}
+      loadingRows={dataViewState.pagination.state.pageSize}
+      {...attributes?.DataViewRoot}
+      className={`studio-data-view-root ${attributes?.DataViewRoot?.className ?? ''}`}
+    >
+      <Stack className="relative flex-1 min-h-0 min-w-0 overflow-y-hidden" gap="density-xl">
+        <IntakeTelemetryToolbar<DataType>
+          searchField={searchField}
+          showFilters={showFilters}
+          onToggleFilters={toggleFilters}
+          filterTogglePortalTargetId={filterTogglePortalTargetId}
+          renderBulkActions={renderBulkActions}
+          searchBarProps={attributes?.DataViewSearchBar}
+          slotEnd={toolbarSlotEnd}
+        />
+        <Flex className="min-h-0 h-full">
+          {children ? (
+            <Block ref={scrollContainerRef} className="flex-1 min-w-0 min-h-[300px] overflow-auto">
+              {children}
+            </Block>
+          ) : (
+            <div className="flex flex-col flex-1 min-w-0 min-h-0 bg-surface-raised border border-base rounded-lg overflow-hidden">
+              <DataView.TableContent
+                stickyTableHeader={attributes?.DataViewTableContent?.stickyTableHeader ?? true}
+                onClick={rowClickHandler}
+                renderEmptyState={() => (
+                  <Block className="h-full">
+                    <TableEmptyState
+                      className="py-4"
+                      header="No Entries Found"
+                      emptyMessage="No entries available."
+                    />
+                  </Block>
+                )}
+                {...attributes?.DataViewTableContent}
+                className={`studio-data-view-table flex-1 min-w-0 ${rowClickClassName} ${attributes?.DataViewTableContent?.className ?? ''}`}
+              />
+              <DataView.Pagination
+                className="bg-surface-raised px-density-2xl py-density-lg"
+                showItemsPerPage
+                showWhileEmpty
+                showWhileLessThanPageSize
+                pageSizeOptions={DEFAULT_PAGE_SIZE_OPTIONS}
+                {...attributes?.DataViewPagination}
+              >
+                <>
+                  <PaginationControlsGroup>
+                    <Text className="@max-2xl:hidden">Items per page</Text>
+                    <PaginationPageSizeSelect />
+                    {!isEmpty && (
+                      <>
+                        <PaginationDivider className="@max-lg:hidden" />
+                        <PaginationItemRangeText className="@max-lg:hidden" />
+                      </>
+                    )}
+                  </PaginationControlsGroup>
+                  <PaginationNavigationGroup className="gap-2">
+                    <PaginationArrowButton direction="first" />
+                    <PaginationArrowButton direction="previous" />
+                    <PaginationPageInput />
+                    <PaginationPageCountText
+                      pageCountTextFormatFn={(pageMeta) => `of ${pageMeta.total}`}
+                    />
+                    <PaginationArrowButton direction="next" />
+                    <PaginationArrowButton direction="last" />
+                  </PaginationNavigationGroup>
+                </>
+              </DataView.Pagination>
+            </div>
+          )}
+          <FilterPanel
+            showFilters={showFilters}
+            containerTestId="studio-dataview-filter-panel-container"
+            panelTestId="studio-dataview-filter-panel"
+          >
+            <ColumnFilterPanel />
+          </FilterPanel>
+        </Flex>
+      </Stack>
+    </DataView.Root>
+  );
+};
diff --git a/web/packages/studio/src/components/IntakeTelemetryStatusBadge/index.spec.tsx b/web/packages/studio/src/components/IntakeTelemetryStatusBadge/index.spec.tsx
new file mode 100644
index 0000000000..b15766cd55
--- /dev/null
+++ b/web/packages/studio/src/components/IntakeTelemetryStatusBadge/index.spec.tsx
@@ -0,0 +1,19 @@
+// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { IntakeTelemetryStatusBadge } from '@studio/components/IntakeTelemetryStatusBadge';
+import { render, screen } from '@studio/tests/util/render';
+
+describe('IntakeTelemetryStatusBadge', () => {
+  it.each([
+    ['success', 'Success'],
+    ['error', 'Error'],
+    ['cancelled', 'Cancelled'],
+    ['unknown', 'Unknown'],
+    [undefined, 'Unknown'],
+  ] as const)('renders %s as %s', (status, label) => {
+    render(<IntakeTelemetryStatusBadge status={status} />);
+
+    expect(screen.getByText(label)).toBeInTheDocument();
+  });
+});
diff --git a/web/packages/studio/src/components/IntakeTelemetryStatusBadge/index.tsx b/web/packages/studio/src/components/IntakeTelemetryStatusBadge/index.tsx
new file mode 100644
index 0000000000..874fae0d69
--- /dev/null
+++ b/web/packages/studio/src/components/IntakeTelemetryStatusBadge/index.tsx
@@ -0,0 +1,52 @@
+// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import type { SpanStatus } from '@nemo/sdk/generated/platform/schema';
+import { Badge, type BadgeProps } from '@nvidia/foundations-react-core';
+import { Ban, CircleCheck, CircleHelp, CircleX } from 'lucide-react';
+import type { ComponentType, SVGProps } from 'react';
+
+interface StatusConfig {
+  label: string;
+  color: Exclude<BadgeProps['color'], null>;
+  icon: ComponentType<SVGProps<SVGSVGElement>>;
+}
+
+const STATUS_CONFIG: Record<SpanStatus, StatusConfig> = {
+  success: {
+    label: 'Success',
+    color: 'green',
+    icon: CircleCheck,
+  },
+  error: {
+    label: 'Error',
+    color: 'red',
+    icon: CircleX,
+  },
+  cancelled: {
+    label: 'Cancelled',
+    color: 'yellow',
+    icon: Ban,
+  },
+  unknown: {
+    label: 'Unknown',
+    color: 'gray',
+    icon: CircleHelp,
+  },
+};
+
+export interface IntakeTelemetryStatusBadgeProps {
+  status: SpanStatus | undefined;
+}
+
+export const IntakeTelemetryStatusBadge = ({ status }: IntakeTelemetryStatusBadgeProps) => {
+  const config = STATUS_CONFIG[status ?? 'unknown'];
+  const Icon = config.icon;
+
+  return (
+    <Badge color={config.color} kind="solid">
+      <Icon width="12px" height="12px" role="img" />
+      {config.label}
+    </Badge>
+  );
+};
diff --git a/web/packages/studio/src/components/IntakeThreadPanel/components/AssistantMessageBubble.tsx b/web/packages/studio/src/components/IntakeThreadPanel/components/AssistantMessageBubble.tsx
deleted file mode 100644
index 4b0b8009b6..0000000000
--- a/web/packages/studio/src/components/IntakeThreadPanel/components/AssistantMessageBubble.tsx
+++ /dev/null
@@ -1,130 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { MessageContent } from '@nemo/common/src/components/Chat/MessageContent';
-import { getContentFromMessage } from '@nemo/common/src/utils/chat';
-import type { Entry } from '@nemo/sdk/generated/platform/schema';
-import {
-  StatusIndicator,
-  Block,
-  Button,
-  Divider,
-  Flex,
-  Stack,
-  Text,
-} from '@nvidia/foundations-react-core';
-import {
-  getAnnotationFromEntry,
-  getRewriteFromAnnotation,
-  isEntryAnnotated,
-} from '@studio/util/entries';
-import { ThumbsDown, ThumbsUp } from 'lucide-react';
-import type { ChatCompletionAssistantMessageParam } from 'openai/resources/index.mjs';
-import { FC } from 'react';
-
-interface AssistantMessageBubbleProps {
-  message: ChatCompletionAssistantMessageParam;
-  entry?: Entry;
-  onViewEntry?: (entryId: string) => void;
-}
-
-export const AssistantMessageBubble: FC<AssistantMessageBubbleProps> = ({
-  message,
-  entry,
-  onViewEntry,
-}) => {
-  // message.content and message.tool_calls are properly typed
-  const content = getContentFromMessage(message);
-  const toolCalls = message.tool_calls;
-
-  // Entry-linked data (only if entry provided)
-  const annotation = entry ? getAnnotationFromEntry(entry) : undefined;
-  const annotated = entry ? isEntryAnnotated(entry) : false;
-  const thumb = annotation?.thumb ?? entry?.user_rating?.thumb;
-  const rewrite = getRewriteFromAnnotation(annotation);
-
-  return (
-    <Stack gap="density-md">
-      <Text kind="body/regular/sm" className="text-start">
-        Assistant
-      </Text>
-      <Block
-        data-testid="assistant-message-bubble"
-        className="rounded-xl rounded-bl-none bg-surface-overlay overflow-hidden whitespace-pre-wrap w-auto self-start"
-      >
-        <Block className={`p-density-xl ${annotation ? 'bg-interaction-disabled' : ''}`}>
-          {toolCalls && !content ? (
-            <ToolCallsDisplay toolCalls={toolCalls} />
-          ) : (
-            <MessageContent content={content} renderAsMarkdown />
-          )}
-        </Block>
-
-        {/* Rewrite section (only if entry has annotation with rewrite) */}
-        {rewrite && (
-          <Stack>
-            <Divider />
-            <Stack gap="density-xs" className="p-density-xl">
-              <Text kind="body/regular/sm" color="secondary">
-                Rewrite
-              </Text>
-              <MessageContent content={rewrite} renderAsMarkdown />
-            </Stack>
-          </Stack>
-        )}
-      </Block>
-
-      {/* Status row (only if linked to an entry) */}
-      {entry && (
-        <Flex
-          align="center"
-          padding="density-xs"
-          className="w-fit rounded-md border border-base bg-surface-raised"
-        >
-          <Flex align="center" gap="density-lg" className="px-2">
-            <AnnotationBadge annotated={annotated} />
-            <span className={thumb === 'up' ? 'text-accent-green' : ''}>
-              <ThumbsUp width={16} height={16} />
-            </span>
-            <span className={thumb === 'down' ? 'text-accent-red' : ''}>
-              <ThumbsDown width={16} height={16} />
-            </span>
-          </Flex>
-
-          {/* Vertical separator */}
-          {onViewEntry && <div className="h-full w-px border-r border-base self-stretch" />}
-
-          {/* View Entry button */}
-          {onViewEntry && (
-            <Button
-              className="px-2"
-              kind="tertiary"
-              size="tiny"
-              onClick={() => onViewEntry(entry.id!)}
-            >
-              View Entry
-            </Button>
-          )}
-        </Flex>
-      )}
-    </Stack>
-  );
-};
-
-// Sub-components (can be extracted if needed)
-const AnnotationBadge: FC<{ annotated: boolean }> = ({ annotated }) => (
-  <Flex align="center" gap="density-md">
-    <StatusIndicator
-      size="medium"
-      color="green"
-      className={annotated ? undefined : '!bg-accent-gray-subtle'}
-    />
-    <Text kind="body/regular/sm">{annotated ? 'Annotated' : 'Unannotated'}</Text>
-  </Flex>
-);
-
-const ToolCallsDisplay: FC<{ toolCalls: unknown[] }> = ({ toolCalls }) => (
-  <Text kind="body/regular/sm" color="secondary">
-    Called {toolCalls.length} tool{toolCalls.length > 1 ? 's' : ''}
-  </Text>
-);
diff --git a/web/packages/studio/src/components/IntakeThreadPanel/components/SystemMessageBubble.tsx b/web/packages/studio/src/components/IntakeThreadPanel/components/SystemMessageBubble.tsx
deleted file mode 100644
index 8c9bfebac5..0000000000
--- a/web/packages/studio/src/components/IntakeThreadPanel/components/SystemMessageBubble.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { MessageContent } from '@nemo/common/src/components/Chat/MessageContent';
-import { getContentFromMessage } from '@nemo/common/src/utils/chat';
-import { Accordion, Block, Text } from '@nvidia/foundations-react-core';
-import type { ChatCompletionSystemMessageParam } from 'openai/resources/index.mjs';
-import type { FC } from 'react';
-
-interface SystemMessageBubbleProps {
-  message: ChatCompletionSystemMessageParam;
-  label?: string;
-  defaultExpanded?: boolean;
-}
-
-export const SystemMessageBubble: FC<SystemMessageBubbleProps> = ({
-  message,
-  label = 'System Prompt',
-  defaultExpanded = false,
-}) => {
-  // message.content is properly typed as string
-  const content = getContentFromMessage(message);
-  const charCount = content.length;
-
-  return (
-    <Accordion
-      defaultValue={defaultExpanded ? 'system' : undefined}
-      items={[
-        {
-          value: 'system',
-          slotTrigger: (
-            <Text kind="body/regular/sm" color="secondary">
-              {label} ({charCount.toLocaleString()} chars)
-            </Text>
-          ),
-          slotContent: (
-            <Block className="p-density-md bg-surface-sunken rounded-md">
-              <MessageContent content={content} renderAsMarkdown />
-            </Block>
-          ),
-        },
-      ]}
-    />
-  );
-};
diff --git a/web/packages/studio/src/components/IntakeThreadPanel/components/ThreadConversation.tsx b/web/packages/studio/src/components/IntakeThreadPanel/components/ThreadConversation.tsx
deleted file mode 100644
index e12cc98e61..0000000000
--- a/web/packages/studio/src/components/IntakeThreadPanel/components/ThreadConversation.tsx
+++ /dev/null
@@ -1,104 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { toOpenAIMessage } from '@nemo/common/src/utils/chat';
-import { Entry, FlexibleMessage } from '@nemo/sdk/generated/platform/schema';
-import { Stack } from '@nvidia/foundations-react-core';
-import { AssistantMessageBubble } from '@studio/components/IntakeThreadPanel/components/AssistantMessageBubble';
-import { SystemMessageBubble } from '@studio/components/IntakeThreadPanel/components/SystemMessageBubble';
-import { ToolResponseBubble } from '@studio/components/IntakeThreadPanel/components/ToolResponseBubble';
-import { UserMessageBubble } from '@studio/components/IntakeThreadPanel/components/UserMessageBubble';
-import type { ChatCompletionSystemMessageParam } from 'openai/resources/index.mjs';
-import { FC, useMemo } from 'react';
-
-interface ThreadConversationProps {
-  entries: Entry[];
-  onViewEntry: (entryId: string) => void;
-}
-
-export const ThreadConversation: FC<ThreadConversationProps> = ({ entries, onViewEntry }) => {
-  // Build content → Entry map for assistant message matching
-  const responseContentToEntry = useMemo(() => {
-    const map = new Map<string, Entry>();
-    for (const entry of entries) {
-      // Cast choices to access message.content (SDK types are loosely defined)
-      const choices = entry.data?.response?.choices as
-        | Array<{ message?: { content?: string } }>
-        | undefined;
-      const content = choices?.[0]?.message?.content;
-      if (typeof content === 'string' && content.trim()) {
-        map.set(content.trim(), entry);
-      }
-    }
-    return map;
-  }, [entries]);
-
-  // Get the full conversation from the last entry
-  const lastEntry = entries.at(-1);
-  if (!lastEntry) return null;
-
-  const allMessages: FlexibleMessage[] = [...(lastEntry.data?.request?.messages ?? [])];
-
-  // Add the final response from the last entry
-  const finalResponse = lastEntry.data?.response?.choices?.[0]?.message as
-    | FlexibleMessage
-    | undefined;
-  if (finalResponse) {
-    allMessages.push(finalResponse);
-  }
-
-  return (
-    <Stack gap="density-lg">
-      {allMessages.map((flexibleMessage, index) => {
-        // Convert to OpenAI format - this enables type narrowing in the switch
-        const message = toOpenAIMessage(flexibleMessage);
-        const key = `${message.role}-${index}`;
-
-        switch (message.role) {
-          case 'user':
-            // TypeScript knows: ChatCompletionUserMessageParam
-            return <UserMessageBubble key={key} message={message} />;
-
-          case 'assistant': {
-            // TypeScript knows: ChatCompletionAssistantMessageParam
-            const content = typeof message.content === 'string' ? message.content.trim() : '';
-            const matchingEntry =
-              responseContentToEntry.get(content) ??
-              (flexibleMessage === finalResponse ? lastEntry : undefined);
-
-            return (
-              <AssistantMessageBubble
-                key={key}
-                message={message}
-                entry={matchingEntry}
-                onViewEntry={onViewEntry}
-              />
-            );
-          }
-
-          case 'system':
-            // TypeScript knows: ChatCompletionSystemMessageParam
-            return <SystemMessageBubble key={key} message={message} />;
-
-          case 'developer':
-            // developer role maps to system-like display
-            // Cast needed since OpenAI types don't include 'developer' in discriminant
-            return (
-              <SystemMessageBubble
-                key={key}
-                message={message as unknown as ChatCompletionSystemMessageParam}
-                label="Developer Instructions"
-              />
-            );
-
-          case 'tool':
-            // TypeScript knows: ChatCompletionToolMessageParam
-            return <ToolResponseBubble key={key} message={message} />;
-
-          default:
-            return null;
-        }
-      })}
-    </Stack>
-  );
-};
diff --git a/web/packages/studio/src/components/IntakeThreadPanel/components/ToolResponseBubble.tsx b/web/packages/studio/src/components/IntakeThreadPanel/components/ToolResponseBubble.tsx
deleted file mode 100644
index e4a379678d..0000000000
--- a/web/packages/studio/src/components/IntakeThreadPanel/components/ToolResponseBubble.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { getContentFromMessage } from '@nemo/common/src/utils/chat';
-import { Block, Flex, Stack, Text } from '@nvidia/foundations-react-core';
-import { Wrench } from 'lucide-react';
-import type { ChatCompletionToolMessageParam } from 'openai/resources/index.mjs';
-import { FC } from 'react';
-
-interface ToolResponseBubbleProps {
-  message: ChatCompletionToolMessageParam;
-}
-
-export const ToolResponseBubble: FC<ToolResponseBubbleProps> = ({ message }) => {
-  // Use getContentFromMessage to handle string | ContentPart[] types
-  const content = getContentFromMessage(message);
-  const toolCallId = message.tool_call_id;
-
-  const label = toolCallId || 'Tool Response';
-
-  return (
-    <Stack gap="density-xs" className="ml-density-xl">
-      <Flex align="center" gap="density-xs">
-        <Wrench width={14} height={14} className="text-secondary" />
-        <Text kind="label/regular/xs" color="secondary">
-          {label}
-        </Text>
-      </Flex>
-      <Block
-        data-testid="tool-response-bubble"
-        className="rounded-lg bg-surface-sunken p-density-md font-mono text-sm overflow-x-auto"
-      >
-        <pre className="whitespace-pre-wrap">{content}</pre>
-      </Block>
-    </Stack>
-  );
-};
diff --git a/web/packages/studio/src/components/IntakeThreadPanel/components/UserMessageBubble.tsx b/web/packages/studio/src/components/IntakeThreadPanel/components/UserMessageBubble.tsx
deleted file mode 100644
index ceb161f887..0000000000
--- a/web/packages/studio/src/components/IntakeThreadPanel/components/UserMessageBubble.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { MessageContent } from '@nemo/common/src/components/Chat/MessageContent';
-import { getContentFromMessage } from '@nemo/common/src/utils/chat';
-import { Block, Stack, Text } from '@nvidia/foundations-react-core';
-import type { ChatCompletionUserMessageParam } from 'openai/resources/index.mjs';
-import type { FC } from 'react';
-
-interface UserMessageBubbleProps {
-  message: ChatCompletionUserMessageParam;
-}
-
-export const UserMessageBubble: FC<UserMessageBubbleProps> = ({ message }) => {
-  // message.content is properly typed as string | ContentPart[]
-  const content = getContentFromMessage(message);
-
-  return (
-    <Stack gap="density-xl">
-      <Text kind="body/regular/sm" className="text-end">
-        User
-      </Text>
-      <Block
-        data-testid="user-message-bubble"
-        className="rounded-xl rounded-br-none bg-surface-sunken p-density-xl whitespace-pre-wrap w-auto self-end"
-      >
-        <MessageContent content={content} renderAsMarkdown />
-      </Block>
-    </Stack>
-  );
-};
diff --git a/web/packages/studio/src/components/IntakeThreadPanel/index.tsx b/web/packages/studio/src/components/IntakeThreadPanel/index.tsx
deleted file mode 100644
index 17525e7d84..0000000000
--- a/web/packages/studio/src/components/IntakeThreadPanel/index.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { useSetTimeout } from '@nemo/common/src/hooks/useSetTimeout';
-import { useListEntries } from '@nemo/sdk/generated/platform/api';
-import type { EntrySortField } from '@nemo/sdk/generated/platform/schema';
-import { SidePanel } from '@nvidia/foundations-react-core';
-import { ThreadConversation } from '@studio/components/IntakeThreadPanel/components/ThreadConversation';
-import { useWorkspaceFromPath } from '@studio/hooks/useWorkspaceFromPath';
-import { getIntakeEntryRoute } from '@studio/routes/utils';
-import { FC, useCallback } from 'react';
-import { useNavigate } from 'react-router';
-
-interface IntakeThreadPanelProps {
-  threadId: string;
-  open: boolean;
-  onOpenChange: (open: boolean) => void;
-}
-
-export const IntakeThreadPanel: FC<IntakeThreadPanelProps> = ({ threadId, open, onOpenChange }) => {
-  const navigate = useNavigate();
-  const workspace = useWorkspaceFromPath();
-
-  const { data, isLoading, error } = useListEntries(workspace, {
-    filter: { context: { thread_id: threadId } },
-    sort: 'created_at' as EntrySortField, // Oldest to newest (chronological)
-  });
-
-  // Animation delay matches SidePanel exit animation duration (see useDeferredUnmount)
-  const PANEL_EXIT_ANIMATION_MS = 300;
-  const [setAnimationTimeout] = useSetTimeout();
-
-  const handleViewEntry = useCallback(
-    (entryId: string) => {
-      // Close the panel first to trigger exit animation
-      onOpenChange(false);
-
-      // Wait for animation to complete before navigating
-      setAnimationTimeout(() => {
-        navigate(getIntakeEntryRoute(workspace, entryId));
-      }, PANEL_EXIT_ANIMATION_MS);
-    },
-    [onOpenChange, navigate, workspace, setAnimationTimeout]
-  );
-
-  const entries = data?.data ?? [];
-
-  return (
-    <SidePanel
-      open={open}
-      onOpenChange={onOpenChange}
-      slotHeading={`Thread: ${threadId}`}
-      bordered
-      modal
-      className="w-[600px]"
-    >
-      {isLoading && <div>Loading...</div>}
-      {error && <div>Error: {error.message}</div>}
-      {entries.length === 0 && !isLoading && <div>No entries found in this thread.</div>}
-      {entries.length > 0 && <ThreadConversation entries={entries} onViewEntry={handleViewEntry} />}
-    </SidePanel>
-  );
-};
diff --git a/web/packages/studio/src/components/IntakeThreadsTable/IntakeThreadsTable.stories.tsx b/web/packages/studio/src/components/IntakeThreadsTable/IntakeThreadsTable.stories.tsx
deleted file mode 100644
index 4c0c549a5c..0000000000
--- a/web/packages/studio/src/components/IntakeThreadsTable/IntakeThreadsTable.stories.tsx
+++ /dev/null
@@ -1,188 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import type { Entry, EntrysPage } from '@nemo/sdk/generated/platform/schema';
-import type { Meta, StoryObj } from '@storybook/react';
-import { IntakeThreadsTable } from '@studio/components/IntakeThreadsTable';
-import { http, HttpResponse } from 'msw';
-
-const INTAKE_ENTRIES_API = '/apis/intake/v2/workspaces/default/entries';
-
-const meta = {
-  component: IntakeThreadsTable,
-  title: 'DataViews/IntakeThreadsTable',
-  args: {
-    workspace: 'default',
-    onRowClick: () => {},
-  },
-} satisfies Meta<typeof IntakeThreadsTable>;
-
-export default meta;
-type Story = StoryObj<typeof meta>;
-
-const emptyEntriesPage: EntrysPage = {
-  data: [],
-  pagination: {
-    page: 1,
-    page_size: 50,
-    current_page_size: 0,
-    total_pages: 0,
-    total_results: 0,
-  },
-};
-
-const mockEntriesPage = {
-  data: [
-    {
-      id: 'entry-thread-abc123',
-      name: 'entry-thread-abc123',
-      workspace: 'default',
-      created_at: '2025-12-16T22:40:12.241917Z',
-      updated_at: '2025-12-16T22:40:12.241918Z',
-      data: {
-        request: {
-          messages: [
-            {
-              role: 'user',
-              content: 'How do I fine-tune a language model for my specific use case?',
-            },
-          ],
-          model: 'meta/llama-3.3-70b-instruct',
-        },
-        response: {
-          choices: [
-            {
-              index: 0,
-              message: {
-                role: 'assistant',
-                content:
-                  'Fine-tuning a language model involves training it on a domain-specific dataset to improve performance on targeted tasks...',
-              },
-              finish_reason: 'stop',
-            },
-          ],
-          usage: { prompt_tokens: 120, completion_tokens: 250, total_tokens: 370 },
-        },
-      },
-      context: {
-        app: 'studio',
-        task: 'qa',
-        thread_id: 'thread-abc123',
-        user_id: 'user-001',
-        created_at: '2025-12-16T22:40:12.241855Z',
-      },
-      events: [],
-    },
-    {
-      id: 'entry-thread-def456',
-      name: 'entry-thread-def456',
-      workspace: 'default',
-      created_at: '2025-12-15T14:20:00.000000Z',
-      updated_at: '2025-12-15T14:20:00.000000Z',
-      data: {
-        request: {
-          messages: [
-            {
-              role: 'user',
-              content: 'What are the best practices for prompt engineering?',
-            },
-          ],
-          model: 'nvidia/nemotron-4-340b-instruct',
-        },
-        response: {
-          choices: [
-            {
-              index: 0,
-              message: {
-                role: 'assistant',
-                content:
-                  'Effective prompt engineering involves being specific, providing context, and iterating on your prompts...',
-              },
-              finish_reason: 'stop',
-            },
-          ],
-          usage: { prompt_tokens: 80, completion_tokens: 180, total_tokens: 260 },
-        },
-      },
-      context: {
-        app: 'studio',
-        task: 'research',
-        thread_id: 'thread-def456',
-        user_id: 'user-002',
-        created_at: '2025-12-15T14:20:00.000000Z',
-      },
-      events: [],
-    },
-    {
-      id: 'entry-thread-ghi789',
-      name: 'entry-thread-ghi789',
-      workspace: 'default',
-      created_at: '2025-12-14T09:00:00.000000Z',
-      updated_at: '2025-12-14T09:00:00.000000Z',
-      data: {
-        request: {
-          messages: [
-            {
-              role: 'user',
-              content: 'Explain the difference between RAG and fine-tuning.',
-            },
-          ],
-          model: 'meta/llama-3.1-8b-instruct',
-        },
-        response: {
-          choices: [
-            {
-              index: 0,
-              message: {
-                role: 'assistant',
-                content:
-                  'RAG (Retrieval-Augmented Generation) retrieves relevant documents at inference time, while fine-tuning bakes knowledge into model weights...',
-              },
-              finish_reason: 'stop',
-            },
-          ],
-          usage: { prompt_tokens: 60, completion_tokens: 150, total_tokens: 210 },
-        },
-      },
-      context: {
-        app: 'studio',
-        task: 'education',
-        thread_id: 'thread-ghi789',
-        user_id: 'user-003',
-        created_at: '2025-12-14T09:00:00.000000Z',
-      },
-      events: [],
-    },
-  ] as Entry[],
-  pagination: {
-    page: 1,
-    page_size: 50,
-    current_page_size: 3,
-    total_pages: 1,
-    total_results: 3,
-  },
-} satisfies EntrysPage;
-
-export const Empty: Story = {
-  parameters: {
-    msw: {
-      handlers: [
-        http.get<never, never, EntrysPage>(INTAKE_ENTRIES_API, () =>
-          HttpResponse.json(emptyEntriesPage)
-        ),
-      ],
-    },
-  },
-};
-
-export const WithData: Story = {
-  parameters: {
-    msw: {
-      handlers: [
-        http.get<never, never, EntrysPage>(INTAKE_ENTRIES_API, () =>
-          HttpResponse.json(mockEntriesPage)
-        ),
-      ],
-    },
-  },
-};
diff --git a/web/packages/studio/src/components/IntakeThreadsTable/index.tsx b/web/packages/studio/src/components/IntakeThreadsTable/index.tsx
deleted file mode 100644
index 42b9986de4..0000000000
--- a/web/packages/studio/src/components/IntakeThreadsTable/index.tsx
+++ /dev/null
@@ -1,317 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import * as DataView from '@nemo/common/src/components/DataView/internal';
-import {
-  ROW_SELECTION_COLUMN_SIZE,
-  StudioDataView,
-} from '@nemo/common/src/components/DataView/StudioDataView';
-import { ErrorMessage } from '@nemo/common/src/components/ErrorMessage';
-import { RelativeTime } from '@nemo/common/src/components/RelativeTime';
-import { TableEmptyState } from '@nemo/common/src/components/TableEmptyState';
-import { useStudioDataViewState } from '@nemo/common/src/hooks/useStudioDataViewState';
-import { getSortParamWithWhitelist } from '@nemo/common/src/utils/query';
-import { useListEntries } from '@nemo/sdk/generated/platform/api';
-import { Entry, EntrySortField } from '@nemo/sdk/generated/platform/schema';
-import { Anchor, Button, Stack, Text } from '@nvidia/foundations-react-core';
-import { useWorkspaceFromPathIfExists } from '@studio/hooks/useWorkspaceFromPath';
-import {
-  getLastAssistantMessage,
-  getLastUserMessageContent,
-  getTurnCount,
-} from '@studio/util/entries';
-import { keepPreviousData } from '@tanstack/react-query';
-import { ComponentProps, FC, useEffect, useMemo, useRef } from 'react';
-import { Link } from 'react-router-dom';
-
-type ThreadEntry = Entry & { id: string };
-
-/** Intake list entries API only supports sorting by created_at / updated_at. */
-const LIST_ENTRIES_SORT_FIELDS = ['created_at', 'updated_at'] as const;
-const THREADS_ENTRY_SCAN_PAGE_SIZE = 1000;
-
-export interface IntakeThreadsTableProps {
-  /** Optional workspace override. Falls back to reading workspace from the URL path. */
-  workspace?: string;
-  /** Callback when threads are selected */
-  onThreadsSelected?: (entries: Entry[]) => void;
-  /** Callback when a row is clicked */
-  onRowClick?: (entry: Entry) => void;
-  /** Enable checkbox selection (default: false) */
-  enableSelection?: boolean;
-  /** Type of selection (default: 'multiple') */
-  selectionType?: 'multiple' | 'single';
-  /** Render thread ID as link - provide a function that returns the route */
-  getThreadRoute?: (entry: Entry) => string;
-  attributes?: {
-    Stack?: ComponentProps<typeof Stack>;
-  };
-}
-
-/**
- * A table that displays a list of intake threads (grouped by thread_id).
- */
-export const IntakeThreadsTable: FC<IntakeThreadsTableProps> = ({
-  workspace: workspaceProp,
-  onThreadsSelected,
-  onRowClick,
-  enableSelection,
-  selectionType = 'multiple',
-  getThreadRoute,
-  attributes,
-}) => {
-  const workspaceFromPath = useWorkspaceFromPathIfExists();
-  const workspace = workspaceProp ?? workspaceFromPath;
-  const workspaceKey = workspace ?? '';
-
-  const dataViewState = useStudioDataViewState({
-    defaultSort: { id: 'created_at', desc: true },
-  });
-  const pageIndex = dataViewState.pagination.state.pageIndex;
-  const pageSize = dataViewState.pagination.state.pageSize;
-
-  // Clear selections when page changes
-  const prevPageIndexRef = useRef(pageIndex);
-  useEffect(() => {
-    if (prevPageIndexRef.current !== pageIndex) {
-      prevPageIndexRef.current = pageIndex;
-      dataViewState.rowSelection.set({});
-    }
-  }, [pageIndex, dataViewState.rowSelection]);
-
-  const {
-    data: entriesResponse,
-    refetch,
-    isFetching,
-    error,
-  } = useListEntries(
-    workspaceKey,
-    {
-      filter: {
-        context: dataViewState.debouncedSearchBar
-          ? { thread_id: dataViewState.debouncedSearchBar }
-          : undefined,
-      },
-      page: 1,
-      page_size: THREADS_ENTRY_SCAN_PAGE_SIZE,
-      sort: getSortParamWithWhitelist(
-        dataViewState.sorting.state,
-        LIST_ENTRIES_SORT_FIELDS,
-        '-created_at'
-      ) as EntrySortField,
-    },
-    {
-      query: {
-        placeholderData: keepPreviousData,
-        enabled: Boolean(workspace),
-      },
-    }
-  );
-
-  // Group the scanned entries locally because some deployed backends reject filter[longest_per_thread].
-  const threads = useMemo<ThreadEntry[]>(() => {
-    const entriesByThread = new Map<string, Entry>();
-
-    for (const entry of entriesResponse?.data || []) {
-      const threadId = entry.context?.thread_id;
-      if (!threadId) continue;
-
-      const currentEntry = entriesByThread.get(threadId);
-      if (!currentEntry || getTurnCount(entry) > getTurnCount(currentEntry)) {
-        entriesByThread.set(threadId, entry);
-      }
-    }
-
-    return Array.from(entriesByThread.entries()).map(([threadId, entry]) => ({
-      ...entry,
-      id: threadId,
-    }));
-  }, [entriesResponse?.data]);
-
-  const paginatedThreads = useMemo(
-    () => threads.slice(pageIndex * pageSize, pageIndex * pageSize + pageSize),
-    [pageIndex, pageSize, threads]
-  );
-
-  // Derive selected threads from DataView's row selection state
-  const selectedThreads = useMemo<ThreadEntry[]>(() => {
-    const selectedIds = Object.keys(dataViewState.rowSelection.state);
-    if (selectedIds.length === 0) return [];
-
-    const selected = selectedIds
-      .map((id) => threads.find((thread) => thread.id === id))
-      .filter((thread): thread is ThreadEntry => thread !== undefined);
-
-    // For single selection mode, return only the last selected item
-    if (selectionType === 'single' && selected.length > 1) {
-      return [selected[selected.length - 1]];
-    }
-
-    return selected;
-  }, [dataViewState.rowSelection.state, threads, selectionType]);
-
-  // Notify parent when selection changes
-  const prevSelectedRef = useRef<ThreadEntry[]>([]);
-  useEffect(() => {
-    // Only notify if selection actually changed (by reference or length)
-    if (
-      prevSelectedRef.current.length !== selectedThreads.length ||
-      !selectedThreads.every((t, i) => t.id === prevSelectedRef.current[i]?.id)
-    ) {
-      prevSelectedRef.current = selectedThreads;
-      onThreadsSelected?.(selectedThreads);
-    }
-  }, [selectedThreads, onThreadsSelected]);
-
-  // Column definitions
-  const makeColumns: ComponentProps<typeof StudioDataView<ThreadEntry>>['makeColumns'] = (
-    { accessor },
-    { rowSelectionColumn }
-  ) =>
-    (
-      [
-        enableSelection && rowSelectionColumn({ size: ROW_SELECTION_COLUMN_SIZE }),
-        {
-          id: 'thread_id',
-          header: 'Thread ID',
-          enableSorting: false,
-          size: 180,
-          cell: ({ row }: { row: DataView.TanstackTable.Row<ThreadEntry> }) => {
-            const threadId = row.original.context?.thread_id || '—';
-            if (getThreadRoute) {
-              return (
-                <Anchor asChild>
-                  <Link to={getThreadRoute(row.original)} className="truncate" title={threadId}>
-                    {threadId}
-                  </Link>
-                </Anchor>
-              );
-            }
-            return (
-              <Text className="truncate" title={threadId}>
-                {threadId}
-              </Text>
-            );
-          },
-        },
-        {
-          id: 'entries_count',
-          header: 'Turns',
-          enableSorting: false,
-          size: 80,
-          cell: ({ row }: { row: DataView.TanstackTable.Row<ThreadEntry> }) => {
-            const count = getTurnCount(row.original);
-            return <Text>{count}</Text>;
-          },
-        },
-        {
-          id: 'model_name',
-          header: 'Model Name',
-          enableSorting: false,
-          size: 150,
-          cell: ({ row }: { row: DataView.TanstackTable.Row<ThreadEntry> }) => {
-            const modelName = row.original.data?.request?.model || '—';
-            return (
-              <Text className="truncate" title={modelName}>
-                {modelName}
-              </Text>
-            );
-          },
-        },
-        {
-          id: 'input',
-          header: 'Input',
-          enableSorting: false,
-          cell: ({ row }: { row: DataView.TanstackTable.Row<ThreadEntry> }) => {
-            const content = getLastUserMessageContent(row.original);
-            return (
-              <Text className="truncate" title={content}>
-                {content || '—'}
-              </Text>
-            );
-          },
-        },
-        {
-          id: 'output',
-          header: 'Output',
-          enableSorting: false,
-          cell: ({ row }: { row: DataView.TanstackTable.Row<ThreadEntry> }) => {
-            const content = getLastAssistantMessage(row.original);
-            return (
-              <Text className="truncate" title={content}>
-                {content || '—'}
-              </Text>
-            );
-          },
-        },
-        accessor('created_at', {
-          id: 'created_at',
-          header: 'Created',
-          enableSorting: true,
-          size: 150,
-          maxSize: 150,
-          minSize: 150,
-          cell({ row }) {
-            return row.original?.created_at ? (
-              <RelativeTime datetime={row.original.created_at} />
-            ) : null;
-          },
-        }),
-        // TODO: Add row actions dropdown menu with thread operations
-        // rowActionsColumn will be added in a future diff
-      ] as (DataView.TanstackTable.ColumnDef<ThreadEntry> | false | undefined)[]
-    ).filter((col): col is DataView.TanstackTable.ColumnDef<ThreadEntry> => Boolean(col));
-
-  // Check if we have an active search (for empty state messaging)
-  const hasActiveSearch = !!dataViewState.debouncedSearchBar;
-
-  return (
-    <Stack gap="density-2xl" {...attributes?.Stack}>
-      <StudioDataView<ThreadEntry>
-        dataViewState={dataViewState}
-        searchField="thread_id"
-        makeColumns={makeColumns}
-        onRowClick={onRowClick ? (row) => onRowClick(row) : undefined}
-        attributes={{
-          DataViewSearchBar: {
-            placeholder: 'Search by thread ID',
-          },
-          DataViewRoot: {
-            data: paginatedThreads,
-            totalCount: threads.length,
-            requestStatus: error ? 'error' : isFetching ? 'loading' : undefined,
-          },
-          DataViewTableContent: {
-            renderErrorState: () => (
-              <ErrorMessage
-                message="Failed to fetch threads"
-                slotFooter={
-                  <Button type="button" kind="tertiary" onClick={() => refetch()}>
-                    Retry
-                  </Button>
-                }
-              />
-            ),
-            renderEmptyState: () => (
-              <TableEmptyState
-                header={hasActiveSearch ? 'No Results' : 'No Threads Found'}
-                emptyMessage={
-                  hasActiveSearch
-                    ? 'No threads match your search criteria.'
-                    : 'Threads for this workspace will appear here when available.'
-                }
-                actions={
-                  hasActiveSearch ? (
-                    <Button kind="tertiary" onClick={dataViewState.resetFilters}>
-                      Clear search
-                    </Button>
-                  ) : undefined
-                }
-              />
-            ),
-          },
-        }}
-      />
-    </Stack>
-  );
-};
diff --git a/web/packages/studio/src/components/IntakeTracesTable/index.spec.tsx b/web/packages/studio/src/components/IntakeTracesTable/index.spec.tsx
new file mode 100644
index 0000000000..f24b657894
--- /dev/null
+++ b/web/packages/studio/src/components/IntakeTracesTable/index.spec.tsx
@@ -0,0 +1,25 @@
+// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { IntakeTracesTable } from '@studio/components/IntakeTracesTable';
+import { renderRoute, screen } from '@studio/tests/util/render';
+import userEvent from '@testing-library/user-event';
+
+describe('IntakeTracesTable', () => {
+  it('shows explicit trace filter facets', async () => {
+    const user = userEvent.setup();
+
+    renderRoute(<IntakeTracesTable workspace="default" />, {
+      history: '/workspaces/default/intake/traces',
+    });
+
+    await screen.findByText('Answer customer policy question');
+    await user.click(await screen.findByTestId('open-filters-button'));
+
+    expect(screen.getByText('Trace ID')).toBeInTheDocument();
+    expect(screen.getByText('Started At')).toBeInTheDocument();
+    expect(screen.queryByText('Status')).not.toBeInTheDocument();
+    expect(screen.queryByText('Session ID')).not.toBeInTheDocument();
+    expect(screen.queryByText('Evaluation Run ID')).not.toBeInTheDocument();
+  });
+});
diff --git a/web/packages/studio/src/components/IntakeTracesTable/index.tsx b/web/packages/studio/src/components/IntakeTracesTable/index.tsx
new file mode 100644
index 0000000000..a6a216ebcd
--- /dev/null
+++ b/web/packages/studio/src/components/IntakeTracesTable/index.tsx
@@ -0,0 +1,209 @@
+// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { dateTimeFilter } from '@nemo/common/src/components/DataView/dateTimeFilter';
+import { ErrorMessage } from '@nemo/common/src/components/ErrorMessage';
+import { RelativeTime } from '@nemo/common/src/components/RelativeTime';
+import { TableEmptyState } from '@nemo/common/src/components/TableEmptyState';
+import { useStudioDataViewState } from '@nemo/common/src/hooks/useStudioDataViewState';
+import { getSortParamWithWhitelist } from '@nemo/common/src/utils/query';
+import { useListTraces } from '@nemo/sdk/generated/platform/api';
+import type { Trace, TraceFilter, TraceSortField } from '@nemo/sdk/generated/platform/schema';
+import { Anchor, Badge, Button } from '@nvidia/foundations-react-core';
+import { getErrorMessage } from '@studio/api/common/utils';
+import { IntakeTelemetryDataView } from '@studio/components/IntakeTelemetryDataView';
+import { useWorkspaceFromPathIfExists } from '@studio/hooks/useWorkspaceFromPath';
+import { getIntakeTraceRoute } from '@studio/routes/utils';
+import {
+  formatCost,
+  formatDurationMs,
+  formatInteger,
+  getTraceDisplayName,
+} from '@studio/util/intakeTelemetry';
+import { keepPreviousData } from '@tanstack/react-query';
+import { ComponentProps, FC, type ReactNode } from 'react';
+import { Link, useNavigate } from 'react-router-dom';
+
+export interface IntakeTracesTableProps {
+  workspace?: string;
+  filterTogglePortalTargetId?: string;
+  emptyStateActions?: ReactNode;
+  noResultsActions?: ReactNode;
+}
+
+export const IntakeTracesTable: FC<IntakeTracesTableProps> = ({
+  workspace: workspaceProp,
+  filterTogglePortalTargetId,
+  emptyStateActions,
+  noResultsActions,
+}) => {
+  const navigate = useNavigate();
+  const routeWorkspace = useWorkspaceFromPathIfExists();
+  const workspace = workspaceProp ?? routeWorkspace;
+  const hasWorkspace = Boolean(workspace);
+  const requestWorkspace = workspace ?? '';
+
+  const dataViewState = useStudioDataViewState({
+    defaultSort: { id: 'started_at', desc: true },
+  });
+
+  const hasActiveFilters = dataViewState.debouncedColumnFilters.length > 0;
+
+  const {
+    data: tracesResponse,
+    isFetching,
+    error,
+  } = useListTraces(
+    requestWorkspace,
+    {
+      filter: (dataViewState.apiFilter.filter ?? {}) as TraceFilter,
+      mode: 'detailed',
+      page: dataViewState.pagination.state.pageIndex + 1,
+      page_size: dataViewState.pagination.state.pageSize,
+      sort: getSortParamWithWhitelist(
+        dataViewState.sorting.state,
+        ['started_at'],
+        '-started_at'
+      ) as TraceSortField,
+    },
+    {
+      query: {
+        enabled: hasWorkspace,
+        placeholderData: keepPreviousData,
+      },
+    }
+  );
+
+  const makeColumns: ComponentProps<typeof IntakeTelemetryDataView<Trace>>['makeColumns'] = ({
+    accessor,
+  }) => [
+    accessor('id', {
+      id: 'id',
+      header: 'Trace',
+      size: 280,
+      enableSorting: false,
+      meta: {
+        filter: {
+          type: 'text' as const,
+          label: 'Trace ID',
+          placeholder: 'Filter by trace ID',
+        },
+      },
+      cell: ({ row }) => {
+        const trace = row.original;
+        const label = getTraceDisplayName(trace);
+        return (
+          <Anchor asChild>
+            <Link
+              to={getIntakeTraceRoute(requestWorkspace, trace.id)}
+              className="truncate"
+              title={label}
+            >
+              {label}
+            </Link>
+          </Anchor>
+        );
+      },
+    }),
+    {
+      id: 'duration_ms',
+      header: 'Duration',
+      size: 120,
+      enableSorting: false,
+      cell: ({ row }) => formatDurationMs(row.original.duration_ms),
+    },
+    {
+      id: 'span_count',
+      header: 'Spans',
+      size: 90,
+      enableSorting: false,
+      cell: ({ row }) => formatInteger(row.original.span_count),
+    },
+    {
+      id: 'error_count',
+      header: 'Errors',
+      size: 90,
+      enableSorting: false,
+      cell: ({ row }) => {
+        const errorCount = row.original.error_count ?? 0;
+        return errorCount > 0 ? (
+          <Badge kind="solid" color="red">
+            {formatInteger(errorCount)}
+          </Badge>
+        ) : (
+          formatInteger(errorCount)
+        );
+      },
+    },
+    {
+      id: 'total_tokens',
+      header: 'Tokens',
+      size: 120,
+      enableSorting: false,
+      cell: ({ row }) => formatInteger(row.original.total_tokens),
+    },
+    {
+      id: 'cost_usd',
+      header: 'Cost',
+      size: 110,
+      enableSorting: false,
+      cell: ({ row }) => formatCost(row.original.cost_usd),
+    },
+    accessor('started_at', {
+      id: 'started_at',
+      header: 'Started',
+      size: 150,
+      enableSorting: true,
+      meta: {
+        filter: dateTimeFilter('Started At'),
+      },
+      cell: ({ row }) => <RelativeTime datetime={row.original.started_at} />,
+    }),
+  ];
+
+  if (error) {
+    return <ErrorMessage message={getErrorMessage(error)} />;
+  }
+
+  if (!workspace) {
+    return <ErrorMessage message="Workspace is required to load traces." />;
+  }
+
+  return (
+    <IntakeTelemetryDataView<Trace>
+      dataViewState={dataViewState}
+      makeColumns={makeColumns}
+      filterTogglePortalTargetId={filterTogglePortalTargetId}
+      onRowClick={(trace) => navigate(getIntakeTraceRoute(requestWorkspace, trace.id))}
+      attributes={{
+        DataViewRoot: {
+          data: tracesResponse?.data ?? [],
+          totalCount: tracesResponse?.pagination?.total_results,
+          requestStatus: isFetching ? 'loading' : undefined,
+        },
+        DataViewTableContent: {
+          renderEmptyState: () =>
+            hasActiveFilters ? (
+              <TableEmptyState
+                header="No Results Found"
+                emptyMessage="No traces match your search or filters."
+                actions={
+                  noResultsActions ?? (
+                    <Button kind="tertiary" onClick={dataViewState.resetFilters}>
+                      Clear Filters
+                    </Button>
+                  )
+                }
+              />
+            ) : (
+              <TableEmptyState
+                header="No Traces"
+                emptyMessage="Trace summaries will appear here after spans are ingested."
+                actions={emptyStateActions}
+              />
+            ),
+        },
+      }}
+    />
+  );
+};
diff --git a/web/packages/studio/src/components/buttons/ExportEntriesButton/index.spec.tsx b/web/packages/studio/src/components/buttons/ExportEntriesButton/index.spec.tsx
deleted file mode 100644
index fb25c84628..0000000000
--- a/web/packages/studio/src/components/buttons/ExportEntriesButton/index.spec.tsx
+++ /dev/null
@@ -1,123 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { ExportEntriesButton } from '@studio/components/buttons/ExportEntriesButton';
-import { ROUTE_PARAMS } from '@studio/constants/routes';
-import { workspace1 } from '@studio/mocks/entity-store/projects';
-import { server } from '@studio/mocks/node';
-import { mockUseParams } from '@studio/tests/util/mockUseParams';
-import { render } from '@studio/tests/util/render';
-import { screen, waitFor } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import { http, HttpResponse } from 'msw';
-
-// Mock brand assets icons
-vi.mock('lucide-react', () => ({
-  Database: () => <span data-testid="db-icon" />,
-  Trash: () => <span data-testid="trash-icon" />,
-  Filter: () => <span data-testid="filter-icon" />,
-}));
-
-const EXPORT_JOBS_URL = '*/apis/intake/v2/workspaces/:workspace/export/jobs';
-
-describe('ExportEntriesButton', () => {
-  const user = userEvent.setup();
-  beforeEach(() => {
-    mockUseParams({
-      [ROUTE_PARAMS.workspace]: workspace1.workspace,
-    });
-  });
-
-  it('renders the export entries button', () => {
-    render(<ExportEntriesButton />);
-
-    const button = screen.getByRole('button', { name: /export entries/i });
-    expect(button).toBeInTheDocument();
-  });
-
-  it('opens the modal when clicking the button', async () => {
-    render(<ExportEntriesButton />);
-
-    const button = screen.getByRole('button', { name: /export entries/i });
-    await user.click(button);
-
-    expect(await screen.findByText('Export Entries to Dataset')).toBeInTheDocument();
-  });
-
-  it('displays the form modal with correct title and submit button', async () => {
-    render(<ExportEntriesButton />);
-
-    await user.click(screen.getByRole('button', { name: /export entries/i }));
-
-    expect(await screen.findByText('Export Entries to Dataset')).toBeInTheDocument();
-    expect(screen.getByRole('button', { name: /confirm/i })).toBeInTheDocument();
-  });
-
-  it('closes the modal when clicking the close button', async () => {
-    render(<ExportEntriesButton />);
-
-    // Open modal
-    await user.click(screen.getByRole('button', { name: /export entries/i }));
-    expect(await screen.findByText('Export Entries to Dataset')).toBeInTheDocument();
-
-    // Close modal via X button (typically has name "Close")
-    const closeButton = screen.getByRole('button', { name: /close/i });
-    await user.click(closeButton);
-
-    await waitFor(() => {
-      expect(screen.queryByText('Export Entries to Dataset')).not.toBeInTheDocument();
-    });
-  });
-
-  it('shows error toast when export job creation fails', async () => {
-    // Suppress expected console.error from the component's catch block
-    const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
-
-    server.use(
-      http.post(EXPORT_JOBS_URL, () => HttpResponse.json({ error: 'Forbidden' }, { status: 403 }))
-    );
-    render(<ExportEntriesButton />);
-
-    // Open modal
-    await user.click(screen.getByRole('button', { name: /export entries/i }));
-    expect(await screen.findByText('Export Entries to Dataset')).toBeInTheDocument();
-
-    // Set dataset
-    await user.click(screen.getByRole('combobox', { name: 'Dataset Destination' }));
-    await user.click(screen.getAllByRole('option')[0]);
-
-    // Submit form
-    const confirmButton = screen.getByRole('button', { name: /confirm/i });
-    await user.click(confirmButton);
-
-    await waitFor(() => {
-      expect(
-        screen.getByText('Failed to create export job. Please try again.')
-      ).toBeInTheDocument();
-    });
-
-    consoleSpy.mockRestore();
-  });
-
-  it('closes modal and resets form on successful submission', async () => {
-    render(<ExportEntriesButton />);
-
-    // Open modal
-    await user.click(screen.getByRole('button', { name: /export entries/i }));
-    expect(await screen.findByText('Export Entries to Dataset')).toBeInTheDocument();
-
-    // Set dataset
-    await user.click(screen.getByRole('combobox', { name: 'Dataset Destination' }));
-    await user.click(screen.getAllByRole('option')[0]);
-
-    // Submit form
-    const confirmButton = screen.getByRole('button', { name: /confirm/i });
-    await user.click(confirmButton);
-
-    await waitFor(() => {
-      expect(screen.getByText('Export job created successfully!')).toBeInTheDocument();
-    });
-
-    expect(screen.queryByText('Export Entries to Dataset')).not.toBeInTheDocument();
-  });
-});
diff --git a/web/packages/studio/src/components/buttons/ExportEntriesButton/index.tsx b/web/packages/studio/src/components/buttons/ExportEntriesButton/index.tsx
deleted file mode 100644
index 173f5ea3c0..0000000000
--- a/web/packages/studio/src/components/buttons/ExportEntriesButton/index.tsx
+++ /dev/null
@@ -1,100 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { zodResolver } from '@hookform/resolvers/zod';
-import { FormModal } from '@nemo/common/src/components/FormModal';
-import { useToast } from '@nemo/common/src/providers/toast/useToast';
-import { getListExportJobsQueryKey, useCreateExportJob } from '@nemo/sdk/generated/platform/api';
-import { Button } from '@nvidia/foundations-react-core';
-import { NewExportJobForm } from '@studio/components/form/NewExportJobForm';
-import {
-  getDefaultExportFileName,
-  newExportJobFormSchema,
-} from '@studio/components/form/NewExportJobForm/constants';
-import { useWorkspaceFromPath } from '@studio/hooks/useWorkspaceFromPath';
-import { handleFormErrorsGeneric } from '@studio/util/forms/error';
-import { useBoolean } from '@studio/util/hooks/useBoolean';
-import { websiteLogger } from '@studio/util/logger';
-import { useQueryClient } from '@tanstack/react-query';
-import { FormProvider, useForm } from 'react-hook-form';
-import { z } from 'zod';
-
-/**
- * A button that enacapsulates the logic for rendering a Form Modal to export entries to a dataset.
- * @returns
- */
-export const ExportEntriesButton = () => {
-  const toast = useToast();
-  const queryClient = useQueryClient();
-  const workspace = useWorkspaceFromPath();
-  const [isOpen, openModal, closeModal] = useBoolean(false);
-  const { mutateAsync: createExportJob, isPending: isCreatingExportJob } = useCreateExportJob();
-  const form = useForm<z.infer<typeof newExportJobFormSchema>>({
-    resolver: zodResolver(newExportJobFormSchema),
-    defaultValues: {
-      export_file_name: getDefaultExportFileName(),
-      namespace: workspace,
-      config: { limit: 1000 },
-    },
-  });
-
-  const resetAndClose = () => {
-    closeModal();
-    form.reset();
-  };
-
-  const submitForm = async (data: z.infer<typeof newExportJobFormSchema>) => {
-    try {
-      if (!data.output_file_url) {
-        toast.error('Output file URL is required.');
-        return;
-      }
-      await createExportJob({
-        workspace,
-        data: {
-          output_file_url: data.output_file_url,
-          config: {
-            limit: data.config?.limit,
-            filters: data.config?.filters,
-            search: data.config?.search,
-            format_options: data.config?.format_options,
-          },
-        },
-      });
-      resetAndClose();
-      toast.success('Export job created successfully!');
-      queryClient.resetQueries({ queryKey: getListExportJobsQueryKey(workspace) });
-    } catch (error) {
-      websiteLogger.error(error instanceof Error ? error.message : 'Failed to create export job');
-      toast.error('Failed to create export job. Please try again.');
-    }
-  };
-
-  return (
-    <>
-      <Button color="brand" onClick={openModal}>
-        Export Entries
-      </Button>
-
-      {isOpen && (
-        <FormModal
-          open
-          className="w-auto min-w-[500px] max-w-[1300px]"
-          title="Export Entries to Dataset"
-          submitButtonText="Confirm"
-          disabled={isCreatingExportJob}
-          loading={isCreatingExportJob}
-          onSubmit={form.handleSubmit(
-            submitForm,
-            handleFormErrorsGeneric({ title: 'New Export Job Form Errors' })
-          )}
-          onClose={resetAndClose}
-        >
-          <FormProvider {...form}>
-            <NewExportJobForm />
-          </FormProvider>
-        </FormModal>
-      )}
-    </>
-  );
-};
diff --git a/web/packages/studio/src/components/charts/FeedbackRatingPieChart/constants.ts b/web/packages/studio/src/components/charts/FeedbackRatingPieChart/constants.ts
deleted file mode 100644
index 715b103d97..0000000000
--- a/web/packages/studio/src/components/charts/FeedbackRatingPieChart/constants.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-export const THUMBS_UP_LABEL = 'Positive';
-export const THUMBS_DOWN_LABEL = 'Negative';
diff --git a/web/packages/studio/src/components/charts/FeedbackRatingPieChart/index.tsx b/web/packages/studio/src/components/charts/FeedbackRatingPieChart/index.tsx
deleted file mode 100644
index 0fd6c5c742..0000000000
--- a/web/packages/studio/src/components/charts/FeedbackRatingPieChart/index.tsx
+++ /dev/null
@@ -1,84 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { PieChart, PieItemIdentifier } from '@mui/x-charts';
-import { ThumbDirection } from '@nemo/sdk/generated/platform/schema';
-import { Text } from '@nvidia/foundations-react-core';
-import {
-  THUMBS_UP_LABEL,
-  THUMBS_DOWN_LABEL,
-} from '@studio/components/charts/FeedbackRatingPieChart/constants';
-import { PieCenterLabels } from '@studio/components/charts/PieCenterLabels';
-import { PieChartSkeleton } from '@studio/components/charts/PieChartSkeleton';
-import { useWorkspaceFromPath } from '@studio/hooks/useWorkspaceFromPath';
-import { getIntakeEntriesRoute } from '@studio/routes/utils';
-import React from 'react';
-import { useNavigate } from 'react-router';
-
-interface ThumbsPieChartProps {
-  height?: number;
-  isPending?: boolean;
-  thumbsUp?: {
-    raw: number;
-    percentage: number;
-  };
-  thumbsDown?: {
-    raw: number;
-    percentage: number;
-  };
-}
-
-export function FeedbackRatingPieChart({
-  height = 400,
-  isPending,
-  thumbsUp,
-  thumbsDown,
-}: ThumbsPieChartProps) {
-  const workspace = useWorkspaceFromPath();
-  const navigate = useNavigate();
-
-  if (isPending || !thumbsUp || !thumbsDown) {
-    return <PieChartSkeleton height={height} />;
-  }
-
-  const totalThumbs = thumbsUp.raw + thumbsDown.raw;
-  const data = [
-    { value: thumbsUp.raw, label: THUMBS_UP_LABEL, color: 'var(--color-green-700)' },
-    { value: thumbsDown.raw, label: THUMBS_DOWN_LABEL, color: 'var(--color-red-700)' },
-  ].sort((a, b) => {
-    return a.value - b.value;
-  });
-
-  const handleItemClick = (
-    _: React.MouseEvent<SVGPathElement, MouseEvent>,
-    params: PieItemIdentifier
-  ) => {
-    const rating =
-      data[params.dataIndex].label === THUMBS_UP_LABEL ? ThumbDirection.up : ThumbDirection.down;
-    navigate(getIntakeEntriesRoute(workspace, { filter: { user_rating: { thumb: rating } } }));
-  };
-
-  return (
-    <>
-      <Text kind="title/sm">Feedback Ratings</Text>
-      <PieChart
-        series={[
-          {
-            data: totalThumbs ? data : [],
-            innerRadius: '60%',
-          },
-        ]}
-        margin={{ left: 1, right: 1, top: 1, bottom: 1 }}
-        onItemClick={handleItemClick}
-        height={height}
-        slotProps={{
-          legend: {
-            hidden: true,
-          },
-        }}
-      >
-        {totalThumbs && <PieCenterLabels labels={[`${totalThumbs}`, 'Total Ratings']} />}
-      </PieChart>
-    </>
-  );
-}
diff --git a/web/packages/studio/src/components/charts/FeedbackSentimentLineChart/index.tsx b/web/packages/studio/src/components/charts/FeedbackSentimentLineChart/index.tsx
deleted file mode 100644
index 1bd8f7dc69..0000000000
--- a/web/packages/studio/src/components/charts/FeedbackSentimentLineChart/index.tsx
+++ /dev/null
@@ -1,106 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { LineChart } from '@mui/x-charts/LineChart';
-import type { Entry } from '@nemo/sdk/generated/platform/schema';
-import { Stack, Text } from '@nvidia/foundations-react-core';
-import {
-  countRatingsByDate,
-  getUniqueSortedDates,
-  mapToLabels,
-} from '@studio/components/charts/FeedbackSentimentLineChart/utils';
-import { LineChartSkeleton } from '@studio/components/charts/LineChartSkeleton';
-import { FC, useMemo } from 'react';
-
-enum GraphAxisId {
-  Date = 'date',
-  Timestamp = 'timestamp',
-  Count = 'count',
-}
-
-interface Props {
-  entries?: Entry[];
-  isPending?: boolean;
-  height?: number;
-}
-
-export const FeedbackSentimentLineChart: FC<Props> = ({
-  entries = [],
-  isPending,
-  height = 400,
-}) => {
-  const graphData = useMemo((): Entry[] => {
-    return entries.sort((entryA, entryB) => {
-      return (
-        new Date(entryA.created_at || '').getTime() - new Date(entryB.created_at || '').getTime()
-      );
-    });
-  }, [entries]);
-
-  const xLabels = getUniqueSortedDates(graphData);
-  const positiveData = countRatingsByDate(graphData, true);
-  const negativeData = countRatingsByDate(graphData, false);
-
-  if (isPending) {
-    return <LineChartSkeleton />;
-  }
-
-  return (
-    <>
-      <Stack gap="density-sm">
-        <Text kind="title/sm">Feedback</Text>
-        <div>
-          <Text className="text-lg">{entries?.length} </Text>
-          <Text>Feedback Entries</Text>
-        </div>
-      </Stack>
-      <LineChart
-        grid={{ horizontal: true }}
-        height={height}
-        xAxis={[
-          {
-            id: GraphAxisId.Date,
-            label: 'Date',
-            data: xLabels,
-            scaleType: 'point',
-          },
-        ]}
-        yAxis={[
-          {
-            id: GraphAxisId.Count,
-            label: 'Count',
-          },
-        ]}
-        series={[
-          {
-            label: 'Positive',
-            data: mapToLabels(positiveData, xLabels),
-            color: 'var(--text-color-brand)',
-            xAxisId: GraphAxisId.Date,
-            showMark: mapToLabels(positiveData, xLabels).length <= 1,
-          },
-          {
-            label: 'Negative',
-            data: mapToLabels(negativeData, xLabels),
-            color: 'var(--text-color-accent-red)',
-            xAxisId: GraphAxisId.Date,
-            showMark: mapToLabels(negativeData, xLabels).length <= 1,
-          },
-        ]}
-        slotProps={{
-          legend: {
-            direction: 'row',
-            position: { vertical: 'top', horizontal: 'right' },
-            itemMarkWidth: 12,
-            itemMarkHeight: 12,
-            labelStyle: {
-              fontSize: 12,
-              lineHeight: '12px',
-              fill: 'var(--text-color-base)',
-            },
-          },
-        }}
-      />
-    </>
-  );
-};
diff --git a/web/packages/studio/src/components/charts/FeedbackSentimentLineChart/utils.spec.ts b/web/packages/studio/src/components/charts/FeedbackSentimentLineChart/utils.spec.ts
deleted file mode 100644
index 10bab048e2..0000000000
--- a/web/packages/studio/src/components/charts/FeedbackSentimentLineChart/utils.spec.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import type { Entry } from '@nemo/sdk/generated/platform/schema';
-import {
-  countRatingsByDate,
-  getUniqueSortedDates,
-  mapToLabels,
-} from '@studio/components/charts/FeedbackSentimentLineChart/utils';
-
-const makeEntry = (created_at: string, user_rating?: unknown): Entry =>
-  ({
-    id: '1',
-    created_at,
-    ...(user_rating !== undefined ? { user_rating } : {}),
-  }) as Entry;
-
-describe('getUniqueSortedDates', () => {
-  it('returns unique sorted dates in YYYY-MM-DD format', () => {
-    const entries = [
-      makeEntry('2024-03-15T10:00:00Z'),
-      makeEntry('2024-03-14T08:00:00Z'),
-      makeEntry('2024-03-15T12:00:00Z'),
-    ];
-    const result = getUniqueSortedDates(entries);
-    expect(result[0]).toBe('2024-03-14');
-    expect(result[1]).toBe('2024-03-15');
-  });
-
-  it('adds today if not already present', () => {
-    const entries = [makeEntry('2020-01-01T00:00:00Z')];
-    const result = getUniqueSortedDates(entries);
-    const today = new Date().toISOString().split('T')[0];
-    expect(result).toContain(today);
-  });
-
-  it('returns empty array for empty entries', () => {
-    expect(getUniqueSortedDates([])).toEqual([]);
-  });
-});
-
-describe('mapToLabels', () => {
-  it('maps counts to labels, defaulting to 0', () => {
-    const mapping = { '2024-03-14': 5, '2024-03-15': 3 };
-    const labels = ['2024-03-13', '2024-03-14', '2024-03-15'];
-    expect(mapToLabels(mapping, labels)).toEqual([0, 5, 3]);
-  });
-
-  it('returns all zeros for empty mapping', () => {
-    expect(mapToLabels({}, ['a', 'b'])).toEqual([0, 0]);
-  });
-});
-
-describe('countRatingsByDate', () => {
-  it('counts entries with user_rating when ratingValue is true', () => {
-    const entries = [
-      makeEntry('2024-03-14T10:00:00Z', { thumb: 'up' }),
-      makeEntry('2024-03-14T12:00:00Z', { thumb: 'down' }),
-      makeEntry('2024-03-15T08:00:00Z'),
-    ];
-    const result = countRatingsByDate(entries, true);
-    expect(result['2024-03-14']).toBe(2);
-    expect(result['2024-03-15']).toBeUndefined();
-  });
-
-  it('counts entries without user_rating when ratingValue is false', () => {
-    const entries = [
-      makeEntry('2024-03-14T10:00:00Z', { thumb: 'up' }),
-      makeEntry('2024-03-14T12:00:00Z'),
-      makeEntry('2024-03-15T08:00:00Z'),
-    ];
-    const result = countRatingsByDate(entries, false);
-    expect(result['2024-03-14']).toBe(1);
-    expect(result['2024-03-15']).toBe(1);
-  });
-});
diff --git a/web/packages/studio/src/components/charts/FeedbackSentimentLineChart/utils.ts b/web/packages/studio/src/components/charts/FeedbackSentimentLineChart/utils.ts
deleted file mode 100644
index fb41da71de..0000000000
--- a/web/packages/studio/src/components/charts/FeedbackSentimentLineChart/utils.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import type { Entry } from '@nemo/sdk/generated/platform/schema';
-
-export const getUniqueSortedDates = (entries: Entry[]) => {
-  // Sort by created_at in ascending order
-  const sortedObjects = entries.sort((a, b) => {
-    return new Date(a.created_at || '').getTime() - new Date(b.created_at || '').getTime();
-  });
-
-  // Map to date-only strings and filter unique dates
-  const uniqueDates = new Set(
-    sortedObjects.map((obj) => new Date(obj.created_at || '').toISOString().split('T')[0]) // 'YYYY-MM-DD' format
-  );
-  const today = new Date().toISOString().split('T')[0];
-  if (!uniqueDates.has(today) && entries.length > 0) {
-    uniqueDates.add(today);
-  }
-
-  return Array.from(uniqueDates);
-};
-
-export const mapToLabels = (mapping: Record<string, number>, labels: string[]) =>
-  labels.map((label) => (mapping[label] ? mapping[label] : 0));
-
-export const countRatingsByDate = (entries: Entry[], ratingValue: boolean) => {
-  return entries
-    .filter((data) => Boolean(data.user_rating) === ratingValue)
-    .reduce(
-      (countMap, entry) => {
-        const dateKey = new Date(entry.created_at || '').toISOString().split('T')[0];
-        if (!countMap[dateKey]) {
-          countMap[dateKey] = 1;
-        } else {
-          countMap[dateKey]++;
-        }
-        return countMap;
-      },
-      {} as Record<string, number>
-    );
-};
diff --git a/web/packages/studio/src/components/dataViews/CustomModelsDataView/index.tsx b/web/packages/studio/src/components/dataViews/CustomModelsDataView/index.tsx
index fc6b074e9f..2ff8e1d05a 100644
--- a/web/packages/studio/src/components/dataViews/CustomModelsDataView/index.tsx
+++ b/web/packages/studio/src/components/dataViews/CustomModelsDataView/index.tsx
@@ -39,7 +39,7 @@ import { BaseModelSearchFilterField } from '@studio/components/FilterFields';
 import type { ModelPanelTab } from '@studio/components/sidePanels/ModelPanels/ModelPanel';
 import { INTAKE_ENABLED } from '@studio/constants/environment';
 import { LINK_DOCS_STUDIO_CUSTOMIZATION } from '@studio/constants/links';
-import { getEvaluationMetricsRunRoute, getIntakeEntriesRoute } from '@studio/routes/utils';
+import { getEvaluationMetricsRunRoute, getIntakeTracesRoute } from '@studio/routes/utils';
 import { keepPreviousData } from '@tanstack/react-query';
 import { BrainCircuit, X, Trash } from 'lucide-react';
 import { ComponentProps, FC, useCallback, useMemo, useState } from 'react';
@@ -375,9 +375,9 @@ export const CustomModelsDataView: FC<CustomModelsDataViewProps> = ({
           ...(INTAKE_ENABLED
             ? [
                 {
-                  children: 'View Entries',
+                  children: 'View Intake',
                   onSelect: () => {
-                    navigate(getIntakeEntriesRoute(workspace));
+                    navigate(getIntakeTracesRoute(workspace));
                   },
                 },
               ]
diff --git a/web/packages/studio/src/components/dataViews/ExportJobsDataView/ExportJobsDataView.stories.tsx b/web/packages/studio/src/components/dataViews/ExportJobsDataView/ExportJobsDataView.stories.tsx
deleted file mode 100644
index ec03b39b76..0000000000
--- a/web/packages/studio/src/components/dataViews/ExportJobsDataView/ExportJobsDataView.stories.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import type { ExportJobsPage } from '@nemo/sdk/generated/platform/schema';
-import type { Meta, StoryObj } from '@storybook/react';
-import { ExportJobsDataView } from '@studio/components/dataViews/ExportJobsDataView';
-import { mockExportJobsPage } from '@studio/mocks/intake/exportJobs';
-import { http, HttpResponse } from 'msw';
-
-const EXPORT_JOBS_API = '/apis/intake/v2/workspaces/default/export/jobs';
-
-const meta = {
-  component: ExportJobsDataView,
-  title: 'DataViews/ExportJobsDataView',
-} satisfies Meta<typeof ExportJobsDataView>;
-
-export default meta;
-type Story = StoryObj<typeof meta>;
-
-const emptyExportJobsPage: ExportJobsPage = {
-  data: [],
-  pagination: {
-    page: 1,
-    page_size: 50,
-    current_page_size: 0,
-    total_pages: 0,
-    total_results: 0,
-  },
-};
-
-export const Empty: Story = {
-  parameters: {
-    msw: {
-      handlers: [
-        http.get<never, never, ExportJobsPage>(EXPORT_JOBS_API, () =>
-          HttpResponse.json(emptyExportJobsPage)
-        ),
-      ],
-    },
-  },
-};
-
-export const WithData: Story = {
-  parameters: {
-    msw: {
-      handlers: [
-        http.get<never, never, ExportJobsPage>(EXPORT_JOBS_API, () =>
-          HttpResponse.json(mockExportJobsPage)
-        ),
-      ],
-    },
-  },
-};
diff --git a/web/packages/studio/src/components/dataViews/ExportJobsDataView/index.spec.tsx b/web/packages/studio/src/components/dataViews/ExportJobsDataView/index.spec.tsx
deleted file mode 100644
index 2624afb6e2..0000000000
--- a/web/packages/studio/src/components/dataViews/ExportJobsDataView/index.spec.tsx
+++ /dev/null
@@ -1,175 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { ExportJobsPage } from '@nemo/sdk/generated/platform/schema';
-import { ExportJobsDataView } from '@studio/components/dataViews/ExportJobsDataView';
-import { ROUTES } from '@studio/constants/routes';
-import { exportJob1, exportJob2 } from '@studio/mocks/intake/exportJobs';
-import { server } from '@studio/mocks/node';
-import { renderRoute } from '@studio/tests/util/render';
-import { screen, waitFor, within } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import { http, HttpResponse } from 'msw';
-
-vi.mock('use-debounce', () => ({
-  useDebounce: (value: unknown) => [value, { cancel: () => {}, flush: () => {} }],
-}));
-
-const EXPORT_JOBS_URL = '*/apis/intake/v2/workspaces/:workspace/export/jobs';
-
-const renderComponent = (initialEntry: string = '/workspaces/default/intake/export-jobs') => {
-  return renderRoute(undefined, {
-    history: initialEntry,
-    routes: [
-      {
-        path: ROUTES.workspace.intakeExportJobs,
-        element: <ExportJobsDataView />,
-      },
-    ],
-  });
-};
-
-describe('ExportJobsDataView', () => {
-  describe('Data Display', () => {
-    it('displays export jobs in the table', async () => {
-      renderComponent();
-
-      await waitFor(() => {
-        expect(screen.getByText(exportJob1.id)).toBeInTheDocument();
-      });
-
-      expect(screen.getByText(exportJob2.id)).toBeInTheDocument();
-    });
-
-    it('displays destination URLs', async () => {
-      renderComponent();
-
-      await waitFor(() => {
-        expect(screen.getByText(exportJob1.output_file_url!)).toBeInTheDocument();
-      });
-    });
-
-    it('displays results count', async () => {
-      renderComponent();
-
-      await waitFor(() => {
-        expect(screen.getByText('1-2 of 2 items')).toBeInTheDocument();
-      });
-    });
-  });
-
-  describe('Empty State', () => {
-    it('displays empty state when no jobs exist', async () => {
-      const emptyPage: ExportJobsPage = {
-        data: [],
-        pagination: {
-          page: 1,
-          page_size: 50,
-          current_page_size: 0,
-          total_pages: 0,
-          total_results: 0,
-        },
-      };
-
-      server.use(
-        http.get(EXPORT_JOBS_URL, () => {
-          return HttpResponse.json(emptyPage);
-        })
-      );
-
-      renderComponent();
-
-      await waitFor(() => {
-        expect(screen.getByText('No Export Jobs')).toBeInTheDocument();
-      });
-    });
-  });
-
-  describe('Filter Panel', () => {
-    it('displays filter options in the panel', async () => {
-      const user = userEvent.setup();
-      renderComponent();
-
-      const filterButton = await screen.findByTestId('open-filters-button');
-      await user.click(filterButton);
-
-      const filterPanel = screen.getByTestId('studio-dataview-filter-panel');
-      expect(within(filterPanel).getByText('Status')).toBeInTheDocument();
-      expect(within(filterPanel).getByText('Created At')).toBeInTheDocument();
-    });
-  });
-
-  describe('Job ID Click', () => {
-    it('job ID opens side panel', async () => {
-      const user = userEvent.setup();
-      renderComponent();
-
-      const jobIdLink = await screen.findByText(exportJob1.id);
-      await user.click(jobIdLink);
-
-      await waitFor(() => {
-        expect(screen.getByText('Export Job Details')).toBeInTheDocument();
-      });
-    });
-  });
-
-  describe('Side Panel', () => {
-    it('does not show side panel initially', () => {
-      renderComponent();
-      const filterPanel = screen.getByTestId('studio-dataview-filter-panel-container');
-      expect(filterPanel).toBeInTheDocument();
-      expect(filterPanel).toHaveClass('w-0', 'opacity-0');
-    });
-  });
-
-  describe('filter query params', () => {
-    const emptyPage: ExportJobsPage = {
-      data: [],
-      pagination: {
-        page: 1,
-        page_size: 50,
-        current_page_size: 0,
-        total_pages: 0,
-        total_results: 0,
-      },
-    };
-
-    const captureRequests = () => {
-      const requestUrls: string[] = [];
-      server.use(
-        http.get(EXPORT_JOBS_URL, ({ request }) => {
-          requestUrls.push(request.url);
-          return HttpResponse.json(emptyPage);
-        })
-      );
-      return requestUrls;
-    };
-
-    it('sends filter[id] (exact match) when id search is active', async () => {
-      const requestUrls = captureRequests();
-      renderComponent('/workspaces/default/intake/export-jobs?s=abc123');
-
-      await waitFor(() => {
-        expect(requestUrls.some((u) => new URL(u).searchParams.has('filter[id]'))).toBe(true);
-      });
-
-      const url = new URL(requestUrls.at(-1)!);
-      expect(url.searchParams.get('filter[id]')).toBe('abc123');
-      // Exact match — must NOT be wrapped in $like
-      expect(url.searchParams.has('filter[id][$like]')).toBe(false);
-    });
-
-    it('never emits a top-level search or search[ key', async () => {
-      const requestUrls = captureRequests();
-      renderComponent('/workspaces/default/intake/export-jobs?s=abc123');
-
-      await waitFor(() => expect(requestUrls.length).toBeGreaterThan(0));
-
-      for (const raw of requestUrls) {
-        const params = new URL(raw).searchParams;
-        expect(params.has('search')).toBe(false);
-        expect(Array.from(params.keys()).some((k) => k.startsWith('search['))).toBe(false);
-      }
-    });
-  });
-});
diff --git a/web/packages/studio/src/components/dataViews/ExportJobsDataView/index.tsx b/web/packages/studio/src/components/dataViews/ExportJobsDataView/index.tsx
deleted file mode 100644
index 8312f8e496..0000000000
--- a/web/packages/studio/src/components/dataViews/ExportJobsDataView/index.tsx
+++ /dev/null
@@ -1,167 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { dateTimeFilter } from '@nemo/common/src/components/DataView/dateTimeFilter';
-import { StudioDataView } from '@nemo/common/src/components/DataView/StudioDataView';
-import { RelativeTime } from '@nemo/common/src/components/RelativeTime';
-import { StatusBadge } from '@nemo/common/src/components/StatusBadge';
-import { TableEmptyState } from '@nemo/common/src/components/TableEmptyState';
-import { useQueryParams } from '@nemo/common/src/hooks/useQueryParams';
-import { useStudioDataViewState } from '@nemo/common/src/hooks/useStudioDataViewState';
-import { getSortParam } from '@nemo/common/src/utils/query';
-import { useListExportJobs } from '@nemo/sdk/generated/platform/api';
-import type {
-  ExportJob,
-  ExportJobFilter,
-  ExportJobSortField,
-} from '@nemo/sdk/generated/platform/schema';
-import { Button, Flex, Stack } from '@nvidia/foundations-react-core';
-import { getErrorMessage } from '@studio/api/common/utils';
-import { ErrorPanel } from '@studio/components/ErrorPanel';
-import { ExportJobPanel } from '@studio/components/sidePanels/ExportJobPanel';
-import { EXPORT_JOB_STATUS_FILTER_OPTIONS } from '@studio/constants/intakeJobs';
-import { useWorkspaceFromPath } from '@studio/hooks/useWorkspaceFromPath';
-import { QUERY_PARAMETERS } from '@studio/routes/constants';
-import { keepPreviousData } from '@tanstack/react-query';
-import { Database } from 'lucide-react';
-import { ComponentProps } from 'react';
-
-export const ExportJobsDataView = () => {
-  const workspace = useWorkspaceFromPath();
-  const { getQueryParam, setQueryParam } = useQueryParams();
-  const exportJobId = getQueryParam(QUERY_PARAMETERS.exportJobId);
-
-  const dataViewState = useStudioDataViewState<ExportJobFilter>({
-    defaultSort: { id: 'created_at', desc: true },
-  });
-
-  const hasActiveFilters =
-    !!dataViewState.debouncedSearchBar || dataViewState.debouncedColumnFilters.length > 0;
-
-  const {
-    data: exportJobsData,
-    isFetching: isFetchingExportJobs,
-    error,
-  } = useListExportJobs(
-    workspace,
-    {
-      page: dataViewState.pagination.state.pageIndex + 1,
-      page_size: dataViewState.pagination.state.pageSize,
-      sort: getSortParam(dataViewState.sorting.state) as ExportJobSortField,
-      filter: {
-        ...dataViewState.apiFilter.filter,
-        ...(dataViewState.apiFilter.searchText ? { id: dataViewState.apiFilter.searchText } : {}),
-      },
-    },
-    {
-      query: {
-        placeholderData: keepPreviousData,
-        // eagerly refetch so user can always see up to date job statuses
-        staleTime: 0,
-        refetchOnWindowFocus: true,
-      },
-    }
-  );
-
-  const makeColumns: ComponentProps<typeof StudioDataView<ExportJob>>['makeColumns'] = ({
-    accessor,
-  }) => [
-    accessor((original) => original?.id || '', {
-      header: 'Job ID',
-      cell: ({ row }) => row.original.id,
-    }),
-    accessor((original) => original?.output_file_url || '', {
-      header: 'Destination',
-      cell: ({ row }) => (
-        <Flex align="center" gap="1">
-          <Database className="flex-none" />
-          {row.original.output_file_url}
-        </Flex>
-      ),
-    }),
-    accessor((original) => original?.status || '', {
-      header: 'Status',
-      size: 125,
-      meta: {
-        filter: {
-          type: 'single-select' as const,
-          label: 'Status',
-          options: EXPORT_JOB_STATUS_FILTER_OPTIONS,
-        },
-      },
-      cell: ({ row }) => <StatusBadge status={row.original.status} />,
-    }),
-    accessor((original) => original?.created_at || '', {
-      id: 'created_at',
-      header: 'Created',
-      size: 200,
-      enableSorting: true,
-      meta: {
-        filter: dateTimeFilter('Created At'),
-      },
-      cell: ({ row }) => <RelativeTime datetime={row.original.created_at ?? ''} />,
-    }),
-  ];
-
-  // Error state
-  if (error) {
-    return <ErrorPanel errorMessage={getErrorMessage(error)} />;
-  }
-
-  return (
-    <Stack className="flex-1 min-h-0">
-      <StudioDataView
-        dataViewState={dataViewState}
-        searchField="id"
-        makeColumns={makeColumns}
-        onRowClick={(row) => {
-          if (row.id) {
-            setQueryParam(QUERY_PARAMETERS.exportJobId, row.id);
-          }
-        }}
-        attributes={{
-          DataViewSearchBar: {
-            placeholder: 'Search by job ID',
-          },
-          DataViewRoot: {
-            data: exportJobsData?.data || [],
-            totalCount: exportJobsData?.pagination?.total_results || 0,
-            requestStatus: isFetchingExportJobs ? 'loading' : undefined,
-          },
-          DataViewTableContent: {
-            renderEmptyState: () =>
-              hasActiveFilters ? (
-                <TableEmptyState
-                  header="No Results Found"
-                  emptyMessage="No export jobs match your filters"
-                  actions={
-                    <Button kind="tertiary" onClick={dataViewState.resetFilters}>
-                      Clear Filters
-                    </Button>
-                  }
-                />
-              ) : (
-                <TableEmptyState
-                  header="No Export Jobs"
-                  emptyMessage="Export jobs will appear here once created."
-                />
-              ),
-          },
-        }}
-      />
-      <ExportJobPanel
-        exportJobId={exportJobId}
-        attributes={{
-          SidePanel: {
-            open: !!exportJobId,
-            onOpenChange: (open) => {
-              if (!open) {
-                setQueryParam(QUERY_PARAMETERS.exportJobId, '');
-              }
-            },
-          },
-        }}
-      />
-    </Stack>
-  );
-};
diff --git a/web/packages/studio/src/components/form/AnnotationForm/AnnotationErrorMessage.tsx b/web/packages/studio/src/components/form/AnnotationForm/AnnotationErrorMessage.tsx
deleted file mode 100644
index e108a5543d..0000000000
--- a/web/packages/studio/src/components/form/AnnotationForm/AnnotationErrorMessage.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { Flex, Text } from '@nvidia/foundations-react-core';
-import { CircleAlert as ErrorIcon } from 'lucide-react';
-import { FC } from 'react';
-
-interface Props {
-  message: string;
-}
-export const AnnotationErrorMessage: FC<Props> = ({ message }) => {
-  return (
-    <Flex align="center" gap="2">
-      <ErrorIcon width={16} height={16} className="text-feedback-danger flex-shrink-0" />
-      <Text kind="body/regular/sm" className="text-feedback-danger">
-        {message}
-      </Text>
-    </Flex>
-  );
-};
diff --git a/web/packages/studio/src/components/form/AnnotationForm/constants.ts b/web/packages/studio/src/components/form/AnnotationForm/constants.ts
deleted file mode 100644
index 731f85616d..0000000000
--- a/web/packages/studio/src/components/form/AnnotationForm/constants.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { z } from 'zod';
-
-export const annotationFormFields = z
-  .object({
-    modelResponse: z.string().optional(),
-    thumb: z.enum(['positive', 'negative']).optional(),
-    rating: z.number().min(0).max(1).optional(),
-    responseOverride: z.record(z.string(), z.unknown()).optional(),
-    hasChanges: z.boolean().optional(), // Need to use a specific field path to store root error
-  })
-  .refine(
-    (data) => {
-      return (
-        data.thumb !== undefined || data.rating !== undefined || data.responseOverride !== undefined
-      );
-    },
-    {
-      path: ['hasChanges'],
-      message: 'At least one of thumb, rating, or response override must be provided',
-    }
-  );
diff --git a/web/packages/studio/src/components/form/AnnotationForm/index.tsx b/web/packages/studio/src/components/form/AnnotationForm/index.tsx
deleted file mode 100644
index 8e2c605427..0000000000
--- a/web/packages/studio/src/components/form/AnnotationForm/index.tsx
+++ /dev/null
@@ -1,120 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { CodeEditor } from '@nemo/common/src/components/CodeEditor';
-import { ContentType } from '@nemo/common/src/components/CodeEditor/constants';
-import { ControlledTextInput } from '@nemo/common/src/components/form/ControlledTextInput';
-import { buildAssistantResponse } from '@nemo/common/src/models/utils';
-import { Stack, Flex, Label, FormField, Text, Block } from '@nvidia/foundations-react-core';
-import { ThumbButton } from '@studio/components/buttons/ThumbButton';
-import { ExpandableMessage } from '@studio/components/ExpandableMessage';
-import { annotationFormFields } from '@studio/components/form/AnnotationForm/constants';
-import { InfoTooltip } from '@studio/components/InfoTooltip';
-import { ChatCompletion } from 'openai/resources/chat/completions';
-import { ComponentProps, FC } from 'react';
-import { useFormContext, useWatch } from 'react-hook-form';
-import { z } from 'zod';
-
-interface Props {
-  slotFooter?: React.ReactNode;
-  attributes?: {
-    Message?: ComponentProps<typeof ExpandableMessage>;
-  };
-}
-export const AnnotationForm: FC<Props> = ({ attributes, slotFooter }) => {
-  const form = useFormContext<z.infer<typeof annotationFormFields>>();
-  const modelResponse = useWatch({ control: form.control, name: 'modelResponse' });
-  const responseOverride = useWatch({ control: form.control, name: 'responseOverride' });
-  const thumbValue = useWatch({ control: form.control, name: 'thumb' });
-  const onThumbChange = (value: 'positive' | 'negative') => {
-    if (thumbValue === value) {
-      form.setValue('thumb', undefined);
-      return;
-    }
-    form.setValue('thumb', value);
-  };
-  const codeEditorContent = responseOverride
-    ? ((responseOverride.choices as ChatCompletion['choices'])[0].message.content ?? '')
-    : (modelResponse ?? '');
-
-  return (
-    <Stack gap="8">
-      <Stack gap="4">
-        <Label>Model Response</Label>
-        <Block className="bg-surface-overlay rounded-xl rounded-bl-none p-density-xl">
-          <ExpandableMessage message={modelResponse} {...attributes?.Message} />
-        </Block>
-      </Stack>
-      <Flex className="max-w-full" wrap="wrap" gap="6">
-        <FormField
-          // eslint-disable-next-line no-restricted-syntax
-          style={{ containerType: 'normal' }}
-          className="w-auto"
-          aria-label="thumb"
-          slotLabel="Thumb"
-          slotError={form.formState.errors.thumb?.message}
-          status={form.formState.errors.thumb ? 'error' : undefined}
-        >
-          <Flex className="inline-flex" gap="2">
-            <ThumbButton
-              direction="up"
-              selected={thumbValue === 'positive'}
-              onClick={() => onThumbChange('positive')}
-            >
-              Positive
-            </ThumbButton>
-            <ThumbButton
-              direction="down"
-              selected={thumbValue === 'negative'}
-              onClick={() => onThumbChange('negative')}
-            >
-              Negative
-            </ThumbButton>
-          </Flex>
-        </FormField>
-        <ControlledTextInput
-          formFieldProps={{
-            className: 'w-auto',
-            style: { containerType: 'normal' },
-            slotInfo: 'Rating must be between 0.0 and 1.0',
-          }}
-          className="w-18"
-          useControllerProps={{ name: 'rating' }}
-          label="Rating"
-          type="number"
-          min={0}
-          max={1}
-          step={0.1}
-        />
-      </Flex>
-      {/* Response Override */}
-      <Stack gap="2">
-        <Flex justify="between">
-          <Label>
-            <Text kind="label/bold/sm">Response Override</Text>
-          </Label>
-          <InfoTooltip message="An override replaces the model's original response with a new one. An override will always replace a rewrite." />
-        </Flex>
-        <FormField
-          slotError={form.formState.errors.responseOverride?.message?.toString()}
-          status={form.formState.errors.responseOverride ? 'error' : undefined}
-        >
-          <CodeEditor
-            className="min-h-[200px] max-h-[400px] overflow-y-auto"
-            contentType={ContentType.JSON}
-            hideCopyButton
-            content={codeEditorContent}
-            onChange={(value) => {
-              form.setValue('responseOverride', buildAssistantResponse(value));
-            }}
-          />
-        </FormField>
-      </Stack>
-      {/* Disclaimer */}
-      <Block className="bg-surface-overlay rounded-xl p-density-xl">
-        <ExpandableMessage message="Changes will create a new annotation entry while preserving the original.  When exporting, only the most recent annotation will be used." />
-      </Block>
-      {slotFooter}
-    </Stack>
-  );
-};
diff --git a/web/packages/studio/src/components/form/AnnotationForm/useCreateReviewerAnnotation.tsx b/web/packages/studio/src/components/form/AnnotationForm/useCreateReviewerAnnotation.tsx
deleted file mode 100644
index a9e5042ca1..0000000000
--- a/web/packages/studio/src/components/form/AnnotationForm/useCreateReviewerAnnotation.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { useToast } from '@nemo/common/src/providers/toast/useToast';
-import {
-  getGetEntryQueryKey,
-  getListEntriesQueryKey,
-  useAddEvents,
-} from '@nemo/sdk/generated/platform/api';
-import { websiteLogger } from '@studio/util/logger';
-import { useQueryClient } from '@tanstack/react-query';
-
-interface Props {
-  workspace: string;
-  entryId?: string;
-}
-export const useCreateReviewerAnnotation = ({ workspace, entryId }: Props) => {
-  const toast = useToast();
-  const queryClient = useQueryClient();
-  return useAddEvents({
-    mutation: {
-      onSuccess: () => {
-        toast.success('Successfully added annotation!');
-        queryClient.resetQueries({
-          queryKey: entryId
-            ? getGetEntryQueryKey(workspace, entryId)
-            : getListEntriesQueryKey(workspace),
-        });
-      },
-      onError: (error: Error) => {
-        toast.error('Failed to add annotation. Please try again.');
-        websiteLogger.error(error instanceof Error ? error.message : 'Failed to add events');
-      },
-    },
-  });
-};
diff --git a/web/packages/studio/src/components/form/AnnotationForm/utils.spec.ts b/web/packages/studio/src/components/form/AnnotationForm/utils.spec.ts
deleted file mode 100644
index e362d5a642..0000000000
--- a/web/packages/studio/src/components/form/AnnotationForm/utils.spec.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { buildAssistantResponse } from '@nemo/common/src/models/utils';
-import { formToReviewerAnnotationEvent } from '@studio/components/form/AnnotationForm/utils';
-
-describe('formToReviewerAnnotationEvent', () => {
-  it('should return a ReviewerAnnotationEvent', () => {
-    const event = formToReviewerAnnotationEvent({
-      modelResponse: 'test',
-      thumb: 'positive',
-      rating: 0.5,
-    });
-    expect(event).toEqual({
-      event_type: 'reviewer_annotation',
-      thumb: 'up',
-      rating: 0.5,
-    });
-  });
-  it('should handle response override', () => {
-    const responseOverride = buildAssistantResponse('test2');
-    const event = formToReviewerAnnotationEvent({
-      modelResponse: 'test',
-      responseOverride,
-    });
-    expect(event).toEqual({
-      event_type: 'reviewer_annotation',
-      response_override: responseOverride,
-    });
-  });
-
-  it('should not return a response override if the model response is the same as the response override', () => {
-    const event = formToReviewerAnnotationEvent({
-      modelResponse: 'test',
-      responseOverride: buildAssistantResponse('test'),
-    });
-    expect(event).toEqual({
-      event_type: 'reviewer_annotation',
-    });
-    expect(event.response_override).toBeUndefined();
-  });
-});
diff --git a/web/packages/studio/src/components/form/AnnotationForm/utils.ts b/web/packages/studio/src/components/form/AnnotationForm/utils.ts
deleted file mode 100644
index d491a248fd..0000000000
--- a/web/packages/studio/src/components/form/AnnotationForm/utils.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { ThumbDirection, type ReviewerAnnotationEvent } from '@nemo/sdk/generated/platform/schema';
-import { annotationFormFields } from '@studio/components/form/AnnotationForm/constants';
-import { ChatCompletion } from 'openai/resources/index.mjs';
-import { z } from 'zod';
-
-export const formToReviewerAnnotationEvent = (
-  data: z.infer<typeof annotationFormFields>
-): ReviewerAnnotationEvent => {
-  const modelResponse = data.modelResponse;
-  // Map form thumb values to API ThumbDirection
-  const thumbDirection =
-    data.thumb === 'positive'
-      ? ThumbDirection.up
-      : data.thumb === 'negative'
-        ? ThumbDirection.down
-        : undefined;
-
-  const reviewerEvent: ReviewerAnnotationEvent = {
-    event_type: 'reviewer_annotation',
-  };
-  if (thumbDirection) {
-    reviewerEvent.thumb = thumbDirection;
-  }
-  if (data.rating) {
-    reviewerEvent.rating = data.rating;
-  }
-  if (data.responseOverride && 'choices' in data.responseOverride) {
-    const asChoice = (data.responseOverride.choices as ChatCompletion['choices'])[0];
-    const responseAsString = asChoice.message?.content;
-    reviewerEvent.response_override =
-      responseAsString !== modelResponse ? data.responseOverride : undefined;
-  }
-  return reviewerEvent;
-};
diff --git a/web/packages/studio/src/components/form/NewExportJobForm/constants.tsx b/web/packages/studio/src/components/form/NewExportJobForm/constants.tsx
deleted file mode 100644
index 8386742cd0..0000000000
--- a/web/packages/studio/src/components/form/NewExportJobForm/constants.tsx
+++ /dev/null
@@ -1,153 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { ControlledDatePicker } from '@nemo/common/src/components/form/ControlledDatePicker';
-import { ControlledSelect } from '@nemo/common/src/components/form/ControlledSelect';
-import { ControlledSwitch } from '@nemo/common/src/components/form/ControlledSwitch';
-import { ZodFormField } from '@nemo/common/src/components/form/ZodFormField';
-import { UseControllerComponentProps } from '@nemo/common/src/types';
-import { generateDefaultName } from '@nemo/common/src/utils/generateDefaultName';
-import { EntryFilter } from '@nemo/sdk/generated/platform/schema';
-import {
-  namespaceSchema,
-  descriptionSchema,
-  URNSchema,
-  customFieldsSchema,
-  ownershipSchema,
-} from '@studio/constants/zod';
-import { adjectives, animals } from 'unique-names-generator';
-import { z } from 'zod';
-
-export const validateIntakeFileUrl = (url: string) => {
-  return (
-    url.startsWith('file://') ||
-    url.startsWith('hf://') ||
-    url.startsWith('nds://') ||
-    url.startsWith('fileset://')
-  );
-};
-
-export const newExportJobFormSchema = z
-  .object({
-    namespace: namespaceSchema.optional(),
-    description: descriptionSchema.optional(),
-    config: z
-      .object({
-        filters: z
-          .preprocess((val) => {
-            const copy = { ...(val ?? {}) };
-            Object.entries(val ?? {}).forEach(([key, value]) => {
-              if (value === '') {
-                delete (copy as Record<string, unknown>)[key];
-              } else if (key === 'created_at' || key === 'updated_at') {
-                (copy as Record<string, unknown>)[key] = {
-                  gte: value.from as string,
-                  lte: value.to as string,
-                };
-              }
-            });
-            return copy;
-          }, z.record(z.string(), z.any()).optional())
-          .describe(
-            'Filter criteria for selecting entries (project, context, external_id, has_thumb, has_rating, longest_per_thread, etc.)'
-          ),
-        search: z
-          .record(z.string(), z.any())
-          .optional()
-          .describe('Search criteria for finding entries'),
-        limit: z
-          .preprocess(
-            (val) => (val === '' || val === undefined ? undefined : Number(val)),
-            z.number().optional()
-          )
-          .describe('Maximum number of entries to export. None means no limit.'),
-        format_options: z
-          .record(z.string(), z.any())
-          .optional()
-          .describe('Format options for the export (e.g., row_transformation)'),
-      })
-      .describe(
-        'Configuration for an export job.\n\nDefines what entries to export and how to format them.'
-      )
-      .describe('The export configuration defining filters, search criteria, and format options.'),
-    output_file_url: z
-      .string()
-      .optional()
-      .describe('The URL of the output file to export to (file://, hf://, nds://, etc.)'),
-    project: URNSchema.optional(),
-    custom_fields: customFieldsSchema,
-    ownership: ownershipSchema,
-    // Additional fields for UI state
-    export_file_name: z
-      .string()
-      .optional()
-      .describe(
-        'The name of the export file. Currently only .jsonl files are supported. If not provided, a default name will be generated.'
-      ),
-    dataset: z.object({
-      name: z.string().optional(),
-      namespace: z.string().optional(),
-      files_url: z.string().optional(),
-    }),
-  })
-  .refine(
-    (data) => {
-      if (!data.output_file_url) {
-        return false;
-      }
-      return validateIntakeFileUrl(data.output_file_url);
-    },
-    {
-      message: 'Dataset is required',
-      path: ['dataset.name'],
-    }
-  );
-export const supportedCriteria: (keyof EntryFilter)[] = [
-  'context',
-  'created_at',
-  'external_id',
-  'id',
-  'longest_per_thread',
-  'project',
-  'updated_at',
-  'user_rating',
-];
-export const getExportCriteriaRender = (
-  props: { filter: keyof EntryFilter } & UseControllerComponentProps
-) => {
-  const { filter } = props;
-  switch (filter) {
-    case 'longest_per_thread':
-      return <ControlledSwitch useControllerProps={props.useControllerProps} />;
-    case 'project':
-      return <ZodFormField {...props} schema={z.string().optional()} />;
-    case 'user_rating':
-      return (
-        <ControlledSelect
-          items={['up', 'down']}
-          kind="single"
-          placeholder="Select a thumb rating"
-          useControllerProps={{
-            control: props.useControllerProps.control,
-            name: 'config.filters.user_rating.thumb',
-          }}
-        />
-      );
-    case 'created_at':
-    case 'updated_at':
-      return (
-        <ControlledDatePicker
-          kind="range"
-          useControllerProps={props.useControllerProps}
-          placeholder="yyyy-mm-dd"
-          format="yyyy-MM-dd"
-          rangeKeys={{ from: 'gte', to: 'lte' }}
-        />
-      );
-    default:
-      return <ZodFormField {...props} schema={z.string().optional()} />;
-  }
-};
-
-export const getDefaultExportFileName = () =>
-  `export-${generateDefaultName({ dictionaries: [adjectives, animals], length: 2 })}.jsonl`;
diff --git a/web/packages/studio/src/components/form/NewExportJobForm/index.spec.tsx b/web/packages/studio/src/components/form/NewExportJobForm/index.spec.tsx
deleted file mode 100644
index 34ce471416..0000000000
--- a/web/packages/studio/src/components/form/NewExportJobForm/index.spec.tsx
+++ /dev/null
@@ -1,268 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { zodResolver } from '@hookform/resolvers/zod';
-import { DEFAULT_WORKSPACE } from '@nemo/common/src/models/constants';
-import { NewExportJobForm } from '@studio/components/form/NewExportJobForm';
-import {
-  getDefaultExportFileName,
-  newExportJobFormSchema,
-} from '@studio/components/form/NewExportJobForm/constants';
-import { PLATFORM_BASE_URL } from '@studio/constants/environment';
-import { ROUTE_PARAMS } from '@studio/constants/routes';
-import { workspace1 } from '@studio/mocks/entity-store/projects';
-import { server } from '@studio/mocks/node';
-import { mockUseParams } from '@studio/tests/util/mockUseParams';
-import { render } from '@studio/tests/util/render';
-import { screen, waitFor } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import { http, HttpResponse } from 'msw';
-import { FormProvider, useForm } from 'react-hook-form';
-import { z } from 'zod';
-
-// Mock brand assets icons
-vi.mock('lucide-react', () => ({
-  Database: () => <span data-testid="db-icon" />,
-  Trash: () => <span data-testid="trash-icon" />,
-  Filter: () => <span data-testid="filter-icon" />,
-}));
-
-const ENTRIES_URL = '*/apis/intake/v2/workspaces/:workspace/entries';
-
-// Test wrapper component that provides form context
-const FormWrapper = ({
-  children,
-  defaultValues,
-}: {
-  children: React.ReactNode;
-  defaultValues?: Partial<z.infer<typeof newExportJobFormSchema>>;
-}) => {
-  const methods = useForm<z.infer<typeof newExportJobFormSchema>>({
-    resolver: zodResolver(newExportJobFormSchema),
-    defaultValues: {
-      export_file_name: getDefaultExportFileName(),
-      project: `${DEFAULT_WORKSPACE}/${workspace1.name}`,
-      config: { limit: 1000 },
-      ...defaultValues,
-    },
-  });
-
-  return <FormProvider {...methods}>{children}</FormProvider>;
-};
-
-describe('NewExportJobForm', () => {
-  const user = userEvent.setup();
-
-  beforeEach(() => {
-    mockUseParams({
-      [ROUTE_PARAMS.workspace]: DEFAULT_WORKSPACE,
-    });
-  });
-
-  it('queries filesets with purpose filter set to dataset', async () => {
-    const requestUrls: string[] = [];
-    server.use(
-      http.get(
-        `${PLATFORM_BASE_URL}/apis/files/v2/workspaces/:workspace/filesets`,
-        ({ request }) => {
-          requestUrls.push(request.url);
-          return HttpResponse.json({
-            data: [],
-            pagination: {
-              page: 1,
-              page_size: 25,
-              current_page_size: 0,
-              total_pages: 1,
-              total_results: 0,
-            },
-          });
-        }
-      )
-    );
-
-    render(
-      <FormWrapper>
-        <NewExportJobForm />
-      </FormWrapper>
-    );
-
-    await waitFor(() => {
-      expect(requestUrls.length).toBeGreaterThan(0);
-    });
-
-    const url = new URL(requestUrls[0]);
-    expect(url.searchParams.get('filter[purpose]')).toBe('dataset');
-  });
-
-  it('renders the form with key elements', async () => {
-    render(
-      <FormWrapper>
-        <NewExportJobForm />
-      </FormWrapper>
-    );
-
-    // Check for description text
-    expect(
-      await screen.findByText('Export entries to a Dataset for evaluation.')
-    ).toBeInTheDocument();
-
-    // Check for dataset destination select
-    expect(screen.getByText('Dataset Destination')).toBeInTheDocument();
-
-    // Check for export file name field
-    expect(screen.getByText('Export File Name')).toBeInTheDocument();
-
-    // Check for limit field
-    expect(screen.getByText('Limit')).toBeInTheDocument();
-
-    // Check for row transformation checkbox
-    expect(screen.getByText('Row Transformation')).toBeInTheDocument();
-
-    // Check for export criteria section
-    expect(screen.getByText('Export Criteria')).toBeInTheDocument();
-  });
-
-  it('shows default message when no filters are applied', async () => {
-    render(
-      <FormWrapper>
-        <NewExportJobForm />
-      </FormWrapper>
-    );
-
-    expect(
-      await screen.findByText('Add at least one filter to export records to a dataset.')
-    ).toBeInTheDocument();
-  });
-
-  it('allows selecting a dataset from the dropdown', async () => {
-    render(
-      <FormWrapper>
-        <NewExportJobForm />
-      </FormWrapper>
-    );
-
-    // Find and click the dataset combobox
-    const datasetSelect = await screen.findByRole('combobox', { name: 'Dataset Destination' });
-    await user.click(datasetSelect);
-
-    // Wait for and select the first dataset option
-    const option = await screen.findByRole('option', { name: 'dataset-187625' });
-    await user.click(option);
-
-    // Verify dataset was selected (the db icon and name should be visible in the trigger)
-    expect(screen.getByTestId('db-icon')).toBeInTheDocument();
-  });
-
-  it('shows Add Criteria dropdown with available filter options', async () => {
-    render(
-      <FormWrapper>
-        <NewExportJobForm />
-      </FormWrapper>
-    );
-
-    // Check that Add Criteria is present
-    expect(await screen.findByText('Add Criteria')).toBeInTheDocument();
-
-    // Find the select for adding criteria
-    const addCriteriaSelect = await screen.findByRole('combobox', {
-      name: /Add criteria/i,
-    });
-    expect(addCriteriaSelect).toBeInTheDocument();
-  });
-
-  it('adds a filter criterion when selected from dropdown', async () => {
-    render(
-      <FormWrapper>
-        <NewExportJobForm />
-      </FormWrapper>
-    );
-
-    // Click on the Add Criteria select
-    const addCriteriaSelect = await screen.findByRole('combobox', {
-      name: /Add criteria/i,
-    });
-    await user.click(addCriteriaSelect);
-
-    // Select the "project" filter option
-    const projectOption = await screen.findByRole('option', { name: 'project' });
-    await user.click(projectOption);
-
-    // Verify the filter was added (there should now be a "project" label)
-    await waitFor(() => {
-      expect(screen.getByText('project')).toBeVisible();
-    });
-  });
-
-  it('removes a filter criterion when delete button is clicked', async () => {
-    render(
-      <FormWrapper defaultValues={{ config: { filters: { project: '' } } }}>
-        <NewExportJobForm />
-      </FormWrapper>
-    );
-
-    // Verify the project filter is displayed within form
-    expect(await screen.findByText('project')).toBeVisible();
-
-    // Click the trash button to remove the filter
-    const deleteButton = await screen.findByTestId('trash-icon');
-    expect(deleteButton).toBeInTheDocument();
-    await user.click(deleteButton!);
-
-    // Verify the filter was removed
-    await waitFor(() => {
-      expect(screen.queryByTestId('trash-icon')).not.toBeInTheDocument();
-    });
-  });
-
-  it('displays matching record count when filters are applied', async () => {
-    // Mock the entries list endpoint to return a count
-    server.use(
-      http.get(ENTRIES_URL, () =>
-        HttpResponse.json({
-          object: 'list',
-          data: [],
-          pagination: {
-            page: 1,
-            page_size: 1,
-            current_page_size: 0,
-            total_pages: 1,
-            total_results: 42,
-          },
-        })
-      )
-    );
-
-    render(
-      <FormWrapper defaultValues={{ config: { filters: { project: 'test' } } }}>
-        <NewExportJobForm />
-      </FormWrapper>
-    );
-
-    // Wait for the record count to be displayed
-    expect(
-      await screen.findByText('42 records matching the filters will be exported')
-    ).toBeInTheDocument();
-  });
-
-  it('shows error message when entries fetch fails', async () => {
-    // Suppress expected console.error
-    const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
-
-    server.use(
-      http.get(ENTRIES_URL, () =>
-        HttpResponse.json({ error: 'Internal Server Error' }, { status: 500 })
-      )
-    );
-
-    render(
-      <FormWrapper defaultValues={{ config: { filters: { project: 'test' } } }}>
-        <NewExportJobForm />
-      </FormWrapper>
-    );
-
-    // Wait for the error message
-    expect(await screen.findByText(/Error fetching entries:/)).toBeInTheDocument();
-
-    consoleSpy.mockRestore();
-  });
-});
diff --git a/web/packages/studio/src/components/form/NewExportJobForm/index.tsx b/web/packages/studio/src/components/form/NewExportJobForm/index.tsx
deleted file mode 100644
index 10c9b900a7..0000000000
--- a/web/packages/studio/src/components/form/NewExportJobForm/index.tsx
+++ /dev/null
@@ -1,254 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { useFilesetsInfinite } from '@nemo/common/src/api/entity-store/useDatasets';
-import { ControlledCheckbox } from '@nemo/common/src/components/form/ControlledCheckbox';
-import {
-  ControlledSearchableSelect,
-  SelectItemOption,
-} from '@nemo/common/src/components/form/ControlledSearchableSelect';
-import { ZodFormField } from '@nemo/common/src/components/form/ZodFormField';
-import { KVPair } from '@nemo/common/src/components/KVPair';
-import { useListEntries } from '@nemo/sdk/generated/platform/api';
-import { EntryFilter, EntrysPage } from '@nemo/sdk/generated/platform/schema';
-import { Block, Button, Divider, Flex, Select, Stack, Text } from '@nvidia/foundations-react-core';
-import { ExpandableMessage } from '@studio/components/ExpandableMessage';
-import {
-  getExportCriteriaRender,
-  getDefaultExportFileName,
-  newExportJobFormSchema,
-  supportedCriteria,
-} from '@studio/components/form/NewExportJobForm/constants';
-import { useWorkspaceFromPath } from '@studio/hooks/useWorkspaceFromPath';
-import { getTextWithCount } from '@studio/util/strings';
-import { Database, Trash } from 'lucide-react';
-import { useCallback, useMemo, useState } from 'react';
-import { useFormContext, useWatch } from 'react-hook-form';
-import { useDebounce } from 'use-debounce';
-import { z } from 'zod';
-
-export const NewExportJobForm = () => {
-  const workspace = useWorkspaceFromPath();
-  const [addCriteriaVal, setAddCriteriaVal] = useState<string>('');
-
-  const { control, setValue } = useFormContext<z.infer<typeof newExportJobFormSchema>>();
-  const exportFileName = useWatch({ control, name: 'export_file_name' });
-  const filters = useWatch({ control, name: 'config.filters' });
-  const [debouncedFilters] = useDebounce(filters, 300);
-  const usedFilters = useMemo(() => (filters ? Object.keys(filters) : []), [filters]);
-  const debouncedUsedFilters = useMemo(
-    () => (debouncedFilters ? Object.keys(debouncedFilters) : []),
-    [debouncedFilters]
-  );
-
-  const {
-    data: datasetsPages,
-    fetchNextPage,
-    hasNextPage,
-    isFetchingNextPage,
-    isLoading,
-  } = useFilesetsInfinite({
-    query: {
-      sort: '-created_at',
-      filter: { purpose: 'dataset' },
-      // TODO: Support filtering and search
-      // search: searchQuery ? { name: searchQuery } : undefined,
-    },
-    workspace,
-  });
-  const {
-    data: entriesData,
-    isFetching: isFetchingEntries,
-    error: entriesError,
-  } = useListEntries(
-    workspace,
-    {
-      page_size: 1,
-      filter: debouncedFilters,
-    },
-    { query: { enabled: debouncedUsedFilters.length > 0 } }
-  );
-
-  // Flatten all pages into a single array of options
-  const datasetOptions: SelectItemOption[] = useMemo(() => {
-    const allDatasets = datasetsPages?.pages.flatMap((page) => page.data) ?? [];
-    return allDatasets.map((dataset) => ({
-      value: dataset.name ?? '',
-      label: dataset.name ?? '',
-    }));
-  }, [datasetsPages]);
-
-  const handleLoadMore = useCallback(async () => {
-    if (hasNextPage && !isFetchingNextPage) {
-      await fetchNextPage();
-    }
-  }, [fetchNextPage, hasNextPage, isFetchingNextPage]);
-
-  /**
-   * Export criteria that are not yet added to the form in filters
-   */
-  const remainingCriteria = useMemo(() => {
-    return supportedCriteria
-      .filter((filter) => !usedFilters.includes(filter))
-      .map((filter) => ({ value: filter, label: filter }));
-  }, [usedFilters]);
-
-  return (
-    <Stack gap="6" className="overflow-auto">
-      <Text kind="body/regular/md">Export entries to a Dataset for evaluation.</Text>
-      <ControlledSearchableSelect
-        options={datasetOptions}
-        onLoadMore={handleLoadMore}
-        onChange={(value) => {
-          const datasets = datasetsPages?.pages.flatMap((page) => page.data) ?? [];
-          const foundDataset = datasets.find((dataset) => dataset.name === value);
-          if (foundDataset) {
-            setValue(
-              'output_file_url',
-              `fileset://${foundDataset.workspace}/${foundDataset.name}/${exportFileName || getDefaultExportFileName()}`
-            );
-          }
-        }}
-        hasMore={hasNextPage ?? false}
-        isLoading={isLoading}
-        isLoadingMore={isFetchingNextPage}
-        searchPlaceholder="Search datasets..."
-        triggerPlaceholder="Select a dataset"
-        emptyMessage="No datasets found"
-        doneLoadingMessage="All datasets loaded"
-        renderValue={(value) =>
-          value ? (
-            <Flex align="center" gap="2">
-              <Database className="flex-none" />
-              <Text kind="body/regular/md">{value}</Text>
-            </Flex>
-          ) : null
-        }
-        formFieldProps={{ slotLabel: 'Dataset Destination' }}
-        useControllerProps={{ name: 'dataset.name', control }}
-      />
-      <ZodFormField
-        schema={newExportJobFormSchema._def.schema.shape.export_file_name}
-        useControllerProps={{ name: 'export_file_name', control }}
-      />
-      <Flex>
-        <Block className="flex-1">
-          <ZodFormField
-            schema={newExportJobFormSchema._def.schema.shape.config.shape.limit}
-            useControllerProps={{ name: 'config.limit', control }}
-          />
-        </Block>
-        <Block className="flex-1" />
-      </Flex>
-      <ControlledCheckbox
-        slotLabel="Use annotation rewrites (when available)"
-        formFieldProps={{ slotLabel: 'Row Transformation' }}
-        useControllerProps={{ name: 'config.format_options.row_transformation', control }}
-      />
-      <Divider />
-      <Text kind="label/bold/lg">Export Criteria</Text>
-
-      {Object.keys(filters ?? {}).map((filter: string) => {
-        const value = getExportCriteriaRender({
-          filter: filter as keyof EntryFilter,
-          formFieldProps: { slotLabel: '' },
-          useControllerProps: { name: `config.filters.${filter}`, control },
-        });
-        return (
-          <Flex
-            key={filter}
-            className="flex-1 [&>div]:flex-1 [&>div]:items-center"
-            gap="2"
-            align="center"
-          >
-            <KVPair
-              key={filter}
-              label={filter}
-              value={value}
-              attributes={{
-                label: {
-                  kind: 'label/bold/sm',
-                },
-                value: {
-                  className: 'flex-1',
-                },
-              }}
-            />
-            <Button
-              type="button"
-              kind="tertiary"
-              className="flex-none"
-              onClick={() => {
-                const newFilters = Object.fromEntries(
-                  Object.entries(filters ?? {}).filter(([key]) => key !== filter)
-                );
-                setValue('config.filters', newFilters, { shouldDirty: true });
-              }}
-            >
-              <Trash />
-            </Button>
-          </Flex>
-        );
-      })}
-      {remainingCriteria.length > 0 ? (
-        <KVPair
-          label="Add Criteria"
-          value={
-            <Select
-              aria-label="Add Criteria"
-              items={remainingCriteria}
-              value={addCriteriaVal}
-              placeholder="Select additional criteria"
-              onValueChange={(value) => {
-                setValue('config.filters', {
-                  ...filters,
-                  [value]: '',
-                });
-                setAddCriteriaVal('');
-              }}
-            />
-          }
-          attributes={{
-            label: {
-              kind: 'label/bold/sm',
-            },
-            value: {
-              className: 'flex-1',
-            },
-          }}
-        />
-      ) : (
-        <Text className="text-secondary w-full text-center" kind="body/regular/md">
-          No additional criteria
-        </Text>
-      )}
-      <BottomInfo
-        isFetchingEntries={isFetchingEntries}
-        entriesError={entriesError}
-        usedFilters={usedFilters}
-        entriesData={entriesData}
-      />
-    </Stack>
-  );
-};
-
-const BottomInfo = ({
-  isFetchingEntries,
-  entriesError,
-  usedFilters,
-  entriesData,
-}: {
-  isFetchingEntries: boolean;
-  entriesError: Error | null;
-  usedFilters: string[];
-  entriesData?: EntrysPage;
-}) => {
-  const errorMessage = entriesError ? `Error fetching entries: ${entriesError.message}` : undefined;
-  const message =
-    usedFilters.length > 0
-      ? `${getTextWithCount('record', entriesData?.pagination?.total_results ?? 0)} matching the filters will be exported`
-      : 'Add at least one filter to export records to a dataset.';
-  return (
-    <ExpandableMessage message={message} errorMessage={errorMessage} loading={isFetchingEntries} />
-  );
-};
diff --git a/web/packages/studio/src/components/modals/AnnotationModal/index.tsx b/web/packages/studio/src/components/modals/AnnotationModal/index.tsx
deleted file mode 100644
index 30df945018..0000000000
--- a/web/packages/studio/src/components/modals/AnnotationModal/index.tsx
+++ /dev/null
@@ -1,88 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { zodResolver } from '@hookform/resolvers/zod';
-import { FormModal } from '@nemo/common/src/components/FormModal';
-import { useToast } from '@nemo/common/src/providers/toast/useToast';
-import { Entry } from '@nemo/sdk/generated/platform/schema';
-import { ExpandableMessage } from '@studio/components/ExpandableMessage';
-import { AnnotationForm } from '@studio/components/form/AnnotationForm';
-import { AnnotationErrorMessage } from '@studio/components/form/AnnotationForm/AnnotationErrorMessage';
-import { annotationFormFields } from '@studio/components/form/AnnotationForm/constants';
-import { useCreateReviewerAnnotation } from '@studio/components/form/AnnotationForm/useCreateReviewerAnnotation';
-import { formToReviewerAnnotationEvent } from '@studio/components/form/AnnotationForm/utils';
-import { getEntryResponseContent } from '@studio/components/IntakeEntriesTable/utils';
-import { useWorkspaceFromPath } from '@studio/hooks/useWorkspaceFromPath';
-import { handleFormErrorsGeneric } from '@studio/util/forms/error';
-import { ComponentProps, FC } from 'react';
-import { FormProvider, useForm } from 'react-hook-form';
-import { z } from 'zod';
-
-interface Props {
-  entry?: Entry;
-  open: boolean;
-  onClose: () => void;
-  attributes?: {
-    FormModal?: ComponentProps<typeof FormModal>;
-    Message?: ComponentProps<typeof ExpandableMessage>;
-  };
-}
-export const AnnotationModal: FC<Props> = ({ open, onClose, entry, attributes }) => {
-  const toast = useToast();
-  const workspace = useWorkspaceFromPath();
-  const { mutateAsync: addEvents, isPending: isAddingEvents } = useCreateReviewerAnnotation({
-    workspace,
-  });
-  const form = useForm({
-    resolver: zodResolver(annotationFormFields),
-    mode: 'onChange',
-    values: {
-      modelResponse: getEntryResponseContent(entry),
-    },
-  });
-
-  const resetAndClose = () => {
-    form.reset();
-    onClose();
-  };
-
-  const onSubmit = async (data: z.infer<typeof annotationFormFields>) => {
-    if (!entry || !entry.id) {
-      toast.error('Cannot create annotation without an existing entry.');
-      return;
-    }
-
-    await addEvents({
-      workspace,
-      name: entry.id,
-      data: { events: [formToReviewerAnnotationEvent(data)] },
-    });
-    resetAndClose();
-  };
-
-  const errorText = form.formState.errors.hasChanges?.message ? (
-    <AnnotationErrorMessage message={form.formState.errors.hasChanges.message} />
-  ) : undefined;
-
-  return (
-    <FormModal
-      className="w-[700px]"
-      open={open}
-      onClose={resetAndClose}
-      title="Annotation"
-      submitButtonText="Save"
-      cancelButtonText="Cancel"
-      onSubmit={form.handleSubmit(
-        onSubmit,
-        handleFormErrorsGeneric({ title: 'Annotation Modal Errors' })
-      )}
-      loading={isAddingEvents}
-      slotFooterLeft={errorText}
-      {...attributes?.FormModal}
-    >
-      <FormProvider {...form}>
-        <AnnotationForm attributes={attributes} />
-      </FormProvider>
-    </FormModal>
-  );
-};
diff --git a/web/packages/studio/src/components/sidePanels/ExportJobPanel/index.tsx b/web/packages/studio/src/components/sidePanels/ExportJobPanel/index.tsx
deleted file mode 100644
index 4c31325de9..0000000000
--- a/web/packages/studio/src/components/sidePanels/ExportJobPanel/index.tsx
+++ /dev/null
@@ -1,76 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { KVPair } from '@nemo/common/src/components/KVPair';
-import { StatusBadge } from '@nemo/common/src/components/StatusBadge';
-import { IJobTerminalStatuses } from '@nemo/common/src/constants/query';
-import { useLiveSeconds } from '@nemo/common/src/hooks/useLiveSeconds';
-import {
-  formatTimeInSeconds,
-  getDifferenceInMilliseconds,
-  utcToLocalDate,
-} from '@nemo/common/src/utils/date';
-import { unknownToString } from '@nemo/common/src/utils/formatters';
-import { getJobRefetchInterval } from '@nemo/common/src/utils/query';
-import { useGetExportJobStatus } from '@nemo/sdk/generated/platform/api';
-import { Divider, Flex, SidePanel, Stack, Text } from '@nvidia/foundations-react-core';
-import { useWorkspaceFromPath } from '@studio/hooks/useWorkspaceFromPath';
-import { ComponentProps } from 'react';
-
-type Props = {
-  exportJobId: string;
-  attributes?: {
-    SidePanel?: ComponentProps<typeof SidePanel>;
-  };
-};
-export const ExportJobPanel = ({ exportJobId, attributes = {} }: Props) => {
-  const workspace = useWorkspaceFromPath();
-  const { data: job } = useGetExportJobStatus(workspace, exportJobId, {
-    query: {
-      refetchInterval: (query) => getJobRefetchInterval(query.state.data?.status),
-    },
-  });
-  const isTerminalStatus = job?.status && IJobTerminalStatuses.includes(job.status);
-  const liveSeconds = useLiveSeconds({
-    startDate: job?.created_at ? utcToLocalDate(job.created_at) : undefined,
-    enabled: !isTerminalStatus,
-  });
-  const differenceInMilliseconds = getDifferenceInMilliseconds(job?.created_at, job?.updated_at);
-  const elapsedSeconds = differenceInMilliseconds
-    ? Math.floor(differenceInMilliseconds / 1000)
-    : undefined;
-
-  const duration = isTerminalStatus ? formatTimeInSeconds(elapsedSeconds) : liveSeconds;
-  const hasFilters = job?.config.filters && Object.keys(job.config.filters).length > 0;
-  return (
-    <SidePanel
-      slotHeading="Export Job Details"
-      modal
-      className="w-[440px]"
-      bordered
-      {...attributes.SidePanel}
-    >
-      <Stack gap="4">
-        <KVPair
-          label="Status"
-          value={
-            <Flex gap="1">
-              <StatusBadge status={job?.status} /> {duration ? duration : ''}
-            </Flex>
-          }
-        />
-        <KVPair label="Job ID" value={job?.id} />
-        <KVPair label="Destination" value={job?.output_file_url} />
-        {hasFilters && (
-          <>
-            <Divider />
-            <Text kind="label/semibold/lg">Filters</Text>
-            {Object.entries(job?.config.filters ?? {}).map(([key, value]) => (
-              <KVPair key={key} label={key} value={unknownToString(value)} />
-            ))}
-          </>
-        )}
-      </Stack>
-    </SidePanel>
-  );
-};
diff --git a/web/packages/studio/src/constants/intakeJobs.ts b/web/packages/studio/src/constants/intakeJobs.ts
deleted file mode 100644
index 9de728ac6a..0000000000
--- a/web/packages/studio/src/constants/intakeJobs.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { JobStatus } from '@nemo/sdk/generated/platform/schema';
-
-export const EXPORT_JOB_STATUS_FILTER_OPTIONS = [
-  { value: JobStatus.pending, label: 'Pending' },
-  { value: JobStatus.running, label: 'Running' },
-  { value: JobStatus.completed, label: 'Completed' },
-  { value: JobStatus.failed, label: 'Failed' },
-  { value: JobStatus.cancelled, label: 'Cancelled' },
-];
diff --git a/web/packages/studio/src/constants/routes.ts b/web/packages/studio/src/constants/routes.ts
index 0d7fb7e5fb..c4737fe645 100644
--- a/web/packages/studio/src/constants/routes.ts
+++ b/web/packages/studio/src/constants/routes.ts
@@ -26,7 +26,8 @@ export const ROUTE_PARAMS = {
   evalConfigName: 'configName',
   safeSynthesizerJobName: 'safeSynthesizerJobName',
   dataDesignerJobName: 'dataDesignerJobName',
-  entryId: 'entryId',
+  traceId: 'traceId',
+  spanId: 'spanId',
   deploymentConfigName: 'deploymentConfigName',
   deploymentName: 'deploymentName',
   /** Side panel mode under deployments (e.g. `details`). */
@@ -82,13 +83,10 @@ export const ROUTES = {
     /** Deployments list with details side panel (deployment name + panel segment, e.g. `details`). */
     deploymentsDeployment: `/workspaces/:${P.workspace}/deployments/:${P.deploymentName}/:${P.deploymentPanelView}`,
     intake: `/workspaces/:${P.workspace}/intake`,
-    intakeEntries: `/workspaces/:${P.workspace}/intake/entries`,
-    intakeThreads: `/workspaces/:${P.workspace}/intake/threads`,
-    intakeExportJobs: `/workspaces/:${P.workspace}/intake/export-jobs`,
-    intakeEntry: `/workspaces/:${P.workspace}/intake/entries/:${P.entryId}`,
-    intakeEntryMessages: `/workspaces/:${P.workspace}/intake/entries/:${P.entryId}/messages`,
-    intakeEntryEvents: `/workspaces/:${P.workspace}/intake/entries/:${P.entryId}/events`,
-    intakeEntryMetadata: `/workspaces/:${P.workspace}/intake/entries/:${P.entryId}/metadata`,
+    intakeTraces: `/workspaces/:${P.workspace}/intake/traces`,
+    intakeSpans: `/workspaces/:${P.workspace}/intake/spans`,
+    intakeTrace: `/workspaces/:${P.workspace}/intake/traces/:${P.traceId}`,
+    intakeSpan: `/workspaces/:${P.workspace}/intake/spans/:${P.spanId}`,
     safeSynthesizer: `/workspaces/:${P.workspace}/safe-synthesizer`,
     safeSynthesizerNew: `/workspaces/:${P.workspace}/safe-synthesizer/new`,
     safeSynthesizerJob: `/workspaces/:${P.workspace}/safe-synthesizer/job/:${P.safeSynthesizerJobName}`,
diff --git a/web/packages/studio/src/mocks/handlers.ts b/web/packages/studio/src/mocks/handlers.ts
index 8a396975d5..1ad79bc3fe 100644
--- a/web/packages/studio/src/mocks/handlers.ts
+++ b/web/packages/studio/src/mocks/handlers.ts
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import {
+  type AnnotationInput,
   HTTPValidationError,
   type MetricEvaluationJob,
   ModelEntitySortField,
@@ -18,6 +19,15 @@ import { modelsHandlers } from '@studio/mocks/handlers/models';
 import { sampleDatasetsHandlers } from '@studio/mocks/handlers/sampleDatasets';
 import { secretsHandlers } from '@studio/mocks/handlers/secrets';
 import { workspacesHandlers } from '@studio/mocks/handlers/workspaces';
+import {
+  createMockAnnotation,
+  deleteMockAnnotation,
+  mockAnnotationsPage,
+  mockSpanById,
+  mockSpansPage,
+  mockTraceById,
+  mockTracesPage,
+} from '@studio/mocks/intake/telemetry';
 import { randomUUID } from 'crypto';
 import { http, HttpResponse } from 'msw';
 
@@ -501,22 +511,63 @@ export const handlers = [
   ),
 
   // Intake
-  http.get('*/apis/intake/v2/workspaces/:workspace/entries', async () => {
-    const { entriesPage1 } = await import('@studio/mocks/intake/entries');
-    return HttpResponse.json(entriesPage1);
+  http.get('*/apis/intake/v2/workspaces/:workspace/traces', () => {
+    return HttpResponse.json(mockTracesPage);
   }),
-  http.options('*/apis/intake/v2/workspaces/:workspace/entries', () => HttpResponse.json({})),
-  http.get('*/apis/intake/v2/workspaces/:workspace/export/jobs', async () => {
-    const { mockExportJobsPage } = await import('@studio/mocks/intake/exportJobs');
-    return HttpResponse.json(mockExportJobsPage);
+  http.get('*/apis/intake/v2/workspaces/:workspace/traces/:traceId', ({ params }) => {
+    const trace = mockTraceById(String(params['traceId']));
+    return trace ? HttpResponse.json(trace) : new HttpResponse(null, { status: 404 });
   }),
-  http.post('*/apis/intake/v2/workspaces/:workspace/export/jobs', async () => {
-    const { exportJob1 } = await import('@studio/mocks/intake/exportJobs');
-    return HttpResponse.json(exportJob1);
+  http.get('*/apis/intake/v2/workspaces/:workspace/spans', ({ request }) => {
+    const url = new URL(request.url);
+    const traceId = url.searchParams.get('filter[trace_id]');
+    const data = traceId
+      ? mockSpansPage.data.filter((span) => span.trace_id === traceId)
+      : mockSpansPage.data;
+
+    return HttpResponse.json({
+      ...mockSpansPage,
+      data,
+      pagination: {
+        ...mockSpansPage.pagination,
+        current_page_size: data.length,
+        total_results: data.length,
+        total_pages: data.length > 0 ? 1 : 0,
+      },
+      filter: traceId ? { trace_id: traceId } : undefined,
+    });
+  }),
+  http.get('*/apis/intake/v2/workspaces/:workspace/spans/:spanId', ({ params }) => {
+    const span = mockSpanById(String(params['spanId']));
+    return span ? HttpResponse.json(span) : new HttpResponse(null, { status: 404 });
+  }),
+  http.get('*/apis/intake/v2/workspaces/:workspace/annotations', ({ request }) => {
+    const url = new URL(request.url);
+    const spanId = url.searchParams.get('filter[span_id]') ?? undefined;
+    const page = Number(url.searchParams.get('page') ?? '1');
+    const pageSize = Number(url.searchParams.get('page_size') ?? '100');
+    return HttpResponse.json(
+      mockAnnotationsPage({
+        spanId,
+        page: Number.isNaN(page) ? 1 : page,
+        pageSize: Number.isNaN(pageSize) ? 100 : pageSize,
+      })
+    );
+  }),
+  http.post('*/apis/intake/v2/workspaces/:workspace/annotations', async ({ request, params }) => {
+    const data = (await request.json()) as AnnotationInput;
+    return HttpResponse.json(
+      createMockAnnotation({
+        workspace: String(params['workspace']),
+        data,
+      })
+    );
   }),
-  http.get('*/apis/intake/v2/workspaces/:workspace/export/jobs/:jobId', async () => {
-    const { exportJob1 } = await import('@studio/mocks/intake/exportJobs');
-    return HttpResponse.json(exportJob1);
+  http.delete('*/apis/intake/v2/workspaces/:workspace/annotations/:annotationId', ({ params }) => {
+    const deleted = deleteMockAnnotation(String(params['annotationId']));
+    return deleted
+      ? new HttpResponse(null, { status: 200 })
+      : new HttpResponse(null, { status: 404 });
   }),
   // Agents V2
   http.get(
diff --git a/web/packages/studio/src/mocks/intake/entries.ts b/web/packages/studio/src/mocks/intake/entries.ts
deleted file mode 100644
index 064c62fbf7..0000000000
--- a/web/packages/studio/src/mocks/intake/entries.ts
+++ /dev/null
@@ -1,122 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-export const entriesPage1 = {
-  object: 'list',
-  data: [
-    {
-      id: 'entry-89Fe7ikidKAU6b3dxsL326',
-      created_at: '2025-12-16T22:40:12.241917',
-      updated_at: '2025-12-16T22:40:12.241918',
-      external_id: null,
-      data: {
-        request: {
-          messages: [
-            {
-              role: 'user',
-              content:
-                'You are an expert at creating high-quality tracker issues from minimal input.\n\nIf called via API, you will receive:\n- title: Issue title (may be vague)\n- description: Issue description (may be empty or just a Slack link)\n- project_id: Target project to create issue in\n- labels: Optional labels\n\nIf called via Slack, you will receive:\n- messages: List of messages from slack, converted to agent message format (OpenAI-style).\n  Each message has a role (user or assistant), content, and user_id.\n\nCreate a plan to enhance this issue:\n\n1. ANALYZE INPUT:\n   - Is description empty or just a link?\n   - Does title need expansion?\n   - Is there a Slack thread to fetch?\n\n2. GATHER CONTEXT:\n   - If Slack link present: fetch thread with get_slack_thread\n   - Summarize discussion with summarize_thread\n   - Extract technical requirements and code references\n\n3. BUILD COMPREHENSIVE DESCRIPTION:\n   - Clear problem statement or goal\n   - Technical details and requirements\n   - Code files/systems to modify (if mentioned)\n   - Suggested unit tests (if applicable)\n   - Acceptance criteria checklist\n\n4. CREATE PAYLOAD:\n   - Use create_issue_payload with enhanced description\n   - Return JSON for user review\n\nYour plan should be clear and account for missing information.\n',
-            },
-          ],
-          model: 'meta/llama-3.3-70b-instruct',
-        },
-        response: {
-          choices: [
-            {
-              index: 0,
-              message: {
-                role: 'assistant',
-                content:
-                  '**Enhanced Issue Creation Plan**\n=====================================\n\n### 1. ANALYZE INPUT\n\n* **Check description**: Verify if the description is empty or contains only a link.\n\t+ If empty or link-only, proceed to gather context from other sources.\n* **Assess title**: Evaluate if the title needs expansion or clarification.\n\t+ If unclear, attempt to extract relevant information from the description or Slack thread (if available).\n* **Identify Slack thread**: Determine if a Slack thread is associated with the issue.\n\t+ If a Slack thread is present, prepare to fetch and analyze the discussion.\n\n### 2. GATHER CONTEXT\n\n* **Fetch Slack thread**: Use `get_slack_thread` to retrieve the Slack thread associated with the issue (if applicable).\n* **Summarize discussion**: Apply `summarize_thread` to condense the Slack thread into a concise summary.\n* **Extract technical details**: Identify and extract technical requirements, code references, and other relevant information from the summary.\n\t+ Look for keywords like "bug," "feature," "fix," or specific technology mentions.\n\n### 3. BUILD COMPREHENSIVE DESCRIPTION\n\n* **Clear problem statement or goal**: Craft a concise problem statement or goal based on the gathered context.\n* **Technical details and requirements**: Include extracted technical details, such as:\n\t+ Code files or systems to modify\n\t+ Specific technologies or libraries involved\n\t+ Relevant configuration or setup information\n* **SS',
-              },
-              finish_reason: 'stop',
-            },
-          ],
-          usage: {
-            prompt_tokens: 89385,
-            completion_tokens: 45750,
-            total_tokens: 135135,
-          },
-        },
-      },
-      context: {
-        app: 'unknown',
-        task: '<workflow>',
-        thread_id: null,
-        user_id: null,
-        trace_id: null,
-        session_id: null,
-        created_at: '2025-12-16T22:40:12.241855Z',
-      },
-      namespace: 'default',
-      user_rating: null,
-      events: [],
-      schema_version: '1.0',
-      description: null,
-      project: null,
-      custom_fields: {},
-      ownership: null,
-    },
-    {
-      id: 'entry-JM89hCVjj1w4dbJnMjJ4py',
-      created_at: '2025-12-16T22:40:12.240606',
-      updated_at: '2025-12-16T22:40:12.240607',
-      external_id: null,
-      data: {
-        request: {
-          messages: [
-            {
-              role: 'user',
-              content:
-                'You are an expert at creating high-quality tracker issues from minimal input.\n\nIf called via API, you will receive:\n- title: Issue title (may be vague)\n- description: Issue description (may be empty or just a Slack link)\n- project_id: Target project to create issue in\n- labels: Optional labels\n\nIf called via Slack, you will receive:\n- messages: List of messages from slack, converted to agent message format (OpenAI-style).\n  Each message has a role (user or assistant), content, and user_id.\n\nCreate a plan to enhance this issue:\n\n1. ANALYZE INPUT:\n   - Is description empty or just a link?\n   - Does title need expansion?\n   - Is there a Slack thread to fetch?\n\n2. GATHER CONTEXT:\n   - If Slack link present: fetch thread with get_slack_thread\n   - Summarize discussion with summarize_thread\n   - Extract technical requirements and code references\n\n3. BUILD COMPREHENSIVE DESCRIPTION:\n   - Clear problem statement or goal\n   - Technical details and requirements\n   - Code files/systems to modify (if mentioned)\n   - Suggested unit tests (if applicable)\n   - Acceptance criteria checklist\n\n4. CREATE PAYLOAD:\n   - Use create_issue_payload with enhanced description\n   - Return JSON for user review\n\nYour plan should be clear and account for missing information.\n',
-            },
-          ],
-          model: 'meta/llama-3.3-70b-instruct',
-        },
-        response: {
-          choices: [
-            {
-              index: 0,
-              message: {
-                role: 'assistant',
-                content:
-                  '**Enhancing Tracker Issues from Minimal Input**\n=====================================================\n\n### 1. Analyze Input\n\nTo create a high-quality tracker issue, we first need to analyze the input provided. This involves checking the following:\n\n* **Description**: Is the description empty or does it only contain a Slack link? If so, we need to fetch the Slack thread to gather more context.\n* **Title**: Does the title need expansion? If the title is vague, we may need to modify it based on the information gathered from the Slack thread or description.\n* **Slack Thread**: Is there a Slack thread to fetch? If a Slack link is present, we need to retrieve the thread to gather more context.\n\n### 2. Gather Context\n\nTo gather context, we will perform the following steps:\n\n* **Fetch Slack Thread**: If a Slack link is present, use the `get_slack_thread` function to retrieve the thread.\n* **Summarize Discussion**: Use the `summarize_thread` function to summarize the discussion in the Slack thread.\n* **Extract Technical Requirements**: Extract technical requirements and code references from the Slack thread or description.\n\n### 3. Build Comprehensive Description\n\nUsing the gathered context, we will build a comprehensive description for the tracker issue. This description should include:\n\n* **Clear Problem Statement or Goal**: A clear statement of the problem or goal.\n* **Technical Details and Requirements**: Technical details and requirements extracted from the Slack thread or description.\n* ** **',
-              },
-              finish_reason: 'stop',
-            },
-          ],
-          usage: {
-            prompt_tokens: 89385,
-            completion_tokens: 45750,
-            total_tokens: 135135,
-          },
-        },
-      },
-      context: {
-        app: 'unknown',
-        task: '<workflow>',
-        thread_id: null,
-        user_id: null,
-        trace_id: null,
-        session_id: null,
-        created_at: '2025-12-16T22:40:12.240534Z',
-      },
-      namespace: 'default',
-      user_rating: null,
-      events: [],
-      schema_version: '1.0',
-      description: null,
-      project: null,
-      custom_fields: {},
-      ownership: null,
-    },
-  ],
-  pagination: {
-    page: 1,
-    page_size: 10,
-    current_page_size: 2,
-    total_pages: 1,
-    total_results: 2,
-  },
-  sort: '-created_at',
-};
diff --git a/web/packages/studio/src/mocks/intake/exportJobs.ts b/web/packages/studio/src/mocks/intake/exportJobs.ts
deleted file mode 100644
index 589fabfeee..0000000000
--- a/web/packages/studio/src/mocks/intake/exportJobs.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import type { ExportJob, ExportJobsPage } from '@nemo/sdk/generated/platform/schema';
-
-export const exportJob1 = {
-  schema_version: '1.0',
-  id: 'int-exp-U6XfM8gYmxV2tiFnwpADv6',
-  type_prefix: 'int-exp',
-  namespace: 'default',
-  project: 'default/sean-test',
-  created_at: '2025-12-16T22:25:16.760901',
-  updated_at: '2025-12-16T22:25:16.760904',
-  custom_fields: {},
-  status: 'completed' as const,
-  status_details: {
-    entries_count: 100,
-  },
-  config: {
-    filters: {
-      namespace: 'default',
-    },
-    limit: 100,
-    format_options: {
-      row_transformation: true,
-    },
-  },
-  output_file_url: 'hf://datasets/default/dataset-sean-test/export-entitled-herring.jsonl',
-} as unknown as ExportJob;
-
-export const exportJob2 = {
-  ...exportJob1,
-  id: 'int-exp-SecondJob123',
-  status: 'pending' as const,
-  output_file_url: 'hf://datasets/default/dataset-test/export-second.jsonl',
-  created_at: '2025-12-15T10:00:00.000000',
-} as unknown as ExportJob;
-
-export const mockExportJobsPage = {
-  data: [exportJob1, exportJob2],
-  pagination: {
-    page: 1,
-    page_size: 50,
-    current_page_size: 2,
-    total_pages: 1,
-    total_results: 2,
-  },
-} as ExportJobsPage;
diff --git a/web/packages/studio/src/mocks/intake/telemetry.ts b/web/packages/studio/src/mocks/intake/telemetry.ts
new file mode 100644
index 0000000000..991b093b5f
--- /dev/null
+++ b/web/packages/studio/src/mocks/intake/telemetry.ts
@@ -0,0 +1,292 @@
+// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import {
+  FeedbackAnnotationInputKind,
+  LabelAnnotationInputKind,
+  MetadataAnnotationInputKind,
+  NoteAnnotationInputKind,
+  type Annotation,
+  type AnnotationInput,
+  type AnnotationsPage,
+  type Span,
+  type SpansPage,
+  type Trace,
+  type TracesPage,
+} from '@nemo/sdk/generated/platform/schema';
+
+const trace1: Trace = {
+  id: 'trace-agent-run-001',
+  root_span_id: 'span-root-001',
+  session_id: 'session-agent-run-001',
+  workspace: 'default',
+  name: 'Answer customer policy question',
+  started_at: '2026-05-20T16:42:00Z',
+  ended_at: '2026-05-20T16:42:12Z',
+  duration_ms: 12_230,
+  status: 'success',
+  input_tokens: 1240,
+  output_tokens: 386,
+  cached_tokens: 128,
+  total_tokens: 1754,
+  cost_usd: 0.0032,
+  span_count: 4,
+  error_count: 0,
+  evaluation_context: {
+    evaluation_run_id: 'eval-run-1729',
+    dataset_name: 'support-policy-smoke',
+    test_case_id: 'case-0042',
+  },
+};
+
+const trace2: Trace = {
+  id: 'trace-agent-run-002',
+  root_span_id: 'span-root-002',
+  session_id: 'session-agent-run-002',
+  workspace: 'default',
+  name: 'Retrieve deployment troubleshooting steps',
+  started_at: '2026-05-20T15:11:00Z',
+  ended_at: '2026-05-20T15:11:07Z',
+  duration_ms: 7240,
+  status: 'error',
+  input_tokens: 780,
+  output_tokens: 96,
+  total_tokens: 876,
+  cost_usd: 0.0011,
+  span_count: 3,
+  error_count: 1,
+};
+
+const span1: Span = {
+  span_id: 'span-root-001',
+  session_id: 'session-agent-run-001',
+  workspace: 'default',
+  kind: 'AGENT',
+  name: 'Answer customer policy question',
+  source: 'otel',
+  trace_id: 'trace-agent-run-001',
+  started_at: '2026-05-20T16:42:00Z',
+  ended_at: '2026-05-20T16:42:12Z',
+  status: 'success',
+  agent_name: 'support-agent',
+  total_tokens: 1754,
+  cost_total_usd: 0.0032,
+  input: 'Can I deploy this model in a private workspace?',
+  output: 'Yes. Use a private workspace and restrict access through workspace membership.',
+  ingested_at: '2026-05-20T16:42:15Z',
+};
+
+const span2: Span = {
+  span_id: 'span-llm-001',
+  session_id: 'session-agent-run-001',
+  workspace: 'default',
+  parent_span_id: 'span-root-001',
+  kind: 'LLM',
+  name: 'Generate final response',
+  source: 'otel',
+  trace_id: 'trace-agent-run-001',
+  started_at: '2026-05-20T16:42:08Z',
+  ended_at: '2026-05-20T16:42:12Z',
+  status: 'success',
+  provider: 'nim',
+  model: 'meta/llama-3.1-70b-instruct',
+  input_tokens: 1240,
+  output_tokens: 386,
+  cached_tokens: 128,
+  total_tokens: 1754,
+  cost_total_usd: 0.0032,
+  input: 'Workspace policy context and user question',
+  output: 'Yes. Use a private workspace and restrict access through workspace membership.',
+  ingested_at: '2026-05-20T16:42:15Z',
+};
+
+const span3: Span = {
+  span_id: 'span-root-002',
+  session_id: 'session-agent-run-002',
+  workspace: 'default',
+  kind: 'AGENT',
+  name: 'Retrieve deployment troubleshooting steps',
+  source: 'otel',
+  trace_id: 'trace-agent-run-002',
+  started_at: '2026-05-20T15:11:00Z',
+  ended_at: '2026-05-20T15:11:07Z',
+  status: 'error',
+  error_type: 'ToolTimeout',
+  error_message: 'Knowledge base lookup timed out after 5s.',
+  agent_name: 'support-agent',
+  total_tokens: 876,
+  cost_total_usd: 0.0011,
+  ingested_at: '2026-05-20T15:11:09Z',
+};
+
+export const mockTracesPage: TracesPage = {
+  data: [trace1, trace2],
+  pagination: {
+    page: 1,
+    page_size: 50,
+    current_page_size: 2,
+    total_pages: 1,
+    total_results: 2,
+  },
+  sort: '-started_at',
+};
+
+export const mockSpansPage: SpansPage = {
+  data: [span1, span2, span3],
+  pagination: {
+    page: 1,
+    page_size: 50,
+    current_page_size: 3,
+    total_pages: 1,
+    total_results: 3,
+  },
+  sort: '-started_at',
+};
+
+export const mockTraceById = (id: string): Trace | undefined =>
+  mockTracesPage.data.find((trace) => trace.id === id);
+
+export const mockSpanById = (id: string): Span | undefined =>
+  mockSpansPage.data.find((span) => span.span_id === id);
+
+const baseAnnotations: Annotation[] = [
+  {
+    annotation_id: 'annotation-feedback-001',
+    workspace: 'default',
+    span_id: span1.span_id,
+    session_id: span1.session_id,
+    created_by: 'test-user',
+    created_at: '2026-05-20T16:43:00Z',
+    ingested_at: '2026-05-20T16:43:01Z',
+    kind: 'feedback',
+    value: 'positive',
+  },
+  {
+    annotation_id: 'annotation-note-001',
+    workspace: 'default',
+    span_id: span1.span_id,
+    session_id: span1.session_id,
+    created_by: 'test-user',
+    created_at: '2026-05-20T16:43:30Z',
+    ingested_at: '2026-05-20T16:43:31Z',
+    kind: 'note',
+    text: 'Good final response, but verify policy citations.',
+  },
+  {
+    annotation_id: 'annotation-metadata-001',
+    workspace: 'default',
+    span_id: span2.span_id,
+    session_id: span2.session_id,
+    created_by: 'test-user',
+    created_at: '2026-05-20T16:44:00Z',
+    ingested_at: '2026-05-20T16:44:01Z',
+    kind: 'metadata',
+    metadata: {
+      review_queue: 'support-policy',
+      priority: 'normal',
+    },
+  },
+];
+
+let mockAnnotations = [...baseAnnotations];
+
+const pageAnnotations = (annotations: Annotation[], page: number, pageSize: number): Annotation[] =>
+  annotations.slice((page - 1) * pageSize, page * pageSize);
+
+export const resetMockAnnotations = (): void => {
+  mockAnnotations = [...baseAnnotations];
+};
+
+export const mockAnnotationsPage = ({
+  spanId,
+  page = 1,
+  pageSize = 100,
+}: {
+  spanId?: string;
+  page?: number;
+  pageSize?: number;
+}): AnnotationsPage => {
+  const filtered = spanId
+    ? mockAnnotations.filter((annotation) => annotation.span_id === spanId)
+    : mockAnnotations;
+  const sorted = [...filtered].sort((a, b) => Date.parse(b.created_at) - Date.parse(a.created_at));
+  const data = pageAnnotations(sorted, page, pageSize);
+
+  return {
+    data,
+    pagination: {
+      page,
+      page_size: pageSize,
+      current_page_size: data.length,
+      total_pages: Math.ceil(sorted.length / pageSize),
+      total_results: sorted.length,
+    },
+    sort: '-created_at',
+    filter: spanId ? { span_id: spanId } : undefined,
+  };
+};
+
+export const createMockAnnotation = ({
+  workspace,
+  data,
+}: {
+  workspace: string;
+  data: AnnotationInput;
+}): Annotation => {
+  const now = new Date().toISOString();
+  const base = {
+    annotation_id: `annotation-${mockAnnotations.length + 1}`,
+    workspace,
+    span_id: data.span_id,
+    session_id: data.session_id,
+    created_by: 'test-user',
+    created_at: now,
+    ingested_at: now,
+  };
+
+  let annotation: Annotation;
+  switch (data.kind) {
+    case FeedbackAnnotationInputKind.feedback:
+      annotation = {
+        ...base,
+        kind: 'feedback',
+        value: data.value,
+      };
+      break;
+    case NoteAnnotationInputKind.note:
+      annotation = {
+        ...base,
+        kind: 'note',
+        text: data.text,
+      };
+      break;
+    case LabelAnnotationInputKind.label:
+      annotation = {
+        ...base,
+        kind: 'label',
+        value: data.value,
+        value_type: data.value_type,
+        name: data.name,
+      };
+      break;
+    case MetadataAnnotationInputKind.metadata:
+      annotation = {
+        ...base,
+        kind: 'metadata',
+        metadata: data.metadata,
+      };
+      break;
+  }
+
+  mockAnnotations = [annotation, ...mockAnnotations];
+  return annotation;
+};
+
+export const deleteMockAnnotation = (annotationId: string): boolean => {
+  const nextAnnotations = mockAnnotations.filter(
+    (annotation) => annotation.annotation_id !== annotationId
+  );
+  const deleted = nextAnnotations.length !== mockAnnotations.length;
+  mockAnnotations = nextAnnotations;
+  return deleted;
+};
diff --git a/web/packages/studio/src/routes/CustomizationJobListRoute/index.tsx b/web/packages/studio/src/routes/CustomizationJobListRoute/index.tsx
index 00d58e8262..e84592eadf 100644
--- a/web/packages/studio/src/routes/CustomizationJobListRoute/index.tsx
+++ b/web/packages/studio/src/routes/CustomizationJobListRoute/index.tsx
@@ -10,7 +10,7 @@ import { ModelPanel, ModelPanelTab } from '@studio/components/sidePanels/ModelPa
 import { INTAKE_ENABLED } from '@studio/constants/environment';
 import { useWorkspaceFromPath } from '@studio/hooks/useWorkspaceFromPath';
 import { useBreadcrumbs } from '@studio/providers/breadcrumbs/useBreadcrumbs';
-import { getEvaluationMetricsRunRoute, getIntakeEntriesRoute } from '@studio/routes/utils';
+import { getEvaluationMetricsRunRoute, getIntakeTracesRoute } from '@studio/routes/utils';
 import { type FC, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 
@@ -72,10 +72,10 @@ export const CustomizationJobListRoute: FC = () => {
                   kind="secondary"
                   size="small"
                   onClick={() => {
-                    navigate(getIntakeEntriesRoute(workspace));
+                    navigate(getIntakeTracesRoute(workspace));
                   }}
                 >
-                  View Intake Entries
+                  View Intake Traces
                 </Button>
               )}
               <Button
diff --git a/web/packages/studio/src/routes/IntakeEntriesRoute/index.tsx b/web/packages/studio/src/routes/IntakeEntriesRoute/index.tsx
deleted file mode 100644
index de9f5d8365..0000000000
--- a/web/packages/studio/src/routes/IntakeEntriesRoute/index.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { IntakeEntriesTable } from '@studio/components/IntakeEntriesTable';
-import { FC } from 'react';
-
-/**
- * Route component for the intake entries list.
- * Displays a table of individual completion entries.
- * Used as a child of IntakeLayout which provides the header and navigation.
- */
-export const IntakeEntriesRoute: FC = () => {
-  return (
-    <IntakeEntriesTable
-      enableSelection
-      enableActions
-      attributes={{
-        Stack: {
-          className: 'flex-1 min-h-0',
-        },
-      }}
-    />
-  );
-};
diff --git a/web/packages/studio/src/routes/IntakeEntryEventsRoute/index.tsx b/web/packages/studio/src/routes/IntakeEntryEventsRoute/index.tsx
deleted file mode 100644
index 67eddd70e6..0000000000
--- a/web/packages/studio/src/routes/IntakeEntryEventsRoute/index.tsx
+++ /dev/null
@@ -1,88 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { getGetEntryQueryKey, useDeleteEvent, useGetEntry } from '@nemo/sdk/generated/platform/api';
-import { Anchor, Block, Panel, StatusMessage } from '@nvidia/foundations-react-core';
-import { IntakeEventsList } from '@studio/components/IntakeEventsList';
-import { Loading } from '@studio/components/Layouts/Loading';
-import { ROUTE_PARAMS } from '@studio/constants/routes';
-import { useWorkspaceFromPath } from '@studio/hooks/useWorkspaceFromPath';
-import { getIntakeEntryMessagesRoute } from '@studio/routes/utils';
-import { useQueryClient } from '@tanstack/react-query';
-import { Star, TriangleAlert } from 'lucide-react';
-import { FC, useCallback } from 'react';
-import { Link, useParams } from 'react-router-dom';
-
-/**
- * Route component for the intake entry Events & Annotations tab.
- * Displays the events and annotations list for the entry.
- * Used as a child of IntakeEntryLayout which provides the header and navigation.
- */
-export const IntakeEntryEventsRoute: FC = () => {
-  const { [ROUTE_PARAMS.entryId]: entryId } = useParams() as { [ROUTE_PARAMS.entryId]: string };
-  const workspace = useWorkspaceFromPath();
-  const { data: entry, isLoading } = useGetEntry(workspace, entryId);
-  const queryClient = useQueryClient();
-  const { mutate: deleteEvent } = useDeleteEvent();
-
-  const handleDeleteEvent = useCallback(
-    (eventId: string) => {
-      deleteEvent(
-        { workspace, entry: entryId, name: eventId },
-        {
-          onSuccess: () => {
-            queryClient.invalidateQueries({
-              queryKey: getGetEntryQueryKey(workspace, entryId),
-            });
-          },
-        }
-      );
-    },
-    [deleteEvent, entryId, queryClient, workspace]
-  );
-
-  const panelProps = {
-    elevation: 'high' as const,
-    slotIcon: <Star />,
-    slotHeading: 'Events and Annotations' as const,
-  };
-
-  // Loading state
-  if (isLoading) {
-    return <Loading description="Loading events..." />;
-  }
-
-  const events = entry?.events ?? [];
-
-  // Empty state - matches Figma design
-  if (events.length === 0) {
-    const messagesRoute = getIntakeEntryMessagesRoute(workspace, entryId);
-    return (
-      <Panel {...panelProps}>
-        <StatusMessage
-          size="medium"
-          slotMedia={<TriangleAlert height={65} width={65} />}
-          slotHeading="No Events or Annotations Found"
-          slotSubheading={
-            <>
-              Begin annotating in the{' '}
-              <Anchor asChild>
-                <Link to={messagesRoute}>Input/Output</Link>
-              </Anchor>{' '}
-              tab.
-            </>
-          }
-          data-testid="no-events-container"
-        />
-      </Panel>
-    );
-  }
-
-  return (
-    <Panel {...panelProps}>
-      <Block className="pl-4">
-        <IntakeEventsList events={events} entryId={entryId} onDeleteEvent={handleDeleteEvent} />
-      </Block>
-    </Panel>
-  );
-};
diff --git a/web/packages/studio/src/routes/IntakeEntryLayout/index.tsx b/web/packages/studio/src/routes/IntakeEntryLayout/index.tsx
deleted file mode 100644
index 3061ddd849..0000000000
--- a/web/packages/studio/src/routes/IntakeEntryLayout/index.tsx
+++ /dev/null
@@ -1,135 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { useGetEntry } from '@nemo/sdk/generated/platform/api';
-import { Button, PageHeader, Stack, StatusMessage, Tabs } from '@nvidia/foundations-react-core';
-import { AccessibleTitle } from '@studio/components/AccessibleTitle';
-import { IntakeThreadPanel } from '@studio/components/IntakeThreadPanel';
-import { Loading } from '@studio/components/Layouts/Loading';
-import { NotFound } from '@studio/components/Layouts/NotFound';
-import { ROUTE_PARAMS, ROUTES } from '@studio/constants/routes';
-import { useWorkspaceFromPath } from '@studio/hooks/useWorkspaceFromPath';
-import { useBreadcrumbs } from '@studio/providers/breadcrumbs/useBreadcrumbs';
-import {
-  getIntakeEntryMessagesRoute,
-  getIntakeEntryEventsRoute,
-  getIntakeEntryMetadataRoute,
-  getIntakeRoute,
-} from '@studio/routes/utils';
-import { CircleAlert as ErrorIcon } from 'lucide-react';
-import { FC, Suspense, useState } from 'react';
-import { Link, Outlet, matchPath, useLocation, useParams } from 'react-router-dom';
-
-/**
- * Layout component for the Intake Entry detail section.
- * Provides shared header and tab navigation for Messages, Events, and Metadata sub-routes.
- * Child routes are rendered via <Outlet />.
- */
-export const IntakeEntryLayout: FC = () => {
-  const workspace = useWorkspaceFromPath();
-  const { [ROUTE_PARAMS.entryId]: entryId } = useParams() as { [ROUTE_PARAMS.entryId]: string };
-
-  const { data: entry, error, isLoading } = useGetEntry(workspace, entryId);
-  const eventsCount = entry?.events?.length ?? 0;
-  const threadId = entry?.context?.thread_id;
-
-  // Thread panel state
-  const [threadPanelOpen, setThreadPanelOpen] = useState(false);
-
-  const location = useLocation();
-  const match = matchPath(
-    { path: `${ROUTES.workspace.intakeEntry}/:selectedTab`, end: false },
-    location.pathname
-  );
-  const {
-    params: { selectedTab },
-  } = match ?? { params: { selectedTab: 'messages' } };
-
-  const messagesRoute = getIntakeEntryMessagesRoute(workspace, entryId);
-  const eventsRoute = getIntakeEntryEventsRoute(workspace, entryId);
-  const metadataRoute = getIntakeEntryMetadataRoute(workspace, entryId);
-
-  useBreadcrumbs({
-    items: [
-      {
-        slotLabel: 'Intake',
-        href: getIntakeRoute(workspace),
-      },
-      {
-        slotLabel: 'Entry',
-      },
-    ],
-  });
-
-  // Show NotFound for 404 errors
-  if (error?.status === 404) {
-    return (
-      <NotFound
-        subheader="Entry Not Found"
-        message="The entry you're looking for doesn't exist or you don't have permission to view it."
-      />
-    );
-  }
-
-  // Show loading state
-  if (isLoading) {
-    return <Loading description="Loading entry..." />;
-  }
-
-  // Show generic error for other errors
-  if (error) {
-    return (
-      <StatusMessage
-        className="mx-auto mt-density-2xl"
-        size="medium"
-        slotMedia={<ErrorIcon width={65} height={65} />}
-        slotHeading="Error loading entry"
-        slotSubheading={error.message}
-      />
-    );
-  }
-
-  return (
-    <AccessibleTitle title={`Entry ${entryId}`}>
-      <Stack gap="density-2xl" padding="density-2xl" className="h-full overflow-auto">
-        <PageHeader
-          className="p-0"
-          slotHeading={`Entry ${entryId}`}
-          slotActions={
-            threadId && (
-              <Button kind="secondary" onClick={() => setThreadPanelOpen(true)}>
-                View Thread
-              </Button>
-            )
-          }
-        />
-        <Tabs
-          // Override KUI's default overflow:hidden since we're using Tabs purely for
-          // navigation (with renderLink), not for containing tab panel content.
-          className="overflow-visible"
-          value={selectedTab}
-          items={[
-            { value: 'messages', children: 'Input/Output', href: messagesRoute },
-            {
-              value: 'events',
-              children: `Events & Annotations (${eventsCount})`,
-              href: eventsRoute,
-            },
-            { value: 'metadata', children: 'Metadata', href: metadataRoute },
-          ]}
-          renderLink={(item) => <Link to={item.href!}>{item.children}</Link>}
-        />
-        <Suspense fallback={<Loading description="Loading..." />}>
-          <Outlet />
-        </Suspense>
-      </Stack>
-      {threadId && (
-        <IntakeThreadPanel
-          threadId={threadId}
-          open={threadPanelOpen}
-          onOpenChange={setThreadPanelOpen}
-        />
-      )}
-    </AccessibleTitle>
-  );
-};
diff --git a/web/packages/studio/src/routes/IntakeEntryMessagesRoute/index.tsx b/web/packages/studio/src/routes/IntakeEntryMessagesRoute/index.tsx
deleted file mode 100644
index cf8e6c9250..0000000000
--- a/web/packages/studio/src/routes/IntakeEntryMessagesRoute/index.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { useGetEntry } from '@nemo/sdk/generated/platform/api';
-import { Flex, StatusMessage } from '@nvidia/foundations-react-core';
-import { IntakeAnnotationPanel } from '@studio/components/IntakeAnnotationPanel';
-import { IntakeEntryConversation } from '@studio/components/IntakeEntryConversation';
-import { Loading } from '@studio/components/Layouts/Loading';
-import { ROUTE_PARAMS } from '@studio/constants/routes';
-import { useWorkspaceFromPath } from '@studio/hooks/useWorkspaceFromPath';
-import { CircleAlert as ErrorIcon } from 'lucide-react';
-import { FC } from 'react';
-import { useParams } from 'react-router-dom';
-
-/**
- * Route component for the intake entry Input/Output tab.
- * Displays the conversation messages from the entry.
- * Used as a child of IntakeEntryLayout which provides the header and navigation.
- */
-export const IntakeEntryMessagesRoute: FC = () => {
-  const { [ROUTE_PARAMS.entryId]: entryId } = useParams() as { [ROUTE_PARAMS.entryId]: string };
-  const workspace = useWorkspaceFromPath();
-  const { data: entry, error, isLoading } = useGetEntry(workspace, entryId);
-
-  if (isLoading) {
-    return <Loading description="Loading conversation..." />;
-  }
-
-  if (error) {
-    return (
-      <StatusMessage
-        className="mx-auto"
-        size="medium"
-        slotMedia={<ErrorIcon width={65} height={65} />}
-        slotHeading="Error loading conversation"
-        slotSubheading={error.message}
-      />
-    );
-  }
-
-  if (!entry) {
-    return (
-      <StatusMessage
-        className="mx-auto"
-        size="medium"
-        slotHeading="Entry not found"
-        slotSubheading="The requested entry could not be loaded."
-      />
-    );
-  }
-
-  return (
-    <Flex className="overflow-hidden" gap="6">
-      <IntakeEntryConversation
-        entry={entry}
-        attributes={{ Panel: { className: 'max-w-[66%] flex-2 overflow-y-auto' } }}
-      />
-      <IntakeAnnotationPanel
-        entry={entry}
-        attributes={{ Panel: { className: 'max-w-[33%] flex-1 overflow-y-auto' } }}
-      />
-    </Flex>
-  );
-};
diff --git a/web/packages/studio/src/routes/IntakeEntryMetadataRoute/index.tsx b/web/packages/studio/src/routes/IntakeEntryMetadataRoute/index.tsx
deleted file mode 100644
index c05b271ee1..0000000000
--- a/web/packages/studio/src/routes/IntakeEntryMetadataRoute/index.tsx
+++ /dev/null
@@ -1,237 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { KVPair } from '@nemo/common/src/components/KVPair';
-import { formatAbsoluteTimestamp } from '@nemo/common/src/components/RelativeTime/util';
-import { useGetApp, useGetEntry, useGetTask } from '@nemo/sdk/generated/platform/api';
-import type { Entry } from '@nemo/sdk/generated/platform/schema';
-import { Anchor, Panel, Stack } from '@nvidia/foundations-react-core';
-import { IntakeThreadPanel } from '@studio/components/IntakeThreadPanel';
-import { Loading } from '@studio/components/Layouts/Loading';
-import { ROUTE_PARAMS } from '@studio/constants/routes';
-import { useWorkspaceFromPath } from '@studio/hooks/useWorkspaceFromPath';
-import { parseAppRef } from '@studio/util/entries';
-import { formatKeyLabel } from '@studio/util/strings';
-import { Sliders } from 'lucide-react';
-import { FC, useState, type ReactNode } from 'react';
-import { useParams } from 'react-router-dom';
-
-/** API may return fields not yet reflected on the generated Entry schema. */
-type EntryDetail = Entry & {
-  description?: string;
-  ownership?: {
-    created_by?: string;
-    updated_by?: string;
-    access_policies?: unknown;
-  };
-  custom_fields?: Record<string, unknown>;
-};
-
-/**
- * Route component for the intake entry Metadata tab.
- * Displays comprehensive metadata for the entry organized into groups:
- * - Entry group (ID, external ID, description, thread ID, model, user ID, created, updated)
- * - App group (ID, name, description)
- * - Task group (ID, name, description)
- * - Tracing group (trace ID, session ID)
- * - Request Metadata group (conditional - all request properties except messages/model)
- * - Response Metadata group (conditional - all response properties except choices)
- * - Ownership group (conditional - created by, updated by, access policies)
- * - Custom Fields group (conditional - dynamic key-value pairs)
- *
- * Used as a child of IntakeEntryLayout which provides the header and navigation.
- */
-export const IntakeEntryMetadataRoute: FC = () => {
-  const { [ROUTE_PARAMS.entryId]: entryId } = useParams() as { [ROUTE_PARAMS.entryId]: string };
-  const workspace = useWorkspaceFromPath();
-  const { data: entry, isLoading: isLoadingEntry } = useGetEntry(workspace, entryId);
-
-  // Parse app reference to get namespace and app name
-  const appParts = parseAppRef(entry?.context?.app);
-
-  // Fetch App entity if context.app is present
-  const { data: app, isLoading: isLoadingApp } = useGetApp(workspace, appParts?.appName ?? '', {
-    query: { enabled: !!appParts },
-  });
-
-  // Fetch Task entity if context.task is present
-  const { data: task, isLoading: isLoadingTask } = useGetTask(
-    workspace,
-    appParts?.appName ?? '',
-    entry?.context?.task ?? '',
-    { query: { enabled: !!appParts && !!entry?.context?.task } }
-  );
-
-  // Thread panel state
-  const [threadPanelOpen, setThreadPanelOpen] = useState(false);
-  const threadId = entry?.context?.thread_id;
-
-  // Show loading state
-  if (isLoadingEntry || isLoadingApp || isLoadingTask) {
-    return <Loading description="Loading metadata..." />;
-  }
-
-  if (!entry) {
-    return null;
-  }
-
-  const detail = entry as EntryDetail;
-
-  // Get request properties excluding 'messages' and 'model' (model is shown in Entry group)
-  const requestProps = entry.data?.request
-    ? Object.entries(entry.data.request).filter(([key]) => key !== 'messages' && key !== 'model')
-    : [];
-
-  // Get response properties excluding 'choices' for dynamic rendering
-  const responseProps = entry.data?.response
-    ? Object.entries(entry.data.response).filter(([key]) => key !== 'choices')
-    : [];
-
-  // Check if we have ownership info to display (`access_policies` is unknown — wrap in Boolean so JSX `{hasOwnership && ...}` is not typed as unknown)
-  const hasOwnership = Boolean(
-    detail.ownership &&
-    (detail.ownership.created_by || detail.ownership.updated_by || detail.ownership.access_policies)
-  );
-
-  // Check if we have custom fields to display
-  const hasCustomFields = Boolean(
-    detail.custom_fields && Object.keys(detail.custom_fields).length > 0
-  );
-
-  // Helper to format values, showing "—" for missing/null values
-  const formatValue = (value: unknown): string => {
-    if (value === null || value === undefined || value === '') return '—';
-    if (typeof value === 'string') return value;
-    if (typeof value === 'number') return value.toLocaleString();
-    if (typeof value === 'boolean') return value ? 'Yes' : 'No';
-    return String(value);
-  };
-
-  // Helper to render complex values (objects/arrays) as formatted JSON
-  const renderComplexValue = (value: unknown): ReactNode => {
-    if (value === null || value === undefined) return '—';
-    if (typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') {
-      return formatValue(value);
-    }
-    // For objects/arrays, display as formatted JSON
-    return (
-      <pre className="text-xs font-mono whitespace-pre-wrap break-words max-w-full">
-        {JSON.stringify(value, null, 2)}
-      </pre>
-    );
-  };
-
-  return (
-    <Panel elevation="high" slotIcon={<Sliders />} slotHeading="Metadata">
-      <Stack gap="density-2xl">
-        {/* Entry Group */}
-        <Stack gap="density-md">
-          <KVPair label="Entry ID" value={formatValue(entry.id)} />
-          <KVPair label="External ID" value={formatValue(entry.external_id)} />
-          <KVPair label="Description" value={formatValue(detail.description)} />
-          <KVPair
-            label="Thread ID"
-            value={
-              threadId ? (
-                <Anchor asChild>
-                  <button onClick={() => setThreadPanelOpen(true)} className="cursor-pointer">
-                    {threadId}
-                  </button>
-                </Anchor>
-              ) : (
-                '—'
-              )
-            }
-          />
-          <KVPair label="Model" value={formatValue(entry.data?.request?.model)} />
-          <KVPair label="User ID" value={formatValue(entry.context?.user_id)} />
-          <KVPair
-            label="Created"
-            value={entry.created_at ? formatAbsoluteTimestamp(entry.created_at) : '—'}
-          />
-          <KVPair
-            label="Updated"
-            value={entry.updated_at ? formatAbsoluteTimestamp(entry.updated_at) : '—'}
-          />
-        </Stack>
-
-        {/* App Group */}
-        <Stack gap="density-md">
-          <KVPair label="App ID" value={formatValue(entry.context?.app)} />
-          <KVPair label="App Name" value={formatValue(app?.name)} />
-          <KVPair label="App Description" value={formatValue(app?.description)} />
-        </Stack>
-
-        {/* Task Group */}
-        <Stack gap="density-md">
-          <KVPair label="Task ID" value={formatValue(entry.context?.task)} />
-          <KVPair label="Task Name" value={formatValue(task?.name)} />
-          <KVPair label="Task Description" value={formatValue(task?.description)} />
-        </Stack>
-
-        <Stack gap="density-md">
-          <KVPair label="Trace ID" value={formatValue(entry.context?.trace_id)} />
-          <KVPair label="Session ID" value={formatValue(entry.context?.session_id)} />
-        </Stack>
-
-        {/* Request Metadata Group (conditional) */}
-        {requestProps.length > 0 && (
-          <Stack gap="density-md">
-            {requestProps.map(([key, value]) => (
-              <KVPair
-                key={key}
-                label={formatKeyLabel(key)}
-                value={renderComplexValue(value) as ReactNode}
-              />
-            ))}
-          </Stack>
-        )}
-
-        {/* Response Metadata Group (conditional) */}
-        {responseProps.length > 0 && (
-          <Stack gap="density-md">
-            {responseProps.map(([key, value]) => (
-              <KVPair
-                key={key}
-                label={formatKeyLabel(key)}
-                value={renderComplexValue(value) as ReactNode}
-              />
-            ))}
-          </Stack>
-        )}
-
-        {/* Ownership Group (conditional) */}
-        {hasOwnership && (
-          <Stack gap="density-md">
-            <KVPair label="Created By" value={formatValue(detail.ownership?.created_by)} />
-            <KVPair label="Updated By" value={formatValue(detail.ownership?.updated_by)} />
-            <KVPair
-              label="Access Policies"
-              value={renderComplexValue(detail.ownership?.access_policies) as ReactNode}
-            />
-          </Stack>
-        )}
-
-        {/* Custom Fields Group (conditional) */}
-        {hasCustomFields && (
-          <Stack gap="density-md">
-            {Object.entries(detail.custom_fields!).map(([key, value]) => (
-              <KVPair
-                key={key}
-                label={formatKeyLabel(key)}
-                value={renderComplexValue(value) as ReactNode}
-              />
-            ))}
-          </Stack>
-        )}
-      </Stack>
-      {threadId && (
-        <IntakeThreadPanel
-          threadId={threadId}
-          open={threadPanelOpen}
-          onOpenChange={setThreadPanelOpen}
-        />
-      )}
-    </Panel>
-  );
-};
diff --git a/web/packages/studio/src/routes/IntakeExportJobsRoute/index.tsx b/web/packages/studio/src/routes/IntakeExportJobsRoute/index.tsx
deleted file mode 100644
index f4716c6ed5..0000000000
--- a/web/packages/studio/src/routes/IntakeExportJobsRoute/index.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { ExportJobsDataView } from '@studio/components/dataViews/ExportJobsDataView';
-import { FC } from 'react';
-
-export const IntakeExportJobsRoute: FC = () => {
-  return <ExportJobsDataView />;
-};
diff --git a/web/packages/studio/src/routes/IntakeLayout/index.tsx b/web/packages/studio/src/routes/IntakeLayout/index.tsx
index 1c46a5c62d..489f47a23f 100644
--- a/web/packages/studio/src/routes/IntakeLayout/index.tsx
+++ b/web/packages/studio/src/routes/IntakeLayout/index.tsx
@@ -3,23 +3,20 @@
 
 import { PageHeader, Stack, Tabs } from '@nvidia/foundations-react-core';
 import { AccessibleTitle } from '@studio/components/AccessibleTitle';
-import { ExportEntriesButton } from '@studio/components/buttons/ExportEntriesButton';
 import { FeatureFlagBadge } from '@studio/components/FeatureFlagBadge';
 import { Loading } from '@studio/components/Layouts/Loading';
 import { ROUTES } from '@studio/constants/routes';
 import { useWorkspaceFromPath } from '@studio/hooks/useWorkspaceFromPath';
 import { useBreadcrumbs } from '@studio/providers/breadcrumbs/useBreadcrumbs';
-import {
-  getIntakeEntriesRoute,
-  getIntakeThreadsRoute,
-  getIntakeExportJobsRoute,
-} from '@studio/routes/utils';
+import { getIntakeSpansRoute, getIntakeTracesRoute } from '@studio/routes/utils';
 import { FC, Suspense } from 'react';
 import { Link, Outlet, matchPath, useLocation } from 'react-router-dom';
 
+export const INTAKE_FILTER_ACTION_TARGET_ID = 'intake-filter-action-target';
+
 /**
  * Layout component for the Intake section.
- * Provides shared header and tab navigation for Entries and Threads sub-routes.
+ * Provides shared header and tab navigation for trace and span telemetry views.
  * Child routes are rendered via <Outlet />.
  */
 export const IntakeLayout: FC = () => {
@@ -32,11 +29,10 @@ export const IntakeLayout: FC = () => {
   );
   const {
     params: { selectedTab },
-  } = match ?? { params: { selectedTab: 'entries' } };
+  } = match ?? { params: { selectedTab: 'traces' } };
 
-  const entriesRoute = getIntakeEntriesRoute(workspace);
-  const threadsRoute = getIntakeThreadsRoute(workspace);
-  const exportJobsRoute = getIntakeExportJobsRoute(workspace);
+  const tracesRoute = getIntakeTracesRoute(workspace);
+  const spansRoute = getIntakeSpansRoute(workspace);
 
   useBreadcrumbs({
     items: [
@@ -57,20 +53,24 @@ export const IntakeLayout: FC = () => {
               <FeatureFlagBadge flag="intakeEnabled" />
             </>
           }
-          slotActions={<ExportEntriesButton />}
-        />
-        <Tabs
-          // Override KUI's default overflow:hidden since we're using Tabs purely for
-          // navigation (with renderLink), not for containing tab panel content.
-          className="overflow-visible"
-          value={selectedTab}
-          items={[
-            { value: 'entries', children: 'Entries', href: entriesRoute },
-            { value: 'threads', children: 'Threads', href: threadsRoute },
-            { value: 'export-jobs', children: 'Export Jobs', href: exportJobsRoute },
-          ]}
-          renderLink={(item) => <Link to={item.href!}>{item.children}</Link>}
         />
+        <div className="grid grid-cols-[minmax(0,1fr)_auto] items-center gap-density-lg">
+          <Tabs
+            // Override KUI's default overflow:hidden since we're using Tabs purely for
+            // navigation (with renderLink), not for containing tab panel content.
+            className="min-w-0 flex-1 overflow-visible"
+            value={selectedTab}
+            items={[
+              { value: 'traces', children: 'Traces', href: tracesRoute },
+              { value: 'spans', children: 'Spans', href: spansRoute },
+            ]}
+            renderLink={(item) => <Link to={item.href!}>{item.children}</Link>}
+          />
+          <div
+            id={INTAKE_FILTER_ACTION_TARGET_ID}
+            className="flex shrink-0 items-center justify-end"
+          />
+        </div>
         <Suspense fallback={<Loading description="Loading..." />}>
           <Outlet />
         </Suspense>
diff --git a/web/packages/studio/src/routes/IntakeSpanDetailRoute/index.tsx b/web/packages/studio/src/routes/IntakeSpanDetailRoute/index.tsx
new file mode 100644
index 0000000000..2bc60c1fd4
--- /dev/null
+++ b/web/packages/studio/src/routes/IntakeSpanDetailRoute/index.tsx
@@ -0,0 +1,331 @@
+// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { KVPair } from '@nemo/common/src/components/KVPair';
+import { formatAbsoluteTimestamp } from '@nemo/common/src/components/RelativeTime/util';
+import { useGetSpan } from '@nemo/sdk/generated/platform/api';
+import {
+  CodeSnippet,
+  Grid,
+  PageHeader,
+  Panel,
+  Stack,
+  StatusMessage,
+  Text,
+} from '@nvidia/foundations-react-core';
+import { AccessibleTitle } from '@studio/components/AccessibleTitle';
+import { IntakeAnnotationsPanel } from '@studio/components/IntakeAnnotationsPanel';
+import { IntakeTelemetryStatusBadge } from '@studio/components/IntakeTelemetryStatusBadge';
+import { Loading } from '@studio/components/Layouts/Loading';
+import { NotFound } from '@studio/components/Layouts/NotFound';
+import { ROUTE_PARAMS } from '@studio/constants/routes';
+import { useWorkspaceFromPath } from '@studio/hooks/useWorkspaceFromPath';
+import { useBreadcrumbs } from '@studio/providers/breadcrumbs/useBreadcrumbs';
+import {
+  getIntakeSpanRoute,
+  getIntakeTraceRoute,
+  getIntakeTracesRoute,
+} from '@studio/routes/utils';
+import {
+  EMPTY_VALUE,
+  formatCost,
+  formatDurationMs,
+  formatInteger,
+  formatMaybe,
+  getEvaluationContextSummary,
+  getSpanDisplayName,
+  getSpanDurationMs,
+  hasEvaluationContext,
+} from '@studio/util/intakeTelemetry';
+import { Activity, CircleAlert, Coins } from 'lucide-react';
+import { FC, useEffect } from 'react';
+import { Link, useParams } from 'react-router-dom';
+
+const truncatedValueAttributes = {
+  value: {
+    className: 'block min-w-0 max-w-full truncate',
+  },
+};
+
+interface SpanContentBlockProps {
+  label: string;
+  value: string | null | undefined;
+  emptyMessage: string;
+}
+
+const SpanContentBlock: FC<SpanContentBlockProps> = ({ label, value, emptyMessage }) => {
+  const content = value?.trim();
+
+  return (
+    <Stack gap="density-md" className="min-w-0">
+      <Text kind="label/bold/sm" className="text-secondary">
+        {label}
+      </Text>
+      {content ? (
+        <CodeSnippet
+          value={content}
+          language="markdown"
+          kind="block"
+          collapsible
+          defaultOpen
+          attributes={{
+            CodeSnippetCode: {
+              className:
+                'max-h-[420px] [&_code]:whitespace-pre-wrap [&_code]:break-words [&_pre]:whitespace-pre-wrap',
+            },
+          }}
+        />
+      ) : (
+        <div className="flex min-h-[120px] items-center rounded-md border border-dashed border-base bg-surface-raised p-density-xl">
+          <Text kind="body/regular/sm" className="text-secondary">
+            {emptyMessage}
+          </Text>
+        </div>
+      )}
+    </Stack>
+  );
+};
+
+export const IntakeSpanDetailRoute: FC = () => {
+  const workspace = useWorkspaceFromPath();
+  const { [ROUTE_PARAMS.spanId]: spanId } = useParams() as { [ROUTE_PARAMS.spanId]: string };
+
+  const { data: span, error, isLoading } = useGetSpan(workspace, spanId);
+  const { setBreadcrumbs } = useBreadcrumbs();
+  const spanBreadcrumbLabel = span ? getSpanDisplayName(span) : spanId;
+
+  useEffect(() => {
+    setBreadcrumbs([
+      {
+        slotLabel: 'Intake',
+        href: getIntakeTracesRoute(workspace),
+      },
+      ...(span?.trace_id
+        ? [
+            {
+              slotLabel: `Trace ${span.trace_id}`,
+              href: getIntakeTraceRoute(workspace, span.trace_id),
+            },
+          ]
+        : []),
+      {
+        slotLabel: `Span ${spanBreadcrumbLabel}`,
+      },
+    ]);
+  }, [setBreadcrumbs, span?.trace_id, spanBreadcrumbLabel, workspace]);
+
+  if (error?.response?.status === 404) {
+    return (
+      <NotFound
+        subheader="Span Not Found"
+        message="The span does not exist or you do not have permission to view it."
+      />
+    );
+  }
+
+  if (isLoading) {
+    return <Loading description="Loading span..." />;
+  }
+
+  if (error) {
+    return (
+      <StatusMessage
+        className="mx-auto mt-density-2xl"
+        size="medium"
+        slotMedia={<CircleAlert width={65} height={65} />}
+        slotHeading="Error loading span"
+        slotSubheading={error.message}
+      />
+    );
+  }
+
+  if (!span) {
+    return null;
+  }
+
+  const title = getSpanDisplayName(span);
+  const showEvaluationContext = hasEvaluationContext(span.evaluation_context);
+
+  return (
+    <AccessibleTitle title={`Span ${title}`}>
+      <Stack gap="density-2xl" padding="density-2xl" className="h-full overflow-auto">
+        <PageHeader className="p-0" slotHeading={title} />
+        <Grid className="grid-cols-1 xl:grid-cols-[minmax(0,1fr)_minmax(0,420px)] gap-density-2xl">
+          <Panel
+            elevation="high"
+            slotIcon={<Activity />}
+            slotHeading="Span Summary"
+            className="min-w-0 overflow-hidden"
+          >
+            <Stack gap="density-xl">
+              <Grid className="grid-cols-1 md:grid-cols-2 gap-density-lg">
+                <KVPair label="Span ID" value={span.span_id} orientation="vertical" truncate />
+                <KVPair label="Kind" value={span.kind} orientation="vertical" />
+                <KVPair
+                  label="Status"
+                  value={<IntakeTelemetryStatusBadge status={span.status} />}
+                  orientation="vertical"
+                />
+                <KVPair label="Source" value={formatMaybe(span.source)} orientation="vertical" />
+                <KVPair
+                  label="Trace"
+                  value={
+                    span.trace_id ? (
+                      <Link to={getIntakeTraceRoute(workspace, span.trace_id)}>
+                        {span.trace_id}
+                      </Link>
+                    ) : (
+                      EMPTY_VALUE
+                    )
+                  }
+                  orientation="vertical"
+                  truncate
+                />
+                <KVPair
+                  label="Parent Span"
+                  value={
+                    span.parent_span_id ? (
+                      <Link to={getIntakeSpanRoute(workspace, span.parent_span_id)}>
+                        {span.parent_span_id}
+                      </Link>
+                    ) : (
+                      EMPTY_VALUE
+                    )
+                  }
+                  orientation="vertical"
+                  truncate
+                />
+                <KVPair
+                  label="Started"
+                  value={formatAbsoluteTimestamp(span.started_at)}
+                  orientation="vertical"
+                />
+                <KVPair
+                  label="Ended"
+                  value={span.ended_at ? formatAbsoluteTimestamp(span.ended_at) : EMPTY_VALUE}
+                  orientation="vertical"
+                />
+                <KVPair
+                  label="Duration"
+                  value={formatDurationMs(getSpanDurationMs(span))}
+                  orientation="vertical"
+                />
+                <KVPair
+                  label="Session ID"
+                  value={span.session_id}
+                  orientation="vertical"
+                  attributes={truncatedValueAttributes}
+                />
+                <KVPair
+                  label="Project"
+                  value={formatMaybe(span.project)}
+                  orientation="vertical"
+                  attributes={truncatedValueAttributes}
+                />
+                <KVPair
+                  label="Model"
+                  value={formatMaybe(span.model)}
+                  orientation="vertical"
+                  attributes={truncatedValueAttributes}
+                />
+                <KVPair
+                  label="Provider"
+                  value={formatMaybe(span.provider)}
+                  orientation="vertical"
+                  attributes={truncatedValueAttributes}
+                />
+                {showEvaluationContext && (
+                  <KVPair
+                    label="Evaluation"
+                    value={getEvaluationContextSummary(span.evaluation_context)}
+                    orientation="vertical"
+                    attributes={truncatedValueAttributes}
+                  />
+                )}
+              </Grid>
+              {span.status === 'error' && (
+                <Grid className="grid-cols-1 md:grid-cols-2 gap-density-lg">
+                  <KVPair
+                    label="Error Type"
+                    value={formatMaybe(span.error_type)}
+                    orientation="vertical"
+                  />
+                  <KVPair
+                    label="Error Message"
+                    value={formatMaybe(span.error_message)}
+                    orientation="vertical"
+                  />
+                </Grid>
+              )}
+              {(span.input?.trim() || span.output?.trim()) && (
+                <Stack gap="density-2xl" className="min-w-0">
+                  <SpanContentBlock
+                    label="Input"
+                    value={span.input}
+                    emptyMessage="No input payload was captured for this span."
+                  />
+                  <SpanContentBlock
+                    label="Output"
+                    value={span.output}
+                    emptyMessage="No output payload was captured for this span."
+                  />
+                </Stack>
+              )}
+            </Stack>
+          </Panel>
+          <Stack gap="density-2xl" className="min-w-0">
+            <Panel
+              elevation="high"
+              slotIcon={<Coins />}
+              slotHeading="Usage"
+              className="min-w-0 overflow-hidden"
+            >
+              <Grid className="grid-cols-2 gap-density-lg">
+                <KVPair
+                  label="Input Tokens"
+                  value={formatInteger(span.input_tokens)}
+                  orientation="vertical"
+                />
+                <KVPair
+                  label="Output Tokens"
+                  value={formatInteger(span.output_tokens)}
+                  orientation="vertical"
+                />
+                <KVPair
+                  label="Cached Tokens"
+                  value={formatInteger(span.cached_tokens)}
+                  orientation="vertical"
+                />
+                <KVPair
+                  label="Total Tokens"
+                  value={formatInteger(span.total_tokens)}
+                  orientation="vertical"
+                />
+                <KVPair
+                  label="Input Cost"
+                  value={formatCost(span.cost_input_usd)}
+                  orientation="vertical"
+                />
+                <KVPair
+                  label="Output Cost"
+                  value={formatCost(span.cost_output_usd)}
+                  orientation="vertical"
+                />
+                <KVPair
+                  label="Total Cost"
+                  value={formatCost(span.cost_total_usd)}
+                  orientation="vertical"
+                />
+              </Grid>
+            </Panel>
+            <IntakeAnnotationsPanel
+              workspace={workspace}
+              spanId={span.span_id}
+              sessionId={span.session_id}
+            />
+          </Stack>
+        </Grid>
+      </Stack>
+    </AccessibleTitle>
+  );
+};
diff --git a/web/packages/studio/src/routes/IntakeThreadsRoute/index.tsx b/web/packages/studio/src/routes/IntakeThreadsRoute/index.tsx
deleted file mode 100644
index 2a0e49fc8e..0000000000
--- a/web/packages/studio/src/routes/IntakeThreadsRoute/index.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { IntakeThreadsTable } from '@studio/components/IntakeThreadsTable';
-import { FC } from 'react';
-
-/**
- * Route component for the intake threads list.
- * Displays a table of conversation threads (grouped by thread_id).
- * Used as a child of IntakeLayout which provides the header and navigation.
- */
-export const IntakeThreadsRoute: FC = () => {
-  return (
-    <IntakeThreadsTable
-      enableSelection
-      attributes={{
-        Stack: {
-          className: 'flex-1 min-h-0',
-        },
-      }}
-    />
-  );
-};
diff --git a/web/packages/studio/src/routes/IntakeTraceDetailRoute/index.spec.tsx b/web/packages/studio/src/routes/IntakeTraceDetailRoute/index.spec.tsx
new file mode 100644
index 0000000000..97f1da4276
--- /dev/null
+++ b/web/packages/studio/src/routes/IntakeTraceDetailRoute/index.spec.tsx
@@ -0,0 +1,36 @@
+// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { IntakeTraceDetailRoute } from '@studio/routes/IntakeTraceDetailRoute';
+import { renderRoute, screen } from '@studio/tests/util/render';
+
+const renderTraceDetail = (traceId: string) =>
+  renderRoute(undefined, {
+    history: `/workspaces/default/intake/traces/${traceId}`,
+    routes: [
+      {
+        path: '/workspaces/:workspace/intake/traces/:traceId',
+        element: <IntakeTraceDetailRoute />,
+      },
+    ],
+  });
+
+describe('IntakeTraceDetailRoute', () => {
+  it('renders evaluation context only when present and filters spans to the trace', async () => {
+    renderTraceDetail('trace-agent-run-001');
+
+    expect(await screen.findByText('Trace Answer customer policy question')).toBeInTheDocument();
+    expect(screen.getByText('Evaluation Context')).toBeInTheDocument();
+    expect(await screen.findByText('Generate final response')).toBeInTheDocument();
+    expect(screen.queryByText('Retrieve deployment troubleshooting steps')).not.toBeInTheDocument();
+  });
+
+  it('omits evaluation context when the trace has none', async () => {
+    renderTraceDetail('trace-agent-run-002');
+
+    expect(
+      await screen.findByText('Trace Retrieve deployment troubleshooting steps')
+    ).toBeInTheDocument();
+    expect(screen.queryByText('Evaluation Context')).not.toBeInTheDocument();
+  });
+});
diff --git a/web/packages/studio/src/routes/IntakeTraceDetailRoute/index.tsx b/web/packages/studio/src/routes/IntakeTraceDetailRoute/index.tsx
new file mode 100644
index 0000000000..f93aab1a21
--- /dev/null
+++ b/web/packages/studio/src/routes/IntakeTraceDetailRoute/index.tsx
@@ -0,0 +1,265 @@
+// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { KVPair } from '@nemo/common/src/components/KVPair';
+import { formatAbsoluteTimestamp } from '@nemo/common/src/components/RelativeTime/util';
+import { useGetTrace } from '@nemo/sdk/generated/platform/api';
+import {
+  Grid,
+  PageHeader,
+  Panel,
+  Stack,
+  StatusMessage,
+  Text,
+} from '@nvidia/foundations-react-core';
+import { AccessibleTitle } from '@studio/components/AccessibleTitle';
+import { IntakeSpansTable } from '@studio/components/IntakeSpansTable';
+import { IntakeTelemetryStatusBadge } from '@studio/components/IntakeTelemetryStatusBadge';
+import { Loading } from '@studio/components/Layouts/Loading';
+import { NotFound } from '@studio/components/Layouts/NotFound';
+import { ROUTE_PARAMS } from '@studio/constants/routes';
+import { useWorkspaceFromPath } from '@studio/hooks/useWorkspaceFromPath';
+import { useBreadcrumbs } from '@studio/providers/breadcrumbs/useBreadcrumbs';
+import { getIntakeSpanRoute, getIntakeTracesRoute } from '@studio/routes/utils';
+import {
+  EMPTY_VALUE,
+  formatCost,
+  formatDurationMs,
+  formatInteger,
+  formatMaybe,
+  getEvaluationContextSummary,
+  getTraceDisplayName,
+  hasEvaluationContext,
+} from '@studio/util/intakeTelemetry';
+import { Activity, CircleAlert, Hash } from 'lucide-react';
+import { FC, useEffect } from 'react';
+import { Link, useParams } from 'react-router-dom';
+
+const TRACE_SPANS_PAGE_SIZE = 1000;
+const TRACE_DETAIL_SPANS_FILTER_TARGET_ID = 'trace-detail-spans-filter-action-target';
+
+export const IntakeTraceDetailRoute: FC = () => {
+  const workspace = useWorkspaceFromPath();
+  const { [ROUTE_PARAMS.traceId]: traceId } = useParams() as { [ROUTE_PARAMS.traceId]: string };
+
+  const {
+    data: trace,
+    error,
+    isLoading,
+  } = useGetTrace(workspace, traceId, {
+    mode: 'detailed',
+  });
+
+  const { setBreadcrumbs } = useBreadcrumbs();
+  const traceBreadcrumbLabel = trace ? getTraceDisplayName(trace) : traceId;
+
+  useEffect(() => {
+    setBreadcrumbs([
+      {
+        slotLabel: 'Intake',
+        href: getIntakeTracesRoute(workspace),
+      },
+      {
+        slotLabel: `Trace ${traceBreadcrumbLabel}`,
+      },
+    ]);
+  }, [setBreadcrumbs, traceBreadcrumbLabel, workspace]);
+
+  if (error?.response?.status === 404) {
+    return (
+      <NotFound
+        subheader="Trace Not Found"
+        message="The trace does not exist or you do not have permission to view it."
+      />
+    );
+  }
+
+  if (isLoading) {
+    return <Loading description="Loading trace..." />;
+  }
+
+  if (error) {
+    return (
+      <StatusMessage
+        className="mx-auto mt-density-2xl"
+        size="medium"
+        slotMedia={<CircleAlert width={65} height={65} />}
+        slotHeading="Error loading trace"
+        slotSubheading={error.message}
+      />
+    );
+  }
+
+  if (!trace) {
+    return null;
+  }
+
+  const title = getTraceDisplayName(trace);
+  const showEvaluationContext = hasEvaluationContext(trace.evaluation_context);
+  const showSpanLimitMessage =
+    trace.span_count !== undefined && trace.span_count > TRACE_SPANS_PAGE_SIZE;
+  const wrappingValueAttributes = {
+    value: {
+      className: 'block min-w-0 max-w-full break-all',
+    },
+  };
+
+  return (
+    <AccessibleTitle title={`Trace ${title}`}>
+      <Stack gap="density-2xl" padding="density-2xl" className="h-full overflow-auto">
+        <PageHeader
+          className="p-0"
+          slotHeading={`Trace ${title}`}
+          slotActions={
+            <div
+              id={TRACE_DETAIL_SPANS_FILTER_TARGET_ID}
+              className="flex shrink-0 items-center justify-end"
+            />
+          }
+        />
+        <Grid className="grid-cols-1 xl:grid-cols-[minmax(0,2fr)_minmax(320px,1fr)] gap-density-2xl items-start">
+          <Stack gap="density-md" className="min-w-0 min-h-[420px]">
+            {showSpanLimitMessage && (
+              <Text kind="body/regular/sm" className="text-secondary">
+                Showing first {TRACE_SPANS_PAGE_SIZE.toLocaleString()} of{' '}
+                {trace.span_count?.toLocaleString()} spans. Parent spans outside this page are
+                marked in the hierarchy.
+              </Text>
+            )}
+            <IntakeSpansTable
+              workspace={workspace}
+              filterTogglePortalTargetId={TRACE_DETAIL_SPANS_FILTER_TARGET_ID}
+              fixedFilter={{ trace_id: trace.id }}
+              defaultPageSize={TRACE_SPANS_PAGE_SIZE}
+              mode="summary"
+              showTraceColumn={false}
+              showHierarchy
+              emptyHeader="No Spans"
+              emptyMessage="No spans were found for this trace."
+            />
+          </Stack>
+          <Stack gap="density-2xl" className="min-w-0">
+            <Panel
+              elevation="high"
+              slotIcon={<Activity />}
+              slotHeading="Trace Summary"
+              className="min-w-0 overflow-hidden"
+            >
+              <Stack gap="density-xl">
+                <Grid className="grid-cols-2 gap-density-lg">
+                  <KVPair
+                    label="Started"
+                    value={formatAbsoluteTimestamp(trace.started_at)}
+                    orientation="vertical"
+                  />
+                  <KVPair
+                    label="Ended"
+                    value={trace.ended_at ? formatAbsoluteTimestamp(trace.ended_at) : EMPTY_VALUE}
+                    orientation="vertical"
+                  />
+                  <KVPair
+                    label="Duration"
+                    value={formatDurationMs(trace.duration_ms)}
+                    orientation="vertical"
+                  />
+                  <KVPair
+                    label="Spans"
+                    value={formatInteger(trace.span_count)}
+                    orientation="vertical"
+                  />
+                  <KVPair
+                    label="Errors"
+                    value={formatInteger(trace.error_count)}
+                    orientation="vertical"
+                  />
+                  <KVPair
+                    label="Total Cost"
+                    value={formatCost(trace.cost_usd)}
+                    orientation="vertical"
+                  />
+                </Grid>
+                <Grid className="grid-cols-1 gap-density-lg min-w-0">
+                  <KVPair
+                    label="Trace ID"
+                    value={trace.id}
+                    orientation="vertical"
+                    attributes={wrappingValueAttributes}
+                  />
+                  <KVPair
+                    label="Root Span"
+                    value={
+                      trace.root_span_id ? (
+                        <Link
+                          to={getIntakeSpanRoute(workspace, trace.root_span_id)}
+                          className="break-all"
+                        >
+                          {trace.root_span_id}
+                        </Link>
+                      ) : (
+                        EMPTY_VALUE
+                      )
+                    }
+                    orientation="vertical"
+                    attributes={wrappingValueAttributes}
+                  />
+                  <KVPair
+                    label="Status"
+                    value={<IntakeTelemetryStatusBadge status={trace.status} />}
+                    orientation="vertical"
+                  />
+                  <KVPair
+                    label="Session ID"
+                    value={trace.session_id}
+                    orientation="vertical"
+                    attributes={wrappingValueAttributes}
+                  />
+                </Grid>
+              </Stack>
+            </Panel>
+            {showEvaluationContext && (
+              <Panel
+                elevation="high"
+                slotIcon={<Hash />}
+                slotHeading="Evaluation Context"
+                className="min-w-0 overflow-hidden"
+              >
+                <Stack gap="density-lg" className="min-w-0">
+                  <KVPair
+                    label="Summary"
+                    value={getEvaluationContextSummary(trace.evaluation_context)}
+                    orientation="vertical"
+                    attributes={wrappingValueAttributes}
+                  />
+                  <KVPair
+                    label="Evaluation ID"
+                    value={formatMaybe(trace.evaluation_context?.evaluation_id)}
+                    orientation="vertical"
+                    attributes={wrappingValueAttributes}
+                  />
+                  <KVPair
+                    label="Run ID"
+                    value={formatMaybe(trace.evaluation_context?.evaluation_run_id)}
+                    orientation="vertical"
+                    attributes={wrappingValueAttributes}
+                  />
+                  <KVPair
+                    label="Dataset"
+                    value={formatMaybe(trace.evaluation_context?.dataset_name)}
+                    orientation="vertical"
+                    attributes={wrappingValueAttributes}
+                  />
+                  <KVPair
+                    label="Test Case"
+                    value={formatMaybe(trace.evaluation_context?.test_case_id)}
+                    orientation="vertical"
+                    attributes={wrappingValueAttributes}
+                  />
+                </Stack>
+              </Panel>
+            )}
+          </Stack>
+        </Grid>
+      </Stack>
+    </AccessibleTitle>
+  );
+};
diff --git a/web/packages/studio/src/routes/WorkspaceLayout/WorkspaceSideNav.tsx b/web/packages/studio/src/routes/WorkspaceLayout/WorkspaceSideNav.tsx
index fbefabe408..2387e55768 100644
--- a/web/packages/studio/src/routes/WorkspaceLayout/WorkspaceSideNav.tsx
+++ b/web/packages/studio/src/routes/WorkspaceLayout/WorkspaceSideNav.tsx
@@ -33,7 +33,7 @@ import {
   getEvaluationMetricsRoute,
   getEvaluationResultsRoute,
   getGuardrailsRoute,
-  getIntakeEntriesRoute,
+  getIntakeTracesRoute,
   getWorkspaceBaseModelsRoute,
   getWorkspaceCustomizationJobListRoute,
   getWorkspaceDashboardRoute,
@@ -132,7 +132,7 @@ export const WorkspaceSideNav = ({ collapsed }: { collapsed?: boolean }) => {
             id: 'annotation',
             slotIcon: <UserPen className={iconColorClass} />,
             slotLabel: 'Annotation',
-            href: getIntakeEntriesRoute(workspace),
+            href: getIntakeTracesRoute(workspace),
           },
         ]
       : [];
diff --git a/web/packages/studio/src/routes/index.spec.tsx b/web/packages/studio/src/routes/index.spec.tsx
index dce5ae91af..ec83338561 100644
--- a/web/packages/studio/src/routes/index.spec.tsx
+++ b/web/packages/studio/src/routes/index.spec.tsx
@@ -74,13 +74,10 @@ const evalRoutes = [
 
 const intakeRoutes = [
   ROUTES.workspace.intake,
-  ROUTES.workspace.intakeEntries,
-  ROUTES.workspace.intakeThreads,
-  ROUTES.workspace.intakeExportJobs,
-  ROUTES.workspace.intakeEntry,
-  ROUTES.workspace.intakeEntryMessages,
-  ROUTES.workspace.intakeEntryEvents,
-  ROUTES.workspace.intakeEntryMetadata,
+  ROUTES.workspace.intakeTraces,
+  ROUTES.workspace.intakeSpans,
+  ROUTES.workspace.intakeTrace,
+  ROUTES.workspace.intakeSpan,
 ];
 
 const safeSynthesizerRoutes = [
diff --git a/web/packages/studio/src/routes/index.tsx b/web/packages/studio/src/routes/index.tsx
index b87a475e96..2dad2d97b5 100644
--- a/web/packages/studio/src/routes/index.tsx
+++ b/web/packages/studio/src/routes/index.tsx
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { ErrorMessage } from '@nemo/common/src/components/ErrorMessage';
+import { Stack } from '@nvidia/foundations-react-core';
 import { ErrorPanel } from '@studio/components/ErrorPanel';
 import { Loading } from '@studio/components/Layouts/Loading';
 import {
@@ -13,6 +14,7 @@ import {
   SAFE_SYNTHESIZER_ENABLED,
 } from '@studio/constants/environment';
 import { ROUTES } from '@studio/constants/routes';
+import { INTAKE_FILTER_ACTION_TARGET_ID } from '@studio/routes/IntakeLayout';
 import { PageLayout } from '@studio/routes/PageLayout';
 import { RootLayout } from '@studio/routes/RootLayout';
 import { RootRedirect } from '@studio/routes/RootRedirect';
@@ -44,39 +46,36 @@ import { Navigate, RouteObject } from 'react-router-dom';
 const IntakeLayout = lazy(() =>
   import('@studio/routes/IntakeLayout').then((module) => ({ default: module.IntakeLayout }))
 );
-const IntakeEntriesRoute = lazy(() =>
-  import('@studio/routes/IntakeEntriesRoute').then((module) => ({
-    default: module.IntakeEntriesRoute,
-  }))
-);
-const IntakeThreadsRoute = lazy(() =>
-  import('@studio/routes/IntakeThreadsRoute').then((module) => ({
-    default: module.IntakeThreadsRoute,
-  }))
-);
-const IntakeExportJobsRoute = lazy(() =>
-  import('@studio/routes/IntakeExportJobsRoute').then((module) => ({
-    default: module.IntakeExportJobsRoute,
-  }))
-);
-const IntakeEntryLayout = lazy(() =>
-  import('@studio/routes/IntakeEntryLayout').then((module) => ({
-    default: module.IntakeEntryLayout,
-  }))
-);
-const IntakeEntryMessagesRoute = lazy(() =>
-  import('@studio/routes/IntakeEntryMessagesRoute').then((module) => ({
-    default: module.IntakeEntryMessagesRoute,
-  }))
+const IntakeTracesTableRoute = lazy(() =>
+  import('@studio/components/IntakeTracesTable').then(({ IntakeTracesTable }) => {
+    const IntakeTracesTableRouteComponent: FC = () => (
+      <Stack className="flex-1 min-h-0">
+        <IntakeTracesTable filterTogglePortalTargetId={INTAKE_FILTER_ACTION_TARGET_ID} />
+      </Stack>
+    );
+
+    return { default: IntakeTracesTableRouteComponent };
+  })
+);
+const IntakeSpansTableRoute = lazy(() =>
+  import('@studio/components/IntakeSpansTable').then(({ IntakeSpansTable }) => {
+    const IntakeSpansTableRouteComponent: FC = () => (
+      <Stack className="flex-1 min-h-0">
+        <IntakeSpansTable filterTogglePortalTargetId={INTAKE_FILTER_ACTION_TARGET_ID} />
+      </Stack>
+    );
+
+    return { default: IntakeSpansTableRouteComponent };
+  })
 );
-const IntakeEntryEventsRoute = lazy(() =>
-  import('@studio/routes/IntakeEntryEventsRoute').then((module) => ({
-    default: module.IntakeEntryEventsRoute,
+const IntakeTraceDetailRoute = lazy(() =>
+  import('@studio/routes/IntakeTraceDetailRoute').then((module) => ({
+    default: module.IntakeTraceDetailRoute,
   }))
 );
-const IntakeEntryMetadataRoute = lazy(() =>
-  import('@studio/routes/IntakeEntryMetadataRoute').then((module) => ({
-    default: module.IntakeEntryMetadataRoute,
+const IntakeSpanDetailRoute = lazy(() =>
+  import('@studio/routes/IntakeSpanDetailRoute').then((module) => ({
+    default: module.IntakeSpanDetailRoute,
   }))
 );
 const CustomizationJobDetailsRoute = lazy(() =>
@@ -610,44 +609,27 @@ export const routes: RouteObject[] = [
                   children: [
                     {
                       index: true,
-                      element: <Navigate to="entries" replace />,
+                      element: <Navigate to="traces" replace />,
                     },
                     {
-                      path: ROUTES.workspace.intakeEntries,
-                      element: <IntakeEntriesRoute />,
+                      path: ROUTES.workspace.intakeTraces,
+                      element: <IntakeTracesTableRoute />,
                     },
                     {
-                      path: ROUTES.workspace.intakeThreads,
-                      element: <IntakeThreadsRoute />,
-                    },
-                    {
-                      path: ROUTES.workspace.intakeExportJobs,
-                      element: <IntakeExportJobsRoute />,
+                      path: ROUTES.workspace.intakeSpans,
+                      element: <IntakeSpansTableRoute />,
                     },
                   ],
                 },
                 {
-                  path: ROUTES.workspace.intakeEntry,
-                  element: <IntakeEntryLayout />,
+                  path: ROUTES.workspace.intakeTrace,
+                  element: <IntakeTraceDetailRoute />,
+                  errorElement: <ErrorPanel title="Intake" />,
+                },
+                {
+                  path: ROUTES.workspace.intakeSpan,
+                  element: <IntakeSpanDetailRoute />,
                   errorElement: <ErrorPanel title="Intake" />,
-                  children: [
-                    {
-                      index: true,
-                      element: <Navigate to="messages" replace />,
-                    },
-                    {
-                      path: ROUTES.workspace.intakeEntryMessages,
-                      element: <IntakeEntryMessagesRoute />,
-                    },
-                    {
-                      path: ROUTES.workspace.intakeEntryEvents,
-                      element: <IntakeEntryEventsRoute />,
-                    },
-                    {
-                      path: ROUTES.workspace.intakeEntryMetadata,
-                      element: <IntakeEntryMetadataRoute />,
-                    },
-                  ],
                 },
               ]),
               ...gateSafeSynthesizerRoutes([
diff --git a/web/packages/studio/src/routes/utils.ts b/web/packages/studio/src/routes/utils.ts
index 35199d6101..a61e6d5fbd 100644
--- a/web/packages/studio/src/routes/utils.ts
+++ b/web/packages/studio/src/routes/utils.ts
@@ -2,8 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { getPartsFromNamedEntityRef, NamedEntityRef } from '@nemo/common/src/namedEntity';
-import { ListEntriesParams } from '@nemo/sdk/generated/platform/schema';
-import { generateFilterParam } from '@studio/api/intake/utils';
 import {
   AGENTS_ENABLED,
   BASE_MODELS_ENABLED,
@@ -229,10 +227,6 @@ export const getWorkspaceDeploymentDetailsRoute = (
   });
 };
 
-export const getWorkspaceIntakeRoute = (workspace: string) => {
-  return generatePath(ROUTES.workspace.intake, { workspace });
-};
-
 export const getWorkspaceSafeSynthesizerRoute = (workspace: string) => {
   return generatePath(ROUTES.workspace.safeSynthesizer, { workspace });
 };
@@ -388,43 +382,20 @@ export const getIntakeRoute = (workspace: string) => {
   return generatePath(ROUTES.workspace.intake, { workspace });
 };
 
-export const getIntakeEntriesRoute = (workspace: string, options?: ListEntriesParams) => {
-  const filterQuery = options ? generateFilterParam(options.filter) : '';
-  const queryParamStr = filterQuery ? `?${filterQuery}` : '';
-  return generatePath(ROUTES.workspace.intakeEntries, { workspace }) + queryParamStr;
-};
-
-export const getIntakeThreadsRoute = (workspace: string) => {
-  return generatePath(ROUTES.workspace.intakeThreads, { workspace });
+export const getIntakeTracesRoute = (workspace: string) => {
+  return generatePath(ROUTES.workspace.intakeTraces, { workspace });
 };
 
-export const getIntakeExportJobsRoute = (workspace: string) => {
-  return generatePath(ROUTES.workspace.intakeExportJobs, { workspace });
+export const getIntakeSpansRoute = (workspace: string) => {
+  return generatePath(ROUTES.workspace.intakeSpans, { workspace });
 };
 
-export const getIntakeEntryRoute = (workspace: string, entryId: string) => {
-  return generatePath(ROUTES.workspace.intakeEntry, { workspace, entryId });
+export const getIntakeTraceRoute = (workspace: string, traceId: string) => {
+  return generatePath(ROUTES.workspace.intakeTrace, { workspace, traceId });
 };
 
-export const getIntakeEntryMessagesRoute = (workspace: string, entryId: string) => {
-  return generatePath(ROUTES.workspace.intakeEntryMessages, {
-    workspace,
-    entryId,
-  });
-};
-
-export const getIntakeEntryEventsRoute = (workspace: string, entryId: string) => {
-  return generatePath(ROUTES.workspace.intakeEntryEvents, {
-    workspace,
-    entryId,
-  });
-};
-
-export const getIntakeEntryMetadataRoute = (workspace: string, entryId: string) => {
-  return generatePath(ROUTES.workspace.intakeEntryMetadata, {
-    workspace,
-    entryId,
-  });
+export const getIntakeSpanRoute = (workspace: string, spanId: string) => {
+  return generatePath(ROUTES.workspace.intakeSpan, { workspace, spanId });
 };
 
 export const getSafeSynthesizerRoute = (workspace: string) => {
diff --git a/web/packages/studio/src/tests/title-change.spec.tsx b/web/packages/studio/src/tests/title-change.spec.tsx
index 180e1685c3..ae2ec533d1 100644
--- a/web/packages/studio/src/tests/title-change.spec.tsx
+++ b/web/packages/studio/src/tests/title-change.spec.tsx
@@ -25,7 +25,8 @@ const pathParams = {
   [RP.evalConfigName]: '',
   [RP.safeSynthesizerJobName]: '',
   [RP.dataDesignerJobName]: '',
-  [RP.entryId]: '',
+  [RP.traceId]: 'trace-1',
+  [RP.spanId]: 'span-1',
   [RP.deploymentName]: '',
   [RP.deploymentPanelView]: '',
   [RP.agentName]: '',
diff --git a/web/packages/studio/src/util/entries.spec.ts b/web/packages/studio/src/util/entries.spec.ts
deleted file mode 100644
index d2b52ddb15..0000000000
--- a/web/packages/studio/src/util/entries.spec.ts
+++ /dev/null
@@ -1,570 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { Entry, ReviewerAnnotationEvent } from '@nemo/sdk/generated/platform/schema';
-import {
-  formatEventCreatedBy,
-  getAnnotationFromEntry,
-  getChatHistoryFromEntry,
-  getLastAssistantMessage,
-  getLastInputOutputPair,
-  getLastUserMessageContent,
-  getNonSystemMessagesFromEntry,
-  getRewriteFromAnnotation,
-  getSystemContextFromEntry,
-  getTurnCount,
-  isReviewerAnnotationEvent,
-  parseAppRef,
-} from '@studio/util/entries';
-
-/**
- * Helper to create partial Entry objects for testing.
- *
- * Uses type assertion to bypass strict type checking for test fixtures.
- * This is acceptable in tests as it allows flexible fixture creation
- * without requiring all Entry properties to be specified.
- *
- * @param partialData - Partial entry data to override defaults
- * @returns A complete Entry object for testing
- */
-const createTestEntry = (partialData: Record<string, unknown> = {}): Entry =>
-  ({
-    data: { request: { messages: [], model: 'test' }, response: { choices: [] } },
-    context: { app: 'test', task: 'test' },
-    ...partialData,
-  }) as unknown as Entry;
-
-describe('entries utilities', () => {
-  describe('getTurnCount', () => {
-    it('returns 1 for entry with no messages', () => {
-      const entry = createTestEntry({ data: { request: { model: 'test' } } });
-      expect(getTurnCount(entry)).toBe(1);
-    });
-
-    it('returns 1 for entry with empty messages array', () => {
-      const entry = createTestEntry({ data: { request: { messages: [], model: 'test' } } });
-      expect(getTurnCount(entry)).toBe(1);
-    });
-
-    it('counts user messages correctly', () => {
-      const entry = createTestEntry({
-        data: {
-          request: {
-            messages: [
-              { role: 'system', content: 'You are helpful' },
-              { role: 'user', content: 'Hello' },
-              { role: 'assistant', content: 'Hi there' },
-              { role: 'user', content: 'How are you?' },
-              { role: 'assistant', content: 'Good!' },
-            ],
-            model: 'test',
-          },
-        },
-      });
-      expect(getTurnCount(entry)).toBe(2);
-    });
-  });
-
-  describe('getLastUserMessageContent', () => {
-    it('returns empty string for entry with no messages', () => {
-      const entry = createTestEntry({ data: { request: { model: 'test' } } });
-      expect(getLastUserMessageContent(entry)).toBe('');
-    });
-
-    it('returns the last user message content', () => {
-      const entry = createTestEntry({
-        data: {
-          request: {
-            messages: [
-              { role: 'user', content: 'First question' },
-              { role: 'assistant', content: 'First answer' },
-              { role: 'user', content: 'Second question' },
-            ],
-            model: 'test',
-          },
-        },
-      });
-      expect(getLastUserMessageContent(entry)).toBe('Second question');
-    });
-  });
-
-  describe('getLastAssistantMessage', () => {
-    it('returns empty string for entry with no response', () => {
-      const entry = createTestEntry({ data: { request: { model: 'test' } } });
-      expect(getLastAssistantMessage(entry)).toBe('');
-    });
-
-    it('returns content from response choices', () => {
-      const entry = createTestEntry({
-        data: {
-          request: { messages: [], model: 'test' },
-          response: {
-            choices: [{ message: { role: 'assistant', content: 'Response content' } }],
-          },
-        },
-      });
-      expect(getLastAssistantMessage(entry)).toBe('Response content');
-    });
-
-    it('falls back to request messages if no response', () => {
-      const entry = createTestEntry({
-        data: {
-          request: {
-            messages: [
-              { role: 'user', content: 'Question' },
-              { role: 'assistant', content: 'Answer from request' },
-            ],
-            model: 'test',
-          },
-        },
-      });
-      expect(getLastAssistantMessage(entry)).toBe('Answer from request');
-    });
-  });
-
-  describe('isReviewerAnnotationEvent', () => {
-    it('returns true for reviewer annotation events', () => {
-      const event = { event_type: 'reviewer_annotation' } as ReviewerAnnotationEvent;
-      expect(isReviewerAnnotationEvent(event)).toBe(true);
-    });
-
-    it('returns false for other event types', () => {
-      const event = { event_type: 'user_feedback' };
-      expect(isReviewerAnnotationEvent(event as never)).toBe(false);
-    });
-  });
-
-  describe('getAnnotationFromEntry', () => {
-    it('returns undefined for entry with no events', () => {
-      const entry = createTestEntry();
-      expect(getAnnotationFromEntry(entry)).toBeUndefined();
-    });
-
-    it('returns undefined for entry with empty events array', () => {
-      const entry = createTestEntry({ events: [] });
-      expect(getAnnotationFromEntry(entry)).toBeUndefined();
-    });
-
-    it('returns undefined when no reviewer annotations exist', () => {
-      const entry = createTestEntry({
-        events: [{ event_type: 'user_feedback', thumb: 'up' }],
-      });
-      expect(getAnnotationFromEntry(entry)).toBeUndefined();
-    });
-
-    it('returns the annotation when one exists', () => {
-      const annotation: ReviewerAnnotationEvent = {
-        event_type: 'reviewer_annotation',
-        thumb: 'up',
-        rewrite: 'Better answer',
-      };
-      const entry = createTestEntry({ events: [annotation] });
-      expect(getAnnotationFromEntry(entry)).toEqual(annotation);
-    });
-
-    it('returns the most recent annotation when multiple exist', () => {
-      const older: ReviewerAnnotationEvent = {
-        event_type: 'reviewer_annotation',
-        created_at: '2024-01-01T00:00:00Z',
-        thumb: 'down',
-      };
-      const newer: ReviewerAnnotationEvent = {
-        event_type: 'reviewer_annotation',
-        created_at: '2024-06-01T00:00:00Z',
-        thumb: 'up',
-      };
-      const entry = createTestEntry({ events: [older, newer] });
-      expect(getAnnotationFromEntry(entry)).toEqual(newer);
-    });
-  });
-
-  describe('getRewriteFromAnnotation', () => {
-    it('returns undefined for undefined annotation', () => {
-      expect(getRewriteFromAnnotation(undefined)).toBeUndefined();
-    });
-
-    it('returns rewrite from annotation.rewrite', () => {
-      const annotation: ReviewerAnnotationEvent = {
-        event_type: 'reviewer_annotation',
-        rewrite: 'Fixed response',
-      };
-      expect(getRewriteFromAnnotation(annotation)).toBe('Fixed response');
-    });
-
-    it('returns content from response_override when rewrite is empty', () => {
-      const annotation = {
-        event_type: 'reviewer_annotation',
-        response_override: {
-          choices: [{ message: { content: 'Override content' } }],
-        },
-      } as ReviewerAnnotationEvent;
-      expect(getRewriteFromAnnotation(annotation)).toBe('Override content');
-    });
-
-    it('prefers rewrite over response_override', () => {
-      const annotation = {
-        event_type: 'reviewer_annotation',
-        rewrite: 'Direct rewrite',
-        response_override: {
-          choices: [{ message: { content: 'Override content' } }],
-        },
-      } as ReviewerAnnotationEvent;
-      expect(getRewriteFromAnnotation(annotation)).toBe('Direct rewrite');
-    });
-
-    it('returns undefined when rewrite is whitespace only', () => {
-      const annotation: ReviewerAnnotationEvent = {
-        event_type: 'reviewer_annotation',
-        rewrite: '   ',
-      };
-      expect(getRewriteFromAnnotation(annotation)).toBeUndefined();
-    });
-
-    it('returns undefined when annotation has neither rewrite nor response_override', () => {
-      const annotation: ReviewerAnnotationEvent = {
-        event_type: 'reviewer_annotation',
-        thumb: 'up',
-      };
-      expect(getRewriteFromAnnotation(annotation)).toBeUndefined();
-    });
-
-    it('trims whitespace from rewrite content', () => {
-      const annotation: ReviewerAnnotationEvent = {
-        event_type: 'reviewer_annotation',
-        rewrite: '  Trimmed content  ',
-      };
-      expect(getRewriteFromAnnotation(annotation)).toBe('Trimmed content');
-    });
-
-    it('trims whitespace from response_override content', () => {
-      const annotation = {
-        event_type: 'reviewer_annotation',
-        response_override: {
-          choices: [{ message: { content: '  Override trimmed  ' } }],
-        },
-      } as ReviewerAnnotationEvent;
-      expect(getRewriteFromAnnotation(annotation)).toBe('Override trimmed');
-    });
-  });
-
-  describe('getChatHistoryFromEntry', () => {
-    it('returns empty array for entry with no data', () => {
-      const entry = createTestEntry();
-      expect(getChatHistoryFromEntry(entry)).toEqual([]);
-    });
-
-    it('returns request messages', () => {
-      const entry = createTestEntry({
-        data: {
-          request: {
-            messages: [
-              { role: 'system', content: 'System prompt' },
-              { role: 'user', content: 'Hello' },
-            ],
-            model: 'test',
-          },
-        },
-      });
-      expect(getChatHistoryFromEntry(entry)).toHaveLength(2);
-    });
-
-    it('includes response message from choices', () => {
-      const entry = createTestEntry({
-        data: {
-          request: {
-            messages: [{ role: 'user', content: 'Hello' }],
-            model: 'test',
-          },
-          response: {
-            choices: [{ message: { role: 'assistant', content: 'Hi!' } }],
-          },
-        },
-      });
-      const history = getChatHistoryFromEntry(entry);
-      expect(history).toHaveLength(2);
-      expect(history[1]).toEqual({ role: 'assistant', content: 'Hi!' });
-    });
-  });
-
-  describe('getSystemContextFromEntry', () => {
-    it('returns empty array for entry with no messages', () => {
-      const entry = createTestEntry({ data: { request: { model: 'test' } } });
-      expect(getSystemContextFromEntry(entry)).toEqual([]);
-    });
-
-    it('returns system messages at the start', () => {
-      const entry = createTestEntry({
-        data: {
-          request: {
-            messages: [
-              { role: 'system', content: 'First system' },
-              { role: 'system', content: 'Second system' },
-              { role: 'user', content: 'Hello' },
-            ],
-            model: 'test',
-          },
-        },
-      });
-      const systemMessages = getSystemContextFromEntry(entry);
-      expect(systemMessages).toHaveLength(2);
-      expect(systemMessages[0].content).toBe('First system');
-      expect(systemMessages[1].content).toBe('Second system');
-    });
-
-    it('stops at first non-system message', () => {
-      const entry = createTestEntry({
-        data: {
-          request: {
-            messages: [
-              { role: 'system', content: 'System prompt' },
-              { role: 'user', content: 'Hello' },
-              { role: 'system', content: 'This should not be included' },
-            ],
-            model: 'test',
-          },
-        },
-      });
-      const systemMessages = getSystemContextFromEntry(entry);
-      expect(systemMessages).toHaveLength(1);
-      expect(systemMessages[0].content).toBe('System prompt');
-    });
-  });
-
-  describe('getNonSystemMessagesFromEntry', () => {
-    it('filters out system messages', () => {
-      const entry = createTestEntry({
-        data: {
-          request: {
-            messages: [
-              { role: 'system', content: 'System prompt' },
-              { role: 'user', content: 'Hello' },
-              { role: 'assistant', content: 'Hi!' },
-            ],
-            model: 'test',
-          },
-        },
-      });
-      const messages = getNonSystemMessagesFromEntry(entry);
-      expect(messages).toHaveLength(2);
-      expect(messages.every((m) => m.role !== 'system')).toBe(true);
-    });
-  });
-
-  describe('getLastInputOutputPair', () => {
-    it('returns empty array for entry with no messages', () => {
-      const entry = createTestEntry({ data: { request: { model: 'test' } } });
-      expect(getLastInputOutputPair(entry)).toEqual([]);
-    });
-
-    it('returns only last user message and response for single turn', () => {
-      const entry = createTestEntry({
-        data: {
-          request: {
-            messages: [{ role: 'user', content: 'Hello' }],
-            model: 'test',
-          },
-          response: {
-            choices: [{ message: { role: 'assistant', content: 'Hi there!' } }],
-          },
-        },
-      });
-      const pair = getLastInputOutputPair(entry);
-      expect(pair).toHaveLength(2);
-      expect(pair[0]).toEqual({ role: 'user', content: 'Hello' });
-      expect(pair[1]).toEqual({ role: 'assistant', content: 'Hi there!' });
-    });
-
-    it('returns only last user message and response for multi-turn conversation', () => {
-      const entry = createTestEntry({
-        data: {
-          request: {
-            messages: [
-              { role: 'system', content: 'System prompt' },
-              { role: 'user', content: 'First question' },
-              { role: 'assistant', content: 'First answer' },
-              { role: 'user', content: 'Second question' },
-              { role: 'assistant', content: 'Second answer' },
-              { role: 'user', content: 'Third question' },
-            ],
-            model: 'test',
-          },
-          response: {
-            choices: [{ message: { role: 'assistant', content: 'Third answer' } }],
-          },
-        },
-      });
-      const pair = getLastInputOutputPair(entry);
-      expect(pair).toHaveLength(2);
-      expect(pair[0]).toEqual({ role: 'user', content: 'Third question' });
-      expect(pair[1]).toEqual({ role: 'assistant', content: 'Third answer' });
-    });
-
-    it('excludes system messages', () => {
-      const entry = createTestEntry({
-        data: {
-          request: {
-            messages: [
-              { role: 'system', content: 'System prompt' },
-              { role: 'user', content: 'Hello' },
-            ],
-            model: 'test',
-          },
-          response: {
-            choices: [{ message: { role: 'assistant', content: 'Hi!' } }],
-          },
-        },
-      });
-      const pair = getLastInputOutputPair(entry);
-      expect(pair).toHaveLength(2);
-      expect(pair.every((m) => m.role !== 'system')).toBe(true);
-    });
-
-    it('returns only user message if no response', () => {
-      const entry = createTestEntry({
-        data: {
-          request: {
-            messages: [{ role: 'user', content: 'Hello' }],
-            model: 'test',
-          },
-        },
-      });
-      const pair = getLastInputOutputPair(entry);
-      expect(pair).toHaveLength(1);
-      expect(pair[0]).toEqual({ role: 'user', content: 'Hello' });
-    });
-
-    it('returns empty array if no user messages', () => {
-      const entry = createTestEntry({
-        data: {
-          request: {
-            messages: [{ role: 'system', content: 'System only' }],
-            model: 'test',
-          },
-          response: {
-            choices: [{ message: { role: 'assistant', content: 'Response' } }],
-          },
-        },
-      });
-      const pair = getLastInputOutputPair(entry);
-      // Only response, no user message
-      expect(pair).toHaveLength(1);
-      expect(pair[0]).toEqual({ role: 'assistant', content: 'Response' });
-    });
-  });
-});
-
-describe('parseAppRef', () => {
-  it('parses valid app reference with namespace and name', () => {
-    const result = parseAppRef('my-namespace/my-app');
-    expect(result).toEqual({ namespace: 'my-namespace', appName: 'my-app' });
-  });
-
-  it('parses app reference with special characters', () => {
-    const result = parseAppRef('ns-123/app_name.v2');
-    expect(result).toEqual({ namespace: 'ns-123', appName: 'app_name.v2' });
-  });
-
-  it('returns null for undefined input', () => {
-    expect(parseAppRef(undefined)).toBeNull();
-  });
-
-  it('returns null for empty string', () => {
-    expect(parseAppRef('')).toBeNull();
-  });
-
-  it('returns null for string without slash', () => {
-    expect(parseAppRef('no-slash-here')).toBeNull();
-  });
-
-  it('returns null for string with multiple slashes', () => {
-    expect(parseAppRef('too/many/slashes')).toBeNull();
-  });
-
-  it('handles edge case with empty namespace', () => {
-    const result = parseAppRef('/app-name');
-    expect(result).toEqual({ namespace: '', appName: 'app-name' });
-  });
-
-  it('handles edge case with empty app name', () => {
-    const result = parseAppRef('namespace/');
-    expect(result).toEqual({ namespace: 'namespace', appName: '' });
-  });
-});
-
-describe('formatEventCreatedBy', () => {
-  it.each([
-    // Undefined/null cases
-    { input: undefined, expected: 'Unknown', description: 'undefined' },
-
-    // Object with name property (highest priority)
-    { input: { name: 'John Doe' }, expected: 'John Doe', description: 'object with name' },
-    {
-      input: { name: 'Jane Smith', username: 'jsmith', email: 'jane@example.com' },
-      expected: 'Jane Smith',
-      description: 'object with name, username, and email (name takes priority)',
-    },
-
-    // Object with username property (second priority)
-    { input: { username: 'jdoe' }, expected: 'jdoe', description: 'object with username only' },
-    {
-      input: { username: 'jdoe', email: 'john@example.com' },
-      expected: 'jdoe',
-      description: 'object with username and email (username takes priority)',
-    },
-
-    // Object with email property (third priority)
-    {
-      input: { email: 'john@example.com' },
-      expected: 'john@example.com',
-      description: 'object with email only',
-    },
-    {
-      input: { email: 'john@example.com', id: 'user-123' },
-      expected: 'john@example.com',
-      description: 'object with email and id (email takes priority)',
-    },
-
-    // Object with id property (fourth priority)
-    { input: { id: 'user-123' }, expected: 'user-123', description: 'object with id only' },
-
-    // Object with other string properties (fallback)
-    {
-      input: { displayName: 'Display Name' },
-      expected: 'Display Name',
-      description: 'object with arbitrary string property',
-    },
-    {
-      input: { custom_field: 'Custom Value' },
-      expected: 'Custom Value',
-      description: 'object with snake_case string property',
-    },
-
-    // Object with no string values
-    { input: {}, expected: 'Unknown', description: 'empty object' },
-    { input: { count: 123 }, expected: 'Unknown', description: 'object with only numeric values' },
-    {
-      input: { active: true, count: 42 },
-      expected: 'Unknown',
-      description: 'object with only non-string values',
-    },
-
-    // Edge cases with empty/invalid name values
-    {
-      input: { name: '' },
-      expected: 'Unknown',
-      description: 'object with empty string name (treats as falsy, returns Unknown)',
-    },
-    {
-      input: { name: '   ' },
-      expected: '   ',
-      description: 'object with whitespace-only name',
-    },
-    {
-      input: { name: 123, username: 'fallback' },
-      expected: 'fallback',
-      description: 'object with non-string name (falls back to username)',
-    },
-  ])('returns "$expected" for $description', ({ input, expected }) => {
-    expect(formatEventCreatedBy(input as never)).toBe(expected);
-  });
-});
diff --git a/web/packages/studio/src/util/entries.ts b/web/packages/studio/src/util/entries.ts
deleted file mode 100644
index b889cda353..0000000000
--- a/web/packages/studio/src/util/entries.ts
+++ /dev/null
@@ -1,251 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import {
-  Entry,
-  FlexibleMessage,
-  ReviewerAnnotationEvent,
-  ReviewerAnnotationEventCreatedBy,
-  ReviewerAnnotationEventResponseOverride,
-  UserActionEventCreatedBy,
-  UserFeedbackEventCreatedBy,
-} from '@nemo/sdk/generated/platform/schema';
-
-type EntryEventItem = NonNullable<Entry['events']>[number];
-
-/**
- * Gets the turn count from an entry's messages.
- * Each user message represents one turn in the conversation.
- */
-export const getTurnCount = (entry: Entry): number => {
-  const messages = entry.data?.request?.messages;
-  if (!messages || !Array.isArray(messages)) return 1;
-  return messages.filter((m: FlexibleMessage) => m.role === 'user').length || 1;
-};
-
-/**
- * Type guard to check if an event is a ReviewerAnnotationEvent.
- */
-export const isReviewerAnnotationEvent = (
-  event: EntryEventItem
-): event is ReviewerAnnotationEvent => {
-  return event.event_type === 'reviewer_annotation';
-};
-
-/**
- * Determines if an entry has been annotated by checking for reviewer_annotation events.
- */
-export const isEntryAnnotated = (entry: Entry): boolean => {
-  if (!entry.events || entry.events.length === 0) return false;
-  return entry.events.some(isReviewerAnnotationEvent);
-};
-
-/**
- * Gets the most recent reviewer annotation from an entry's events.
- * Returns undefined if no reviewer annotations exist.
- */
-export const getAnnotationFromEntry = (entry: Entry): ReviewerAnnotationEvent | undefined => {
-  const events = entry.events;
-  if (!events || !Array.isArray(events)) return undefined;
-
-  const annotations = events.filter(isReviewerAnnotationEvent);
-  if (annotations.length === 0) return undefined;
-
-  // Return the most recent annotation (last one in the array, or sort by created_at)
-  return annotations.reduce((latest, current) => {
-    if (!latest.created_at) return current;
-    if (!current.created_at) return latest;
-    return new Date(current.created_at) > new Date(latest.created_at) ? current : latest;
-  }, annotations[0]);
-};
-
-/**
- * Gets the complete chat history from an entry, combining request messages and response.
- * Returns an array of FlexibleMessage objects in conversation order.
- */
-export const getChatHistoryFromEntry = (entry: Entry): FlexibleMessage[] => {
-  const messages: FlexibleMessage[] = [];
-
-  // Add request messages (conversation history)
-  const requestMessages = entry.data?.request?.messages;
-  if (requestMessages && Array.isArray(requestMessages)) {
-    messages.push(...requestMessages);
-  }
-
-  // Add response message from choices
-  const choices = entry.data?.response?.choices;
-  if (choices && choices.length > 0) {
-    const responseMessage = choices[0]?.message as FlexibleMessage | undefined;
-    if (responseMessage && responseMessage.role) {
-      messages.push(responseMessage);
-    }
-  }
-
-  return messages;
-};
-
-/**
- * Extracts system context messages from entry's chat history.
- * Returns system messages at the beginning of the conversation.
- */
-export const getSystemContextFromEntry = (entry: Entry): FlexibleMessage[] => {
-  const messages = entry.data?.request?.messages;
-  if (!messages || !Array.isArray(messages)) return [];
-
-  const systemMessages: FlexibleMessage[] = [];
-  for (const message of messages) {
-    if (message.role === 'system') {
-      systemMessages.push(message);
-    } else {
-      // Stop at first non-system message (system context is typically at the start)
-      break;
-    }
-  }
-
-  return systemMessages;
-};
-
-/**
- * Gets non-system messages from an entry (user and assistant messages for display).
- */
-export const getNonSystemMessagesFromEntry = (entry: Entry): FlexibleMessage[] => {
-  const allMessages = getChatHistoryFromEntry(entry);
-  return allMessages.filter((m) => m.role !== 'system');
-};
-
-/**
- * Gets the last user message content from an entry's request messages.
- * Returns the content of the last message with role 'user'.
- */
-export const getLastUserMessageContent = (entry: Entry): string => {
-  const messages = entry.data?.request?.messages;
-  if (!messages || !Array.isArray(messages)) return '';
-  const userMessages = messages.filter((m: FlexibleMessage) => m.role === 'user');
-  if (userMessages.length === 0) return '';
-  const content = userMessages.at(-1)?.content;
-  return typeof content === 'string' ? content : '';
-};
-
-/**
- * Gets the last assistant message content for the Output column.
- * First tries response.choices, then falls back to request messages.
- */
-export const getLastAssistantMessage = (entry: Entry): string => {
-  // Try to get from response.choices first (most recent)
-  const choices = entry.data?.response?.choices;
-  if (choices && choices.length > 0) {
-    const lastChoice = choices[choices.length - 1];
-    const content = (lastChoice?.message as FlexibleMessage)?.content;
-    if (typeof content === 'string') {
-      return content;
-    }
-  }
-
-  // Fallback to last assistant message in request messages
-  const messages = entry.data?.request?.messages;
-  if (!messages || !Array.isArray(messages)) return '';
-  const assistantMessages = messages.filter((m: FlexibleMessage) => m.role === 'assistant');
-  if (assistantMessages.length === 0) return '';
-  const content = assistantMessages[assistantMessages.length - 1]?.content;
-  return typeof content === 'string' ? content : '';
-};
-
-/**
- * Gets only the last user message and the assistant response from an entry.
- * Used for displaying just the input/output pair, not the full conversation history.
- */
-export const getLastInputOutputPair = (entry: Entry): FlexibleMessage[] => {
-  const messages: FlexibleMessage[] = [];
-  const requestMessages = entry.data?.request?.messages;
-
-  // Get last user message
-  if (requestMessages && Array.isArray(requestMessages)) {
-    const userMessages = requestMessages.filter((m: FlexibleMessage) => m.role === 'user');
-    const lastUserMessage = userMessages.at(-1);
-    if (lastUserMessage) {
-      messages.push(lastUserMessage);
-    }
-  }
-
-  // Get response from choices
-  const choices = entry.data?.response?.choices;
-  if (choices && choices.length > 0) {
-    const responseMessage = choices[0]?.message as FlexibleMessage | undefined;
-    if (responseMessage && responseMessage.role) {
-      messages.push(responseMessage);
-    }
-  }
-
-  return messages;
-};
-
-/**
- * Format the created_by field from an event which can be a string or an object.
- * Attempts to extract a human-readable name from various object shapes.
- */
-export const formatEventCreatedBy = (
-  createdBy:
-    | UserFeedbackEventCreatedBy
-    | UserActionEventCreatedBy
-    | ReviewerAnnotationEventCreatedBy
-    | undefined
-): string => {
-  if (!createdBy) return 'Unknown';
-  if (typeof createdBy === 'string') return createdBy;
-  if (typeof createdBy === 'object') {
-    const obj = createdBy as Record<string, unknown>;
-    if (obj.name && typeof obj.name === 'string') return obj.name;
-    if (obj.username && typeof obj.username === 'string') return obj.username;
-    if (obj.email && typeof obj.email === 'string') return obj.email;
-    if (obj.id && typeof obj.id === 'string') return obj.id;
-    const firstStringValue = Object.values(obj).find((v) => typeof v === 'string');
-    if (firstStringValue) return firstStringValue as string;
-  }
-  return 'Unknown';
-};
-
-/**
- * Parses an app reference string (format: "namespace/name") into its parts.
- * Returns null if the format is invalid.
- */
-export const parseAppRef = (
-  appRef: string | undefined
-): { namespace: string; appName: string } | null => {
-  if (!appRef) return null;
-  const parts = appRef.split('/');
-  if (parts.length !== 2) return null;
-  return { namespace: parts[0], appName: parts[1] };
-};
-
-/**
- * Extracts text content from a response_override object.
- *
- * The response_override follows the OpenAI chat completion format where the
- * content is nested at `choices[0].message.content`.
- *
- * @param responseOverride - The response override object from an annotation
- * @returns The extracted text content, or undefined if not present
- */
-const getResponseOverrideContent = (
-  responseOverride?: ReviewerAnnotationEventResponseOverride
-): string | undefined => {
-  if (!responseOverride) return undefined;
-  const choices = responseOverride.choices as Array<{ message?: { content?: string } }> | undefined;
-  return choices?.[0]?.message?.content?.trim();
-};
-
-/**
- * Gets the rewrite content from an annotation, checking both `rewrite` and `response_override`.
- *
- * @param annotation - The reviewer annotation event
- * @returns The rewrite content string, or undefined if no rewrite exists
- */
-export const getRewriteFromAnnotation = (
-  annotation?: ReviewerAnnotationEvent
-): string | undefined => {
-  if (!annotation) return undefined;
-  const rewrite = annotation.rewrite?.trim();
-  const responseOverrideContent = getResponseOverrideContent(annotation.response_override);
-  const content = rewrite || responseOverrideContent;
-  return content || undefined;
-};
diff --git a/web/packages/studio/src/util/intakeTelemetry.spec.ts b/web/packages/studio/src/util/intakeTelemetry.spec.ts
new file mode 100644
index 0000000000..6fa74d3a7f
--- /dev/null
+++ b/web/packages/studio/src/util/intakeTelemetry.spec.ts
@@ -0,0 +1,117 @@
+// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { SpanKind, SpanStatus, type Span } from '@nemo/sdk/generated/platform/schema';
+import {
+  buildSpanHierarchyRows,
+  compareSpansByStartedAt,
+  formatCost,
+} from '@studio/util/intakeTelemetry';
+
+const makeSpan = (span: Partial<Span> & Pick<Span, 'span_id' | 'started_at'>): Span => ({
+  session_id: 'session-1',
+  workspace: 'default',
+  kind: SpanKind.AGENT,
+  source: 'otel',
+  status: SpanStatus.success,
+  ingested_at: '2026-05-20T00:00:00Z',
+  ...span,
+});
+
+describe('intakeTelemetry span hierarchy helpers', () => {
+  it('formats sub-cent costs without trailing zero padding', () => {
+    expect(formatCost(0.0032)).toBe('$0.0032');
+  });
+
+  it('sorts spans by started_at and falls back to span_id', () => {
+    const a = makeSpan({ span_id: 'span-b', started_at: '2026-05-20T00:00:00Z' });
+    const b = makeSpan({ span_id: 'span-a', started_at: '2026-05-20T00:00:00Z' });
+    const c = makeSpan({ span_id: 'span-c', started_at: '2026-05-20T00:00:01Z' });
+
+    expect([c, a, b].sort(compareSpansByStartedAt).map((span) => span.span_id)).toEqual([
+      'span-a',
+      'span-b',
+      'span-c',
+    ]);
+  });
+
+  it('builds nested rows by parent_span_id', () => {
+    const rows = buildSpanHierarchyRows([
+      makeSpan({
+        span_id: 'child-2',
+        parent_span_id: 'root',
+        started_at: '2026-05-20T00:00:03Z',
+      }),
+      makeSpan({ span_id: 'root', started_at: '2026-05-20T00:00:01Z' }),
+      makeSpan({
+        span_id: 'grandchild',
+        parent_span_id: 'child-1',
+        started_at: '2026-05-20T00:00:04Z',
+      }),
+      makeSpan({
+        span_id: 'child-1',
+        parent_span_id: 'root',
+        started_at: '2026-05-20T00:00:02Z',
+      }),
+    ]);
+
+    expect(rows.map((row) => [row.span_id, row.hierarchyDepth])).toEqual([
+      ['root', 0],
+      ['child-1', 1],
+      ['grandchild', 2],
+      ['child-2', 1],
+    ]);
+  });
+
+  it('keeps multiple roots ordered by start time', () => {
+    const rows = buildSpanHierarchyRows([
+      makeSpan({ span_id: 'root-2', started_at: '2026-05-20T00:00:03Z' }),
+      makeSpan({ span_id: 'root-1', started_at: '2026-05-20T00:00:01Z' }),
+      makeSpan({
+        span_id: 'child-1',
+        parent_span_id: 'root-1',
+        started_at: '2026-05-20T00:00:02Z',
+      }),
+    ]);
+
+    expect(rows.map((row) => [row.span_id, row.hierarchyDepth])).toEqual([
+      ['root-1', 0],
+      ['child-1', 1],
+      ['root-2', 0],
+    ]);
+  });
+
+  it('keeps spans visible when their parent is not in the current page', () => {
+    const rows = buildSpanHierarchyRows([
+      makeSpan({
+        span_id: 'orphan-child',
+        parent_span_id: 'missing-parent',
+        started_at: '2026-05-20T00:00:01Z',
+      }),
+    ]);
+
+    expect(rows.map((row) => [row.span_id, row.hierarchyDepth, row.hierarchyStatus])).toEqual([
+      ['orphan-child', 0, 'parent_outside_page'],
+    ]);
+  });
+
+  it('keeps cyclic spans visible with an unresolved hierarchy marker', () => {
+    const rows = buildSpanHierarchyRows([
+      makeSpan({
+        span_id: 'span-1',
+        parent_span_id: 'span-2',
+        started_at: '2026-05-20T00:00:01Z',
+      }),
+      makeSpan({
+        span_id: 'span-2',
+        parent_span_id: 'span-1',
+        started_at: '2026-05-20T00:00:02Z',
+      }),
+    ]);
+
+    expect(rows.map((row) => [row.span_id, row.hierarchyDepth, row.hierarchyStatus])).toEqual([
+      ['span-1', 0, 'cycle_or_unreachable'],
+      ['span-2', 1, undefined],
+    ]);
+  });
+});
diff --git a/web/packages/studio/src/util/intakeTelemetry.ts b/web/packages/studio/src/util/intakeTelemetry.ts
new file mode 100644
index 0000000000..292659a606
--- /dev/null
+++ b/web/packages/studio/src/util/intakeTelemetry.ts
@@ -0,0 +1,158 @@
+// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import type { Span, SpanEvaluationContext, Trace } from '@nemo/sdk/generated/platform/schema';
+
+export const EMPTY_VALUE = '—';
+
+export type SpanTableRow = Span & {
+  hierarchyDepth: number;
+  hierarchyStatus?: 'parent_outside_page' | 'cycle_or_unreachable';
+};
+
+export const formatInteger = (value: number | null | undefined): string => {
+  if (value === null || value === undefined) return EMPTY_VALUE;
+  return value.toLocaleString();
+};
+
+export const formatCost = (value: number | null | undefined): string => {
+  if (value === null || value === undefined) return EMPTY_VALUE;
+  if (value === 0) return '$0.00';
+  if (Math.abs(value) < 0.01) {
+    return `$${value.toFixed(6).replace(/0+$/, '').replace(/\.$/, '')}`;
+  }
+  return `$${value.toFixed(2)}`;
+};
+
+export const formatDurationMs = (value: number | null | undefined): string => {
+  if (value === null || value === undefined) return EMPTY_VALUE;
+  if (value < 1) return `${value.toFixed(2)} ms`;
+  if (value < 1000) return `${Math.round(value).toLocaleString()} ms`;
+  if (value < 60_000) return `${(value / 1000).toFixed(2)} s`;
+  return `${(value / 60_000).toFixed(2)} min`;
+};
+
+export const getSpanDurationMs = (span: Span): number | undefined => {
+  if (!span.ended_at) return undefined;
+  const startedAt = Date.parse(span.started_at);
+  const endedAt = Date.parse(span.ended_at);
+  if (Number.isNaN(startedAt) || Number.isNaN(endedAt)) return undefined;
+  return Math.max(endedAt - startedAt, 0);
+};
+
+export const getTraceDisplayName = (trace: Trace): string => {
+  return trace.name || trace.id;
+};
+
+export const getSpanDisplayName = (span: Span): string => {
+  return span.name || span.tool_name || span.model || span.agent_name || span.kind;
+};
+
+export const getSpanSubject = (span: Span): string => {
+  return (
+    span.tool_name ||
+    span.model ||
+    span.agent_name ||
+    span.provider ||
+    span.prompt_name ||
+    span.project ||
+    span.kind
+  );
+};
+
+export const formatMaybe = (value: string | number | boolean | null | undefined): string => {
+  if (value === null || value === undefined || value === '') return EMPTY_VALUE;
+  if (typeof value === 'number') return formatInteger(value);
+  if (typeof value === 'boolean') return value ? 'Yes' : 'No';
+  return value;
+};
+
+export const getEvaluationContextSummary = (
+  context: SpanEvaluationContext | null | undefined
+): string => {
+  if (!context) return EMPTY_VALUE;
+  return (
+    context.evaluation_run_id ||
+    context.evaluation_id ||
+    context.dataset_name ||
+    context.test_case_id ||
+    EMPTY_VALUE
+  );
+};
+
+export const hasEvaluationContext = (context: SpanEvaluationContext | null | undefined): boolean =>
+  Boolean(
+    context &&
+    (context.evaluation_id ||
+      context.evaluation_sha ||
+      context.evaluation_run_id ||
+      context.dataset_id ||
+      context.dataset_name ||
+      context.dataset_version ||
+      context.test_case_id ||
+      (context.metadata && Object.keys(context.metadata).length > 0))
+  );
+
+export const compareSpansByStartedAt = (a: Span, b: Span): number => {
+  const aStartedAt = Date.parse(a.started_at);
+  const bStartedAt = Date.parse(b.started_at);
+  if (Number.isNaN(aStartedAt) || Number.isNaN(bStartedAt) || aStartedAt === bStartedAt) {
+    return a.span_id.localeCompare(b.span_id);
+  }
+  return aStartedAt - bStartedAt;
+};
+
+export const buildSpanHierarchyRows = (spans: Span[]): SpanTableRow[] => {
+  const spansById = new Map(spans.map((span) => [span.span_id, span]));
+  const childrenByParent = new Map<string, Span[]>();
+  const roots: Span[] = [];
+  const orphans: Span[] = [];
+
+  for (const span of spans) {
+    if (span.parent_span_id && spansById.has(span.parent_span_id)) {
+      const children = childrenByParent.get(span.parent_span_id) ?? [];
+      children.push(span);
+      childrenByParent.set(span.parent_span_id, children);
+    } else if (span.parent_span_id) {
+      orphans.push(span);
+    } else {
+      roots.push(span);
+    }
+  }
+
+  for (const children of childrenByParent.values()) {
+    children.sort(compareSpansByStartedAt);
+  }
+  roots.sort(compareSpansByStartedAt);
+  orphans.sort(compareSpansByStartedAt);
+
+  const rows: SpanTableRow[] = [];
+  const visited = new Set<string>();
+
+  const collect = (
+    span: Span,
+    depth: number,
+    hierarchyStatus?: SpanTableRow['hierarchyStatus']
+  ): void => {
+    if (visited.has(span.span_id)) return;
+    visited.add(span.span_id);
+    rows.push({ ...span, hierarchyDepth: depth, hierarchyStatus });
+    for (const child of childrenByParent.get(span.span_id) ?? []) {
+      collect(child, depth + 1);
+    }
+  };
+
+  for (const root of roots) {
+    collect(root, 0);
+  }
+
+  for (const orphan of orphans) {
+    collect(orphan, 0, 'parent_outside_page');
+  }
+
+  for (const span of spans) {
+    collect(span, 0, 'cycle_or_unreachable');
+  }
+
+  return rows;
+};

From 7cd7c58ba57cd0c1fd7ec20994cbd25e745da11d Mon Sep 17 00:00:00 2001
From: Brian Newsom <brnewsom@nvidia.com>
Date: Wed, 27 May 2026 15:04:59 -0600
Subject: [PATCH 2/3] chore: trim dependencies

Signed-off-by: Brian Newsom <brnewsom@nvidia.com>
---
 web/packages/studio/package.json | 1 -
 web/pnpm-lock.yaml               | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/web/packages/studio/package.json b/web/packages/studio/package.json
index e89a8bf2ff..11bd457af4 100644
--- a/web/packages/studio/package.json
+++ b/web/packages/studio/package.json
@@ -77,7 +77,6 @@
     "react-router-dom": "catalog:",
     "recharts": "catalog:",
     "seedrandom": "^3.0.5",
-    "unique-names-generator": "^4.7.1",
     "use-debounce": "catalog:",
     "vite": "catalog:",
     "vite-plugin-mkcert": "catalog:",
diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml
index 661f21495a..c364ad526b 100644
--- a/web/pnpm-lock.yaml
+++ b/web/pnpm-lock.yaml
@@ -684,9 +684,6 @@ importers:
       seedrandom:
         specifier: ^3.0.5
         version: 3.0.5
-      unique-names-generator:
-        specifier: ^4.7.1
-        version: 4.7.1
       use-debounce:
         specifier: 'catalog:'
         version: 10.1.0(react@19.2.5)

From ce6a34439d6adf3aedfeb929681e1b8eb9f95a4f Mon Sep 17 00:00:00 2001
From: Brian Newsom <brnewsom@nvidia.com>
Date: Wed, 27 May 2026 15:22:47 -0600
Subject: [PATCH 3/3] fix: address intake review comments

Signed-off-by: Brian Newsom <brnewsom@nvidia.com>
---
 web/packages/common/src/utils/query.ts        |  6 +--
 .../IntakeAnnotationsPanel/index.spec.tsx     |  8 +--
 .../IntakeAnnotationsPanel/index.tsx          | 51 ++++++++++++-------
 .../src/components/IntakeSpansTable/index.tsx |  2 +-
 .../IntakeTelemetryDataView/index.tsx         |  8 +--
 .../components/IntakeTracesTable/index.tsx    |  2 +-
 web/packages/studio/src/mocks/handlers.ts     | 10 ++--
 .../studio/src/mocks/intake/telemetry.ts      |  6 ++-
 .../routes/IntakeSpanDetailRoute/index.tsx    | 19 ++++++-
 .../routes/IntakeTraceDetailRoute/index.tsx   | 21 +++++++-
 10 files changed, 95 insertions(+), 38 deletions(-)

diff --git a/web/packages/common/src/utils/query.ts b/web/packages/common/src/utils/query.ts
index 9d9b13c356..dfa8587ef9 100644
--- a/web/packages/common/src/utils/query.ts
+++ b/web/packages/common/src/utils/query.ts
@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { PlatformJobStatus } from '@nemo/sdk/generated/platform/schema';
+import { CJobTerminalStatuses } from '@nemo/common/src/constants/query';
+import type { PlatformJobStatus } from '@nemo/sdk/generated/platform/schema';
 
 import * as DataView from '../components/DataView/internal';
 import { JOB_POLLING_INTERVAL_MS } from '../constants';
-import { CJobTerminalStatuses } from '../constants/query';
 
-export const getJobRefetchInterval = (status?: PlatformJobStatus) => {
+export const getJobRefetchInterval = (status?: PlatformJobStatus): number | false => {
   if (!status || !CJobTerminalStatuses.includes(status)) {
     return JOB_POLLING_INTERVAL_MS;
   }
diff --git a/web/packages/studio/src/components/IntakeAnnotationsPanel/index.spec.tsx b/web/packages/studio/src/components/IntakeAnnotationsPanel/index.spec.tsx
index 8d7743f89b..8512db0280 100644
--- a/web/packages/studio/src/components/IntakeAnnotationsPanel/index.spec.tsx
+++ b/web/packages/studio/src/components/IntakeAnnotationsPanel/index.spec.tsx
@@ -6,8 +6,8 @@ import { resetMockAnnotations } from '@studio/mocks/intake/telemetry';
 import { renderRoute, screen, waitFor, within } from '@studio/tests/util/render';
 import userEvent from '@testing-library/user-event';
 
-const spanId = 'span-root-001';
-const sessionId = 'session-agent-run-001';
+const SPAN_ID = 'span-root-001';
+const SESSION_ID = 'session-agent-run-001';
 
 describe('IntakeAnnotationsPanel', () => {
   beforeEach(() => {
@@ -18,7 +18,7 @@ describe('IntakeAnnotationsPanel', () => {
     const user = userEvent.setup();
 
     renderRoute(
-      <IntakeAnnotationsPanel workspace="default" spanId={spanId} sessionId={sessionId} />,
+      <IntakeAnnotationsPanel workspace="default" spanId={SPAN_ID} sessionId={SESSION_ID} />,
       { history: '/workspaces/default/intake/spans/span-root-001' }
     );
 
@@ -39,7 +39,7 @@ describe('IntakeAnnotationsPanel', () => {
     const user = userEvent.setup();
 
     renderRoute(
-      <IntakeAnnotationsPanel workspace="default" spanId={spanId} sessionId={sessionId} />,
+      <IntakeAnnotationsPanel workspace="default" spanId={SPAN_ID} sessionId={SESSION_ID} />,
       { history: '/workspaces/default/intake/spans/span-root-001' }
     );
 
diff --git a/web/packages/studio/src/components/IntakeAnnotationsPanel/index.tsx b/web/packages/studio/src/components/IntakeAnnotationsPanel/index.tsx
index 3d84ed31aa..8ddaca6bf3 100644
--- a/web/packages/studio/src/components/IntakeAnnotationsPanel/index.tsx
+++ b/web/packages/studio/src/components/IntakeAnnotationsPanel/index.tsx
@@ -1,6 +1,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
+import { zodResolver } from '@hookform/resolvers/zod';
 import { formatAbsoluteTimestamp } from '@nemo/common/src/components/RelativeTime/util';
 import {
   getListAnnotationsQueryKey,
@@ -30,7 +31,15 @@ import { getErrorMessage } from '@studio/api/common/utils';
 import { ThumbButton } from '@studio/components/buttons/ThumbButton';
 import { useQueryClient } from '@tanstack/react-query';
 import { MessageSquarePlus, NotebookPen, Trash2 } from 'lucide-react';
-import { ChangeEvent, FC, FormEvent, useMemo, useState } from 'react';
+import { type FC, useMemo, useState } from 'react';
+import { type SubmitHandler, useForm } from 'react-hook-form';
+import { z } from 'zod';
+
+const noteSchema = z.object({
+  text: z.string().trim().min(1, 'Note is required.'),
+});
+
+type NoteFormValues = z.infer<typeof noteSchema>;
 
 const getAnnotationErrorMessage = (error: unknown, fallback: string): string =>
   error instanceof Error ? getErrorMessage(error, fallback) : fallback;
@@ -99,8 +108,18 @@ export const IntakeAnnotationsPanel: FC<IntakeAnnotationsPanelProps> = ({
   sessionId,
 }) => {
   const queryClient = useQueryClient();
-  const [noteText, setNoteText] = useState('');
   const [mutationError, setMutationError] = useState<string | undefined>();
+  const {
+    register,
+    handleSubmit,
+    reset,
+    watch,
+    formState: { errors, isValid },
+  } = useForm<NoteFormValues>({
+    resolver: zodResolver(noteSchema),
+    defaultValues: { text: '' },
+    mode: 'onChange',
+  });
 
   const listParams = useMemo(
     () => ({
@@ -122,6 +141,7 @@ export const IntakeAnnotationsPanel: FC<IntakeAnnotationsPanelProps> = ({
   const createAnnotation = useCreateAnnotation();
   const deleteAnnotation = useDeleteAnnotation();
 
+  const noteText = watch('text');
   const annotations = annotationsResponse?.data ?? [];
   const activeFeedback = annotations.find((annotation) => annotation.kind === 'feedback');
   const isMutating = createAnnotation.isPending || deleteAnnotation.isPending;
@@ -150,16 +170,7 @@ export const IntakeAnnotationsPanel: FC<IntakeAnnotationsPanelProps> = ({
     }
   };
 
-  const handleNoteChange = (event: ChangeEvent<HTMLDivElement>): void => {
-    if (!(event.target instanceof HTMLTextAreaElement)) return;
-    setNoteText(event.target.value);
-  };
-
-  const handleNoteSubmit = async (event: FormEvent<HTMLFormElement>): Promise<void> => {
-    event.preventDefault();
-    const text = noteText.trim();
-    if (!text) return;
-
+  const handleNoteSubmit: SubmitHandler<NoteFormValues> = async ({ text }) => {
     setMutationError(undefined);
     try {
       await createAnnotation.mutateAsync({
@@ -171,7 +182,7 @@ export const IntakeAnnotationsPanel: FC<IntakeAnnotationsPanelProps> = ({
           span_id: spanId,
         },
       });
-      setNoteText('');
+      reset();
       await refreshAnnotations();
     } catch (error) {
       setMutationError(getAnnotationErrorMessage(error, 'Failed to save note.'));
@@ -221,24 +232,30 @@ export const IntakeAnnotationsPanel: FC<IntakeAnnotationsPanelProps> = ({
           </Flex>
         </Stack>
 
-        <form onSubmit={(event) => void handleNoteSubmit(event)}>
+        <form onSubmit={(event) => void handleSubmit(handleNoteSubmit)(event)}>
           <Stack gap="density-sm">
-            <FormField name="annotation-note" slotLabel="Note">
+            <FormField
+              name="annotation-note"
+              slotLabel="Note"
+              slotError={errors.text?.message}
+              status={errors.text && 'error'}
+            >
               <TextArea
                 value={noteText}
-                onChange={handleNoteChange}
                 placeholder="Add a note about this span."
                 disabled={isMutating}
+                status={errors.text && 'error'}
                 resizeable="manual"
                 attributes={{
                   TextAreaElement: {
                     rows: 3,
                   },
                 }}
+                {...register('text')}
               />
             </FormField>
             <Flex justify="end">
-              <Button type="submit" disabled={isMutating || noteText.trim().length === 0}>
+              <Button type="submit" disabled={isMutating || !isValid}>
                 <MessageSquarePlus />
                 Add Note
               </Button>
diff --git a/web/packages/studio/src/components/IntakeSpansTable/index.tsx b/web/packages/studio/src/components/IntakeSpansTable/index.tsx
index 71b7f57beb..9ce24e9406 100644
--- a/web/packages/studio/src/components/IntakeSpansTable/index.tsx
+++ b/web/packages/studio/src/components/IntakeSpansTable/index.tsx
@@ -32,7 +32,7 @@ import {
   type SpanTableRow,
 } from '@studio/util/intakeTelemetry';
 import { keepPreviousData } from '@tanstack/react-query';
-import { ComponentProps, FC, useMemo, type ReactNode } from 'react';
+import { type ComponentProps, type FC, type ReactNode, useMemo } from 'react';
 import { Link, useNavigate } from 'react-router-dom';
 
 const SPAN_STATUS_FILTER_OPTIONS = [
diff --git a/web/packages/studio/src/components/IntakeTelemetryDataView/index.tsx b/web/packages/studio/src/components/IntakeTelemetryDataView/index.tsx
index 71d818a978..656eb96c38 100644
--- a/web/packages/studio/src/components/IntakeTelemetryDataView/index.tsx
+++ b/web/packages/studio/src/components/IntakeTelemetryDataView/index.tsx
@@ -73,7 +73,9 @@ const IntakeTelemetryToolbar = <DataType,>({
   ) : null;
   const shouldPortalToggle = Boolean(filterTogglePortalTargetId);
   const rendersInlineToggle = Boolean(!filterTogglePortalTargetId && filterToggle);
-  const rendersToolbar = Boolean(searchField || slotEnd || rendersInlineToggle);
+  const rendersToolbar = Boolean(
+    searchField || slotEnd || rendersInlineToggle || renderBulkActions
+  );
 
   return (
     <>
@@ -225,8 +227,8 @@ export const IntakeTelemetryDataView = <DataType,>({
                   <Block className="h-full">
                     <TableEmptyState
                       className="py-4"
-                      header="No Entries Found"
-                      emptyMessage="No entries available."
+                      header="No Data Found"
+                      emptyMessage="No telemetry data available."
                     />
                   </Block>
                 )}
diff --git a/web/packages/studio/src/components/IntakeTracesTable/index.tsx b/web/packages/studio/src/components/IntakeTracesTable/index.tsx
index a6a216ebcd..33c4df48e7 100644
--- a/web/packages/studio/src/components/IntakeTracesTable/index.tsx
+++ b/web/packages/studio/src/components/IntakeTracesTable/index.tsx
@@ -21,7 +21,7 @@ import {
   getTraceDisplayName,
 } from '@studio/util/intakeTelemetry';
 import { keepPreviousData } from '@tanstack/react-query';
-import { ComponentProps, FC, type ReactNode } from 'react';
+import type { ComponentProps, FC, ReactNode } from 'react';
 import { Link, useNavigate } from 'react-router-dom';
 
 export interface IntakeTracesTableProps {
diff --git a/web/packages/studio/src/mocks/handlers.ts b/web/packages/studio/src/mocks/handlers.ts
index 1ad79bc3fe..e54c093320 100644
--- a/web/packages/studio/src/mocks/handlers.ts
+++ b/web/packages/studio/src/mocks/handlers.ts
@@ -544,13 +544,15 @@ export const handlers = [
   http.get('*/apis/intake/v2/workspaces/:workspace/annotations', ({ request }) => {
     const url = new URL(request.url);
     const spanId = url.searchParams.get('filter[span_id]') ?? undefined;
-    const page = Number(url.searchParams.get('page') ?? '1');
-    const pageSize = Number(url.searchParams.get('page_size') ?? '100');
+    const parsedPage = Number(url.searchParams.get('page') ?? '1');
+    const parsedPageSize = Number(url.searchParams.get('page_size') ?? '100');
+    const page = Number.isInteger(parsedPage) && parsedPage > 0 ? parsedPage : 1;
+    const pageSize = Number.isInteger(parsedPageSize) && parsedPageSize > 0 ? parsedPageSize : 100;
     return HttpResponse.json(
       mockAnnotationsPage({
         spanId,
-        page: Number.isNaN(page) ? 1 : page,
-        pageSize: Number.isNaN(pageSize) ? 100 : pageSize,
+        page,
+        pageSize,
       })
     );
   }),
diff --git a/web/packages/studio/src/mocks/intake/telemetry.ts b/web/packages/studio/src/mocks/intake/telemetry.ts
index 991b093b5f..58e94ef4ff 100644
--- a/web/packages/studio/src/mocks/intake/telemetry.ts
+++ b/web/packages/studio/src/mocks/intake/telemetry.ts
@@ -189,14 +189,18 @@ const baseAnnotations: Annotation[] = [
 ];
 
 let mockAnnotations = [...baseAnnotations];
+let nextAnnotationSequence = baseAnnotations.length + 1;
 
 const pageAnnotations = (annotations: Annotation[], page: number, pageSize: number): Annotation[] =>
   annotations.slice((page - 1) * pageSize, page * pageSize);
 
 export const resetMockAnnotations = (): void => {
   mockAnnotations = [...baseAnnotations];
+  nextAnnotationSequence = baseAnnotations.length + 1;
 };
 
+const nextAnnotationId = (): string => `annotation-${nextAnnotationSequence++}`;
+
 export const mockAnnotationsPage = ({
   spanId,
   page = 1,
@@ -235,7 +239,7 @@ export const createMockAnnotation = ({
 }): Annotation => {
   const now = new Date().toISOString();
   const base = {
-    annotation_id: `annotation-${mockAnnotations.length + 1}`,
+    annotation_id: nextAnnotationId(),
     workspace,
     span_id: data.span_id,
     session_id: data.session_id,
diff --git a/web/packages/studio/src/routes/IntakeSpanDetailRoute/index.tsx b/web/packages/studio/src/routes/IntakeSpanDetailRoute/index.tsx
index 2bc60c1fd4..5413188fc4 100644
--- a/web/packages/studio/src/routes/IntakeSpanDetailRoute/index.tsx
+++ b/web/packages/studio/src/routes/IntakeSpanDetailRoute/index.tsx
@@ -38,7 +38,7 @@ import {
   hasEvaluationContext,
 } from '@studio/util/intakeTelemetry';
 import { Activity, CircleAlert, Coins } from 'lucide-react';
-import { FC, useEffect } from 'react';
+import { type FC, useEffect } from 'react';
 import { Link, useParams } from 'react-router-dom';
 
 const truncatedValueAttributes = {
@@ -86,9 +86,24 @@ const SpanContentBlock: FC<SpanContentBlockProps> = ({ label, value, emptyMessag
   );
 };
 
+type SpanRouteParams = Record<typeof ROUTE_PARAMS.spanId, string | undefined>;
+
 export const IntakeSpanDetailRoute: FC = () => {
+  const { [ROUTE_PARAMS.spanId]: spanId } = useParams<SpanRouteParams>();
+
+  if (!spanId) {
+    return <NotFound subheader="Span Not Found" message="The span route is missing a span ID." />;
+  }
+
+  return <IntakeSpanDetailContent spanId={spanId} />;
+};
+
+interface IntakeSpanDetailContentProps {
+  spanId: string;
+}
+
+const IntakeSpanDetailContent: FC<IntakeSpanDetailContentProps> = ({ spanId }) => {
   const workspace = useWorkspaceFromPath();
-  const { [ROUTE_PARAMS.spanId]: spanId } = useParams() as { [ROUTE_PARAMS.spanId]: string };
 
   const { data: span, error, isLoading } = useGetSpan(workspace, spanId);
   const { setBreadcrumbs } = useBreadcrumbs();
diff --git a/web/packages/studio/src/routes/IntakeTraceDetailRoute/index.tsx b/web/packages/studio/src/routes/IntakeTraceDetailRoute/index.tsx
index f93aab1a21..0664e6d950 100644
--- a/web/packages/studio/src/routes/IntakeTraceDetailRoute/index.tsx
+++ b/web/packages/studio/src/routes/IntakeTraceDetailRoute/index.tsx
@@ -32,15 +32,32 @@ import {
   hasEvaluationContext,
 } from '@studio/util/intakeTelemetry';
 import { Activity, CircleAlert, Hash } from 'lucide-react';
-import { FC, useEffect } from 'react';
+import { type FC, useEffect } from 'react';
 import { Link, useParams } from 'react-router-dom';
 
 const TRACE_SPANS_PAGE_SIZE = 1000;
 const TRACE_DETAIL_SPANS_FILTER_TARGET_ID = 'trace-detail-spans-filter-action-target';
 
+type TraceRouteParams = Record<typeof ROUTE_PARAMS.traceId, string | undefined>;
+
 export const IntakeTraceDetailRoute: FC = () => {
+  const { [ROUTE_PARAMS.traceId]: traceId } = useParams<TraceRouteParams>();
+
+  if (!traceId) {
+    return (
+      <NotFound subheader="Trace Not Found" message="The trace route is missing a trace ID." />
+    );
+  }
+
+  return <IntakeTraceDetailContent traceId={traceId} />;
+};
+
+interface IntakeTraceDetailContentProps {
+  traceId: string;
+}
+
+const IntakeTraceDetailContent: FC<IntakeTraceDetailContentProps> = ({ traceId }) => {
   const workspace = useWorkspaceFromPath();
-  const { [ROUTE_PARAMS.traceId]: traceId } = useParams() as { [ROUTE_PARAMS.traceId]: string };
 
   const {
     data: trace,