diff --git a/apps/web/src/app/agents/[id]/chat/[chatId]/page.tsx b/apps/web/src/app/agents/[id]/chat/[chatId]/page.tsx
index 5c290bc..f10585e 100644
--- a/apps/web/src/app/agents/[id]/chat/[chatId]/page.tsx
+++ b/apps/web/src/app/agents/[id]/chat/[chatId]/page.tsx
@@ -227,6 +227,7 @@ export default function PublicAgentChatPage(): React.ReactElement {
   const [hasMoreMessages, setHasMoreMessages] = useState(false);
   const [isLoadingMore, setIsLoadingMore] = useState(false);
   const [sidebarOpen, setSidebarOpen] = useState(true);
+  const [viewMode, setViewMode] = useState<'chat' | 'debug'>('chat');
 
   // Track first item index for prepending (Virtuoso pattern)
   const [firstItemIndex, setFirstItemIndex] = useState(10000);
@@ -643,32 +644,80 @@ export default function PublicAgentChatPage(): React.ReactElement {
         {/* Main Chat Area */}
         <div className="flex-1 flex flex-col min-w-0">
           {/* Chat Header */}
-          <div className="border-b border-border bg-surface/50 px-4 py-3 flex items-center justify-between">
-            <div className="flex items-center gap-3">
+          <div className="border-b border-border bg-surface/50 px-4 py-3">
+            <div className="flex items-center justify-between">
+              <div className="flex items-center gap-3">
+                <button
+                  type="button"
+                  onClick={() => setSidebarOpen(!sidebarOpen)}
+                  className="p-2 hover:bg-surface-secondary rounded-lg transition-colors"
+                  title={sidebarOpen ? 'Hide sidebar' : 'Show sidebar'}
+                >
+                  <Icon icon="menu" size="sm" />
+                </button>
+                <div>
+                  <h1 className="text-lg font-semibold text-foreground">{agent.name}</h1>
+                  <p className="text-sm text-foreground-tertiary">
+                    {PROVIDER_DISPLAY_NAMES[agent.provider]} • {agent.modelId}
+                  </p>
+                </div>
+              </div>
+              <Button variant="outline" size="sm" onClick={startNewConversation}>
+                <Icon icon="plus" size="xs" className="mr-2" />
+                New Chat
+              </Button>
+            </div>
+            {/* View Mode Tabs */}
+            <div className="flex gap-1 mt-3">
               <button
                 type="button"
-                onClick={() => setSidebarOpen(!sidebarOpen)}
-                className="p-2 hover:bg-surface-secondary rounded-lg transition-colors"
-                title={sidebarOpen ? 'Hide sidebar' : 'Show sidebar'}
+                onClick={() => setViewMode('chat')}
+                className={`px-3 py-1.5 text-sm rounded-md transition-colors ${
+                  viewMode === 'chat'
+                    ? 'bg-primary text-primary-foreground'
+                    : 'text-foreground-secondary hover:text-foreground hover:bg-surface-secondary'
+                }`}
               >
-                <Icon icon="menu" size="sm" />
+                Chat
+              </button>
+              <button
+                type="button"
+                onClick={() => setViewMode('debug')}
+                className={`px-3 py-1.5 text-sm rounded-md transition-colors ${
+                  viewMode === 'debug'
+                    ? 'bg-primary text-primary-foreground'
+                    : 'text-foreground-secondary hover:text-foreground hover:bg-surface-secondary'
+                }`}
+              >
+                Debug JSON
               </button>
-              <div>
-                <h1 className="text-lg font-semibold text-foreground">{agent.name}</h1>
-                <p className="text-sm text-foreground-tertiary">
-                  {PROVIDER_DISPLAY_NAMES[agent.provider]} • {agent.modelId}
-                </p>
-              </div>
             </div>
-            <Button variant="outline" size="sm" onClick={startNewConversation}>
-              <Icon icon="plus" size="xs" className="mr-2" />
-              New Chat
-            </Button>
           </div>
 
-          {/* Messages */}
-          <div className="flex-1 overflow-hidden">
-            {messages.length === 0 && !streamingContent ? (
+          {/* Debug JSON View */}
+          {viewMode === 'debug' && (
+            <div className="flex-1 overflow-auto p-4 bg-background">
+              <div className="mb-4">
+                <h2 className="text-sm font-medium text-foreground mb-2">
+                  Raw Messages Array ({messages.length} messages)
+                </h2>
+                <p className="text-xs text-foreground-tertiary mb-4">
+                  Messages are ordered by createdAt. Each message includes role, content, and tool
+                  call data.
+                </p>
+              </div>
+              <pre className="text-xs font-mono bg-surface-secondary border border-border rounded-lg p-4 overflow-x-auto whitespace-pre-wrap">
+                {JSON.stringify(messages, null, 2)}
+              </pre>
+            </div>
+          )}
+
+          {/* Chat View */}
+          {viewMode === 'chat' && (
+            <>
+              {/* Messages */}
+              <div className="flex-1 overflow-hidden">
+                {messages.length === 0 && !streamingContent ? (
               <div className="h-full flex items-center justify-center p-4">
                 <div className="text-center">
                   <div className="w-16 h-16 rounded-full bg-primary/10 flex items-center justify-center mx-auto mb-4">
@@ -897,6 +946,8 @@ export default function PublicAgentChatPage(): React.ReactElement {
               Press Enter to send, Shift+Enter for new line
             </p>
           </div>
+            </>
+          )}
         </div>
       </div>
     </div>
diff --git a/apps/web/src/app/api/agents/[id]/conversation/[conversationId]/route.ts b/apps/web/src/app/api/agents/[id]/conversation/[conversationId]/route.ts
index b14b313..936165e 100644
--- a/apps/web/src/app/api/agents/[id]/conversation/[conversationId]/route.ts
+++ b/apps/web/src/app/api/agents/[id]/conversation/[conversationId]/route.ts
@@ -269,6 +269,12 @@ export async function POST(request: NextRequest, context: RouteContext): Promise
           // Accumulate tool calls with their input args
           const toolCallsMap: Map<string, { toolCallId: string; toolName: string; args: unknown }> =
             new Map();
+          // Collect tool results to save AFTER assistant message (for correct chronological order)
+          const pendingToolResults: Array<{
+            toolCallId: string;
+            toolName: string;
+            output: unknown;
+          }> = [];
           let inputTokens = 0;
           let outputTokens = 0;
 
@@ -312,7 +318,7 @@ export async function POST(request: NextRequest, context: RouteContext): Promise
                 }
               }
 
-              // Send tool results
+              // Send tool results via SSE but don't save yet (save after assistant message for correct order)
               if (toolResults && toolResults.length > 0) {
                 for (const tr of toolResults) {
                   sendEvent('tool_result', {
@@ -320,16 +326,11 @@ export async function POST(request: NextRequest, context: RouteContext): Promise
                     output: tr.output,
                   });
 
-                  // Save tool message to database
-                  await prisma.message.create({
-                    data: {
-                      conversationId: conversation.id,
-                      role: 'TOOL',
-                      content: JSON.stringify(tr.output),
-                      toolCallId: tr.toolCallId,
-                      toolName: tr.toolName,
-                      toolResult: tr.output as object,
-                    },
+                  // Collect tool results to save after assistant message
+                  pendingToolResults.push({
+                    toolCallId: tr.toolCallId,
+                    toolName: tr.toolName,
+                    output: tr.output,
                   });
                 }
               }
@@ -360,7 +361,7 @@ export async function POST(request: NextRequest, context: RouteContext): Promise
             outputTokens = finalUsage.outputTokens ?? outputTokens;
           }
 
-          // Save assistant message
+          // Save assistant message FIRST (so it has earlier createdAt than tool results)
           const assistantMessage = await prisma.message.create({
             data: {
               conversationId: conversation.id,
@@ -376,6 +377,20 @@ export async function POST(request: NextRequest, context: RouteContext): Promise
             },
           });
 
+          // Now save TOOL messages (after assistant, for correct chronological order)
+          for (const tr of pendingToolResults) {
+            await prisma.message.create({
+              data: {
+                conversationId: conversation.id,
+                role: 'TOOL',
+                content: JSON.stringify(tr.output),
+                toolCallId: tr.toolCallId,
+                toolName: tr.toolName,
+                toolResult: tr.output as object,
+              },
+            });
+          }
+
           // Update conversation timestamp
           await prisma.conversation.update({
             where: { id: conversation.id },