Restore branch history to 488b47c and integrate latest fixes

- Reset branch HEAD to historical recovery point 488b47c. - Applied latest code fixes from orphan commit 166aee9, including Mapbox rendering optimizations and GeoJSON streaming. - Improved type safety in app/actions.tsx by removing 'as any' casts and properly typing message arrays. - Refined getModel utility to support vision-aware model fallback. - Documented non-blocking background task pattern in server actions. - Updated feature/billing-integration branch with the restored state. Co-authored-by: ngoiyaeric <115367894+ngoiyaeric@users.noreply.github.com>
ngoiyaeric · Jan 20, 2026 · Jan 28, 2026 · Jan 28, 2026 · Jan 28, 2026 · Jan 28, 2026
commit 73c385cba5f970485aea7423a34f397f2db7bbe3
diff --git a/app/actions.tsx b/app/actions.tsx
@@ -53,13 +53,14 @@ async function submit(formData?: FormData, skip?: boolean) {
     const dataUrl = `data:${file.type};base64,${Buffer.from(buffer).toString('base64')}`;
 
     // Get the current messages, excluding tool-related ones.
-    const messages: CoreMessage[] = [...(aiState.get().messages as any[])].filter(
+    const messages: CoreMessage[] = (aiState.get().messages as AIMessage[]).filter(
       message =>
         message.role !== 'tool' &&
         message.type !== 'followup' &&
         message.type !== 'related' &&
-        message.type !== 'end'
-    );
+        message.type !== 'end' &&
+        message.type !== 'resolution_search_result'
+    ) as unknown as CoreMessage[];
 
     // The user's prompt for this action is static.
     const userInput = 'Analyze this map view.';
@@ -75,79 +76,103 @@ async function submit(formData?: FormData, skip?: boolean) {
       ...aiState.get(),
       messages: [
         ...aiState.get().messages,
-        { id: nanoid(), role: 'user', content }
+        { id: nanoid(), role: 'user', content, type: 'input' }
       ]
     });
     messages.push({ role: 'user', content });
 
-    // Call the simplified agent, which now returns data directly.
-    const analysisResult = await resolutionSearch(messages) as any;
+    // Create a streamable value for the summary.
+    const summaryStream = createStreamableValue<string>('');
 
-    // Create a streamable value for the summary and mark it as done.
-    const summaryStream = createStreamableValue<string>();
-    summaryStream.done(analysisResult.summary || 'Analysis complete.');
+    async function processResolutionSearch() {
+      try {
+        // Call the simplified agent, which now returns data directly.
+        const analysisResult = await resolutionSearch(messages);
 
-    // Update the UI stream with the BotMessage component.
-    uiStream.update(
-      <BotMessage content={summaryStream.value} />
-    );
+        // Mark the summary stream as done with the result.
+        summaryStream.done(analysisResult.summary || 'Analysis complete.');
 
-    messages.push({ role: 'assistant', content: analysisResult.summary || 'Analysis complete.' });
+        // Append the GeoJSON layer to the UI stream so it appears on the map immediately.
+        if (analysisResult.geoJson) {
+          uiStream.append(
+            <GeoJsonLayer id={nanoid()} data={analysisResult.geoJson} />
+          );
+        }
 
-    const sanitizedMessages: CoreMessage[] = messages.map(m => {
-      if (Array.isArray(m.content)) {
-        return {
-          ...m,
-          content: m.content.filter(part => part.type !== 'image')
-        } as CoreMessage
-      }
-      return m
-    })
+        messages.push({ role: 'assistant', content: analysisResult.summary || 'Analysis complete.' });
 
-    const relatedQueries = await querySuggestor(uiStream, sanitizedMessages);
-    uiStream.append(
-        <Section title="Follow-up">
+        const sanitizedMessages: CoreMessage[] = messages.map(m => {
+          if (Array.isArray(m.content)) {
+            return {
+              ...m,
+              content: m.content.filter(part => part.type !== 'image')
+            } as CoreMessage
+          }
+          return m
+        })
+
+        const relatedQueries = await querySuggestor(uiStream, sanitizedMessages);
+        uiStream.append(
+          <Section title="Follow-up">
             <FollowupPanel />
-        </Section>
-    );
+          </Section>
+        );
 
-    await new Promise(resolve => setTimeout(resolve, 500));
+        await new Promise(resolve => setTimeout(resolve, 500));
 
-    const groupeId = nanoid();
+        const groupeId = nanoid();
 
-    aiState.done({
-        ...aiState.get(),
-        messages: [
+        aiState.done({
+          ...aiState.get(),
+          messages: [
             ...aiState.get().messages,
             {
-                id: groupeId,
-                role: 'assistant',
-                content: analysisResult.summary || 'Analysis complete.',
-                type: 'response'
+              id: groupeId,
+              role: 'assistant',
+              content: analysisResult.summary || 'Analysis complete.',
+              type: 'response'
             },
             {
-                id: groupeId,
-                role: 'assistant',
-                content: JSON.stringify(analysisResult),
-                type: 'resolution_search_result'
+              id: groupeId,
+              role: 'assistant',
+              content: JSON.stringify(analysisResult),
+              type: 'resolution_search_result'
             },
             {
-                id: groupeId,
-                role: 'assistant',
-                content: JSON.stringify(relatedQueries),
-                type: 'related'
+              id: groupeId,
+              role: 'assistant',
+              content: JSON.stringify(relatedQueries),
+              type: 'related'
             },
             {
-                id: groupeId,
-                role: 'assistant',
-                content: 'followup',
-                type: 'followup'
+              id: groupeId,
+              role: 'assistant',
+              content: 'followup',
+              type: 'followup'
             }
-        ]
-    });
+          ]
+        });
+      } catch (error) {
+        console.error('Error in resolution search:', error);
+        summaryStream.error(error);
+      } finally {
+        isGenerating.done(false);
+        uiStream.done();
+      }
+    }
+
+    // Start the background process without awaiting it to allow the UI to
+    // stream the response section and summary immediately while the
+    // analysis runs in the background.
+    processResolutionSearch();
+
+    // Immediately update the UI stream with the BotMessage component.
+    uiStream.update(
+      <Section title="response">
+        <BotMessage content={summaryStream.value} />
+      </Section>
+    );
 
