@sentry/junior-dashboard 0.234.0 → 0.236.0

package/src/client/conversations/ConversationForkLinks.tsx

@@ -0,0 +1,51 @@
+import { GitFork } from "lucide-react";
+import { Link } from "react-router";
+import { conversationPath } from "./conversationRoutes";
+
+const linkClassName =
+  "font-medium text-dashboard-text no-underline underline-offset-2 hover:underline";
+
+/** Link a conversation to its fork source and to its forks. */
+export function ConversationForkLinks(props: {
+  forkedFromConversationId?: string;
+  forkedFromTitle?: string;
+  forks?: string[];
+}) {
+  return (
+    <nav
+      aria-label="Conversation forks"
+      className="flex min-w-0 flex-wrap items-center gap-x-1.5 gap-y-1 text-xs leading-snug text-dashboard-text-muted"
+    >
+      <GitFork aria-hidden="true" size={12} className="shrink-0" />
+      {props.forkedFromConversationId ? (
+        <span>
+          Forked from{" "}
+          <Link
+            className={linkClassName}
+            to={conversationPath(props.forkedFromConversationId)}
+          >
+            {props.forkedFromTitle ?? "source conversation"}
+          </Link>
+        </span>
+      ) : null}
+      {props.forkedFromConversationId && props.forks?.length ? (
+        <span>·</span>
+      ) : null}
+      {props.forks?.length ? (
+        <span className="inline-flex flex-wrap items-center gap-x-1.5">
+          Forks:
+          {props.forks.map((id, index) => (
+            <Link
+              key={id}
+              aria-label={`Fork ${index + 1}`}
+              className={linkClassName}
+              to={conversationPath(id)}
+            >
+              {index + 1}
+            </Link>
+          ))}
+        </span>
+      ) : null}
+    </nav>
+  );
+}

package/src/client/conversations/ConversationHeader.tsx

