Merge branch 'main' into codex/support-gpt-5-6

Author: cosarah

components/chat/chat-session.tsx

@@ -116,7 +116,7 @@ const MessageBubble = memo(function MessageBubble({
             : 'bg-indigo-50 dark:bg-indigo-900/20 text-indigo-900 dark:text-indigo-200 border border-indigo-100/50 dark:border-indigo-800/50 rounded-tl-sm',
       )}
     >
-      <span className="break-words">
+      <span className="whitespace-pre-wrap break-words">
         {parts.map((part: MessagePart, i: number) => {
           if (part.type === 'text' || part.type === 'step-start') {
             const text = part.type === 'text' ? part.text : '';

tests/chat/chat-session-markup.test.ts

@@ -0,0 +1,40 @@
+import { createElement } from 'react';
+import { renderToStaticMarkup } from 'react-dom/server';
+import { describe, expect, it, vi } from 'vitest';
+import { ChatSessionComponent } from '@/components/chat/chat-session';
+import type { ChatSession } from '@/lib/types/chat';
+
+vi.mock('@/lib/hooks/use-i18n', () => ({
+  useI18n: () => ({ t: (key: string) => key }),
+}));
+
+describe('ChatSessionComponent markup contract', () => {
+  it('preserves newlines in the shared message text wrapper', () => {
+    const session: ChatSession = {
+      id: 'session-1',
+      type: 'qa',
+      title: 'Q&A',
+      status: 'active',
+      messages: [
+        {
+          id: 'message-1',
+          role: 'user',
+          parts: [{ type: 'text', text: 'first line\nsecond line' }],
+          metadata: { originalRole: 'user', senderName: 'You' },
+        },
+      ],
+      config: { agentIds: ['default-1'] },
+      toolCalls: [],
+      pendingToolCalls: [],
+      createdAt: 1,
+      updatedAt: 1,
+    };
+
+    const html = renderToStaticMarkup(
+      createElement(ChatSessionComponent, { session, isActive: false }),
+    );
+
+    expect(html).toContain('class="whitespace-pre-wrap break-words"');
+    expect(html).toContain('first line\nsecond line');
+  });
+});