k

backend/ee/onyx/server/query_history/api.py

@@ -138,6 +138,7 @@ def get_user_chat_sessions(
                 name=chat.description,
                 persona_id=chat.persona_id,
                 time_created=chat.time_created.isoformat(),
+                time_updated=chat.time_updated.isoformat(),
                 shared_status=chat.shared_status,
                 folder_id=chat.folder_id,
                 current_alternate_model=chat.current_alternate_model,

backend/onyx/db/chat.py

@@ -168,7 +168,7 @@ def get_chat_sessions_by_user(
     if not include_onyxbot_flows:
         stmt = stmt.where(ChatSession.onyxbot_flow.is_(False))
 
-    stmt = stmt.order_by(desc(ChatSession.time_created))
+    stmt = stmt.order_by(desc(ChatSession.time_updated))
 
     if deleted is not None:
         stmt = stmt.where(ChatSession.deleted == deleted)

backend/onyx/server/features/folder/api.py

@@ -49,6 +49,7 @@ def get_folders(
                         name=chat_session.description,
                         persona_id=chat_session.persona_id,
                         time_created=chat_session.time_created.isoformat(),
+                        time_updated=chat_session.time_updated.isoformat(),
                         shared_status=chat_session.shared_status,
                         folder_id=folder.id,
                     )

backend/onyx/server/openai_assistants_api/threads_api.py

@@ -147,9 +147,11 @@ def list_threads(
                 name=chat.description,
                 persona_id=chat.persona_id,
                 time_created=chat.time_created.isoformat(),
+                time_updated=chat.time_updated.isoformat(),
                 shared_status=chat.shared_status,
                 folder_id=chat.folder_id,
                 current_alternate_model=chat.current_alternate_model,
+                current_temperature_override=chat.temperature_override,
             )
             for chat in chat_sessions
         ]

backend/onyx/server/query_and_chat/chat_backend.py

@@ -119,6 +119,7 @@ def get_user_chat_sessions(
                 name=chat.description,
                 persona_id=chat.persona_id,
                 time_created=chat.time_created.isoformat(),
+                time_updated=chat.time_updated.isoformat(),
                 shared_status=chat.shared_status,
                 folder_id=chat.folder_id,
                 current_alternate_model=chat.current_alternate_model,

backend/onyx/server/query_and_chat/models.py

@@ -181,6 +181,7 @@ class ChatSessionDetails(BaseModel):
     name: str | None
     persona_id: int | None = None
     time_created: str
+    time_updated: str
     shared_status: ChatSessionSharedStatus
     folder_id: int | None = None
     current_alternate_model: str | None = None

backend/onyx/server/query_and_chat/query_backend.py

@@ -159,6 +159,7 @@ def get_user_search_sessions(
                 name=sessions_with_documents_dict[search.id],
                 persona_id=search.persona_id,
                 time_created=search.time_created.isoformat(),
+                time_updated=search.time_updated.isoformat(),
                 shared_status=search.shared_status,
                 folder_id=search.folder_id,
                 current_alternate_model=search.current_alternate_model,

web/src/app/chat/ChatPage.tsx

@@ -132,12 +132,18 @@ import {
 
 import { getSourceMetadata } from "@/lib/sources";
 import { UserSettingsModal } from "./modal/UserSettingsModal";
+import { AlignStartVertical } from "lucide-react";
 import { AgenticMessage } from "./message/AgenticMessage";
 import AssistantModal from "../assistants/mine/AssistantModal";
-import { useSidebarShortcut } from "@/lib/browserUtilities";
+import {
+  OperatingSystem,
+  useOperatingSystem,
+  useSidebarShortcut,
+} from "@/lib/browserUtilities";
+import { Button } from "@/components/ui/button";
 import { ConfirmEntityModal } from "@/components/modals/ConfirmEntityModal";
+import { MessageChannel } from "node:worker_threads";
 import { ChatSearchModal } from "./chat_search/ChatSearchModal";
-import { ErrorBanner } from "./message/Resubmit";
 
 const TEMP_USER_MESSAGE_ID = -1;
 const TEMP_ASSISTANT_MESSAGE_ID = -2;
@@ -1163,7 +1169,6 @@ export function ChatPage({
     navigatingAway.current = false;
     let frozenSessionId = currentSessionId();
     updateCanContinue(false, frozenSessionId);
-    setUncaughtError(null);
 
     // Mark that we've sent a message for this session in the current page load
     markSessionMessageSent(frozenSessionId);
@@ -1314,7 +1319,6 @@ export function ChatPage({
     let isStreamingQuestions = true;
     let includeAgentic = false;
     let secondLevelMessageId: number | null = null;
-    let isAgentic: boolean = false;
 
     let initialFetchDetails: null | {
       user_message_id: number;
@@ -1477,9 +1481,6 @@ export function ChatPage({
                 second_level_generating = true;
               }
             }
-            if (Object.hasOwn(packet, "is_agentic")) {
-              isAgentic = (packet as any).is_agentic;
-            }
 
             if (Object.hasOwn(packet, "refined_answer_improvement")) {
               isImprovement = (packet as RefinedAnswerImprovement)
@@ -1513,7 +1514,6 @@ export function ChatPage({
               );
             } else if (Object.hasOwn(packet, "sub_question")) {
               updateChatState("toolBuilding", frozenSessionId);
-              isAgentic = true;
               is_generating = true;
               sub_questions = constructSubQuestions(
                 sub_questions,
@@ -1714,7 +1714,6 @@ export function ChatPage({
                 sub_questions: sub_questions,
                 second_level_generating: second_level_generating,
                 agentic_docs: agenticDocs,
-                is_agentic: isAgentic,
               },
               ...(includeAgentic
                 ? [
@@ -2063,26 +2062,6 @@ export function ChatPage({
   const [sharedChatSession, setSharedChatSession] =
     useState<ChatSession | null>();
 
-  const handleResubmitLastMessage = () => {
-    // Grab the last user-type message
-    const lastUserMsg = messageHistory
-      .slice()
-      .reverse()
-      .find((m) => m.type === "user");
-    if (!lastUserMsg) {
-      setPopup({
-        message: "No previously-submitted user message found.",
-        type: "error",
-      });
-      return;
-    }
-    // We call onSubmit, passing a `messageOverride`
-    onSubmit({
-      messageIdToResend: lastUserMsg.messageId,
-      messageOverride: lastUserMsg.message,
-    });
-  };
-
   const showShareModal = (chatSession: ChatSession) => {
     setSharedChatSession(chatSession);
   };
@@ -2665,9 +2644,9 @@ export function ChatPage({
                                         : null
                                     }
                                   >
-                                    {message.is_agentic ? (
+                                    {message.sub_questions &&
+                                    message.sub_questions.length > 0 ? (
                                       <AgenticMessage
-                                        resubmit={handleResubmitLastMessage}
                                         error={uncaughtError}
                                         isStreamingQuestions={
                                           message.isStreamingQuestions ?? false
@@ -3015,18 +2994,21 @@ export function ChatPage({
                                       currentPersona={liveAssistant}
                                       messageId={message.messageId}
                                       content={
-                                        <ErrorBanner
-                                          resubmit={handleResubmitLastMessage}
-                                          error={message.message}
-                                          showStackTrace={
-                                            message.stackTrace
-                                              ? () =>
-                                                  setStackTraceModalContent(
-                                                    message.stackTrace!
-                                                  )
-                                              : undefined
-                                          }
-                                        />
+                                        <p className="text-red-700 text-sm my-auto">
+                                          {message.message}
+                                          {message.stackTrace && (
+                                            <span
+                                              onClick={() =>
+                                                setStackTraceModalContent(
+                                                  message.stackTrace!
+                                                )
+                                              }
+                                              className="ml-2 cursor-pointer underline"
+                                            >
+                                              Show stack trace.
+                                            </span>
+                                          )}
+                                        </p>
                                       }
                                     />
                                   </div>

web/src/app/chat/folders/FolderList.tsx

@@ -168,7 +168,7 @@ const FolderItem = ({
   };
 
   const folders = folder.chat_sessions.sort((a, b) => {
-    return a.time_created.localeCompare(b.time_created);
+    return a.time_updated.localeCompare(b.time_updated);
   });
 
   // Determine whether to show the trash can icon

web/src/app/chat/interfaces.ts

@@ -70,6 +70,7 @@ export interface ChatSession {
   name: string;
   persona_id: number;
   time_created: string;
+  time_updated: string;
   shared_status: ChatSessionSharedStatus;
   folder_id: number | null;
   current_alternate_model: string;
@@ -103,7 +104,6 @@ export interface Message {
   overridden_model?: string;
   stopReason?: StreamStopReason | null;
   sub_questions?: SubQuestionDetail[] | null;
-  is_agentic?: boolean | null;
 
   // Streaming only
   second_level_generating?: boolean;
@@ -123,6 +123,7 @@ export interface BackendChatSession {
   persona_icon_shape: number | null;
   messages: BackendMessage[];
   time_created: string;
+  time_updated: string;
   shared_status: ChatSessionSharedStatus;
   current_temperature_override: number | null;
   current_alternate_model?: string;
@@ -149,7 +150,6 @@ export interface BackendMessage {
   comments: any;
   parentMessageId: number | null;
   refined_answer_improvement: boolean | null;
-  is_agentic: boolean | null;
 }
 
 export interface MessageResponseIDInfo {

web/src/app/chat/lib.tsx

@@ -48,10 +48,10 @@ export function getChatRetentionInfo(
 ): ChatRetentionInfo {
   // If `maximum_chat_retention_days` isn't set- never display retention warning.
   const chatRetentionDays = settings.maximum_chat_retention_days || 10000;
-  const createdDate = new Date(chatSession.time_created);
+  const updatedDate = new Date(chatSession.time_updated);
   const today = new Date();
   const daysFromCreation = Math.ceil(
-    (today.getTime() - createdDate.getTime()) / (1000 * 3600 * 24)
+    (today.getTime() - updatedDate.getTime()) / (1000 * 3600 * 24)
   );
   const daysUntilExpiration = chatRetentionDays - daysFromCreation;
   const showRetentionWarning =
@@ -419,7 +419,7 @@ export function groupSessionsByDateRange(chatSessions: ChatSession[]) {
   };
 
   chatSessions.forEach((chatSession) => {
-    const chatSessionDate = new Date(chatSession.time_created);
+    const chatSessionDate = new Date(chatSession.time_updated);
 
     const diffTime = today.getTime() - chatSessionDate.getTime();
     const diffDays = diffTime / (1000 * 3600 * 24); // Convert time difference to days

web/src/app/chat/message/AgenticMessage.tsx

@@ -50,9 +50,6 @@ import "katex/dist/katex.min.css";
 import SubQuestionsDisplay from "./SubQuestionsDisplay";
 import { StatusRefinement } from "../Refinement";
 import { copyAll, handleCopy } from "./copyingUtils";
-import { Button } from "@/components/ui/button";
-import { RefreshCw } from "lucide-react";
-import { ErrorBanner, Resubmit } from "./Resubmit";
 
 export const AgenticMessage = ({
   isStreamingQuestions,
@@ -87,9 +84,7 @@ export const AgenticMessage = ({
   secondLevelSubquestions,
   toggleDocDisplay,
   error,
-  resubmit,
 }: {
-  resubmit?: () => void;
   isStreamingQuestions: boolean;
   isGenerating: boolean;
   docSidebarToggled?: boolean;
@@ -460,6 +455,7 @@ export const AgenticMessage = ({
                     finalContent.length > 8) ||
                   (files && files.length > 0) ? (
                     <>
+                      {/* <FileDisplay files={files || []} /> */}
                       <div className="w-full  py-4 flex flex-col gap-4">
                         <div className="flex items-center gap-x-2 px-4">
                           <div className="text-black text-lg font-medium">
@@ -507,7 +503,9 @@ export const AgenticMessage = ({
                             content
                           )}
                           {error && (
-                            <ErrorBanner error={error} resubmit={resubmit} />
+                            <p className="mt-2 text-red-700 text-sm my-auto">
+                              {error}
+                            </p>
                           )}
                         </div>
                       </div>
@@ -515,13 +513,15 @@ export const AgenticMessage = ({
                   ) : isComplete ? (
                     error && (
                       <p className="mt-2 mx-4 text-red-700 text-sm my-auto">
-                        <ErrorBanner error={error} resubmit={resubmit} />
+                        {error}
                       </p>
                     )
                   ) : (
                     <>
                       {error && (
-                        <ErrorBanner error={error} resubmit={resubmit} />
+                        <p className="mt-2 mx-4 text-red-700 text-sm my-auto">
+                          {error}
+                        </p>
                       )}
                     </>
                   )}

web/src/app/chat/message/Resubmit.tsx

@@ -1,58 +0,0 @@
-import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
-import { AlertCircle } from "lucide-react";
-import { Button } from "@/components/ui/button";
-import { RefreshCw } from "lucide-react";
-
-interface ResubmitProps {
-  resubmit: () => void;
-}
-
-export const Resubmit: React.FC<ResubmitProps> = ({ resubmit }) => {
-  return (
-    <div className="flex flex-col items-center justify-center gap-y-2 mt-4">
-      <p className="text-sm text-neutral-700 dark:text-neutral-300">
-        There was an error with the response.
-      </p>
-      <Button
-        onClick={resubmit}
-        variant="agent"
-        size="sm"
-        className="flex items-center gap-2 text-white font-medium py-2 px-4 rounded"
-      >
-        <RefreshCw className="w-4 h-4" />
-        Regenerate
-      </Button>
-    </div>
-  );
-};
-
-export const ErrorBanner = ({
-  error,
-  showStackTrace,
-  resubmit,
-}: {
-  error: string;
-  showStackTrace?: () => void;
-  resubmit?: () => void;
-}) => {
-  return (
-    <div className="text-red-700 mt-4 text-sm my-auto">
-      <Alert variant="broken">
-        <AlertCircle className="h-4 w-4" />
-        <AlertTitle>Error</AlertTitle>
-        <AlertDescription className="flex  gap-x-2">
-          {error}
-          {showStackTrace && (
-            <span
-              className="text-red-600 hover:text-red-800 cursor-pointer underline"
-              onClick={showStackTrace}
-            >
-              Show stack trace
-            </span>
-          )}
-        </AlertDescription>
-      </Alert>
-      {resubmit && <Resubmit resubmit={resubmit} />}
-    </div>
-  );
-};

web/src/app/chat/shared/[chatId]/SharedChatDisplay.tsx

@@ -206,7 +206,7 @@ export function SharedChatDisplay({
                       {chatSession.description || `Unnamed Chat`}
                     </h1>
                     <p className=" text-text-darker">
-                      {humanReadableFormat(chatSession.time_created)}
+                      {humanReadableFormat(chatSession.time_updated)}
                     </p>
                     <div
                       className={`

web/src/components/ui/alert.tsx

@@ -8,10 +8,8 @@ const alertVariants = cva(
   {
     variants: {
       variant: {
-        broken:
-          "border-red-500/50 text-red-500 dark:border-red-500 [&>svg]:text-red-500 dark:border-red-900/50 dark:text-red-100 dark:dark:border-red-900 dark:[&>svg]:text-red-700 bg-red-50 dark:bg-red-950",
-        ark: "border-amber-500/50 text-amber-500 dark:border-amber-500 [&>svg]:text-amber-500 dark:border-amber-900/50 dark:text-amber-900 dark:dark:border-amber-900 dark:[&>svg]:text-amber-900 bg-amber-50 dark:bg-amber-950",
         info: "border-black/50 dark:border-black dark:border-black/50 dark:dark:border-black",
+
         default:
           "bg-neutral-50 text-neutral-darker dark:bg-neutral-950 dark:text-text",
         destructive:

web/src/components/ui/button.tsx

@@ -9,8 +9,6 @@ const buttonVariants = cva(
   {
     variants: {
       variant: {
-        agent:
-          "bg-agent text-white hover:bg-agent-hovered dark:bg-agent dark:text-white dark:hover:bg-agent/90",
         success:
           "bg-green-100 text-green-600 hover:bg-green-500/90 dark:bg-green-700 dark:text-green-100 dark:hover:bg-green-600/90",
         "success-reverse":

web/src/lib/chat/fetchChatData.ts

@@ -148,7 +148,7 @@ export async function fetchChatData(searchParams: {
 
   chatSessions.sort(
     (a, b) =>
-      new Date(b.time_created).getTime() - new Date(a.time_created).getTime()
+      new Date(b.time_updated).getTime() - new Date(a.time_updated).getTime()
   );
 
   let documentSets: DocumentSet[] = [];