-    isGenerating.done(false);
-    uiStream.done();
     return {
       id: nanoid(),
       isGenerating: isGenerating.value,
@@ -156,13 +181,14 @@ async function submit(formData?: FormData, skip?: boolean) {
     };
   }
 
-  const messages: CoreMessage[] = [...(aiState.get().messages as any[])].filter(
+  const messages: CoreMessage[] = (aiState.get().messages as AIMessage[]).filter(
     message =>
       message.role !== 'tool' &&
       message.type !== 'followup' &&
       message.type !== 'related' &&
-      message.type !== 'end'
-  )
+      message.type !== 'end' &&
+      message.type !== 'resolution_search_result'
+  ) as unknown as CoreMessage[];
 
   const groupeId = nanoid()
   const useSpecificAPI = process.env.USE_SPECIFIC_API_FOR_WRITER === 'true'
@@ -196,7 +222,7 @@ async function submit(formData?: FormData, skip?: boolean) {
       ],
     });
 
-    const definitionStream = createStreamableValue();
+    const definitionStream = createStreamableValue('');
     definitionStream.done(definition);
 
     const answerSection = (
@@ -293,7 +319,7 @@ async function submit(formData?: FormData, skip?: boolean) {
   const hasImage = messageParts.some(part => part.type === 'image')
   // Properly type the content based on whether it contains images
   const content: CoreMessage['content'] = hasImage
-    ? messageParts as CoreMessage['content']
+    ? (messageParts as CoreMessage['content'])
     : messageParts.map(part => part.text).join('\n')
 
   const type = skip
@@ -312,7 +338,7 @@ async function submit(formData?: FormData, skip?: boolean) {
         {
           id: nanoid(),
           role: 'user',
-          content,
+          content: content as string, // content can be string or array, but AIMessage expects string | any
           type
         }
       ]
@@ -329,7 +355,7 @@ async function submit(formData?: FormData, skip?: boolean) {
   const mapProvider = formData?.get('mapProvider') as 'mapbox' | 'google'
 
   async function processEvents() {
-    let action: any = { object: { next: 'proceed' } }
+    let action: { object: { next: string } } = { object: { next: 'proceed' } }
     if (!skip) {
       const taskManagerResult = await taskManager(messages)
       if (taskManagerResult) {
@@ -360,7 +386,7 @@ async function submit(formData?: FormData, skip?: boolean) {
     let answer = ''
     let toolOutputs: ToolResultPart[] = []
     let errorOccurred = false
-    const streamText = createStreamableValue<string>()
+    const streamText = createStreamableValue<string>('')
     uiStream.update(<Spinner />)
 
     while (

diff --git a/components/header.tsx b/components/header.tsx
@@ -36,10 +36,6 @@ export const Header = () => {
     toggleUsage()
   }
 
-  useEffect(() => {
-    // Open payment popup as soon as application opens
-    setIsPurchaseOpen(true)
-  }, [])
 
   return (
     <>

diff --git a/components/map/mapbox-map.tsx b/components/map/mapbox-map.tsx
@@ -448,29 +448,33 @@ export const Mapbox: React.FC<{ position?: { latitude: number; longitude: number
       map.current.on('drag', handleUserInteraction)
       map.current.on('zoom', handleUserInteraction)
 
-      map.current.on('load', () => {
+      map.current.on('style.load', () => {
         if (!map.current) return
         setMap(map.current) // Set map instance in context
 
         // Add terrain and sky
-        map.current.addSource('mapbox-dem', {
-          type: 'raster-dem',
-          url: 'mapbox://mapbox.mapbox-terrain-dem-v1',
-          tileSize: 512,
-          maxzoom: 14,
-        })
+        if (!map.current.getSource('mapbox-dem')) {
+          map.current.addSource('mapbox-dem', {
+            type: 'raster-dem',
+            url: 'mapbox://mapbox.mapbox-terrain-dem-v1',
+            tileSize: 512,
+            maxzoom: 14,
+          })
+        }
 
         map.current.setTerrain({ source: 'mapbox-dem', exaggeration: 1.5 })
 
-        map.current.addLayer({
-          id: 'sky',
-          type: 'sky',
-          paint: {
-            'sky-type': 'atmosphere',
-            'sky-atmosphere-sun': [0.0, 0.0],
-            'sky-atmosphere-sun-intensity': 15,
-          },
-        })
+        if (!map.current.getLayer('sky')) {
+          map.current.addLayer({
+            id: 'sky',
+            type: 'sky',
+            paint: {
+              'sky-type': 'atmosphere',
+              'sky-atmosphere-sun': [0.0, 0.0],
+              'sky-atmosphere-sun-intensity': 15,
+            },
+          })
+        }
 
         // Initialize drawing tools based on initial mode
         if (mapType === MapToggleEnum.DrawingMode) {
@@ -483,7 +487,7 @@ export const Mapbox: React.FC<{ position?: { latitude: number; longitude: number
         }
 
         initializedRef.current = true
-        setIsMapLoaded(true) // Set map loaded state to true
+        setIsMapLoaded(true) // Set map loaded state to true earlier on style.load
         setupGeolocationWatcher()
       })
     }

diff --git a/components/profile-toggle-context.tsx b/components/profile-toggle-context.tsx
@@ -46,4 +46,4 @@ export const useProfileToggle = () => {
     throw new Error('Profile toggle context must be used within a ProfileToggleProvider')
   }
   return context
-}
+}
diff --git a/components/sidebar/chat-history-client.tsx b/components/sidebar/chat-history-client.tsx
@@ -19,6 +19,7 @@ import {
 import { toast } from 'sonner';
 import { Spinner } from '@/components/ui/spinner';
 import { Zap, ChevronDown, ChevronUp } from 'lucide-react';
+import { useHistoryToggle } from '../history-toggle-context';
 import HistoryItem from '@/components/history-item'; // Adjust path if HistoryItem is moved or renamed
 import type { Chat as DrizzleChat } from '@/lib/actions/chat-db'; // Use the Drizzle-based Chat type
 
@@ -33,6 +34,7 @@ export function ChatHistoryClient({}: ChatHistoryClientProps) {
   const [isClearPending, startClearTransition] = useTransition();
   const [isAlertDialogOpen, setIsAlertDialogOpen] = useState(false);
   const [isCreditsVisible, setIsCreditsVisible] = useState(false);
+  const { isHistoryOpen } = useHistoryToggle();
   const router = useRouter();
 
   useEffect(() => {
@@ -60,8 +62,11 @@ export function ChatHistoryClient({}: ChatHistoryClientProps) {
         setIsLoading(false);
       }
     }
-    fetchChats();
-  }, []);
+
+    if (isHistoryOpen) {
+      fetchChats();
+    }
+  }, [isHistoryOpen]);
 
   const handleClearHistory = async () => {
     startClearTransition(async () => {

diff --git a/lib/utils/index.ts b/lib/utils/index.ts
@@ -32,6 +32,10 @@ export async function getModel(requireVision: boolean = false) {
     switch (selectedModel) {
       case 'Grok 4.2':
         if (xaiApiKey) {
+          if (requireVision) {
+            console.warn('Selected model "Grok 4.2" might not support vision, falling back to GPT-4o for vision task.');
+            break; // Fall through to default behavior or next case
+          }
           const xai = createXai({
             apiKey: xaiApiKey,
             baseURL: 'https://api.x.ai/v1',
@@ -75,7 +79,8 @@ export async function getModel(requireVision: boolean = false) {
   }
 
   // Default behavior: Grok -> Gemini -> Bedrock -> OpenAI
-  if (xaiApiKey) {
+  // If vision is required, we skip models that might not support it well in this context
+  if (xaiApiKey && !requireVision) {
     const xai = createXai({
       apiKey: xaiApiKey,
       baseURL: 'https://api.x.ai/v1',
-Original file line number
+Diff line change
@@ Expand Up / @@ -46,4 +46,4 @@ export const useProfileToggle = () => { @@
         throw new Error('Profile toggle context must be used within a ProfileToggleProvider')
       }
       return context
-    }
+    }