@anthusai/papyrus 1.0.0-next.64 → 1.0.0-next.65

package/amplify/data/schema.js

@@ -815,7 +815,6 @@ const baseDefinitions = {
     ])
         .authorization((allow) => [
         allow.groups(categoryWriteGroups).to(categoryAppendOnlyOperations),
-        allow.authenticated("identityPool").to(authoringOperations),
     ]),
     AssignmentEvent: modelWithoutSubscriptions({
         id: a.id().required(),
@@ -1395,7 +1394,6 @@ const baseDefinitions = {
     ])
         .authorization((allow) => [
         allow.groups(categoryWriteGroups).to(["read", "create", "update"]),
-        allow.authenticated("identityPool").to(authoringOperations),
     ]),
     ModelAttachment: modelWithoutSubscriptions({
         id: a.id().required(),

package/amplify/data/schema.ts

@@ -886,7 +886,6 @@ const baseDefinitions = {
     ])
     .authorization((allow) => [
       allow.groups(categoryWriteGroups).to(categoryAppendOnlyOperations),
-      allow.authenticated("identityPool").to(authoringOperations),
     ]),
 
   AssignmentEvent: modelWithoutSubscriptions({
@@ -1486,7 +1485,6 @@ const baseDefinitions = {
     ])
     .authorization((allow) => [
       allow.groups(categoryWriteGroups).to(["read", "create", "update"]),
-      allow.authenticated("identityPool").to(authoringOperations),
     ]),
 
   ModelAttachment: modelWithoutSubscriptions({

package/amplify/functions/email-submission-processor/handler.py

@@ -30,8 +30,10 @@ def handler(event: dict[str, Any], _context: Any = None) -> dict[str, Any]:
         event.get("corpusKey")
         or event.get("corpus_key")
         or os.environ.get("PAPYRUS_INBOUND_EMAIL_CORPUS_KEY")
-        or "AI-ML-research"
+        or ""
     ).strip()
+    if not corpus_key:
+        raise ValueError("corpusKey or PAPYRUS_INBOUND_EMAIL_CORPUS_KEY is required.")
 
     from papyrus_content.graphql_authoring import PapyrusGraphQLAuthoringClient
     from papyrus_newsroom.email_submissions import process_email_submission_message

package/amplify/functions/ses-inbound-receive/handler.ts

@@ -2,6 +2,13 @@ import { InvokeCommand, LambdaClient } from "@aws-sdk/client-lambda";
 import { GetObjectCommand, ListObjectsV2Command, S3Client } from "@aws-sdk/client-s3";
 import {
   buildEmailSubmissionMessageInput,
+  isInboundSenderAuthenticated,
+  readInboundSenderAuthenticationFromRawMime,
+  readInboundScanVerdictsFromSesReceipt,
+  REJECTION_KIND_UNAUTHENTICATED_SENDER,
+  UNAUTHENTICATED_SENDER_RESPONSE_ERROR,
+  UNVERIFIED_SENDER_AUTHENTICATION,
+  type InboundSenderAuthentication,
   classifyInboundEmailIntake,
   countInboundAttachments,
   extractDirectCitations,
@@ -49,6 +56,7 @@ type InboundPayload = {
   attachmentCount: number;
   userComposedText: string;
   parentSubmissionMessageId: string | null;
+  senderAuthentication: InboundSenderAuthentication;
 };
 
 type ExistingMessage = {
@@ -123,7 +131,8 @@ async function processInboundSubmission(inbound: InboundPayload): Promise<Record
   const resolvedMessageId = messageId ?? `message-email-submission-${crypto.randomUUID().replace(/-/g, "").slice(0, 20)}`;
   const dataClient = await getLambdaDataClient();
   const profileId = await lookupRegisteredUserProfileId(dataClient, inbound.senderEmail);
-  const authorized = Boolean(profileId);
+  const senderAuthenticated = isInboundSenderAuthenticated(inbound.senderAuthentication, inbound.senderEmail);
+  const authorized = Boolean(profileId) && senderAuthenticated;
   const citations = authorized
     ? (inbound.citations.length > 0
       ? inbound.citations
@@ -143,7 +152,9 @@ async function processInboundSubmission(inbound: InboundPayload): Promise<Record
 
   let status = authorized ? "received" : "rejected";
   let responseStatus = authorized ? "PENDING" : "REJECTED";
-  let responseError: string | null = authorized ? null : UNREGISTERED_SENDER_RESPONSE_ERROR;
+  let responseError: string | null = authorized
+    ? null
+    : (senderAuthenticated ? UNREGISTERED_SENDER_RESPONSE_ERROR : UNAUTHENTICATED_SENDER_RESPONSE_ERROR);
 
   if (authorized && looksLikeResearchAssignmentRequest(inbound.bodyText, citations.length)) {
     status = "rejected";
@@ -173,7 +184,8 @@ async function processInboundSubmission(inbound: InboundPayload): Promise<Record
     s3Bucket: inbound.s3Bucket,
     s3Key: inbound.s3Key,
     authorized,
-    authorUserProfileId: profileId,
+    rejectionKind: senderAuthenticated ? undefined : REJECTION_KIND_UNAUTHENTICATED_SENDER,
+    authorUserProfileId: authorized ? profileId : null,
     authorLabel: inbound.senderEmail || "unknown-sender",
     citations,
     status,
@@ -205,7 +217,7 @@ async function processInboundSubmission(inbound: InboundPayload): Promise<Record
 
   if (authorized && responseStatus === "PENDING" && PROCESSOR_FUNCTION_NAME) {
     await invokeEmailProcessor(resolvedMessageId);
-  } else if (responseStatus === "REJECTED" && PROCESSOR_FUNCTION_NAME) {
+  } else if (responseStatus === "REJECTED" && senderAuthenticated && PROCESSOR_FUNCTION_NAME) {
     await invokeEmailProcessor(resolvedMessageId, { sendFeedbackOnly: true });
   }
 
@@ -390,6 +402,7 @@ async function resolveFromSesMail(
       senderEmail: loaded.senderEmail || senderEmail,
       recipients: loaded.recipients.length > 0 ? loaded.recipients : recipients,
       subject: loaded.subject !== "(no subject)" ? loaded.subject : subject,
+      senderAuthentication: mergeScanVerdicts(loaded.senderAuthentication, readInboundScanVerdictsFromSesReceipt(receipt)),
     };
   }
 
@@ -407,6 +420,7 @@ async function resolveFromSesMail(
     attachmentCount: 0,
     userComposedText: "",
     parentSubmissionMessageId: null,
+    senderAuthentication: { ...UNVERIFIED_SENDER_AUTHENTICATION, ...readInboundScanVerdictsFromSesReceipt(receipt) },
   });
 }
 
@@ -433,6 +447,7 @@ async function loadInboundFromS3Object(
     attachmentCount: countInboundAttachments(rawBytes),
     userComposedText: extractUserComposedReplyText(intake.bodyText),
     parentSubmissionMessageId: null,
+    senderAuthentication: readInboundSenderAuthenticationFromRawMime(rawBytes),
   });
 }
 
@@ -446,6 +461,19 @@ function enrichInboundPayload(payload: InboundPayload): InboundPayload {
   };
 }
 
+function mergeScanVerdicts(
+  authentication: InboundSenderAuthentication,
+  receiptVerdicts: Pick<InboundSenderAuthentication, "spamVerdict" | "virusVerdict">,
+): InboundSenderAuthentication {
+  const worst = (fromMime: string, fromReceipt: string) =>
+    fromMime === "fail" || fromReceipt === "fail" ? "fail" : fromMime !== "unknown" ? fromMime : fromReceipt;
+  return {
+    ...authentication,
+    spamVerdict: worst(authentication.spamVerdict, receiptVerdicts.spamVerdict),
+    virusVerdict: worst(authentication.virusVerdict, receiptVerdicts.virusVerdict),
+  };
+}
+
 function sesMessageIdFromObjectKey(key: string): string | null {
   const basename = key.split("/").pop() ?? "";
   const match = basename.match(/^[A-Za-z0-9_-]+$/);

package/amplify/functions/shared/email-submission.ts

@@ -11,6 +11,113 @@ export const REJECTION_KIND_UNREGISTERED_SENDER = "unregistered_sender";
 export const UNREGISTERED_SENDER_RESPONSE_ERROR =
   "This submission was not accepted because only registered Papyrus users may send reference submissions by email.";
 
+export const UNAUTHENTICATED_SENDER_RESPONSE_ERROR =
+  "This submission was not accepted because the sender could not be authenticated (SPF or DKIM must pass).";
+export const REJECTION_KIND_UNAUTHENTICATED_SENDER = "unauthenticated_sender";
+
+export type InboundSenderAuthentication = {
+  spfPassDomains: string[];
+  dkimPassDomains: string[];
+  spamVerdict: string;
+  virusVerdict: string;
+};
+
+const TRUSTED_AUTHENTICATION_RESULTS_SERVER_ID = "amazonses.com";
+
+export const UNVERIFIED_SENDER_AUTHENTICATION: InboundSenderAuthentication = {
+  spfPassDomains: [],
+  dkimPassDomains: [],
+  spamVerdict: "unknown",
+  virusVerdict: "unknown",
+};
+
+function domainOfAddress(address: string): string {
+  return normalizeEmailAddress(address).split("@")[1] ?? "";
+}
+
+function domainsAreAligned(authenticatedDomain: string, fromDomain: string): boolean {
+  if (!authenticatedDomain || !fromDomain) return false;
+  return authenticatedDomain === fromDomain
+    || fromDomain.endsWith(`.${authenticatedDomain}`)
+    || authenticatedDomain.endsWith(`.${fromDomain}`);
+}
+
+export function isInboundSenderAuthenticated(
+  authentication: InboundSenderAuthentication,
+  fromAddress: string,
+): boolean {
+  if (authentication.spamVerdict === "fail" || authentication.virusVerdict === "fail") return false;
+  const fromDomain = domainOfAddress(fromAddress);
+  return [...authentication.spfPassDomains, ...authentication.dkimPassDomains]
+    .some((domain) => domainsAreAligned(domain, fromDomain));
+}
+
+export function readInboundScanVerdictsFromSesReceipt(
+  receipt: Record<string, unknown> | undefined,
+): Pick<InboundSenderAuthentication, "spamVerdict" | "virusVerdict"> {
+  const verdictStatus = (key: string): string => {
+    const verdict = receipt?.[key];
+    const status = verdict && typeof verdict === "object" ? (verdict as { status?: unknown }).status : null;
+    return typeof status === "string" ? status.trim().toLowerCase() : "unknown";
+  };
+  return { spamVerdict: verdictStatus("spamVerdict"), virusVerdict: verdictStatus("virusVerdict") };
+}
+
+function readHeaderBlock(rawBytes: Uint8Array): string[] {
+  const raw = Buffer.from(rawBytes).toString("utf8");
+  const headerBlockEnd = raw.search(/\r?\n\r?\n/);
+  const headerBlock = headerBlockEnd === -1 ? raw : raw.slice(0, headerBlockEnd);
+  return headerBlock.replace(/\r?\n[ \t]+/g, " ").split(/\r?\n/);
+}
+
+function firstHeaderValue(headerLines: string[], name: string): string | null {
+  const prefix = new RegExp(`^${name}:\\s*`, "i");
+  const line = headerLines.find((entry) => prefix.test(entry));
+  return line ? line.replace(prefix, "") : null;
+}
+
+export function readInboundSenderAuthenticationFromRawMime(rawBytes: Uint8Array): InboundSenderAuthentication {
+  const headerLines = readHeaderBlock(rawBytes);
+  const verdictHeader = (name: string): string =>
+    (firstHeaderValue(headerLines, name) ?? "unknown").trim().toLowerCase();
+  const scanVerdicts = {
+    spamVerdict: verdictHeader("X-SES-Spam-Verdict"),
+    virusVerdict: verdictHeader("X-SES-Virus-Verdict"),
+  };
+  const topmostResults = firstHeaderValue(headerLines, "Authentication-Results");
+  if (!topmostResults) return { ...UNVERIFIED_SENDER_AUTHENTICATION, ...scanVerdicts };
+  const [serverId, ...parts] = topmostResults.replace(/\([^)]*\)/g, "").split(";").map((part) => part.trim());
+  if (serverId.toLowerCase() !== TRUSTED_AUTHENTICATION_RESULTS_SERVER_ID) {
+    return { ...UNVERIFIED_SENDER_AUTHENTICATION, ...scanVerdicts };
+  }
+
+  const spfPassDomains: string[] = [];
+  const dkimPassDomains: string[] = [];
+  let spfPassed = false;
+  let envelopeFromDomain = "";
+  let heloDomain = "";
+  for (const part of parts) {
+    const result = /^(spf|dkim)\s*=\s*([a-z]+)/i.exec(part);
+    if (result) {
+      const passed = result[2].toLowerCase() === "pass";
+      if (result[1].toLowerCase() === "spf") spfPassed = spfPassed || passed;
+      else if (passed) {
+        const signingDomain = /header\.(?:i|d)\s*=\s*@?([^\s;]+)/i.exec(part)?.[1];
+        if (signingDomain) dkimPassDomains.push(signingDomain.toLowerCase().replace(/^.*@/, ""));
+      }
+    }
+    const envelopeFrom = /^(?:envelope-from|smtp\.mailfrom)\s*=\s*(\S+)/i.exec(part)?.[1];
+    if (envelopeFrom) envelopeFromDomain = domainOfAddress(envelopeFrom.replace(/^<|>$/g, ""));
+    const helo = /^(?:helo|smtp\.helo)\s*=\s*(\S+)/i.exec(part)?.[1];
+    if (helo) heloDomain = helo.toLowerCase();
+  }
+  if (spfPassed) {
+    const spfDomain = envelopeFromDomain || heloDomain;
+    if (spfDomain) spfPassDomains.push(spfDomain);
+  }
+  return { spfPassDomains, dkimPassDomains, ...scanVerdicts };
+}
+
 const URL_PATTERN = /https?:\/\/[^\s<>"')\]]+/gi;
 const DOI_PATTERN = /\b10\.\d{4,9}\/[-._;()/:A-Z0-9]+/gi;
 const RESEARCH_ASSIGNMENT_PHRASES = [
@@ -337,6 +444,7 @@ export function buildEmailSubmissionMessageInput(input: {
   s3Bucket: string | null;
   s3Key: string | null;
   authorized: boolean;
+  rejectionKind?: string;
   authorUserProfileId: string | null;
   authorLabel: string;
   citations: Array<Record<string, unknown>>;
@@ -378,7 +486,7 @@ export function buildEmailSubmissionMessageInput(input: {
       ...(input.authorized
         ? {}
         : {
-            rejectionKind: REJECTION_KIND_UNREGISTERED_SENDER,
+            rejectionKind: input.rejectionKind ?? REJECTION_KIND_UNREGISTERED_SENDER,
           }),
       directCitationCount: input.citations.length,
       directCitations: input.citations,

package/app/tailwind.css

@@ -3,14 +3,8 @@
 @source "../components/**/*.{ts,tsx}";
 @source "../app/**/*.{ts,tsx}";
 @source "../lib/**/*.{ts,tsx}";
-@source "../../../streamdown/dist/*.js";
-@source "../../../@streamdown/code/dist/*.js";
-@source "../../../@streamdown/cjk/dist/*.js";
-@source "../../../@streamdown/math/dist/*.js";
-@source "../../../@streamdown/mermaid/dist/*.js";
 @import "tw-animate-css";
 @import "shadcn/tailwind.css";
-@import "streamdown/styles.css";
 
 @custom-variant dark (&:is(.dark *));
 

package/components/topic-steering-workspace.tsx

@@ -263,7 +263,6 @@ type TopicProposalEditState = {
 };
 type AnalysisCommandPlanEntry = {
   label: string;
-  cwd: string;
   executable: string;
   args: string[];
   metadata?: Record<string, unknown>;
@@ -13607,7 +13606,6 @@ function buildAnalysisDestructivePreview({
 function analysisCommand(label: string, args: string[], mode: AnalysisReindexMode): AnalysisCommandPlanEntry {
   return {
     label,
-    cwd: "/Users/ryan/Projects/Biblicus",
     executable: "uv",
     args: ["run", "--extra", "topic-modeling", "biblicus", ...args],
     metadata: { mode },

package/package.json

@@ -65,7 +65,6 @@
       "default": "./infra/index.js"
     },
     "./components/ai-elements/conversation": "./components/ai-elements/conversation.tsx",
-    "./components/ai-elements/message": "./components/ai-elements/message.tsx",
     "./components/ai-elements/model-selector": "./components/ai-elements/model-selector.tsx",
     "./components/ai-elements/prompt-input": "./components/ai-elements/prompt-input.tsx",
     "./components/ai-elements/shimmer": "./components/ai-elements/shimmer.tsx",
@@ -340,7 +339,7 @@
       "optional": true
     }
   },
-  "version": "1.0.0-next.64",
+  "version": "1.0.0-next.65",
   "dependencies": {
     "@aws-amplify/adapter-nextjs": "^1.7.3",
     "@aws-crypto/sha256-js": "5.2.0",
@@ -357,10 +356,6 @@
     "@radix-ui/colors": "3.0.0",
     "@smithy/protocol-http": "5.4.1",
     "@smithy/signature-v4": "5.7.4",
-    "@streamdown/cjk": "^1.0.3",
-    "@streamdown/code": "^1.1.1",
-    "@streamdown/math": "^1.0.2",
-    "@streamdown/mermaid": "^1.0.2",
     "@tailwindcss/postcss": "^4.3.0",
     "ai": "^6.0.191",
     "anthus-vultus": "github:AnthusAI/Vultus#af98d57",
@@ -373,12 +368,10 @@
     "esbuild": "^0.28.2",
     "gray-matter": "^4.0.3",
     "gsap": "^3.15.0",
-    "katex": "^0.17.0",
     "lucide-react": "^1.16.0",
     "motion": "^12.40.0",
     "nanoid": "^5.1.11",
     "shadcn": "^4.8.0",
-    "streamdown": "^2.5.0",
     "tailwind-merge": "^3.6.0",
     "tailwindcss": "^4.3.0",
     "tsx": "^4.23.15",

package/routes.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-next.64",
+  "version": "1.0.0-next.65",
   "routes": [
     {
       "file": "app/%5F_preview/[[...path]]/route.ts",

package/components/ai-elements/message.tsx

@@ -1,360 +0,0 @@
-"use client";
-
-import { Button } from "../ui/button";
-import {
-  ButtonGroup,
-  ButtonGroupText,
-} from "../ui/button-group";
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipProvider,
-  TooltipTrigger,
-} from "../ui/tooltip";
-import { cn } from "../../lib/utils";
-import { cjk } from "@streamdown/cjk";
-import { code } from "@streamdown/code";
-import { math } from "@streamdown/math";
-import { mermaid } from "@streamdown/mermaid";
-import type { UIMessage } from "ai";
-import { ChevronLeftIcon, ChevronRightIcon } from "lucide-react";
-import type { ComponentProps, HTMLAttributes, ReactElement } from "react";
-import {
-  createContext,
-  memo,
-  useCallback,
-  useContext,
-  useEffect,
-  useMemo,
-  useState,
-} from "react";
-import { Streamdown } from "streamdown";
-
-export type MessageProps = HTMLAttributes<HTMLDivElement> & {
-  from: UIMessage["role"];
-};
-
-export const Message = ({ className, from, ...props }: MessageProps) => (
-  <div
-    className={cn(
-      "group flex w-full max-w-[95%] flex-col gap-2",
-      from === "user" ? "is-user ml-auto justify-end" : "is-assistant",
-      className
-    )}
-    {...props}
-  />
-);
-
-export type MessageContentProps = HTMLAttributes<HTMLDivElement>;
-
-export const MessageContent = ({
-  children,
-  className,
-  ...props
-}: MessageContentProps) => (
-  <div
-    className={cn(
-      "is-user:dark flex w-fit min-w-0 max-w-full flex-col gap-2 overflow-hidden text-sm",
-      "group-[.is-user]:ml-auto group-[.is-user]:rounded-lg group-[.is-user]:bg-secondary group-[.is-user]:px-4 group-[.is-user]:py-3 group-[.is-user]:text-foreground",
-      "group-[.is-assistant]:text-foreground",
-      className
-    )}
-    {...props}
-  >
-    {children}
-  </div>
-);
-
-export type MessageActionsProps = ComponentProps<"div">;
-
-export const MessageActions = ({
-  className,
-  children,
-  ...props
-}: MessageActionsProps) => (
-  <div className={cn("flex items-center gap-1", className)} {...props}>
-    {children}
-  </div>
-);
-
-export type MessageActionProps = ComponentProps<typeof Button> & {
-  tooltip?: string;
-  label?: string;
-};
-
-export const MessageAction = ({
-  tooltip,
-  children,
-  label,
-  variant = "ghost",
-  size = "icon-sm",
-  ...props
-}: MessageActionProps) => {
-  const button = (
-    <Button size={size} type="button" variant={variant} {...props}>
-      {children}
-      <span className="sr-only">{label || tooltip}</span>
-    </Button>
-  );
-
-  if (tooltip) {
-    return (
-      <TooltipProvider>
-        <Tooltip>
-          <TooltipTrigger>{button}</TooltipTrigger>
-          <TooltipContent>
-            <p>{tooltip}</p>
-          </TooltipContent>
-        </Tooltip>
-      </TooltipProvider>
-    );
-  }
-
-  return button;
-};
-
-interface MessageBranchContextType {
-  currentBranch: number;
-  totalBranches: number;
-  goToPrevious: () => void;
-  goToNext: () => void;
-  branches: ReactElement[];
-  setBranches: (branches: ReactElement[]) => void;
-}
-
-const MessageBranchContext = createContext<MessageBranchContextType | null>(
-  null
-);
-
-const useMessageBranch = () => {
-  const context = useContext(MessageBranchContext);
-
-  if (!context) {
-    throw new Error(
-      "MessageBranch components must be used within MessageBranch"
-    );
-  }
-
-  return context;
-};
-
-export type MessageBranchProps = HTMLAttributes<HTMLDivElement> & {
-  defaultBranch?: number;
-  onBranchChange?: (branchIndex: number) => void;
-};
-
-export const MessageBranch = ({
-  defaultBranch = 0,
-  onBranchChange,
-  className,
-  ...props
-}: MessageBranchProps) => {
-  const [currentBranch, setCurrentBranch] = useState(defaultBranch);
-  const [branches, setBranches] = useState<ReactElement[]>([]);
-
-  const handleBranchChange = useCallback(
-    (newBranch: number) => {
-      setCurrentBranch(newBranch);
-      onBranchChange?.(newBranch);
-    },
-    [onBranchChange]
-  );
-
-  const goToPrevious = useCallback(() => {
-    const newBranch =
-      currentBranch > 0 ? currentBranch - 1 : branches.length - 1;
-    handleBranchChange(newBranch);
-  }, [currentBranch, branches.length, handleBranchChange]);
-
-  const goToNext = useCallback(() => {
-    const newBranch =
-      currentBranch < branches.length - 1 ? currentBranch + 1 : 0;
-    handleBranchChange(newBranch);
-  }, [currentBranch, branches.length, handleBranchChange]);
-
-  const contextValue = useMemo<MessageBranchContextType>(
-    () => ({
-      branches,
-      currentBranch,
-      goToNext,
-      goToPrevious,
-      setBranches,
-      totalBranches: branches.length,
-    }),
-    [branches, currentBranch, goToNext, goToPrevious]
-  );
-
-  return (
-    <MessageBranchContext.Provider value={contextValue}>
-      <div
-        className={cn("grid w-full gap-2 [&>div]:pb-0", className)}
-        {...props}
-      />
-    </MessageBranchContext.Provider>
-  );
-};
-
-export type MessageBranchContentProps = HTMLAttributes<HTMLDivElement>;
-
-export const MessageBranchContent = ({
-  children,
-  ...props
-}: MessageBranchContentProps) => {
-  const { currentBranch, setBranches, branches } = useMessageBranch();
-  const childrenArray = useMemo(
-    () => (Array.isArray(children) ? children : [children]),
-    [children]
-  );
-
-  // Use useEffect to update branches when they change
-  useEffect(() => {
-    if (branches.length !== childrenArray.length) {
-      setBranches(childrenArray);
-    }
-  }, [childrenArray, branches, setBranches]);
-
-  return childrenArray.map((branch, index) => (
-    <div
-      className={cn(
-        "grid gap-2 overflow-hidden [&>div]:pb-0",
-        index === currentBranch ? "block" : "hidden"
-      )}
-      key={branch.key}
-      {...props}
-    >
-      {branch}
-    </div>
-  ));
-};
-
-export type MessageBranchSelectorProps = ComponentProps<typeof ButtonGroup>;
-
-export const MessageBranchSelector = ({
-  className,
-  ...props
-}: MessageBranchSelectorProps) => {
-  const { totalBranches } = useMessageBranch();
-
-  // Don't render if there's only one branch
-  if (totalBranches <= 1) {
-    return null;
-  }
-
-  return (
-    <ButtonGroup
-      className={cn(
-        "[&>*:not(:first-child)]:rounded-l-md [&>*:not(:last-child)]:rounded-r-md",
-        className
-      )}
-      orientation="horizontal"
-      {...props}
-    />
-  );
-};
-
-export type MessageBranchPreviousProps = ComponentProps<typeof Button>;
-
-export const MessageBranchPrevious = ({
-  children,
-  ...props
-}: MessageBranchPreviousProps) => {
-  const { goToPrevious, totalBranches } = useMessageBranch();
-
-  return (
-    <Button
-      aria-label="Previous branch"
-      disabled={totalBranches <= 1}
-      onClick={goToPrevious}
-      size="icon-sm"
-      type="button"
-      variant="ghost"
-      {...props}
-    >
-      {children ?? <ChevronLeftIcon size={14} />}
-    </Button>
-  );
-};
-
-export type MessageBranchNextProps = ComponentProps<typeof Button>;
-
-export const MessageBranchNext = ({
-  children,
-  ...props
-}: MessageBranchNextProps) => {
-  const { goToNext, totalBranches } = useMessageBranch();
-
-  return (
-    <Button
-      aria-label="Next branch"
-      disabled={totalBranches <= 1}
-      onClick={goToNext}
-      size="icon-sm"
-      type="button"
-      variant="ghost"
-      {...props}
-    >
-      {children ?? <ChevronRightIcon size={14} />}
-    </Button>
-  );
-};
-
-export type MessageBranchPageProps = HTMLAttributes<HTMLSpanElement>;
-
-export const MessageBranchPage = ({
-  className,
-  ...props
-}: MessageBranchPageProps) => {
-  const { currentBranch, totalBranches } = useMessageBranch();
-
-  return (
-    <ButtonGroupText
-      className={cn(
-        "border-none bg-transparent text-muted-foreground shadow-none",
-        className
-      )}
-      {...props}
-    >
-      {currentBranch + 1} of {totalBranches}
-    </ButtonGroupText>
-  );
-};
-
-export type MessageResponseProps = ComponentProps<typeof Streamdown>;
-
-const streamdownPlugins = { cjk, code, math, mermaid };
-
-export const MessageResponse = memo(
-  ({ className, ...props }: MessageResponseProps) => (
-    <Streamdown
-      className={cn(
-        "size-full [&>*:first-child]:mt-0 [&>*:last-child]:mb-0",
-        className
-      )}
-      plugins={streamdownPlugins}
-      {...props}
-    />
-  ),
-  (prevProps, nextProps) =>
-    prevProps.children === nextProps.children &&
-    nextProps.isAnimating === prevProps.isAnimating
-);
-
-MessageResponse.displayName = "MessageResponse";
-
-export type MessageToolbarProps = ComponentProps<"div">;
-
-export const MessageToolbar = ({
-  className,
-  children,
-  ...props
-}: MessageToolbarProps) => (
-  <div
-    className={cn(
-      "mt-4 flex w-full items-center justify-between gap-4",
-      className
-    )}
-    {...props}
-  >
-    {children}
-  </div>
-);