From 4c9957dc260a69686eb4add2b2c2c1893f2271b5 Mon Sep 17 00:00:00 2001
From: abhi1992002 <abhimanyu1992002@gmail.com>
Date: Mon, 2 Feb 2026 09:37:11 +0530
Subject: [PATCH] arranging messages code

---
 .../ChatMessagesContainer.tsx                 | 122 +++++++++++++
 .../components/ChatSidebar/ChatSidebar.tsx    |   0
 .../components/EmptySession/EmptySession.tsx  |  34 ++++
 .../src/app/(platform)/copilot-2/page.tsx     | 160 +++---------------
 .../(platform)/copilot-2/store/chat-store.ts  |   0
 5 files changed, 179 insertions(+), 137 deletions(-)
 create mode 100644 autogpt_platform/frontend/src/app/(platform)/copilot-2/components/ChatMessagesContainer/ChatMessagesContainer.tsx
 rename autogpt_platform/frontend/src/app/(platform)/copilot-2/{tools => }/components/ChatSidebar/ChatSidebar.tsx (100%)
 create mode 100644 autogpt_platform/frontend/src/app/(platform)/copilot-2/components/EmptySession/EmptySession.tsx
 create mode 100644 autogpt_platform/frontend/src/app/(platform)/copilot-2/store/chat-store.ts

diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot-2/components/ChatMessagesContainer/ChatMessagesContainer.tsx b/autogpt_platform/frontend/src/app/(platform)/copilot-2/components/ChatMessagesContainer/ChatMessagesContainer.tsx
new file mode 100644
index 0000000000..7806dcb9f2
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot-2/components/ChatMessagesContainer/ChatMessagesContainer.tsx
@@ -0,0 +1,122 @@
+import {
+    Conversation,
+    ConversationContent,
+    ConversationEmptyState,
+    ConversationScrollButton,
+  } from "@/components/ai-elements/conversation";
+  import {
+    Message,
+    MessageContent,
+    MessageResponse,
+  } from "@/components/ai-elements/message";
+import { MessageSquareIcon } from "lucide-react";
+import { UIMessage, UIDataTypes, UITools } from "ai";
+
+
+interface ChatMessagesContainerProps {
+    messages: UIMessage<unknown, UIDataTypes, UITools>[];
+    status: string;
+    error: Error | undefined;
+    handleSubmit: (e: React.FormEvent) => void;
+    input: string;
+    setInput: (input: string) => void;
+  }
+
+export const ChatMessagesContainer = ({messages, status, error, handleSubmit, input, setInput}: ChatMessagesContainerProps) => {
+  return (
+    <div className="flex h-full flex-1 flex-col">
+        <Conversation className="flex-1">
+          <ConversationContent>
+            {messages.length === 0 ? (
+              <ConversationEmptyState
+                icon={<MessageSquareIcon className="size-12" />}
+                title="Start a conversation"
+                description="Type a message below to begin chatting"
+              />
+            ) : (
+              messages.map((message) => (
+                <Message from={message.role} key={message.id}>
+                  <MessageContent>
+                    {message.parts.map((part, i) => {
+                      switch (part.type) {
+                        case "text":
+                          return (
+                            <MessageResponse key={`${message.id}-${i}`}>
+                              {part.text}
+                            </MessageResponse>
+                          );
+                        case "tool-find_block":
+                          return (
+                            <div
+                              key={`${message.id}-${i}`}
+                              className="w-fit rounded-xl border border-zinc-200 bg-zinc-100 p-2 text-xs text-zinc-700"
+                            >
+                              {part.state === "input-streaming" && (
+                                <p>Finding blocks for you</p>
+                              )}
+                              {part.state === "input-available" && (
+                                <p>
+                                  Searching blocks for{" "}
+                                  {(part.input as { query: string }).query}
+                                </p>
+                              )}
+                              {part.state === "output-available" && (
+                                <p>
+                                  Found{" "}
+                                  {
+                                    (
+                                      JSON.parse(part.output as string) as {
+                                        count: number;
+                                      }
+                                    ).count
+                                  }{" "}
+                                  blocks
+                                </p>
+                              )}
+                            </div>
+                          );
+                        default:
+                          return null;
+                      }
+                    })}
+                  </MessageContent>
+                </Message>
+              ))
+            )}
+            {status === "submitted" && (
+              <Message from="assistant">
+                <MessageContent>
+                  <p className="text-zinc-500">Thinking...</p>
+                </MessageContent>
+              </Message>
+            )}
+            {error && (
+              <div className="rounded-lg bg-red-50 p-3 text-red-600">
+                Error: {error.message}
+              </div>
+            )}
+          </ConversationContent>
+          <ConversationScrollButton />
+        </Conversation>
+
+        <form onSubmit={handleSubmit} className="border-t p-4">
+          <div className="mx-auto flex max-w-2xl gap-2">
+            <input
+              value={input}
+              onChange={(e) => setInput(e.target.value)}
+              disabled={status !== "ready"}
+              placeholder="Say something..."
+              className="flex-1 rounded-md border border-zinc-300 px-4 py-2 focus:border-zinc-500 focus:outline-none"
+            />
+            <button
+              type="submit"
+              disabled={status !== "ready" || !input.trim()}
+              className="rounded-md bg-zinc-900 px-4 py-2 text-white transition-colors hover:bg-zinc-800 disabled:opacity-50"
+            >
+              Send
+            </button>
+          </div>
+        </form>
+      </div>
+  );
+};  
\ No newline at end of file
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot-2/tools/components/ChatSidebar/ChatSidebar.tsx b/autogpt_platform/frontend/src/app/(platform)/copilot-2/components/ChatSidebar/ChatSidebar.tsx
similarity index 100%
rename from autogpt_platform/frontend/src/app/(platform)/copilot-2/tools/components/ChatSidebar/ChatSidebar.tsx
rename to autogpt_platform/frontend/src/app/(platform)/copilot-2/components/ChatSidebar/ChatSidebar.tsx
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot-2/components/EmptySession/EmptySession.tsx b/autogpt_platform/frontend/src/app/(platform)/copilot-2/components/EmptySession/EmptySession.tsx
new file mode 100644
index 0000000000..33eafc2110
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot-2/components/EmptySession/EmptySession.tsx
@@ -0,0 +1,34 @@
+import { ChatSidebar } from "../ChatSidebar/ChatSidebar";
+
+interface EmptySessionProps {
+  isCreating: boolean;
+  handleSubmit: (e: React.FormEvent) => void;
+  input: string;
+  setInput: (input: string) => void;
+}
+
+export const EmptySession = ({ isCreating, handleSubmit, input, setInput }: EmptySessionProps) => {
+  return (
+    <div className="flex h-full flex-1 flex-col items-center justify-center bg-zinc-100 p-4">
+      <h2 className="mb-4 text-xl font-semibold text-zinc-700">
+        Start a new conversation
+      </h2>
+      <form onSubmit={handleSubmit} className="w-full max-w-md">
+        <input
+          value={input}
+          onChange={(e) => setInput(e.target.value)}
+          disabled={isCreating}
+          placeholder="Type your message to start..."
+          className="w-full rounded-md border border-zinc-300 px-4 py-2"
+        />
+        <button
+          type="submit"
+          disabled={isCreating || !input.trim()}
+          className="mt-2 w-full rounded-md bg-blue-600 px-4 py-2 text-white transition-colors hover:bg-blue-700 disabled:opacity-50"
+        >
+          {isCreating ? "Starting..." : "Start Chat"}
+        </button>
+      </form>
+    </div>
+  );
+};
\ No newline at end of file
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot-2/page.tsx b/autogpt_platform/frontend/src/app/(platform)/copilot-2/page.tsx
index 1da4fe075f..1a561aa0ea 100644
--- a/autogpt_platform/frontend/src/app/(platform)/copilot-2/page.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot-2/page.tsx
@@ -5,21 +5,13 @@ import { DefaultChatTransport } from "ai";
 import { useState, useMemo } from "react";
 import { parseAsString, useQueryState } from "nuqs";
 import { MessageSquare } from "lucide-react";
