diff --git a/front/components/assistant/AssistantPreview.tsx b/front/components/assistant/AssistantPreview.tsx
index 8b7a6d29aae3..11c7e0516a58 100644
--- a/front/components/assistant/AssistantPreview.tsx
+++ b/front/components/assistant/AssistantPreview.tsx
@@ -4,7 +4,6 @@ import {
   Chip,
   DashIcon,
   MoreIcon,
-  PlayIcon,
   PlusIcon,
 } from "@dust-tt/sparkle";
 import {
@@ -29,7 +28,6 @@ interface AssistantPreviewProps {
   onUpdate: () => void;
   variant: AssistantPreviewVariant;
   flow: AssistantPreviewFlow;
-  setTestModalAssistant?: (agentConfiguration: AgentConfigurationType) => void;
 }
 
 function getDescriptionClassName(variant: AssistantPreviewVariant): string {
@@ -57,7 +55,6 @@ export function AssistantPreview({
   onUpdate,
   variant,
   flow,
-  setTestModalAssistant,
 }: AssistantPreviewProps) {
   const [isUpdatingList, setIsUpdatingList] = useState<boolean>(false);
   // TODO(flav) Move notification logic to the caller. This maintains the purity of the component by
@@ -203,24 +200,7 @@ export function AssistantPreview({
     default:
       assertNever(flow);
   }
-  let testButton = null;
-  if (
-    setTestModalAssistant &&
-    ((flow === "workspace" && agentConfiguration.scope === "published") ||
-      (flow === "personal" &&
-        agentConfiguration.userListStatus === "not-in-list"))
-  ) {
-    testButton = (
-      <Button
-        key="test"
-        variant="tertiary"
-        icon={PlayIcon}
-        size="xs"
-        label={"Test"}
-        onClick={() => setTestModalAssistant(agentConfiguration)}
-      />
-    );
-  }
+
   const showAssistantButton = (
     <Button
       key="show_details"
@@ -288,9 +268,7 @@ export function AssistantPreview({
 
   // Define button groups with JSX elements, including default buttons
   const buttonGroups: Record<AssistantPreviewVariant, JSX.Element[]> = {
-    gallery: [addButton, testButton, showAssistantButton].filter(
-      Boolean
-    ) as JSX.Element[],
+    gallery: [addButton, showAssistantButton].filter(Boolean) as JSX.Element[],
     home: defaultButtons,
   };
 
diff --git a/front/components/assistant/TryAssistantModal.tsx b/front/components/assistant/TryAssistantModal.tsx
deleted file mode 100644
index b75e44fe872d..000000000000
--- a/front/components/assistant/TryAssistantModal.tsx
+++ /dev/null
@@ -1,121 +0,0 @@
-import { Modal } from "@dust-tt/sparkle";
-import {
-  AgentConfigurationType,
-  AgentMention,
-  ConversationType,
-  MentionType,
-  UserType,
-} from "@dust-tt/types";
-import { WorkspaceType } from "@dust-tt/types";
-import { useContext, useEffect, useState } from "react";
-
-import Conversation from "@app/components/assistant/conversation/Conversation";
-import { GenerationContextProvider } from "@app/components/assistant/conversation/GenerationContextProvider";
-import { FixedAssistantInputBar } from "@app/components/assistant/conversation/input_bar/InputBar";
-import {
-  createConversationWithMessage,
-  submitMessage,
-} from "@app/components/assistant/conversation/lib";
-import { SendNotificationsContext } from "@app/components/sparkle/Notification";
-
-export function TryAssistantModal({
-  owner,
-  user,
-  assistant,
-  onClose,
-}: {
-  owner: WorkspaceType;
-  user: UserType;
-  assistant: AgentConfigurationType;
-  onClose: () => void;
-}) {
-  const [stickyMentions, setStickyMentions] = useState<AgentMention[]>([
-    { configurationId: assistant?.sId as string },
-  ]);
-  const [conversation, setConversation] = useState<ConversationType | null>(
-    null
-  );
-  const sendNotification = useContext(SendNotificationsContext);
-
-  const handleSubmit = async (
-    input: string,
-    mentions: MentionType[],
-    contentFragment?: {
-      title: string;
-      content: string;
-    }
-  ) => {
-    const messageData = { input, mentions, contentFragment };
-    if (!conversation) {
-      const result = await createConversationWithMessage({
-        owner,
-        user,
-        messageData,
-        visibility: "test",
-        title: `Trying @${assistant.name}`,
-      });
-      if (result.isOk()) {
-        setConversation(result.value);
-        return;
-      }
-      sendNotification({
-        title: result.error.title,
-        description: result.error.message,
-        type: "error",
-      });
-    } else {
-      const result = await submitMessage({
-        owner,
-        user,
-        conversationId: conversation.sId as string,
-        messageData,
-      });
-      if (result.isOk()) return;
-      sendNotification({
-        title: result.error.title,
-        description: result.error.message,
-        type: "error",
-      });
-    }
-  };
-
-  useEffect(() => {
-    setStickyMentions([{ configurationId: assistant?.sId as string }]);
-  }, [assistant]);
-
-  return (
-    <Modal
-      isOpen={!!assistant}
-      title={`Trying @${assistant?.name}`}
-      onClose={async () => {
-        onClose();
-        if (conversation && "sId" in conversation) {
-          setConversation(null);
-        }
-      }}
-      hasChanged={false}
-      variant="side-md"
-    >
-      <GenerationContextProvider>
-        {conversation && (
-          <Conversation
-            owner={owner}
-            user={user}
-            conversationId={conversation.sId}
-            onStickyMentionsChange={setStickyMentions}
-          />
-        )}
-
-        <div className="lg:[&>*]:left-0">
-          <FixedAssistantInputBar
-            owner={owner}
-            onSubmit={handleSubmit}
-            stickyMentions={stickyMentions}
-            conversationId={conversation?.sId || null}
-            additionalAgentConfigurations={[assistant]}
-          />
-        </div>
-      </GenerationContextProvider>
-    </Modal>
-  );
-}
diff --git a/front/components/assistant/conversation/input_bar/InputBar.tsx b/front/components/assistant/conversation/input_bar/InputBar.tsx
index eb376132666f..581976e3dcf3 100644
--- a/front/components/assistant/conversation/input_bar/InputBar.tsx
+++ b/front/components/assistant/conversation/input_bar/InputBar.tsx
@@ -45,7 +45,6 @@ export function AssistantInputBar({
   onSubmit,
   conversationId,
   stickyMentions,
-  additionalAgentConfigurations,
 }: {
   owner: WorkspaceType;
   onSubmit: (
@@ -55,7 +54,6 @@ export function AssistantInputBar({
   ) => void;
   conversationId: string | null;
   stickyMentions?: AgentMention[];
-  additionalAgentConfigurations?: AgentConfigurationType[];
 }) {
   const [contentFragmentBody, setContentFragmentBody] = useState<
     string | undefined
@@ -67,8 +65,6 @@ export function AssistantInputBar({
     workspaceId: owner.sId,
     agentsGetView: conversationId ? { conversationId } : "list",
   });
-  agentConfigurations.push(...(additionalAgentConfigurations ?? []));
-
   const sendNotification = useContext(SendNotificationsContext);
 
   const [isAnimating, setIsAnimating] = useState<boolean>(false);
@@ -269,7 +265,6 @@ export function FixedAssistantInputBar({
   onSubmit,
   stickyMentions,
   conversationId,
-  additionalAgentConfigurations,
 }: {
   owner: WorkspaceType;
   onSubmit: (
@@ -279,7 +274,6 @@ export function FixedAssistantInputBar({
   ) => void;
   stickyMentions?: AgentMention[];
   conversationId: string | null;
-  additionalAgentConfigurations?: AgentConfigurationType[];
 }) {
   return (
     <div className="4xl:px-0 fixed bottom-0 left-0 right-0 z-20 flex-initial lg:left-80">
@@ -289,7 +283,6 @@ export function FixedAssistantInputBar({
           onSubmit={onSubmit}
           conversationId={conversationId}
           stickyMentions={stickyMentions}
-          additionalAgentConfigurations={additionalAgentConfigurations}
         />
       </div>
     </div>
diff --git a/front/components/assistant/conversation/lib.ts b/front/components/assistant/conversation/lib.ts
deleted file mode 100644
index cc00f92bf88e..000000000000
--- a/front/components/assistant/conversation/lib.ts
+++ /dev/null
@@ -1,206 +0,0 @@
-import {
-  ConversationType,
-  ConversationVisibility,
-  Err,
-  InternalPostConversationsRequestBodySchema,
-  MentionType,
-  Ok,
-  Result,
-  UserType,
-  WorkspaceType,
-} from "@dust-tt/types";
-import * as t from "io-ts";
-
-import { NotificationType } from "@app/components/sparkle/Notification";
-import { PostConversationsResponseBody } from "@app/pages/api/w/[wId]/assistant/conversations";
-
-export type ConversationErrorType = {
-  type:
-    | "attachment_upload_error"
-    | "message_send_error"
-    | "plan_limit_reached_error";
-  title: string;
-  message: string;
-};
-
-export async function submitMessage({
-  owner,
-  user,
-  conversationId,
-  messageData,
-}: {
-  owner: WorkspaceType;
-  user: UserType;
-  conversationId: string;
-  messageData: {
-    input: string;
-    mentions: MentionType[];
-    contentFragment?: {
-      title: string;
-      content: string;
-    };
-  };
-}): Promise<Result<void, ConversationErrorType>> {
-  const { input, mentions, contentFragment } = messageData;
-  // Create a new content fragment.
-  if (contentFragment) {
-    const mcfRes = await fetch(
-      `/api/w/${owner.sId}/assistant/conversations/${conversationId}/content_fragment`,
-      {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-        },
-        body: JSON.stringify({
-          title: contentFragment.title,
-          content: contentFragment.content,
-          url: null,
-          contentType: "file_attachment",
-          context: {
-            timezone: Intl.DateTimeFormat().resolvedOptions().timeZone || "UTC",
-            profilePictureUrl: user.image,
-          },
-        }),
-      }
-    );
-
-    if (!mcfRes.ok) {
-      const data = await mcfRes.json();
-      console.error("Error creating content fragment", data);
-      return new Err({
-        type: "attachment_upload_error",
-        title: "Error uploading file.",
-        message: data.error.message || "Please try again or contact us.",
-      });
-    }
-  }
-
-  // Create a new user message.
-  const mRes = await fetch(
-    `/api/w/${owner.sId}/assistant/conversations/${conversationId}/messages`,
-    {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({
-        content: input,
-        context: {
-          timezone: Intl.DateTimeFormat().resolvedOptions().timeZone || "UTC",
-          profilePictureUrl: user.image,
-        },
-        mentions,
-      }),
-    }
-  );
-
-  if (!mRes.ok) {
-    const data = await mRes.json();
-    return new Err({
-      type:
-        data.error.type === "test_plan_message_limit_reached"
-          ? "plan_limit_reached_error"
-          : "message_send_error",
-      title: "Your message could not be sent.",
-      message: data.error.message || "Please try again or contact us.",
-    });
-  }
-  return new Ok(undefined);
-}
-
-export async function deleteConversation({
-  workspaceId,
-  conversationId,
-  sendNotification,
-}: {
-  workspaceId: string;
-  conversationId: string;
-  sendNotification: (notification: NotificationType) => void;
-}) {
-  const res = await fetch(
-    `/api/w/${workspaceId}/assistant/conversations/${conversationId}`,
-    {
-      method: "DELETE",
-    }
-  );
-
-  if (!res.ok) {
-    const data = await res.json();
-    sendNotification({
-      title: "Error deleting conversation.",
-      description: data.error.message || "Please try again or contact us.",
-      type: "error",
-    });
-    return;
-  }
-}
-
-export async function createConversationWithMessage({
-  owner,
-  user,
-  messageData,
-  visibility = "unlisted",
-  title,
-}: {
-  owner: WorkspaceType;
-  user: UserType;
-  messageData: {
-    input: string;
-    mentions: MentionType[];
-    contentFragment?: {
-      title: string;
-      content: string;
-    };
-  };
-  visibility?: ConversationVisibility;
-  title?: string;
-}): Promise<Result<ConversationType, ConversationErrorType>> {
-  const { input, mentions, contentFragment } = messageData;
-  const body: t.TypeOf<typeof InternalPostConversationsRequestBodySchema> = {
-    title: title ?? null,
-    visibility,
-    message: {
-      content: input,
-      context: {
-        timezone: Intl.DateTimeFormat().resolvedOptions().timeZone || "UTC",
-        profilePictureUrl: user.image,
-      },
-      mentions,
-    },
-    contentFragment: contentFragment
-      ? {
-          ...contentFragment,
-          contentType: "file_attachment",
-          url: null,
-          context: {
-            profilePictureUrl: user.image,
-          },
-        }
-      : undefined,
-  };
-
-  // Create new conversation and post the initial message at the same time.
-  const cRes = await fetch(`/api/w/${owner.sId}/assistant/conversations`, {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-    },
-    body: JSON.stringify(body),
-  });
-
-  if (!cRes.ok) {
-    const data = await cRes.json();
-    return new Err({
-      type:
-        data.error.type === "test_plan_message_limit_reached"
-          ? "plan_limit_reached_error"
-          : "message_send_error",
-      title: "Your message could not be sent.",
-      message: data.error.message || "Please try again or contact us.",
-    });
-  }
-
-  return new Ok(
-    ((await cRes.json()) as PostConversationsResponseBody).conversation
-  );
-}
diff --git a/front/components/sparkle/Notification.tsx b/front/components/sparkle/Notification.tsx
index 000d398d42ee..0c34a00e998f 100644
--- a/front/components/sparkle/Notification.tsx
+++ b/front/components/sparkle/Notification.tsx
@@ -11,7 +11,7 @@ import { createPortal } from "react-dom";
 
 import { classNames } from "@app/lib/utils";
 
-export type NotificationType = {
+type NotificationType = {
   title?: string;
   description?: string;
   type: "success" | "error";
diff --git a/front/lib/api/assistant/conversation.ts b/front/lib/api/assistant/conversation.ts
index b392daddaaac..68dcf2fe579b 100644
--- a/front/lib/api/assistant/conversation.ts
+++ b/front/lib/api/assistant/conversation.ts
@@ -40,7 +40,6 @@ import crypto from "crypto";
 import { Op, Transaction } from "sequelize";
 
 import { runActionStreamed } from "@app/lib/actions/server";
-import { renderRetrievalActionByModelId } from "@app/lib/api/assistant/actions/retrieval";
 import { runAgent } from "@app/lib/api/assistant/agent";
 import { signalAgentUsage } from "@app/lib/api/assistant/agent_usage";
 import { getAgentConfiguration } from "@app/lib/api/assistant/configuration";
@@ -62,6 +61,8 @@ import { ContentFragment } from "@app/lib/models/assistant/conversation";
 import { updateWorkspacePerMonthlyActiveUsersSubscriptionUsage } from "@app/lib/plans/subscription";
 import { generateModelSId } from "@app/lib/utils";
 import logger from "@app/logger/logger";
+
+import { renderRetrievalActionByModelId } from "./actions/retrieval";
 /**
  * Conversation Creation, update and deletion
  */
@@ -479,8 +480,7 @@ async function batchRenderContentFragment(messages: Message[]) {
 
 export async function getUserConversations(
   auth: Authenticator,
-  includeDeleted?: boolean,
-  includeTest?: boolean
+  includeDeleted?: boolean
 ): Promise<ConversationWithoutContentType[]> {
   const owner = auth.workspace();
   const user = auth.user();
@@ -514,8 +514,7 @@ export async function getUserConversations(
       }
       if (
         p.conversation.workspaceId !== owner.id ||
-        (p.conversation.visibility === "deleted" && !includeDeleted) ||
-        (p.conversation.visibility === "test" && !includeTest)
+        (p.conversation.visibility === "deleted" && !includeDeleted)
       ) {
         return acc;
       }
diff --git a/front/pages/api/w/[wId]/assistant/conversations/[cId]/index.ts b/front/pages/api/w/[wId]/assistant/conversations/[cId]/index.ts
index 4d883893dc71..aca2b54fc790 100644
--- a/front/pages/api/w/[wId]/assistant/conversations/[cId]/index.ts
+++ b/front/pages/api/w/[wId]/assistant/conversations/[cId]/index.ts
@@ -19,7 +19,6 @@ export const PatchConversationsRequestBodySchema = t.type({
     t.literal("unlisted"),
     t.literal("workspace"),
     t.literal("deleted"),
-    t.literal("test"),
   ]),
 });
 
diff --git a/front/pages/w/[wId]/assistant/[cId]/index.tsx b/front/pages/w/[wId]/assistant/[cId]/index.tsx
index eaa169b89c28..abd6d4f0a81a 100644
--- a/front/pages/w/[wId]/assistant/[cId]/index.tsx
+++ b/front/pages/w/[wId]/assistant/[cId]/index.tsx
@@ -9,10 +9,6 @@ import Conversation from "@app/components/assistant/conversation/Conversation";
 import { ConversationTitle } from "@app/components/assistant/conversation/ConversationTitle";
 import { GenerationContextProvider } from "@app/components/assistant/conversation/GenerationContextProvider";
 import { FixedAssistantInputBar } from "@app/components/assistant/conversation/input_bar/InputBar";
-import {
-  deleteConversation,
-  submitMessage,
-} from "@app/components/assistant/conversation/lib";
 import { AssistantSidebarMenu } from "@app/components/assistant/conversation/SidebarMenu";
 import AppLayout from "@app/components/sparkle/AppLayout";
 import { subNavigationConversations } from "@app/components/sparkle/navigation";
@@ -93,7 +89,6 @@ export default function AssistantConversation({
     conversationId,
     workspaceId: owner.sId,
   });
-
   const handleSubmit = async (
     input: string,
     mentions: MentionType[],
@@ -102,23 +97,90 @@ export default function AssistantConversation({
       content: string;
     }
   ) => {
-    const messageData = { input, mentions, contentFragment };
-    const result = await submitMessage({
-      owner,
-      user,
-      conversationId,
-      messageData,
-    });
-    if (result.isOk()) return;
-    if (result.error.type === "plan_limit_reached_error") {
-      setPlanLimitReached(true);
-    } else {
-      sendNotification({
-        title: result.error.title,
-        description: result.error.message,
-        type: "error",
-      });
+    // Create a new content fragment.
+    if (contentFragment) {
+      const mcfRes = await fetch(
+        `/api/w/${owner.sId}/assistant/conversations/${conversationId}/content_fragment`,
+        {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json",
+          },
+          body: JSON.stringify({
+            title: contentFragment.title,
+            content: contentFragment.content,
+            url: null,
+            contentType: "file_attachment",
+            context: {
+              timezone:
+                Intl.DateTimeFormat().resolvedOptions().timeZone || "UTC",
+              profilePictureUrl: user.image,
+            },
+          }),
+        }
+      );
+
+      if (!mcfRes.ok) {
+        const data = await mcfRes.json();
+        console.error("Error creating content fragment", data);
+        sendNotification({
+          title: "Error uploading file.",
+          description: data.error.message || "Please try again or contact us.",
+          type: "error",
+        });
+        return;
+      }
     }
+
+    // Create a new user message.
+    const mRes = await fetch(
+      `/api/w/${owner.sId}/assistant/conversations/${conversationId}/messages`,
+      {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify({
+          content: input,
+          context: {
+            timezone: Intl.DateTimeFormat().resolvedOptions().timeZone || "UTC",
+            profilePictureUrl: user.image,
+          },
+          mentions,
+        }),
+      }
+    );
+
+    if (!mRes.ok) {
+      const data = await mRes.json();
+      if (data.error.type === "test_plan_message_limit_reached") {
+        setPlanLimitReached(true);
+      } else {
+        sendNotification({
+          title: "Your message could not be sent",
+          description: data.error.message || "Please try again or contact us.",
+          type: "error",
+        });
+      }
+      return;
+    }
+  };
+
+  const handdleDeleteConversation = async () => {
+    const res = await fetch(
+      `/api/w/${owner.sId}/assistant/conversations/${conversationId}`,
+      {
+        method: "DELETE",
+      }
+    );
+
+    if (!res.ok) {
+      const data = await res.json();
+      window.alert(`Error deleting conversation: ${data.error.message}`);
+      return;
+    }
+
+    await router.push(`/w/${owner.sId}/assistant/new`);
   };
 
   return (
@@ -145,13 +207,8 @@ export default function AssistantConversation({
               owner={owner}
               conversation={conversation}
               shareLink={`${baseUrl}/w/${owner.sId}/assistant/${conversationId}`}
-              onDelete={async () => {
-                await deleteConversation({
-                  workspaceId: owner.sId,
-                  conversationId,
-                  sendNotification,
-                });
-                void router.push(`/w/${owner.sId}/assistant/new`);
+              onDelete={() => {
+                void handdleDeleteConversation();
               }}
             />
           )
diff --git a/front/pages/w/[wId]/assistant/gallery.tsx b/front/pages/w/[wId]/assistant/gallery.tsx
index dff83c049366..06895241efb6 100644
--- a/front/pages/w/[wId]/assistant/gallery.tsx
+++ b/front/pages/w/[wId]/assistant/gallery.tsx
@@ -13,7 +13,6 @@ import { useState } from "react";
 
 import { AssistantDetails } from "@app/components/assistant/AssistantDetails";
 import { AssistantPreview } from "@app/components/assistant/AssistantPreview";
-import { TryAssistantModal } from "@app/components/assistant/TryAssistantModal";
 import AppLayout from "@app/components/sparkle/AppLayout";
 import { AppLayoutSimpleCloseTitle } from "@app/components/sparkle/AppLayoutTitle";
 import { subNavigationConversations } from "@app/components/sparkle/navigation";
@@ -145,8 +144,6 @@ export default function AssistantsGallery({
   const [showDetails, setShowDetails] = useState<AgentConfigurationType | null>(
     null
   );
-  const [testModalAssistant, setTestModalAssistant] =
-    useState<AgentConfigurationType | null>(null);
 
   const tabs = [
     {
@@ -220,14 +217,6 @@ export default function AssistantsGallery({
           flow={flow === "workspace_add" ? "workspace" : "personal"}
         />
       )}
-      {testModalAssistant && (
-        <TryAssistantModal
-          owner={owner}
-          user={user}
-          assistant={testModalAssistant}
-          onClose={() => setTestModalAssistant(null)}
-        />
-      )}
       <div className="pb-16">
         <Page.Vertical gap="xl" align="stretch">
           <Tab tabs={tabs} />
@@ -286,7 +275,6 @@ export default function AssistantsGallery({
                   }}
                   variant="gallery"
                   flow={flow === "workspace_add" ? "workspace" : "personal"}
-                  setTestModalAssistant={setTestModalAssistant}
                 />
               ))}
             </div>
diff --git a/front/pages/w/[wId]/assistant/new.tsx b/front/pages/w/[wId]/assistant/new.tsx
index f8824edbe241..1ee37c17968b 100644
--- a/front/pages/w/[wId]/assistant/new.tsx
+++ b/front/pages/w/[wId]/assistant/new.tsx
@@ -12,11 +12,13 @@ import {
   AgentMention,
   ContentFragmentContentType,
   ConversationType,
+  InternalPostConversationsRequestBodySchema,
   MentionType,
   SubscriptionType,
   UserType,
   WorkspaceType,
 } from "@dust-tt/types";
+import * as t from "io-ts";
 import { GetServerSideProps, InferGetServerSidePropsType } from "next";
 import Link from "next/link";
 import { useRouter } from "next/router";
@@ -30,7 +32,6 @@ import {
   FixedAssistantInputBar,
   InputBarContext,
 } from "@app/components/assistant/conversation/input_bar/InputBar";
-import { createConversationWithMessage } from "@app/components/assistant/conversation/lib";
 import { AssistantSidebarMenu } from "@app/components/assistant/conversation/SidebarMenu";
 import AppLayout from "@app/components/sparkle/AppLayout";
 import { subNavigationConversations } from "@app/components/sparkle/navigation";
@@ -39,6 +40,7 @@ import { compareAgentsForSort } from "@app/lib/assistant";
 import { Authenticator, getSession, getUserFromSession } from "@app/lib/auth";
 import { useSubmitFunction } from "@app/lib/client/utils";
 import { useAgentConfigurations } from "@app/lib/swr";
+import type { PostConversationsResponseBody } from "@app/pages/api/w/[wId]/assistant/conversations";
 
 const { GA_TRACKING_ID = "" } = process.env;
 
@@ -111,35 +113,65 @@ export default function AssistantNew({
         content: string;
       }
     ) => {
-      const conversationRes = await createConversationWithMessage({
-        owner,
-        user,
-        messageData: {
-          input,
-          mentions,
-          contentFragment,
+      const body: t.TypeOf<typeof InternalPostConversationsRequestBodySchema> =
+        {
+          title: null,
+          visibility: "unlisted",
+          message: {
+            content: input,
+            context: {
+              timezone:
+                Intl.DateTimeFormat().resolvedOptions().timeZone || "UTC",
+              profilePictureUrl: user.image,
+            },
+            mentions,
+          },
+          contentFragment: contentFragment
+            ? {
+                ...contentFragment,
+                contentType: "file_attachment",
+                url: null,
+                context: {
+                  profilePictureUrl: user.image,
+                },
+              }
+            : undefined,
+        };
+
+      // Create new conversation and post the initial message at the same time.
+      const cRes = await fetch(`/api/w/${owner.sId}/assistant/conversations`, {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
         },
+        body: JSON.stringify(body),
       });
-      if (conversationRes.isErr()) {
-        if (conversationRes.error.type === "plan_limit_reached_error") {
+
+      if (!cRes.ok) {
+        const data = await cRes.json();
+        if (data.error.type === "test_plan_message_limit_reached") {
           setPlanLimitReached(true);
         } else {
           sendNotification({
-            title: conversationRes.error.title,
-            description: conversationRes.error.message,
+            title: "Your message could not be sent",
+            description:
+              data.error.message || "Please try again or contact us.",
             type: "error",
           });
         }
-      } else {
-        // We use this to clear the UI start rendering the conversation immediately to give an
-        // impression of instantaneity.
-        setConversation(conversationRes.value);
-
-        // We start the push before creating the message to optimize for instantaneity as well.
-        void router.push(
-          `/w/${owner.sId}/assistant/${conversationRes.value.sId}`
-        );
+        return;
       }
+
+      const conversation = (
+        (await cRes.json()) as PostConversationsResponseBody
+      ).conversation;
+
+      // We use this to clear the UI start rendering the conversation immediately to give an
+      // impression of instantaneity.
+      setConversation(conversation);
+
+      // We start the push before creating the message to optimize for instantaneity as well.
+      void router.push(`/w/${owner.sId}/assistant/${conversation.sId}`);
     }
   );
 
diff --git a/types/src/front/api_handlers/internal/assistant.ts b/types/src/front/api_handlers/internal/assistant.ts
index 450a710142fa..57c8bed0f087 100644
--- a/types/src/front/api_handlers/internal/assistant.ts
+++ b/types/src/front/api_handlers/internal/assistant.ts
@@ -36,7 +36,6 @@ export const InternalPostConversationsRequestBodySchema = t.type({
     t.literal("unlisted"),
     t.literal("workspace"),
     t.literal("deleted"),
-    t.literal("test"),
   ]),
   message: t.union([InternalPostMessagesRequestBodySchema, t.null]),
   contentFragment: t.union([
diff --git a/types/src/front/api_handlers/public/assistant.ts b/types/src/front/api_handlers/public/assistant.ts
index 78da7333868f..d27e5bc9e372 100644
--- a/types/src/front/api_handlers/public/assistant.ts
+++ b/types/src/front/api_handlers/public/assistant.ts
@@ -45,7 +45,6 @@ export const PublicPostConversationsRequestBodySchema = t.type({
     t.literal("unlisted"),
     t.literal("workspace"),
     t.literal("deleted"),
-    t.literal("test"),
   ]),
   message: t.union([PublicPostMessagesRequestBodySchema, t.undefined]),
   contentFragment: t.union([
diff --git a/types/src/front/assistant/conversation.ts b/types/src/front/assistant/conversation.ts
index 37e8ba27e625..94fde49f4667 100644
--- a/types/src/front/assistant/conversation.ts
+++ b/types/src/front/assistant/conversation.ts
@@ -164,16 +164,7 @@ export function isContentFragmentType(
  * Conversations
  */
 
-/**
- * Visibility of a conversation. Test visibility is for conversations happening
- * when a user 'tests' an assistant not in their list using the "test" button of
- * the assistant gallery: those conversations do not show in users' histories.
- */
-export type ConversationVisibility =
-  | "unlisted"
-  | "workspace"
-  | "deleted"
-  | "test";
+export type ConversationVisibility = "unlisted" | "workspace" | "deleted";
 
 /**
  * content [][] structure is intended to allow retries (of agent messages) or edits (of user