@@ -32,6 +32,8 @@ export function ConversationHeader(props: {
   archive: ConversationArchiveAction;
   brief?: ReactNode;
   conversationId: string;
+  /** Links to the fork source and to forks of this conversation. */
+  forks?: ReactNode;
   identity: ReactNode;
   linkedWork?: ReactNode;
   lastActivityAt?: string;
@@ -149,7 +151,10 @@ export function ConversationHeader(props: {
   );
 
   const showMobileHeader =
-    searchOpenVisible || props.archive.error || Boolean(props.linkedWork);
+    searchOpenVisible ||
+    props.archive.error ||
+    Boolean(props.linkedWork) ||
+    Boolean(props.forks);
 
   const liveIndicator = props.live ? (
     <span
@@ -183,6 +188,9 @@ export function ConversationHeader(props: {
                 {props.meta}
               </div>
             ) : null}
+            {props.forks ? (
+              <div className="mt-1.5 min-w-0">{props.forks}</div>
+            ) : null}
           </div>
           <ConversationHeaderActions
             archive={props.archive}
@@ -196,6 +204,9 @@ export function ConversationHeader(props: {
             view={props.view}
           />
         </div>
+        {props.forks ? (
+          <div className="px-4 py-2 md:hidden">{props.forks}</div>
+        ) : null}
         {props.linkedWork ? (
           <div
             aria-label="Linked work"

package/src/client/conversations/ConversationPage.tsx

@@ -1,4 +1,5 @@
 import { memo, useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { useSearchParams } from "react-router";
 import type {
   ConversationDetailReport,
   ConversationFeed,
@@ -18,8 +19,13 @@ import type { ConversationMailboxMessage } from "./conversationOutbox";
 import { buildConversationMarkdown } from "../markdownExport";
 import { CopyMarkdownButton } from "./CopyMarkdownButton";
 import { ConversationBrief } from "./ConversationBrief";
+import {
+  CONVERSATION_EVENT_PARAM,
+  parseConversationEventSeq,
+} from "./conversationRoutes";
 import { ConversationComposer } from "./ConversationComposer";
 import { ConversationHeader } from "./ConversationHeader";
+import { ConversationForkLinks } from "./ConversationForkLinks";
 import { ConversationHeaderMeta } from "./ConversationHeaderMeta";
 import {
   ConversationAnnotations,
@@ -67,7 +73,15 @@ export function ConversationPage(props: {
 }) {
   const [subagentTarget, setSubagentTarget] =
     useState<SubagentTranscriptTarget>();
-  const [view, setView] = useState<TranscriptViewMode>("rich");
+  const [searchParams, setSearchParams] = useSearchParams();
+  // The URL owns the open event log entry so readers can share that link.
+  const selectedEventSeq = parseConversationEventSeq(
+    searchParams.get(CONVERSATION_EVENT_PARAM),
+  );
+  const [viewState, setView] = useState<TranscriptViewMode>(() =>
+    selectedEventSeq === undefined ? "rich" : "raw",
+  );
+  const view = selectedEventSeq === undefined ? viewState : "raw";
   const [search, setSearch] = useState("");
   const [pinRequestVersion, setPinRequestVersion] = useState(0);
   const conversationId = props.conversationId;
@@ -109,6 +123,48 @@ export function ConversationPage(props: {
   // polls refresh generatedAt every 2s even when the queue is unchanged.
   const pendingGeneratedAtRef = useRef(detail.pendingGeneratedAt);
   pendingGeneratedAtRef.current = detail.pendingGeneratedAt;
+  const setSelectedEventSeq = useCallback(
+    (seq: number | undefined) => {
+      // Keep the event log after close, even when a link opened the page.
+      setView("raw");
+      setSearchParams(
+        (current) => {
+          const next = new URLSearchParams(current);
+          if (seq === undefined) next.delete(CONVERSATION_EVENT_PARAM);
+          else next.set(CONVERSATION_EVENT_PARAM, String(seq));
+          return next;
+        },
+        { replace: true },
+      );
+    },
+    [setSearchParams],
+  );
+  const onViewChange = useCallback(
+    (value: TranscriptViewMode) => {
+      if (value !== "raw" && selectedEventSeq !== undefined) {
+        setSelectedEventSeq(undefined);
+      }
+      setView(value);
+    },
+    [selectedEventSeq, setSelectedEventSeq],
+  );
+  // A linked event can be older than the first page. Load earlier pages until
+  // it is present or history ends.
+  const loadPreviousPageRef = useRef(detail.loadPreviousPage);
+  loadPreviousPageRef.current = detail.loadPreviousPage;
+  const oldestLoadedSeq = transcript?.events[0]?.seq;
+  const linkedEventMissing =
+    selectedEventSeq !== undefined &&
+    oldestLoadedSeq !== undefined &&
+    selectedEventSeq < oldestLoadedSeq;
+  const loadLinkedEvent =
+    linkedEventMissing &&
+    detail.hasPreviousPage &&
+    !detail.isLoadingPreviousPage &&
+    !detail.historyError;
+  useEffect(() => {
+    if (loadLinkedEvent) loadPreviousPageRef.current();
+  }, [loadLinkedEvent, oldestLoadedSeq]);
   const requestPin = useCallback(() => {
     setPinRequestVersion((version) => version + 1);
   }, []);
@@ -137,6 +193,18 @@ export function ConversationPage(props: {
           <section className="min-w-0">
             <ConversationHeader
               conversationId={conversationId}
+              forks={
+                detail.data?.forkedFromConversationId ||
+                detail.data?.forks?.length ? (
+                  <ConversationForkLinks
+                    forkedFromConversationId={
+                      detail.data.forkedFromConversationId
+                    }
+                    forkedFromTitle={detail.data.forkedFromTitle}
+                    forks={detail.data.forks}
+                  />
+                ) : null
+              }
               lastActivityAt={conversation?.lastSeenAt}
               sentryConversationUrl={detail.data?.sentryConversationUrl}
               copyAction={
@@ -206,7 +274,7 @@ export function ConversationPage(props: {
                 />
               }
               onSearchChange={setSearch}
-              onViewChange={setView}
+              onViewChange={onViewChange}
               privacy={
                 <ConversationPrivacyChip
                   visibility={conversation?.visibility}
@@ -256,12 +324,14 @@ export function ConversationPage(props: {
                     live={live}
                     loadingPreviousPage={detail.isLoadingPreviousPage}
                     onLoadPreviousPage={detail.loadPreviousPage}
+                    onSelectedEventSeqChange={setSelectedEventSeq}
                     pinRequestVersion={pinRequestVersion}
                     responding={
                       !detail.error && conversationIsResponding(transcript)
                     }
                     onOpenSubagentTranscript={onOpenSubagentTranscript}
                     search={search}
+                    selectedEventSeq={selectedEventSeq}
                     transcript={transcript}
                     view={view}
                   />

package/src/client/conversations/ForkConversationButton.tsx

@@ -0,0 +1,125 @@
+import { GitFork } from "lucide-react";
+import { useId, useState } from "react";
+import { createPortal } from "react-dom";
+import { useNavigate } from "react-router";
+import { Button } from "../components/Button";
+import { Drawer } from "../components/Drawer";
+import { Field } from "../components/Field";
+import { TextArea } from "../components/TextInput";
+import { DashboardApiError } from "../http";
+import { conversationPath } from "./conversationRoutes";
+import { useForkConversation } from "./queries";
+
+type ForkTarget = { conversationId: string; messageId: string };
+
+/** Open the fork dialog for one assistant reply. */
+export function ForkConversationButton(props: ForkTarget) {
+  const [open, setOpen] = useState(false);
+  return (
+    <>
+      <Button
+        size="icon"
+        aria-label="Fork after this message"
+        title="Fork after this message"
+        onClick={() => setOpen(true)}
+      >
+        <GitFork size={14} aria-hidden="true" />
+      </Button>
+      {open
+        ? createPortal(
+            <ForkConversationDialog
+              {...props}
+              onClose={() => setOpen(false)}
+            />,
+            document.body,
+          )
+        : null}
+    </>
+  );
+}
+
+function ForkConversationDialog(props: ForkTarget & { onClose(): void }) {
+  const titleId = useId();
+  const inputId = useId();
+  const [idempotencyKey] = useState(() => crypto.randomUUID());
+  const [message, setMessage] = useState("");
+  const navigate = useNavigate();
+  const fork = useForkConversation(props.conversationId);
+  const submit = () => {
+    if (!message.trim() || fork.isPending) return;
+    fork.mutate(
+      { idempotencyKey, message, messageId: props.messageId },
+      {
+        onSuccess: (accepted) => {
+          props.onClose();
+          navigate(conversationPath(accepted.conversationId));
+        },
+      },
+    );
+  };
+  return (
+    <Drawer
+      closeLabel="Close fork dialog"
+      dismissLabel="Dismiss fork dialog"
+      header={
+        <h2 id={titleId} className="m-0 text-lg font-semibold">
+          Fork Conversation
+        </h2>
+      }
+      titleId={titleId}
+      openKey={idempotencyKey}
+      onClose={() => {
+        if (!fork.isPending) props.onClose();
+      }}
+      width="narrow"
+    >
+      <form
+        className="grid gap-4 text-sm"
+        onSubmit={(event) => {
+          event.preventDefault();
+          submit();
+        }}
+      >
+        <p className="m-0">
+          Creates a fork of the conversation from this point.
+        </p>
+        <Field htmlFor={inputId} label="Message">
+          <TextArea
+            id={inputId}
+            prose
+            autoFocus
+            className="min-h-28"
+            placeholder="Message Junior…"
+            value={message}
+            disabled={fork.isPending}
+            onChange={(event) => setMessage(event.target.value)}
+            onKeyDown={(event) => {
+              // Same keys as the composer: Enter sends, Shift+Enter adds a line.
+              if (
+                event.key === "Enter" &&
+                !event.shiftKey &&
+                !event.nativeEvent.isComposing
+              ) {
+                event.preventDefault();
+                submit();
+              }
+            }}
+          />
+        </Field>
+        {fork.error ? (
+          <p role="alert" className="m-0 text-red-300">
+            {(fork.error instanceof DashboardApiError && fork.error.apiError) ||
+              "Could not fork the conversation. Try again."}
+          </p>
+        ) : null}
+        <Button
+          tone="primary"
+          type="submit"
+          disabled={!message.trim() || fork.isPending}
+        >
+          {fork.isPending ? "Forking…" : "Fork and send"}
+        </Button>
+      </form>
+    </Drawer>
+  );
+}

package/src/client/conversations/TranscriptMessageView.tsx

@@ -1,3 +1,4 @@
+import { ForkConversationButton } from "./ForkConversationButton";
 import { TranscriptAttachments } from "./TranscriptAttachment";
 import { ObjectCard } from "./ObjectCard";
 import { AutomationCard } from "../components/AutomationCard";
@@ -46,11 +47,7 @@ export const TranscriptMessageView = memo(
         }}
       >
         <TranscriptMessageHeader
-          contextAction={
-            props.message.role === "user" && props.message.contexts?.length ? (
-              <TranscriptTurnContextView contexts={props.message.contexts} />
-            ) : undefined
-          }
+          action={messageAction(props.message, props.conversation)}
           message={props.message}
           conversation={props.conversation}
         />
@@ -86,6 +83,7 @@ export const TranscriptMessageView = memo(
     previous.message === next.message &&
     previous.conversation.conversationId === next.conversation.conversationId &&
     previous.conversation.surface === next.conversation.surface &&
+    previous.conversation.canFork === next.conversation.canFork &&
     previous.conversation.actorIdentity === next.conversation.actorIdentity,
 );
 
@@ -114,8 +112,31 @@ export function RedactedMessageView(props: {
   );
 }
 
+function messageAction(
+  message: TranscriptViewMessage,
+  conversation: ConversationTranscript,
+): ReactNode {
+  if (message.role === "user" && message.contexts?.length) {
+    return <TranscriptTurnContextView contexts={message.contexts} />;
+  }
+  if (
+    conversation.canFork &&
+    message.role === "assistant" &&
+    message.messageId &&
+    !message.pending
+  ) {
+    return (
+      <ForkConversationButton
+        conversationId={conversation.conversationId}
+        messageId={message.messageId}
+      />
+    );
+  }
+  return undefined;
+}
+
 function TranscriptMessageHeader(props: {
-  contextAction?: ReactNode;
+  action?: ReactNode;
   message: TranscriptViewMessage;
   conversation: ConversationTranscript;
 }) {
@@ -127,7 +148,7 @@ function TranscriptMessageHeader(props: {
   );
 
   return (
-    <TranscriptMessageHeading action={props.contextAction}>
+    <TranscriptMessageHeading action={props.action}>
       <span className={transcriptRoleLabelClass(props.message.role)}>
         {roleLabel}
       </span>

package/src/client/conversations/TranscriptView.tsx

@@ -25,8 +25,10 @@ export function Transcript(props: {
   loadingPreviousPage?: boolean;
   pinRequestVersion?: number;
   onLoadPreviousPage?: () => void;
+  onSelectedEventSeqChange?(seq: number | undefined): void;
   responding?: boolean;
   search?: string;
+  selectedEventSeq?: number;
   onOpenSubagentTranscript?: (args: {
     part: TranscriptViewSubagentPart;
     conversation: ConversationTranscript;
@@ -101,6 +103,8 @@ export function Transcript(props: {
           <ConversationEventLog
             key={props.transcript.conversationId}
             conversation={props.transcript}
+            onSelectedSeqChange={props.onSelectedEventSeqChange}
+            selectedSeq={props.selectedEventSeq}
           />
         ) : (
           <ConversationTranscriptView

package/src/client/conversations/conversationRoutes.ts

@@ -10,3 +10,13 @@ export const NEW_CONVERSATION_PATH = "/";
 export function isNewConversationPath(pathname: string): boolean {
   return pathname === "/" || pathname === "/conversations/new";
 }
+
+/** Query param that opens one event log entry by its sequence number. */
+export const CONVERSATION_EVENT_PARAM = "event";
+
+/** Read a linked event sequence number. Ignore values that are not one. */
+export function parseConversationEventSeq(
+  value: string | null | undefined,
+): number | undefined {
+  return value && /^\d+$/.test(value) ? Number(value) : undefined;
+}

package/src/client/conversations/queries.ts

@@ -25,6 +25,7 @@ import {
   conversationDetailReportSchema,
   conversationEventPageSchema,
   conversationPendingMessagesReportSchema,
+  forkConversationResponseSchema,
 } from "@sentry/junior/api/schema";
 
 import type { DashboardCoreData } from "../types";
@@ -227,6 +228,50 @@ export function useCreateConversation() {
   });
 }
 
+/**
+ * Fork a conversation at one assistant reply and send the first message to
+ * the fork. A retry with the same key returns the same fork and message.
+ */
+export function useForkConversation(sourceConversationId: string) {
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: async (args: {
+      idempotencyKey: string;
+      message: string;
+      messageId: string;
+    }) => {
+      const fork = await post(
+        forkConversationResponseSchema,
+        `/api/conversations/${encodeURIComponent(sourceConversationId)}/forks`,
+        { messageId: args.messageId, idempotencyKey: args.idempotencyKey },
+      );
+      return post(
+        acceptedConversationMessageSchema,
+        `/api/conversations/${encodeURIComponent(fork.conversationId)}/messages`,
+        { idempotencyKey: args.idempotencyKey, message: args.message },
+      );
+    },
+    onSuccess: (accepted, args) => {
+      queryClient.setQueryData<ConversationOutboxMessage[]>(
+        conversationOutboxQueryKey(accepted.conversationId),
+        (current) =>
+          upsertConversationOutboxMessage(current, {
+            ...conversationOutboxMessageForSubmit({
+              idempotencyKey: args.idempotencyKey,
+              message: args.message,
+              actorIdentity: outboxActorIdentity(queryClient),
+              messageId: accepted.messageId,
+            }),
+            status: "accepted",
+          }),
+      );
+      void queryClient.invalidateQueries({
+        queryKey: ["dashboard", "conversations"],
+      });
+    },
+  });
+}
+
 /** Add one dashboard message and refresh the shared transcript. */
 export function useAppendConversationMessage(conversationId: string) {
   const queryClient = useQueryClient();

package/src/client/pages/automations/AutomationDetailsDrawer.tsx

@@ -1,5 +1,11 @@
 import { AutomationLifecycle } from "./AutomationLifecycle";
 import { automationOutcomeLabel } from "./automationOutcomes";
+import {
+  automationEventConditions,
+  automationEventNames,
+  automationScheduleLabel,
+  formatAutomationRunTime,
+} from "./automationFormat";
 import type { AutomationSummary } from "@sentry/junior/api/schema";
 import { Link, useLocation } from "react-router";
 import { Detail, DetailList } from "../../components/DetailList";
@@ -34,26 +40,24 @@ export function AutomationDetailsDrawer(props: {
   ) : (
     automation.createdBy
   );
+  const conditions =
+    automation.kind === "event" ? automationEventConditions(automation) : "";
   const details =
     automation.kind === "scheduled"
       ? [
-          { label: "Schedule", value: automation.schedule },
+          { label: "Schedule", value: automationScheduleLabel(automation) },
           {
             label: "Next run",
             value:
               automation.status === "active" && automation.nextRunAt
-                ? formatRunDate(automation.nextRunAt)
+                ? formatAutomationRunTime(automation.nextRunAt)
                 : "None",
           },
         ]
       : [
           { label: "Watching", value: automation.resource },
-          {
-            label: "Events",
-            value: automation.events
-              .map((event) => event.replaceAll(/[._]/g, " "))
-              .join(", "),
-          },
+          { label: "Events", value: automationEventNames(automation) },
+          ...(conditions ? [{ label: "Conditions", value: conditions }] : []),
         ];
   const titleId = "automation-details-drawer-title";
 
@@ -110,16 +114,24 @@ export function AutomationDetailsDrawer(props: {
             )}
           </Detail>
         </DetailList>
-        {automation.totalRuns > 0 &&
-        automation.lastRunStatus !== "failed" &&
-        automation.lastRunStatus !== "blocked" ? (
+        <div className="flex flex-wrap gap-x-5">
+          {automation.totalRuns > 0 &&
+          automation.lastRunStatus !== "failed" &&
+          automation.lastRunStatus !== "blocked" ? (
+            <Link
+              className="w-fit py-2 text-sm text-dashboard-text underline underline-offset-2"
+              to={`/automations/${automation.kind}/${encodeURIComponent(automation.id)}/executions`}
+            >
+              View all runs
+            </Link>
+          ) : null}
           <Link
             className="w-fit py-2 text-sm text-dashboard-text underline underline-offset-2"
-            to={`/automations/${automation.kind}/${encodeURIComponent(automation.id)}/executions`}
+            to={`/automations/${automation.kind}/${encodeURIComponent(automation.id)}/versions${location.search}`}
           >
-            View all runs
+            Version history
           </Link>
-        ) : null}
+        </div>
         <details>
           <summary className="cursor-pointer py-3 text-sm text-dashboard-text-muted hover:text-dashboard-text focus-visible:outline focus-visible:outline-dashboard-focus">
             More details
@@ -192,10 +204,10 @@ function AutomationExecutionSummary(props: {
             className="text-dashboard-text underline decoration-white/20 underline-offset-2 hover:decoration-white/60"
             to={conversationPath(automation.lastConversationId)}
           >
-            {formatRunDate(automation.lastRunAt)}
+            {formatAutomationRunTime(automation.lastRunAt)}
           </Link>
         ) : automation.lastRunAt ? (
-          formatRunDate(automation.lastRunAt)
+          formatAutomationRunTime(automation.lastRunAt)
         ) : null}
       </span>
     </div>
@@ -208,14 +220,3 @@ function formatDate(value: string): string {
     timeStyle: "short",
   });
 }
-
-function formatRunDate(value: string): string {
-  return formatTime(value, {
-    day: "numeric",
-    hour: "numeric",
-    minute: "2-digit",
-    month: "short",
-    timeZoneName: "short",
-    year: "numeric",
-  });
-}