Skip to content

🪢 Open source agent evals & observability: Trace, evaluate, and improve LLM applications with one open platform.

feat(sessions): Add observation timeline actions (#17287)

Ben Bachem5c7b06a70185
diff --git a/web/src/components/ui/dialog.clienttest.tsx b/web/src/components/ui/dialog.clienttest.tsx
index 5d3d77d954..bd8249b195 100644
--- a/web/src/components/ui/dialog.clienttest.tsx
+++ b/web/src/components/ui/dialog.clienttest.tsx
@@ -91,4 +91,22 @@ describe("DialogController", () => {
expect(onDismiss).not.toHaveBeenCalled();
expect(screen.getByText("Vetoed dialog")).toBeInTheDocument();
});
+
+ it("opens from initialState without reacting to later changes", () => {
+ const renderController = (initialState: string | undefined) => (
+ <DialogController<string>
+ initialState={() => initialState}
+ closeOnInteractionOutside={false}
+ size="default"
+ renderContent={({ state }) => <DialogTitle>{state}</DialogTitle>}
+ >
+ {() => null}
+ </DialogController>
+ );
+ const { rerender } = render(renderController("first"));
+
+ expect(screen.getByText("first")).toBeInTheDocument();
+ rerender(renderController("second"));
+ expect(screen.queryByText("second")).not.toBeInTheDocument();
+ });
});
diff --git a/web/src/components/ui/dialog.tsx b/web/src/components/ui/dialog.tsx
index d915521f0d..16d179e510 100644
--- a/web/src/components/ui/dialog.tsx
+++ b/web/src/components/ui/dialog.tsx
@@ -175,6 +175,8 @@ DialogContent.displayName = DialogPrimitive.Content.displayName;
* Owns dialog open state while callers retain trigger and content presentation.
*/
type DialogControllerProps<State = void> = {
+ // Evaluated only when the controller mounts; later callback or dependency changes do not update the dialog.
+ initialState?: () => State | undefined;
children: (control: {
isOpen: boolean;
openDialog: (...args: [State] extends [void] ? [] : [state: State]) => void;
@@ -190,6 +192,7 @@ type DialogControllerProps<State = void> = {
};
const DialogController = <State = void,>({
+ initialState,
children,
closeOnInteractionOutside,
onBeforeClose,
@@ -199,7 +202,10 @@ const DialogController = <State = void,>({
}: DialogControllerProps<State>) => {
const [controllerState, setControllerState] = React.useState<
{ active: false } | { active: boolean; state: State }
- >({ active: false });
+ >(() => {
+ const state = initialState?.();
+ return state === undefined ? { active: false } : { active: true, state };
+ });
const closeDialog = () => {
if (onBeforeClose?.() === false) return false;
setControllerState((currentState) =>
diff --git a/web/src/components/ui/drawer.clienttest.tsx b/web/src/components/ui/drawer.clienttest.tsx
index 7d955feb7d..028ace1669 100644
--- a/web/src/components/ui/drawer.clienttest.tsx
+++ b/web/src/components/ui/drawer.clienttest.tsx
@@ -126,6 +126,27 @@ describe("Drawer", () => {
expect(screen.getByText("open")).toBeInTheDocument();
});
+ it("opens from initialState without reacting to later changes", () => {
+ const renderController = (initialState: string | undefined) => (
+ <DrawerController<string>
+ initialState={() => initialState}
+ forceDirection="bottom"
+ renderContent={({ state }) => (
+ <DrawerContent>
+ <DrawerTitle>{state}</DrawerTitle>
+ </DrawerContent>
+ )}
+ >
+ {() => null}
+ </DrawerController>
+ );
+ const { rerender } = render(renderController("first"));
+
+ expect(screen.getByText("first")).toBeInTheDocument();
+ rerender(renderController("second"));
+ expect(screen.queryByText("second")).not.toBeInTheDocument();
+ });
+
it("ignores stale state replacements after closing", () => {
let replaceStateAfterClose: (() => void) | undefined;
diff --git a/web/src/components/ui/drawer.tsx b/web/src/components/ui/drawer.tsx
index 75090e1d35..8a97355403 100644
--- a/web/src/components/ui/drawer.tsx
+++ b/web/src/components/ui/drawer.tsx
@@ -237,6 +237,8 @@ type DrawerControllerProps<State = void> = Pick<
| "modal"
| "shouldScaleBackground"
> & {
+ // Evaluated only when the controller mounts; later callback or dependency changes do not update the drawer.
+ initialState?: () => State | undefined;
onOpenChange?: (open: boolean) => boolean | void;
children: (control: {
isOpen: boolean;
@@ -250,6 +252,7 @@ type DrawerControllerProps<State = void> = Pick<
};
const DrawerController = <State = void,>({
+ initialState,
children,
onOpenChange,
renderContent,
@@ -257,7 +260,10 @@ const DrawerController = <State = void,>({
}: DrawerControllerProps<State>) => {
const [controllerState, setControllerState] = React.useState<
{ active: false } | { active: boolean; state: State }
- >({ active: false });
+ >(() => {
+ const state = initialState?.();
+ return state === undefined ? { active: false } : { active: true, state };
+ });
const closeDrawer = () =>
setControllerState((currentState) =>
"state" in currentState
diff --git a/web/src/features/annotation-queues/components/processors/SessionAnnotationProcessor.tsx b/web/src/features/annotation-queues/components/processors/SessionAnnotationProcessor.tsx
index af033fc4ef..fab40015db 100644
--- a/web/src/features/annotation-queues/components/processors/SessionAnnotationProcessor.tsx
+++ b/web/src/features/annotation-queues/components/processors/SessionAnnotationProcessor.tsx
@@ -138,8 +138,6 @@ export const SessionAnnotationProcessor: React.FC<
</div>
<CommentDrawerController
projectId={projectId}
- objectId={item.objectId}
- objectType="SESSION"
count={getNumberFromMap(sessionCommentCounts.data, item.objectId)}
>
{({ disabled, openDrawer }) => (
@@ -147,7 +145,13 @@ export const SessionAnnotationProcessor: React.FC<
type="button"
variant="outline"
disabled={disabled}
- onClick={() => openDrawer({ type: "comments" })}
+ onClick={() =>
+ openDrawer({
+ type: "comments",
+ objectId: item.objectId,
+ objectType: "SESSION",
+ })
+ }
className="gap-1"
>
{disabled ? (
diff --git a/web/src/features/comments/CommentDrawerController.tsx b/web/src/features/comments/CommentDrawerController.tsx
index d346f7f460..2baa033ddf 100644
--- a/web/src/features/comments/CommentDrawerController.tsx
+++ b/web/src/features/comments/CommentDrawerController.tsx
@@ -9,7 +9,7 @@ import { CommentList } from "@/src/features/comments/CommentList";
import { useHasProjectAccess } from "@/src/features/rbac";
import { type CommentObjectType } from "@langfuse/shared";
import { useRouter } from "next/router";
-import { type ReactNode, useEffect, useRef, useState } from "react";
+import { type ReactNode, useRef, useState } from "react";
import { type SelectionData } from "./contexts/InlineCommentSelectionContext";
type CommentDrawerContentProps = {
@@ -78,9 +78,9 @@ function CommentDrawerContent({
export type CommentDrawerControllerProps = {
projectId: string;
- objectId: string;
- objectType: CommentObjectType;
- objectStartTime?: Date | null;
+ // Evaluated only on mount; use for deep-linked comments, not reactive drawer state.
+ initialState?: () => CommentDrawerState | undefined;
+ mode?: "read-write" | "read-only";
count?: number;
onCommentChange?: () => void | Promise<void>;
children: (control: {
@@ -89,57 +89,44 @@ export type CommentDrawerControllerProps = {
}) => ReactNode;
};
-type CommentDrawerState =
- | { type: "comments" }
- | { type: "inline-comment"; selection: SelectionData };
+type CommentDrawerTarget = {
+ objectId: string;
+ objectType: CommentObjectType;
+ objectStartTime?: Date | null;
+};
+
+type CommentDrawerState = CommentDrawerTarget &
+ ({ type: "comments" } | { type: "inline-comment"; selection: SelectionData });
+
+export function getCommentDrawerInitialStateFromUrl(
+ query: Record<string, string | string[] | undefined>,
+) {
+ const objectId = query.commentObjectId;
+ const objectType = query.commentObjectType;
+ if (
+ query.comments !== "open" ||
+ typeof objectId !== "string" ||
+ typeof objectType !== "string"
+ ) {
+ return;
+ }
+
+ return {
+ type: "comments" as const,
+ objectId,
+ objectType: objectType as CommentObjectType,
+ };
+}
function CommentDrawerTriggers({
children,
disabled,
- isOpen,
- objectId,
- objectType,
openDrawer,
}: {
children: CommentDrawerControllerProps["children"];
disabled: boolean;
- isOpen: boolean;
- objectId: string;
- objectType: CommentObjectType;
openDrawer: (state: CommentDrawerState) => void;
}) {
- const router = useRouter();
- const hasAutoOpenedRef = useRef(false);
-
- useEffect(() => {
- const shouldAutoOpen =
- router.query.comments === "open" &&
- router.query.commentObjectType === objectType &&
- router.query.commentObjectId === objectId &&
- !disabled &&
- !isOpen &&
- !hasAutoOpenedRef.current;
-
- if (shouldAutoOpen) {
- hasAutoOpenedRef.current = true;
- openDrawer({ type: "comments" });
-
- if (router.asPath.includes("#comment-")) {
- setTimeout(() => {
- const hash = router.asPath.split("#")[1];
- document.getElementById(hash)?.scrollIntoView({
- behavior: "smooth",
- block: "center",
- });
- }, 300);
- }
- }
-
- if (router.query.comments !== "open" && hasAutoOpenedRef.current) {
- hasAutoOpenedRef.current = false;
- }
- }, [disabled, isOpen, objectId, objectType, openDrawer, router]);
-
return children({
disabled,
openDrawer: (state) => {
@@ -151,9 +138,8 @@ function CommentDrawerTriggers({
export function CommentDrawerController({
children,
projectId,
- objectId,
- objectType,
- objectStartTime,
+ initialState,
+ mode = "read-write",
count,
onCommentChange,
}: CommentDrawerControllerProps) {
@@ -168,7 +154,8 @@ export function CommentDrawerController({
projectId,
scope: "comments:CUD",
});
- const disabled = !hasReadAccess || (!hasWriteAccess && !count);
+ const disabled =
+ !hasReadAccess || (mode === "read-write" && !hasWriteAccess && !count);
const handleOpenChange = (open: boolean) => {
if (!open && isMentionDropdownOpen) return false;
@@ -183,32 +170,27 @@ export function CommentDrawerController({
return (
<DrawerController<CommentDrawerState>
- key={hasReadAccess ? "allowed" : "denied"}
+ initialState={disabled ? undefined : initialState}
+ key={`${disabled ? "disabled" : "enabled"}-${router.isReady ? "ready" : "pending"}`}
blockTextSelection={false}
onOpenChange={handleOpenChange}
renderContent={({ state, replaceState }) => (
<CommentDrawerContent
projectId={projectId}
- objectId={objectId}
- objectType={objectType}
- objectStartTime={objectStartTime}
+ objectId={state.objectId}
+ objectType={state.objectType}
+ objectStartTime={state.objectStartTime}
pendingSelection={
state.type === "inline-comment" ? state.selection : null
}
- onSelectionUsed={() => replaceState({ type: "comments" })}
+ onSelectionUsed={() => replaceState({ ...state, type: "comments" })}
onCommentChange={onCommentChange}
onMentionDropdownChange={setIsMentionDropdownOpen}
/>
)}
>
- {({ isOpen, openDrawer }) => (
- <CommentDrawerTriggers
- disabled={disabled}
- isOpen={hasReadAccess && isOpen}
- objectId={objectId}
- objectType={objectType}
- openDrawer={openDrawer}
- >
+ {({ openDrawer }) => (
+ <CommentDrawerTriggers disabled={disabled} openDrawer={openDrawer}>
{children}
</CommentDrawerTriggers>
)}
diff --git a/web/src/features/prompts/components/prompt-detail.tsx b/web/src/features/prompts/components/prompt-detail.tsx
index 176f4c448b..1fcbc6b3bd 100644
--- a/web/src/features/prompts/components/prompt-detail.tsx
+++ b/web/src/features/prompts/components/prompt-detail.tsx
@@ -69,7 +69,10 @@ import {
import { DeletePromptVersion } from "@/src/features/prompts/components/delete-prompt-version";
import { TagPromptDetailsPopover } from "@/src/features/tag/components/TagPromptDetailsPopover";
import { SetPromptVersionLabels } from "@/src/features/prompts/components/SetPromptVersionLabels";
-import { CommentDrawerController } from "@/src/features/comments/CommentDrawerController";
+import {
+ CommentDrawerController,
+ getCommentDrawerInitialStateFromUrl,
+} from "@/src/features/comments/CommentDrawerController";
import { Command, CommandInput } from "@/src/components/ui/command";
import {
PromptReferenceProvider,
@@ -366,17 +369,56 @@ export const PromptDetail = ({
</Link>
</Button>
</div>
- <div className="flex flex-col overflow-y-auto">
- <PromptHistoryNode
- prompts={promptHistory.data.promptVersions}
- currentPromptVersion={prompt.version}
- setCurrentPromptVersion={(version) => {
- setCurrentPromptVersion(version);
- setCurrentPromptLabel(null);
- }}
- commentCounts={commentCounts}
- />
- </div>
+ <CommentDrawerController
+ projectId={projectId as string}
+ mode="read-only"
+ onCommentChange={() =>
+ utils.prompts.allVersions.invalidate(promptHistoryInput)
+ }
+ >
+ {({ openDrawer }) => {
+ const openPromptComments = (
+ promptId: string,
+ promptVersion: number,
+ ) => {
+ const { label, ...query } = router.query;
+ router.push(
+ {
+ pathname: router.pathname,
+ query: {
+ ...query,
+ version: promptVersion,
+ comments: "open",
+ commentObjectType: "PROMPT",
+ commentObjectId: promptId,
+ },
+ },
+ undefined,
+ { shallow: true },
+ );
+ openDrawer({
+ type: "comments",
+ objectId: promptId,
+ objectType: "PROMPT",
+ });
+ };
+
+ return (
+ <div className="flex flex-col overflow-y-auto">
+ <PromptHistoryNode
+ prompts={promptHistory.data.promptVersions}
+ currentPromptVersion={prompt.version}
+ setCurrentPromptVersion={(version) => {
+ setCurrentPromptVersion(version);
+ setCurrentPromptLabel(null);
+ }}
+ openCommentDrawer={openPromptComments}
+ commentCounts={commentCounts}
+ />
+ </div>
+ );
+ }}
+ </CommentDrawerController>
</Command>
<div className="col-span-2 mt-3 flex max-h-full min-h-0 flex-col md:col-span-3">
<div className="flex flex-col items-start gap-2">
@@ -474,8 +516,9 @@ export const PromptDetail = ({
)}
<CommentDrawerController
projectId={projectId as string}
- objectId={prompt.id}
- objectType="PROMPT"
+ initialState={() =>
+ getCommentDrawerInitialStateFromUrl(router.query)
+ }
count={getNumberFromMap(commentCounts, prompt.id)}
onCommentChange={() =>
utils.prompts.allVersions.invalidate(promptHistoryInput)
@@ -486,7 +529,13 @@ export const PromptDetail = ({
type="button"
variant="outline"
disabled={disabled}
- onClick={() => openDrawer({ type: "comments" })}
+ onClick={() =>
+ openDrawer({
+ type: "comments",
+ objectId: prompt.id,
+ objectType: "PROMPT",
+ })
+ }
className="gap-1"
>
{disabled ? (
diff --git a/web/src/features/prompts/components/prompt-history.tsx b/web/src/features/prompts/components/prompt-history.tsx
index 23a7ead073..9062ab3d1c 100644
--- a/web/src/features/prompts/components/prompt-history.tsx
+++ b/web/src/features/prompts/components/prompt-history.tsx
@@ -1,5 +1,4 @@
import { type RouterOutputs } from "@/src/utils/api";
-import { type NextRouter, useRouter } from "next/router";
import { useState, useRef, useEffect } from "react";
import { PromptVersionDiffDialogContent } from "./PromptVersionDiffDialog";
import {
@@ -20,7 +19,7 @@ const PromptHistoryTraceNode = (props: {
currentPrompt?: RouterOutputs["prompts"]["allVersions"]["promptVersions"][number];
currentPromptVersion: number | undefined;
setCurrentPromptVersion: (version: number | undefined) => void;
- router: NextRouter;
+ openCommentDrawer: (promptId: string, promptVersion: number) => void;
commentCounts?: Map<string, number>;
}) => {
const [isHovered, setIsHovered] = useState(false);
@@ -113,20 +112,7 @@ const PromptHistoryTraceNode = (props: {
<span
onClick={(e) => {
e.stopPropagation();
- props.router.push(
- {
- pathname: props.router.pathname,
- query: {
- ...props.router.query,
- version: prompt.version,
- comments: "open",
- commentObjectType: "PROMPT",
- commentObjectId: prompt.id,
- },
- },
- undefined,
- { shallow: true },
- );
+ props.openCommentDrawer(prompt.id, prompt.version);
}}
className="cursor-pointer"
role="button"
@@ -200,9 +186,9 @@ export const PromptHistoryNode = (props: {
prompts: RouterOutputs["prompts"]["allVersions"]["promptVersions"];
currentPromptVersion: number | undefined;
setCurrentPromptVersion: (id: number | undefined) => void;
+ openCommentDrawer: (promptId: string, promptVersion: number) => void;
commentCounts?: Map<string, number>;
}) => {
- const router = useRouter();
const currentPrompt = props.prompts.find(
(p) => p.version === props.currentPromptVersion,
);
@@ -217,7 +203,7 @@ export const PromptHistoryNode = (props: {
currentPrompt={currentPrompt}
currentPromptVersion={props.currentPromptVersion}
setCurrentPromptVersion={props.setCurrentPromptVersion}
- router={router}
+ openCommentDrawer={props.openCommentDrawer}
commentCounts={props.commentCounts}
/>
))}
diff --git a/web/src/features/scores/components/AnnotateDrawerController.tsx b/web/src/features/scores/components/AnnotateDrawerController.tsx
index 66f19d6d18..b566f963af 100644
--- a/web/src/features/scores/components/AnnotateDrawerController.tsx
+++ b/web/src/features/scores/components/AnnotateDrawerController.tsx
@@ -1,34 +1,141 @@
import { useHasProjectAccess } from "@/src/features/rbac";
-import { DrawerController } from "@/src/components/ui/drawer";
+import { DrawerContent, DrawerController } from "@/src/components/ui/drawer";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import {
type AnalyticsData,
type ScoreTarget,
} from "@/src/features/scores/types";
-import { type ReactNode } from "react";
+import { type ReactNode, useEffect, useMemo, useRef } from "react";
import { AnnotateDrawerContent } from "@/src/features/scores/components/AnnotateDrawerContent";
-import { type ScoreDomain } from "@langfuse/shared";
-import { type WithStringifiedMetadata } from "@/src/utils/clientSideDomainTypes";
+import {
+ filterAndValidateDbScoreList,
+ ScoreDataTypeArray,
+ ScoreDataTypeEnum,
+ type ScoreDomain,
+} from "@langfuse/shared";
+import {
+ toDomainArrayWithStringifiedMetadata,
+ type WithStringifiedMetadata,
+} from "@/src/utils/clientSideDomainTypes";
+import { api } from "@/src/utils/api";
+import { Button } from "@/src/components/ui/button";
export type AnnotateDrawerControllerProps<Target extends ScoreTarget> = {
children: (control: {
disabled: boolean;
- openDrawer: (payload: AnnotateDrawerState<Target>) => void;
+ openDrawer: (payload: AnnotateDrawerPayload<Target>) => void;
}) => ReactNode;
projectId: string;
};
-type AnnotateDrawerState<Target extends ScoreTarget> = {
+type AnnotateDrawerState = {
analyticsData: AnalyticsData;
scoreMetadata: {
projectId: string;
queueId?: string;
environment?: string;
};
- scoreTarget: Target;
- scores: WithStringifiedMetadata<ScoreDomain>[];
+ scoreTarget: ScoreTarget;
+ scores?: WithStringifiedMetadata<ScoreDomain>[];
};
+type AnnotateDrawerPayload<Target extends ScoreTarget> =
+ Target extends Extract<ScoreTarget, { type: "trace" }>
+ ? Omit<AnnotateDrawerState, "scoreTarget" | "scores"> & {
+ scoreTarget: Target;
+ scores?: WithStringifiedMetadata<ScoreDomain>[];
+ }
+ : Omit<AnnotateDrawerState, "scoreTarget" | "scores"> & {
+ scoreTarget: Target;
+ scores: WithStringifiedMetadata<ScoreDomain>[];
+ };
+
+function ConnectedAnnotateDrawerContent({
+ state,
+ capture,
+}: {
+ state: AnnotateDrawerState;
+ capture: ReturnType<typeof usePostHogClientCapture>;
+}) {
+ const shouldFetchScores =
+ state.scores === undefined && state.scoreTarget.type === "trace";
+ const scoresQuery = api.events.scoresForTrace.useQuery(
+ {
+ projectId: state.scoreMetadata.projectId,
+ traceId:
+ state.scoreTarget.type === "trace" ? state.scoreTarget.traceId : "",
+ },
+ {
+ enabled: shouldFetchScores,
+ staleTime: 60 * 1000,
+ },
+ );
+ const fetchedScores = useMemo(() => {
+ const scoreTarget = state.scoreTarget;
+ if (!scoresQuery.data || scoreTarget.type !== "trace") return;
+
+ const scores = filterAndValidateDbScoreList({
+ scores: scoresQuery.data,
+ dataTypes: [...ScoreDataTypeArray],
+ onParseError: (error) => console.error(error),
+ }).filter((score) => {
+ if (score.dataType === ScoreDataTypeEnum.CORRECTION) return false;
+ if (scoreTarget.observationId) {
+ return score.observationId === scoreTarget.observationId;
+ }
+ return !score.observationId;
+ });
+
+ return toDomainArrayWithStringifiedMetadata(scores);
+ }, [scoresQuery.data, state.scoreTarget]);
+ const scores = state.scores ?? fetchedScores;
+ const capturedState = useRef<typeof state>(null);
+
+ useEffect(() => {
+ if (state.scores !== undefined || scores === undefined) return;
+ if (capturedState.current === state) return;
+
+ capturedState.current = state;
+ capture(
+ scores.length ? "score:update_form_open" : "score:create_form_open",
+ state.analyticsData,
+ );
+ }, [capture, scores, state]);
+
+ if (scoresQuery.isError && scores === undefined) {
+ return (
+ <DrawerContent className="flex flex-col gap-3 p-3">
+ <p className="text-sm">Could not load scores.</p>
+ <Button
+ className="self-start"
+ onClick={async () => {
+ await scoresQuery.refetch();
+ }}
+ >
+ Try again
+ </Button>
+ </DrawerContent>
+ );
+ }
+
+ if (scores === undefined) {
+ return (
+ <DrawerContent className="p-3">
+ <p className="text-muted-foreground text-sm">Loading scores...</p>
+ </DrawerContent>
+ );
+ }
+
+ return (
+ <AnnotateDrawerContent
+ analyticsData={state.analyticsData}
+ scoreMetadata={state.scoreMetadata}
+ scoreTarget={state.scoreTarget}
+ scores={scores}
+ />
+ );
+}
+
export function AnnotateDrawerController<Target extends ScoreTarget>({
children,
projectId,
@@ -41,14 +148,9 @@ export function AnnotateDrawerController<Target extends ScoreTarget>({
const disabled = !hasAccess;
return (
- <DrawerController<AnnotateDrawerState<Target>>
+ <DrawerController<AnnotateDrawerState>
renderContent={({ state }) => (
- <AnnotateDrawerContent
- analyticsData={state.analyticsData}
- scoreMetadata={state.scoreMetadata}
- scoreTarget={state.scoreTarget}
- scores={state.scores}
- />
+ <ConnectedAnnotateDrawerContent state={state} capture={capture} />
)}
>
{({ openDrawer }) =>
@@ -57,12 +159,14 @@ export function AnnotateDrawerController<Target extends ScoreTarget>({
openDrawer: (payload) => {
if (disabled) return;
- capture(
- payload.scores.length
- ? "score:update_form_open"
- : "score:create_form_open",
- payload.analyticsData,
- );
+ if (payload.scores !== undefined) {
+ capture(
+ payload.scores.length
+ ? "score:update_form_open"
+ : "score:create_form_open",
+ payload.analyticsData,
+ );
+ }
openDrawer(payload);
},
})
diff --git a/web/src/features/sessions/SessionConversationTimeline/ConnectedSessionConversationTimeline.tsx b/web/src/features/sessions/SessionConversationTimeline/ConnectedSessionConversationTimeline.tsx
index f0ad96c732..6ce3689e4a 100644
--- a/web/src/features/sessions/SessionConversationTimeline/ConnectedSessionConversationTimeline.tsx
+++ b/web/src/features/sessions/SessionConversationTimeline/ConnectedSessionConversationTimeline.tsx
@@ -8,6 +8,11 @@ import {
} from "@/src/features/sessions/SessionConversationTimeline/SessionConversationTimeline";
import { type SessionObservation } from "@/src/features/sessions/SessionConversationTimeline/components/SessionConversationTimelineTrace/SessionConversationTimelineTrace";
import { type EventSessionTrace } from "@/src/features/sessions/sessionDetailPageTypes";
+import { AnnotateDrawerController } from "@/src/features/scores/components/AnnotateDrawerController";
+import { CommentDrawerController } from "@/src/features/comments/CommentDrawerController";
+import { NewDatasetItemFromExistingObjectDialogController } from "@/src/features/datasets/components/NewDatasetItemFromExistingObjectDialogController";
+import { showErrorToast } from "@/src/features/notifications/showErrorToast";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { api, sendAsPostOption, type RouterOutputs } from "@/src/utils/api";
const BATCH_IO_SIZE = 50;
@@ -59,6 +64,11 @@ export function ConnectedSessionConversationTimeline({
) => void;
onLoadMoreObservations?: () => void;
}) {
+ const utils = api.useUtils();
+ const hasDatasetAccess = useHasProjectAccess({
+ projectId,
+ scope: "datasets:CUD",
+ });
const observationRefs = useMemo(
() =>
traces.flatMap(
@@ -169,6 +179,7 @@ export function ConnectedSessionConversationTimeline({
);
return {
...observation,
+ traceId: trace.id,
input: io?.input ?? null,
output: io?.output ?? null,
metadata: io?.metadata ?? null,
@@ -192,20 +203,99 @@ export function ConnectedSessionConversationTimeline({
: "No observation matches the current filters in this trace.";
return (
- <SessionConversationTimeline
- traces={timelineTraces}
- filterMeasurementKey={filterMeasurementKey}
- emptyMessage={emptyMessage}
- onOpenTrace={(trace) => openPeek(trace.id, trace)}
- onOpenObservation={(trace, observationId) =>
- openPeek(trace.id, { ...trace, observationId })
- }
- controller={controller}
- scrollTarget={scrollTarget}
- observationActions={{
- onFilterByName: onFilterObservationByName,
- }}
- onLoadMoreObservations={onLoadMoreObservations}
- />
+ <AnnotateDrawerController projectId={projectId}>
+ {({ disabled: annotateDisabled, openDrawer: openAnnotateDrawer }) => (
+ <CommentDrawerController projectId={projectId} mode="read-only">
+ {({ disabled: commentDisabled, openDrawer: openCommentDrawer }) => (
+ <NewDatasetItemFromExistingObjectDialogController
+ projectId={projectId}
+ >
+ {({ openDialog: openDatasetDialog }) => (
+ <SessionConversationTimeline
+ traces={timelineTraces}
+ filterMeasurementKey={filterMeasurementKey}
+ emptyMessage={emptyMessage}
+ onOpenTrace={(trace) => openPeek(trace.id, trace)}
+ onOpenObservation={(trace, observationId) =>
+ openPeek(trace.id, { ...trace, observationId })
+ }
+ controller={controller}
+ scrollTarget={scrollTarget}
+ observationActions={{
+ onFilterByName: onFilterObservationByName,
+ annotate: {
+ disabled: annotateDisabled,
+ onSelect: (observation) =>
+ openAnnotateDrawer({
+ scoreTarget: {
+ type: "trace",
+ traceId: observation.traceId,
+ observationId: observation.id,
+ },
+ analyticsData: {
+ type: "trace",
+ source: "SessionDetail",
+ },
+ scoreMetadata: {
+ projectId,
+ environment: observation.environment,
+ },
+ }),
+ },
+ comment: {
+ disabled: commentDisabled,
+ onSelect: (observation) =>
+ openCommentDrawer({
+ type: "comments",
+ objectId: observation.id,
+ objectType: "OBSERVATION",
+ objectStartTime: observation.startTime,
+ }),
+ },
+ addToDataset: {
+ disabled: !hasDatasetAccess,
+ onSelect: async (observation) => {
+ try {
+ // Remove this fetch if the timeline starts loading full IO upfront.
+ const [fullObservation] =
+ await utils.events.batchIO.fetch({
+ projectId,
+ traceId: observation.traceId,
+ observations: [
+ {
+ id: observation.id,
+ traceId: observation.traceId,
+ },
+ ],
+ minStartTime: observation.startTime,
+ maxStartTime: observation.startTime,
+ truncated: false,
+ });
+ if (!fullObservation) throw new Error();
+
+ openDatasetDialog({
+ traceId: observation.traceId,
+ observationId: observation.id,
+ input: fullObservation.input,
+ output: fullObservation.output,
+ metadata: fullObservation.metadata,
+ });
+ } catch {
+ showErrorToast(
+ "Failed to load observation",
+ "Could not fetch the observation's full I/O. Please try again.",
+ );
+ }
+ },
+ },
+ }}
+ onLoadMoreObservations={onLoadMoreObservations}
+ />
+ )}
+ </NewDatasetItemFromExistingObjectDialogController>
+ )}
+ </CommentDrawerController>
+ )}
+ </AnnotateDrawerController>
);
}
diff --git a/web/src/features/sessions/SessionConversationTimeline/SessionConversationTimeline.stories.tsx b/web/src/features/sessions/SessionConversationTimeline/SessionConversationTimeline.stories.tsx
index 3eab0bd173..5a3249a702 100644
--- a/web/src/features/sessions/SessionConversationTimeline/SessionConversationTimeline.stories.tsx
+++ b/web/src/features/sessions/SessionConversationTimeline/SessionConversationTimeline.stories.tsx
@@ -1802,6 +1802,9 @@ const implementationCodingAgentTrace = {
const observationActions = {
onFilterByName: fn(),
+ annotate: { disabled: false, onSelect: fn() },
+ comment: { disabled: false, onSelect: fn() },
+ addToDataset: { disabled: false, onSelect: fn() },
} satisfies NonNullable<TimelineProps["observationActions"]>;
const loadedArgs = {
@@ -2212,6 +2215,9 @@ export const UseObservationFilters = meta.story({
...loadedArgs,
observationActions: {
onFilterByName: fn(),
+ annotate: { disabled: false, onSelect: fn() },
+ comment: { disabled: false, onSelect: fn() },
+ addToDataset: { disabled: false, onSelect: fn() },
},
},
play: async ({ args, canvasElement }) => {
@@ -2233,14 +2239,14 @@ export const UseObservationFilters = meta.story({
}),
).toBeInTheDocument();
await expect(
- page.queryByRole("menuitem", { name: "Annotate" }),
- ).not.toBeInTheDocument();
+ page.getByRole("menuitem", { name: "Annotate" }),
+ ).toBeInTheDocument();
await expect(
- page.queryByRole("menuitem", { name: "Add comment" }),
- ).not.toBeInTheDocument();
+ page.getByRole("menuitem", { name: "Add comment" }),
+ ).toBeInTheDocument();
await expect(
- page.queryByRole("menuitem", { name: "Add to dataset" }),
- ).not.toBeInTheDocument();
+ page.getByRole("menuitem", { name: "Add to dataset" }),
+ ).toBeInTheDocument();
await userEvent.click(
page.getByRole("menuitem", {
diff --git a/web/src/features/sessions/SessionConversationTimeline/components/SessionConversationTimelineTrace/SessionConversationTimelineTrace.tsx b/web/src/features/sessions/SessionConversationTimeline/components/SessionConversationTimelineTrace/SessionConversationTimelineTrace.tsx
index dae486e625..8170e25325 100644
--- a/web/src/features/sessions/SessionConversationTimeline/components/SessionConversationTimelineTrace/SessionConversationTimelineTrace.tsx
+++ b/web/src/features/sessions/SessionConversationTimeline/components/SessionConversationTimelineTrace/SessionConversationTimelineTrace.tsx
@@ -41,9 +41,10 @@ type EventObservation = RouterOutputs["events"]["all"]["observations"][number];
type EventObservationIO = RouterOutputs["events"]["batchIO"][number];
export type SessionObservation = Omit<
EventObservation,
- "input" | "output" | "metadata"
+ "input" | "output" | "metadata" | "traceId"
> &
Pick<EventObservationIO, "input" | "output" | "metadata"> & {
+ traceId: string;
inputTruncated?: boolean;
outputTruncated?: boolean;
metadataTruncated?: boolean;
@@ -67,6 +68,18 @@ export type PreparedSessionConversationTimelineTraceState =
export type SessionObservationActions = {
onFilterByName: (name: string, operator: "any of" | "none of") => void;
+ annotate: {
+ disabled: boolean;
+ onSelect: (observation: SessionObservation) => void;
+ };
+ comment: {
+ disabled: boolean;
+ onSelect: (observation: SessionObservation) => void;
+ };
+ addToDataset: {
+ disabled: boolean;
+ onSelect: (observation: SessionObservation) => void;
+ };
};
function SessionTimelineStatusIndicator({
@@ -121,6 +134,24 @@ function SessionObservationActionsMenuContent({
}) {
return (
<DropdownMenuContent align="end" sideOffset={0}>
+ <DropdownMenuItem
+ disabled={actions.annotate.disabled}
+ onSelect={() => actions.annotate.onSelect(observation)}
+ >
+ Annotate
+ </DropdownMenuItem>
+ <DropdownMenuItem
+ disabled={actions.comment.disabled}
+ onSelect={() => actions.comment.onSelect(observation)}
+ >
+ Add comment
+ </DropdownMenuItem>
+ <DropdownMenuItem
+ disabled={actions.addToDataset.disabled}
+ onSelect={() => actions.addToDataset.onSelect(observation)}
+ >
+ Add to dataset
+ </DropdownMenuItem>
{observation.name ? (
<DropdownMenuItem
onSelect={() =>
diff --git a/web/src/features/sessions/SessionPages.tsx b/web/src/features/sessions/SessionPages.tsx
index a5e5d79e6c..621fab00c7 100644
--- a/web/src/features/sessions/SessionPages.tsx
+++ b/web/src/features/sessions/SessionPages.tsx
@@ -18,7 +18,10 @@ import { useVirtualizer } from "@tanstack/react-virtual";
import { AnnotateDrawerController } from "@/src/features/scores/components/AnnotateDrawerController";
import { ActionButtonCountBadge } from "@/src/components/ui/action-button-count-badge";
import { Button } from "@/src/components/ui/button";
-import { CommentDrawerController } from "@/src/features/comments/CommentDrawerController";
+import {
+ CommentDrawerController,
+ getCommentDrawerInitialStateFromUrl,
+} from "@/src/features/comments/CommentDrawerController";
import { useSession } from "next-auth/react";
import {
CheckIcon,
@@ -566,8 +569,9 @@ export const SessionPage: React.FC<{
<CommentDrawerController
key="comment"
projectId={projectId}
- objectId={sessionId}
- objectType="SESSION"
+ initialState={() =>
+ getCommentDrawerInitialStateFromUrl(router.query)
+ }
count={getNumberFromMap(sessionCommentCounts.data, sessionId)}
>
{({ disabled, openDrawer }) => (
@@ -575,7 +579,13 @@ export const SessionPage: React.FC<{
type="button"
variant="outline"
disabled={disabled}
- onClick={() => openDrawer({ type: "comments" })}
+ onClick={() =>
+ openDrawer({
+ type: "comments",
+ objectId: sessionId,
+ objectType: "SESSION",
+ })
+ }
className="gap-1"
>
{disabled ? (
@@ -686,8 +696,6 @@ export const SessionPage: React.FC<{
<CopySessionIdButton sessionId={sessionId} layout="menu" />
<CommentDrawerController
projectId={projectId}
- objectId={sessionId}
- objectType="SESSION"
count={getNumberFromMap(sessionCommentCounts.data, sessionId)}
>
{({ disabled, openDrawer }) => (
@@ -696,7 +704,13 @@ export const SessionPage: React.FC<{
variant="ghost"
size="sm"
disabled={disabled}
- onClick={() => openDrawer({ type: "comments" })}
+ onClick={() =>
+ openDrawer({
+ type: "comments",
+ objectId: sessionId,
+ objectType: "SESSION",
+ })
+ }
className="w-full justify-start gap-2 font-normal"
>
{disabled ? (
@@ -1592,8 +1606,9 @@ const LoadedSessionEventsPage: React.FC<{
<CommentDrawerController
key="comment"
projectId={projectId}
- objectId={sessionId}
- objectType="SESSION"
+ initialState={() =>
+ getCommentDrawerInitialStateFromUrl(router.query)
+ }
count={getNumberFromMap(sessionCommentCounts.data, sessionId)}
>
{({ disabled, openDrawer }) => (
@@ -1601,7 +1616,13 @@ const LoadedSessionEventsPage: React.FC<{
type="button"
variant="outline"
disabled={disabled}
- onClick={() => openDrawer({ type: "comments" })}
+ onClick={() =>
+ openDrawer({
+ type: "comments",
+ objectId: sessionId,
+ objectType: "SESSION",
+ })
+ }
className="gap-1"
>
{disabled ? (
@@ -1744,8 +1765,6 @@ const LoadedSessionEventsPage: React.FC<{
<CopySessionIdButton sessionId={sessionId} layout="menu" />
<CommentDrawerController
projectId={projectId}
- objectId={sessionId}
- objectType="SESSION"
count={getNumberFromMap(sessionCommentCounts.data, sessionId)}
>
{({ disabled, openDrawer }) => (
@@ -1754,7 +1773,13 @@ const LoadedSessionEventsPage: React.FC<{
variant="ghost"
size="sm"
disabled={disabled}
- onClick={() => openDrawer({ type: "comments" })}
+ onClick={() =>
+ openDrawer({
+ type: "comments",
+ objectId: sessionId,
+ objectType: "SESSION",
+ })
+ }
className="w-full justify-start gap-2 font-normal"
>
{disabled ? (
diff --git a/web/src/features/sessions/SessionTraceActionButtons.tsx b/web/src/features/sessions/SessionTraceActionButtons.tsx
index 6289d613bf..4bf87ff6ed 100644
--- a/web/src/features/sessions/SessionTraceActionButtons.tsx
+++ b/web/src/features/sessions/SessionTraceActionButtons.tsx
@@ -190,19 +190,20 @@ export function SessionTraceActionButtons({
)}
</AnnotationQueueItemDropdownMenuController>
</div>
- <CommentDrawerController
- projectId={projectId}
- objectId={traceId}
- objectType="TRACE"
- count={commentCount}
- >
+ <CommentDrawerController projectId={projectId} count={commentCount}>
{({ disabled, openDrawer }) => (
<Button
type="button"
variant="outline"
size={size}
disabled={disabled}
- onClick={() => openDrawer({ type: "comments" })}
+ onClick={() =>
+ openDrawer({
+ type: "comments",
+ objectId: traceId,
+ objectType: "TRACE",
+ })
+ }
className="gap-1"
>
{disabled ? (
diff --git a/web/src/features/traces/components/ObservationDetailView/ConnectedObservationDetailView.tsx b/web/src/features/traces/components/ObservationDetailView/ConnectedObservationDetailView.tsx
index 35e455c32d..d07cdb4fa4 100644
--- a/web/src/features/traces/components/ObservationDetailView/ConnectedObservationDetailView.tsx
+++ b/web/src/features/traces/components/ObservationDetailView/ConnectedObservationDetailView.tsx
@@ -39,7 +39,11 @@ import {
TooltipProvider,
TooltipTrigger,
} from "@/src/components/ui/tooltip";
-import { CommentDrawerController } from "@/src/features/comments/CommentDrawerController";
+import {
+ CommentDrawerController,
+ getCommentDrawerInitialStateFromUrl,
+} from "@/src/features/comments/CommentDrawerController";
+import { useRouter } from "next/router";
import ScoresTable from "@/src/components/table/use-cases/scores";
import { getMostRecentCorrection } from "@/src/features/corrections/utils/getMostRecentCorrection";
import { useJsonExpansion } from "@/src/features/traces/contexts/JsonExpansionContext";
@@ -77,6 +81,7 @@ export function ConnectedObservationDetailView({
projectId,
traceId,
}: ConnectedObservationDetailViewProps) {
+ const router = useRouter();
// Tab and view state from URL (via SelectionContext)
const {
selectedTab: globalSelectedTab,
@@ -294,9 +299,7 @@ export function ConnectedObservationDetailView({
return (
<CommentDrawerController
projectId={projectId}
- objectId={observation.id}
- objectType="OBSERVATION"
- objectStartTime={observation.startTime}
+ initialState={() => getCommentDrawerInitialStateFromUrl(router.query)}
count={comments.get(observation.id)}
>
{({ disabled, openDrawer }) => (
@@ -311,7 +314,13 @@ export function ConnectedObservationDetailView({
commentCount={comments.get(observation.id)}
commentDrawerControl={{
disabled,
- openDrawer: () => openDrawer({ type: "comments" }),
+ openDrawer: () =>
+ openDrawer({
+ type: "comments",
+ objectId: observation.id,
+ objectType: "OBSERVATION",
+ objectStartTime: observation.startTime,
+ }),
}}
subtreeMetrics={subtreeMetrics}
treeNodeTotalCost={treeNode?.totalCost}
@@ -490,7 +499,13 @@ export function ConnectedObservationDetailView({
setJsonFieldExpansion("metadata", expanded),
enableInlineComments: true,
onAddInlineComment: (selection) =>
- openDrawer({ type: "inline-comment", selection }),
+ openDrawer({
+ type: "inline-comment",
+ selection,
+ objectId: observation.id,
+ objectType: "OBSERVATION",
+ objectStartTime: observation.startTime,
+ }),
commentedPathsByField,
showMetadata: true,
observationId: observation.id,
diff --git a/web/src/features/traces/components/TraceDetailView/TraceDetailView.tsx b/web/src/features/traces/components/TraceDetailView/TraceDetailView.tsx
index bdc349472c..a5e280e20c 100644
--- a/web/src/features/traces/components/TraceDetailView/TraceDetailView.tsx
+++ b/web/src/features/traces/components/TraceDetailView/TraceDetailView.tsx
@@ -14,8 +14,12 @@ import {
import { Tabs } from "@/src/components/design-system/Tabs/Tabs";
import { Switch } from "@/src/components/design-system/Switch/Switch";
import { useCallback, useMemo, useState } from "react";
-import { CommentDrawerController } from "@/src/features/comments/CommentDrawerController";
+import {
+ CommentDrawerController,
+ getCommentDrawerInitialStateFromUrl,
+} from "@/src/features/comments/CommentDrawerController";
import { api } from "@/src/utils/api";
+import { useRouter } from "next/router";
import {
Tooltip,
TooltipContent,
@@ -70,6 +74,7 @@ export function TraceDetailView({
corrections,
projectId,
}: TraceDetailViewProps) {
+ const router = useRouter();
// Tab and view state from URL (via SelectionContext)
const { selectedTab, setSelectedTab } = useSelection();
const utils = api.useUtils();
@@ -206,8 +211,7 @@ export function TraceDetailView({
return (
<CommentDrawerController
projectId={projectId}
- objectId={trace.id}
- objectType="TRACE"
+ initialState={() => getCommentDrawerInitialStateFromUrl(router.query)}
count={comments.get(trace.id)}
>
{({ disabled, openDrawer }) => (
@@ -222,7 +226,12 @@ export function TraceDetailView({
commentCount={comments.get(trace.id)}
commentDrawerControl={{
disabled,
- openDrawer: () => openDrawer({ type: "comments" }),
+ openDrawer: () =>
+ openDrawer({
+ type: "comments",
+ objectId: trace.id,
+ objectType: "TRACE",
+ }),
}}
/>
@@ -422,7 +431,12 @@ export function TraceDetailView({
}
enableInlineComments={true}
onAddInlineComment={(selection) =>
- openDrawer({ type: "inline-comment", selection })
+ openDrawer({
+ type: "inline-comment",
+ selection,
+ objectId: trace.id,
+ objectType: "TRACE",
+ })
}
commentedPathsByField={commentedPathsByField}
showMetadata