-import { ChatSidebar } from "./tools/components/ChatSidebar/ChatSidebar";
-import {
-  Conversation,
-  ConversationContent,
-  ConversationEmptyState,
-  ConversationScrollButton,
-} from "@/components/ai-elements/conversation";
-import {
-  Message,
-  MessageContent,
-  MessageResponse,
-} from "@/components/ai-elements/message";
+import { ChatSidebar } from "./components/ChatSidebar/ChatSidebar";
+import { EmptySession } from "./components/EmptySession/EmptySession";
+import { ChatMessagesContainer } from "./components/ChatMessagesContainer/ChatMessagesContainer";
+import { postV2CreateSession } from "@/app/api/__generated__/endpoints/chat/chat";
 
 export default function Page() {
-  const [sessionId] = useQueryState("sessionId", parseAsString);
+  const [sessionId, setSessionId] = useQueryState("sessionId", parseAsString);
   const [isCreating, setIsCreating] = useState(false);
   const [input, setInput] = useState("");
 
@@ -46,143 +38,37 @@ export default function Page() {
     transport: transport ?? undefined,
   });
 
-  function handleSubmit(e: React.FormEvent) {
+  async function handleSubmit(e: React.FormEvent) {
     e.preventDefault();
+    if(!sessionId) {
+      const newSessionId = await postV2CreateSession({
+        body: JSON.stringify({}),
+      });
+      if (newSessionId.status === 200 && newSessionId.data?.id) {
+        setSessionId(newSessionId.data.id);
+      }
+      console.log("newSessionId", newSessionId);
+    }
     if (input.trim()) {
       sendMessage({ text: input });
       setInput("");
     }
   }
 
-  // Show landing page when no session exists
-  if (!sessionId) {
-    return (
-      <div className="flex h-full">
-        <ChatSidebar isCreating={isCreating} setIsCreating={setIsCreating} />
-
-        <div className="flex h-full flex-1 flex-col items-center justify-center bg-zinc-100 p-4">
-          <h2 className="mb-4 text-xl font-semibold text-zinc-700">
-            Start a new conversation
-          </h2>
-          <form onSubmit={handleSubmit} className="w-full max-w-md">
-            <input
-              value={input}
-              onChange={(e) => setInput(e.target.value)}
-              disabled={isCreating}
-              placeholder="Type your message to start..."
-              className="w-full rounded-md border border-zinc-300 px-4 py-2"
-            />
-            <button
-              type="submit"
-              disabled={isCreating || !input.trim()}
-              className="mt-2 w-full rounded-md bg-blue-600 px-4 py-2 text-white transition-colors hover:bg-blue-700 disabled:opacity-50"
-            >
-              {isCreating ? "Starting..." : "Start Chat"}
-            </button>
-          </form>
-        </div>
-      </div>
-    );
-  }
 
   return (
     <div className="flex h-full">
       <ChatSidebar isCreating={isCreating} setIsCreating={setIsCreating} />
 
-      <div className="flex h-full flex-1 flex-col">
-        <Conversation className="flex-1">
-          <ConversationContent>
-            {messages.length === 0 ? (
-              <ConversationEmptyState
-                icon={<MessageSquare className="size-12" />}
-                title="Start a conversation"
-                description="Type a message below to begin chatting"
-              />
-            ) : (
-              messages.map((message) => (
-                <Message from={message.role} key={message.id}>
-                  <MessageContent>
-                    {message.parts.map((part, i) => {
-                      switch (part.type) {
-                        case "text":
-                          return (
-                            <MessageResponse key={`${message.id}-${i}`}>
-                              {part.text}
-                            </MessageResponse>
-                          );
-                        case "tool-find_block":
-                          return (
-                            <div
-                              key={`${message.id}-${i}`}
-                              className="w-fit rounded-xl border border-zinc-200 bg-zinc-100 p-2 text-xs text-zinc-700"
-                            >
-                              {part.state === "input-streaming" && (
-                                <p>Finding blocks for you</p>
-                              )}
-                              {part.state === "input-available" && (
-                                <p>
-                                  Searching blocks for{" "}
-                                  {(part.input as { query: string }).query}
-                                </p>
-                              )}
-                              {part.state === "output-available" && (
-                                <p>
-                                  Found{" "}
-                                  {
-                                    (
-                                      JSON.parse(part.output as string) as {
-                                        count: number;
-                                      }
-                                    ).count
-                                  }{" "}
-                                  blocks
-                                </p>
-                              )}
-                            </div>
-                          );
-                        default:
-                          return null;
-                      }
-                    })}
-                  </MessageContent>
-                </Message>
-              ))
-            )}
-            {status === "submitted" && (
-              <Message from="assistant">
-                <MessageContent>
-                  <p className="text-zinc-500">Thinking...</p>
-                </MessageContent>
-              </Message>
-            )}
-            {error && (
-              <div className="rounded-lg bg-red-50 p-3 text-red-600">
-                Error: {error.message}
-              </div>
-            )}
-          </ConversationContent>
-          <ConversationScrollButton />
-        </Conversation>
+      {
+        sessionId ? (
+          <ChatMessagesContainer messages={messages} status={status} error={error} handleSubmit={handleSubmit} input={input} setInput={setInput} />
+        ) : (
+          <EmptySession isCreating={isCreating} handleSubmit={handleSubmit} input={input} setInput={setInput} />
+        )
+      }
 
-        <form onSubmit={handleSubmit} className="border-t p-4">
-          <div className="mx-auto flex max-w-2xl gap-2">
-            <input
-              value={input}
-              onChange={(e) => setInput(e.target.value)}
-              disabled={status !== "ready"}
-              placeholder="Say something..."
-              className="flex-1 rounded-md border border-zinc-300 px-4 py-2 focus:border-zinc-500 focus:outline-none"
-            />
-            <button
-              type="submit"
-              disabled={status !== "ready" || !input.trim()}
-              className="rounded-md bg-zinc-900 px-4 py-2 text-white transition-colors hover:bg-zinc-800 disabled:opacity-50"
-            >
-              Send
-            </button>
-          </div>
-        </form>
-      </div>
+      
     </div>
   );
 }
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot-2/store/chat-store.ts b/autogpt_platform/frontend/src/app/(platform)/copilot-2/store/chat-store.ts
new file mode 100644
index 0000000000..e69de29bb2