feat(ai): AiChatView store-first rendering cutover

apps/web/src/app/api/ai/chat/route.ts

@@ -35,6 +35,7 @@ import { createStreamLifecycle, type StreamLifecycleHandle } from '@/lib/ai/core
 import { takeOverConversationStreams } from '@/lib/ai/core/stream-takeover';
 import { startGenerationExclusive } from '@/lib/ai/core/start-generation-exclusive';
 import { chunkToPart } from '@/lib/ai/streams/chunkToPart';
+import { resolveMessageId } from '@/lib/ai/streams/resolveMessageId';
 import { validateBrowserSessionIdHeader } from '@/lib/ai/core/browser-session-id-validation';
 import { authenticateRequestWithOptions, isAuthError, isMCPAuthResult, checkMCPPageScope, getAllowedDriveIds, isScopedMCPAuth, canPrincipalViewPage, canPrincipalEditPage } from '@/lib/auth';
 
@@ -575,7 +576,14 @@ export async function POST(request: Request) {
     let askUserSyncPromise: Promise<unknown> | undefined;
     if (userMessage && userMessage.role === 'user') {
       try {
-        const messageId = userMessage.id || createId();
+        const messageId = resolveMessageId(userMessage.id);
+        // Reassign so every downstream use of `userMessage` (the broadcast below,
+        // any future read) agrees with what was actually persisted — resolveMessageId
+        // mints a FRESH id when the client-supplied one is absent or fails the safe-id
+        // shape check, and without this the object stays inconsistent: saved under
+        // `messageId`, but still carrying the original (possibly rejected) id anywhere
+        // `userMessage` itself is read afterward.
+        userMessage.id = messageId;
         const messageContent = extractMessageContent(userMessage);
 
         // Process @mentions in the user message

apps/web/src/app/api/ai/global/[id]/messages/__tests__/conversation-id-resolution.test.ts

@@ -101,7 +101,11 @@ vi.mock('@pagespace/db/db', () => {
       };
     }),
   }));
-  const insert = vi.fn(() => ({ values: vi.fn(() => ({ onConflictDoUpdate: vi.fn().mockResolvedValue(undefined) })) }));
+  const insert = vi.fn(() => ({
+    values: vi.fn(() => ({
+      onConflictDoUpdate: vi.fn(() => ({ returning: vi.fn().mockResolvedValue([{ id: 'msg-1' }]) })),
+    })),
+  }));
   const update = vi.fn(() => ({ set: vi.fn(() => ({ where: vi.fn().mockResolvedValue(undefined) })) }));
   // startGenerationExclusive's advisory lock: always free, so takeover+lifecycle-create run
   // exactly as before. Its own retry/degrade behavior is covered by
@@ -226,7 +230,9 @@ vi.mock('ai', () => ({
   createUIMessageStreamResponse: vi.fn().mockReturnValue(new Response('', { status: 200 })),
 }));
 
-vi.mock('@paralleldrive/cuid2', () => ({ createId: vi.fn().mockReturnValue('test-message-id') }));
+vi.mock('@paralleldrive/cuid2', () => ({
+  createId: vi.fn().mockReturnValue('test-message-id'),
+}));
 vi.mock('@/lib/logging/mask', () => ({ maskIdentifier: vi.fn((id: string) => `***${id.slice(-3)}`) }));
 vi.mock('@pagespace/lib/monitoring/ai-monitoring', () => ({
   AIMonitoring: { trackUsage: vi.fn(), trackToolUsage: vi.fn() },

apps/web/src/app/api/ai/global/[id]/messages/__tests__/credit-gate.test.ts

@@ -110,7 +110,11 @@ vi.mock('@pagespace/db/db', () => {
       };
     }),
   }));
-  const insert = vi.fn(() => ({ values: vi.fn(() => ({ onConflictDoUpdate: vi.fn().mockResolvedValue(undefined) })) }));
+  const insert = vi.fn(() => ({
+    values: vi.fn(() => ({
+      onConflictDoUpdate: vi.fn(() => ({ returning: vi.fn().mockResolvedValue([{ id: 'msg-1' }]) })),
+    })),
+  }));
   const update = vi.fn(() => ({ set: vi.fn(() => ({ where: vi.fn().mockResolvedValue(undefined) })) }));
   // startGenerationExclusive's advisory lock: always free, so takeover+lifecycle-create run
   // exactly as before. Its own retry/degrade behavior is covered by
@@ -236,7 +240,9 @@ vi.mock('ai', () => ({
   createUIMessageStreamResponse: vi.fn().mockReturnValue(new Response('', { status: 200 })),
 }));
 
-vi.mock('@paralleldrive/cuid2', () => ({ createId: vi.fn().mockReturnValue('test-message-id') }));
+vi.mock('@paralleldrive/cuid2', () => ({
+  createId: vi.fn().mockReturnValue('test-message-id'),
+}));
 vi.mock('@/lib/logging/mask', () => ({ maskIdentifier: vi.fn((id: string) => `***${id.slice(-3)}`) }));
 vi.mock('@pagespace/lib/monitoring/ai-monitoring', () => ({
   AIMonitoring: { trackUsage: vi.fn(), trackToolUsage: vi.fn() },

apps/web/src/app/api/ai/global/[id]/messages/__tests__/stream-socket-events.test.ts

@@ -114,7 +114,9 @@ vi.mock('@pagespace/db/db', () => {
 
   const insert = vi.fn(() => ({
     values: vi.fn(() => ({
-      onConflictDoUpdate: vi.fn().mockResolvedValue(undefined),
+      onConflictDoUpdate: vi.fn(() => ({
+        returning: vi.fn().mockResolvedValue([{ id: 'msg-1' }]),
+      })),
     })),
   }));
 

apps/web/src/app/api/ai/global/[id]/messages/route.ts

@@ -3,6 +3,7 @@ import { streamText, stepCountIs, hasToolCall, UIMessage, createUIMessageStream,
 import type { convertToModelMessages } from 'ai';
 import { finishTool, FINISH_TOOL_NAME } from '@/lib/ai/tools/finish-tool';
 import { askUserTools, ASK_USER_TOOL_NAME } from '@/lib/ai/tools/ask-user-tools';
+import { resolveMessageId } from '@/lib/ai/streams/resolveMessageId';
 import { canUseAskUser } from '@/lib/ai/core/ask-user-gating';
 import { ASK_USER_SECTION } from '@/lib/ai/core/inline-instructions';
 import { buildLocationTurnPrompt } from '@/lib/ai/core/location-prompt';
@@ -457,7 +458,11 @@ export async function POST(
     let askUserSyncPromise: Promise<unknown> | undefined;
     if (userMessage && userMessage.role === 'user') {
       try {
-        const messageId = userMessage.id || createId();
+        const messageId = resolveMessageId(userMessage.id);
+        // Reassign so every downstream use of `userMessage` (the broadcast below,
+        // any future read) agrees with what was actually persisted — see the
+        // equivalent comment in apps/web/src/app/api/ai/chat/route.ts.
+        userMessage.id = messageId;
         const messageContent = extractMessageContent(userMessage);
 
         // Process @mentions in the user message