diff --git a/app/actions.tsx b/app/actions.tsx
index a2aa182d..31eb8629 100644
--- a/app/actions.tsx
+++ b/app/actions.tsx
@@ -8,10 +8,11 @@ import {
 } from 'ai/rsc'
 import { CoreMessage, ToolResultPart } from 'ai'
 import { nanoid } from 'nanoid'
+import type { FeatureCollection } from 'geojson'
 import { Spinner } from '@/components/ui/spinner'
 import { Section } from '@/components/section'
 import { FollowupPanel } from '@/components/followup-panel'
-import { inquire, researcher, taskManager, querySuggestor } from '@/lib/agents'
+import { inquire, researcher, taskManager, querySuggestor, resolutionSearch } from '@/lib/agents'
 // Removed import of useGeospatialToolMcp as it no longer exists and was incorrectly used here.
 // The geospatialTool (if used by agents like researcher) now manages its own MCP client.
 import { writer } from '@/lib/agents/writer'
@@ -21,6 +22,7 @@ import { UserMessage } from '@/components/user-message'
 import { BotMessage } from '@/components/message'
 import { SearchSection } from '@/components/search-section'
 import SearchRelated from '@/components/search-related'
+import { GeoJsonLayer } from '@/components/map/geojson-layer'
 import { CopilotDisplay } from '@/components/copilot-display'
 import RetrieveSection from '@/components/retrieve-section'
 import { VideoSearchSection } from '@/components/video-search-section'
@@ -39,6 +41,80 @@ async function submit(formData?: FormData, skip?: boolean) {
   const uiStream = createStreamableUI()
   const isGenerating = createStreamableValue(true)
   const isCollapsed = createStreamableValue(false)
+
+  const action = formData?.get('action') as string;
+  if (action === 'resolution_search') {
+    const file = formData?.get('file') as File;
+    if (!file) {
+      throw new Error('No file provided for resolution search.');
+    }
+
+    const buffer = await file.arrayBuffer();
+    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(
+      message =>
+        message.role !== 'tool' &&
+        message.type !== 'followup' &&
+        message.type !== 'related' &&
+        message.type !== 'end'
+    );
+
+    // The user's prompt for this action is static.
+    const userInput = 'Analyze this map view.';
+
+    // Construct the multimodal content for the user message.
+    const content: CoreMessage['content'] = [
+      { type: 'text', text: userInput },
+      { type: 'image', image: dataUrl, mimeType: file.type }
+    ];
+
+    // Add the new user message to the AI state.
+    aiState.update({
+      ...aiState.get(),
+      messages: [
+        ...aiState.get().messages,
+        { id: nanoid(), role: 'user', content }
+      ]
+    });
+    messages.push({ role: 'user', content });
+
+    // Call the simplified agent, which now returns data directly.
+    const analysisResult = await resolutionSearch(messages);
+
+    // Create a streamable value for the summary and mark it as done.
+    const summaryStream = createStreamableValue<string>();
+    summaryStream.done(analysisResult.summary || 'Analysis complete.');
+
+    // Update the UI stream with the BotMessage component.
+    uiStream.update(
+      <BotMessage content={summaryStream.value} />
+    );
+
+    aiState.done({
+      ...aiState.get(),
+      messages: [
+        ...aiState.get().messages,
+        {
+          id: nanoid(),
+          role: 'assistant',
+          content: JSON.stringify(analysisResult),
+          type: 'resolution_search_result'
+        }
+      ]
+    });
+
+    isGenerating.done(false);
+    uiStream.done();
+    return {
+      id: nanoid(),
+      isGenerating: isGenerating.value,
+      component: uiStream.value,
+      isCollapsed: isCollapsed.value
+    };
+  }
+
   const messages: CoreMessage[] = [...(aiState.get().messages as any[])].filter(
     message =>
       message.role !== 'tool' &&
@@ -539,6 +615,26 @@ export const getUIStateFromAIState = (aiState: AIState): UIState => {
                   </Section>
                 )
               }
+            case 'resolution_search_result': {
+              const analysisResult = JSON.parse(content as string);
+              const summaryValue = createStreamableValue();
+              summaryValue.done(analysisResult.summary);
+              const geoJson = analysisResult.geoJson as FeatureCollection;
+
+              return {
+                id,
+                component: (
+                  <>
+                    <Section title="Map Analysis">
+                      <BotMessage content={summaryValue.value} />
+                    </Section>
+                    {geoJson && (
+                      <GeoJsonLayer id={id} data={geoJson} />
+                    )}
+                  </>
+                )
+              }
+            }
           }
           break
         case 'tool':
diff --git a/bun.lockb b/bun.lockb
index 6ce99d8c..fe074ae5 100755
Binary files a/bun.lockb and b/bun.lockb differ
diff --git a/components/analysis-tool.tsx b/components/analysis-tool.tsx
new file mode 100644
index 00000000..db53fa71
--- /dev/null
+++ b/components/analysis-tool.tsx
@@ -0,0 +1,77 @@
+'use client'
+
+import React, { useState } from 'react'
+import { useActions, useUIState } from 'ai/rsc'
+import { AI } from '@/app/actions'
+import { Button } from '@/components/ui/button'
+import { Search } from 'lucide-react'
+import { useMap } from './map/map-context'
+import { nanoid } from 'nanoid'
+import { UserMessage } from './user-message'
+import { toast } from 'react-toastify'
+
+export function AnalysisTool() {
+  const { map } = useMap()
+  const { submit } = useActions()
+  const [, setMessages] = useUIState<typeof AI>()
+  const [isAnalyzing, setIsAnalyzing] = useState(false)
+
+  const handleResolutionSearch = async () => {
+    if (!map) {
+      toast.error('Map is not available yet. Please wait for it to load.')
+      return
+    }
+
+    setIsAnalyzing(true)
+
+    try {
+      setMessages(currentMessages => [
+        ...currentMessages,
+        {
+          id: nanoid(),
+          component: <UserMessage content={[{ type: 'text', text: 'Analyze this map view.' }]} />
+        }
+      ])
+
+      const canvas = map.getCanvas()
+      const blob = await new Promise<Blob | null>(resolve => {
+        canvas.toBlob(resolve, 'image/png')
+      })
+
+      if (!blob) {
+        throw new Error('Failed to capture map image.')
+      }
+
+      const formData = new FormData()
+      formData.append('file', blob, 'map_capture.png')
+      formData.append('action', 'resolution_search')
+
+      const responseMessage = await submit(formData)
+      setMessages(currentMessages => [...currentMessages, responseMessage as any])
+    } catch (error) {
+      console.error('Failed to perform resolution search:', error)
+      toast.error('An error occurred while analyzing the map.')
+    } finally {
+      setIsAnalyzing(false)
+    }
+  }
+
+  return (
+    <div className="absolute top-4 right-4 z-20">
+      <Button
+        variant="outline"
+        size="icon"
+        onClick={handleResolutionSearch}
+        disabled={isAnalyzing || !map}
+        title="Analyze current map view"
+        className="bg-background/80 backdrop-blur-sm hover:bg-background"
+      >
+        {isAnalyzing ? (
+          <div className="h-5 w-5 animate-spin rounded-full border-b-2 border-current"></div>
+        ) : (
+          <Search className="h-5 w-5" />
+        )}
+      </Button>
+    </div>
+  )
+}
\ No newline at end of file
diff --git a/components/chat.tsx b/components/chat.tsx
index 0a40bd13..44de7be0 100644
--- a/components/chat.tsx
+++ b/components/chat.tsx
@@ -11,7 +11,13 @@ import MobileIconsBar from './mobile-icons-bar'
 import { useProfileToggle, ProfileToggleEnum } from "@/components/profile-toggle-context";
 import SettingsView from "@/components/settings/settings-view";
 import { MapDataProvider, useMapData } from './map/map-data-context'; // Add this and useMapData
+import { MapProvider } from './map/map-context'
 import { updateDrawingContext } from '@/lib/actions/chat'; // Import the server action
+import dynamic from 'next/dynamic'
+
+const AnalysisTool = dynamic(() => import('./analysis-tool').then(mod => mod.AnalysisTool), {
+  ssr: false,
+})
 
 type ChatProps = {
   id?: string // This is the chatId
@@ -80,8 +86,9 @@ export function Chat({ id }: ChatProps) {
   if (isMobile) {
     return (
       <MapDataProvider> {/* Add Provider */}
-        <div className="mobile-layout-container">
-          <div className="mobile-map-section">
+        <MapProvider>
+          <div className="mobile-layout-container">
+            <div className="mobile-map-section">
             {activeView ? <SettingsView /> : <Mapbox />}
           </div>
           <div className="mobile-icons-bar">
@@ -100,8 +107,9 @@ export function Chat({ id }: ChatProps) {
             ) : (
               <ChatMessages messages={messages} />
             )}
+            </div>
           </div>
-        </div>
+        </MapProvider>
       </MapDataProvider>
     );
   }
@@ -109,8 +117,9 @@ export function Chat({ id }: ChatProps) {
   // Desktop layout
   return (
     <MapDataProvider> {/* Add Provider */}
-      <div className="flex justify-start items-start">
-        {/* This is the new div for scrolling */}
+      <MapProvider>
+        <div className="flex justify-start items-start">
+          {/* This is the new div for scrolling */}
         <div className="w-1/2 flex flex-col space-y-3 md:space-y-4 px-8 sm:px-12 pt-12 md:pt-14 pb-4 h-[calc(100vh-0.5in)] overflow-y-auto">
           <ChatPanel messages={messages} input={input} setInput={setInput} />
           {showEmptyScreen ? (
@@ -123,13 +132,15 @@ export function Chat({ id }: ChatProps) {
             <ChatMessages messages={messages} />
           )}
         </div>
-        <div
-          className="w-1/2 p-4 fixed h-[calc(100vh-0.5in)] top-0 right-0 mt-[0.5in]"
-          style={{ zIndex: 10 }} // Added z-index
-        >
-          {activeView ? <SettingsView /> : <Mapbox />}
+          <div
+            className="w-1/2 p-4 fixed h-[calc(100vh-0.5in)] top-0 right-0 mt-[0.5in]"
+            style={{ zIndex: 10 }} // Added z-index
+          >
+            {activeView ? <SettingsView /> : <Mapbox />}
+            <AnalysisTool />
+          </div>
         </div>
-      </div>
+      </MapProvider>
     </MapDataProvider>
   );
 }
diff --git a/components/map/geojson-layer.tsx b/components/map/geojson-layer.tsx
new file mode 100644
index 00000000..63ac4e50
--- /dev/null
+++ b/components/map/geojson-layer.tsx
@@ -0,0 +1,100 @@
+'use client'
+
+import { useEffect } from 'react'
+import type mapboxgl from 'mapbox-gl'
+import { useMap } from './map-context'
+import type { FeatureCollection } from 'geojson'
+
+interface GeoJsonLayerProps {
+  id: string;
+  data: FeatureCollection;
+}
+
+export function GeoJsonLayer({ id, data }: GeoJsonLayerProps) {
+  const { map } = useMap()
+
+  useEffect(() => {
+    if (!map || !data) return
+
+    const sourceId = `geojson-source-${id}`
+    const pointLayerId = `geojson-point-layer-${id}`
+    const polygonLayerId = `geojson-polygon-layer-${id}`
+    const polygonOutlineLayerId = `geojson-polygon-outline-layer-${id}`
+
+    const onMapLoad = () => {
+      // Add source if it doesn't exist
+      if (!map.getSource(sourceId)) {
+        map.addSource(sourceId, {
+          type: 'geojson',
+          data: data
+        })
+      } else {
+        // If source exists, just update the data
+        const source = map.getSource(sourceId) as mapboxgl.GeoJSONSource;
+        source.setData(data);
+      }
+
+      // Add polygon layer for fill
+      if (!map.getLayer(polygonLayerId)) {
+        map.addLayer({
+          id: polygonLayerId,
+          type: 'fill',
+          source: sourceId,
+          filter: ['==', '$type', 'Polygon'],
+          paint: {
+            'fill-color': '#088',
+            'fill-opacity': 0.4
+          }
+        })
+      }
+
+      // Add polygon layer for outline
+      if (!map.getLayer(polygonOutlineLayerId)) {
+        map.addLayer({
+          id: polygonOutlineLayerId,
+          type: 'line',
+          source: sourceId,
+          filter: ['==', '$type', 'Polygon'],
+          paint: {
+            'line-color': '#088',
+            'line-width': 2
+          }
+        })
+      }
+
+      // Add point layer for circles
+      if (!map.getLayer(pointLayerId)) {
+        map.addLayer({
+          id: pointLayerId,
+          type: 'circle',
+          source: sourceId,
+          filter: ['==', '$type', 'Point'],
+          paint: {
+            'circle-radius': 6,
+            'circle-color': '#B42222',
+            'circle-stroke-width': 2,
+            'circle-stroke-color': '#ffffff'
+          }
+        })
+      }
+    }
+
+    if (map.isStyleLoaded()) {
+      onMapLoad()
+    } else {
+      map.on('load', onMapLoad)
+    }
+
+    // Cleanup function
+    return () => {
+      if (map.isStyleLoaded()) {
+        if (map.getLayer(pointLayerId)) map.removeLayer(pointLayerId)
+        if (map.getLayer(polygonLayerId)) map.removeLayer(polygonLayerId)
+        if (map.getLayer(polygonOutlineLayerId)) map.removeLayer(polygonOutlineLayerId)
+        if (map.getSource(sourceId)) map.removeSource(sourceId)
+      }
+    }
+  }, [map, id, data])
+
+  return null // This component does not render any DOM elements itself
+}
\ No newline at end of file
diff --git a/components/map/map-context.tsx b/components/map/map-context.tsx
new file mode 100644
index 00000000..3f19540f
--- /dev/null
+++ b/components/map/map-context.tsx
@@ -0,0 +1,30 @@
+'use client'
+
+import { createContext, useContext, useState, ReactNode } from 'react'
+import type { Map as MapboxMap } from 'mapbox-gl'
+
+// A more direct context to hold the map instance itself.
+type MapContextType = {
+  map: MapboxMap | null;
+  setMap: (map: MapboxMap | null) => void;
+};
+
+const MapContext = createContext<MapContextType | undefined>(undefined);
+
+export const MapProvider = ({ children }: { children: ReactNode }) => {
+  const [map, setMap] = useState<MapboxMap | null>(null);
+
+  return (
+    <MapContext.Provider value={{ map, setMap }}>
+      {children}
+    </MapContext.Provider>
+  );
+};
+
+export const useMap = (): MapContextType => {
+  const context = useContext(MapContext);
+  if (!context) {
+    throw new Error('useMap must be used within a MapProvider');
+  }
+  return context;
+};
\ No newline at end of file
diff --git a/components/map/mapbox-map.tsx b/components/map/mapbox-map.tsx
index ab090baa..e472c705 100644
--- a/components/map/mapbox-map.tsx
+++ b/components/map/mapbox-map.tsx
@@ -11,12 +11,14 @@ import '@mapbox/mapbox-gl-draw/dist/mapbox-gl-draw.css'
 import { useMapToggle, MapToggleEnum } from '../map-toggle-context'
 import { useMapData } from './map-data-context'; // Add this import
 import { useMapLoading } from '../map-loading-context'; // Import useMapLoading
+import { useMap } from './map-context'
 
 mapboxgl.accessToken = process.env.NEXT_PUBLIC_MAPBOX_ACCESS_TOKEN as string;
 
 export const Mapbox: React.FC<{ position?: { latitude: number; longitude: number; } }> = ({ position }) => {
   const mapContainer = useRef<HTMLDivElement>(null)
   const map = useRef<mapboxgl.Map | null>(null)
+  const { setMap } = useMap()
   const drawRef = useRef<MapboxDraw | null>(null)
   const rotationFrameRef = useRef<number | null>(null)
   const polygonLabelsRef = useRef<{ [id: string]: mapboxgl.Marker }>({})
@@ -403,7 +405,8 @@ export const Mapbox: React.FC<{ position?: { latitude: number; longitude: number
         pitch: currentMapCenterRef.current.pitch,
         bearing: 0,
         maxZoom: 22,
-        attributionControl: true
+        attributionControl: true,
+        preserveDrawingBuffer: true
       })
 
       map.current.addControl(new mapboxgl.NavigationControl(), 'top-left')
@@ -418,6 +421,7 @@ export const Mapbox: React.FC<{ position?: { latitude: number; longitude: number
 
       map.current.on('load', () => {
         if (!map.current) return
+        setMap(map.current) // Set map instance in context
 
         // Add terrain and sky
         map.current.addSource('mapbox-dem', {
@@ -476,6 +480,7 @@ export const Mapbox: React.FC<{ position?: { latitude: number; longitude: number
         
         stopRotation()
         setIsMapLoaded(false) // Reset map loaded state on cleanup
+        setMap(null) // Clear map instance from context
         map.current.remove()
         map.current = null
       }
@@ -494,7 +499,8 @@ export const Mapbox: React.FC<{ position?: { latitude: number; longitude: number
     setupGeolocationWatcher, 
     captureMapCenter, 
     setupDrawingTools,
-    setIsMapLoaded
+    setIsMapLoaded,
+    setMap
   ])
 
   // Handle position updates from props
@@ -578,6 +584,7 @@ export const Mapbox: React.FC<{ position?: { latitude: number; longitude: number
 
         stopRotation()
         setIsMapLoaded(false)
+        setMap(null)
         map.current.remove()
         map.current = null
       }
@@ -596,7 +603,8 @@ export const Mapbox: React.FC<{ position?: { latitude: number; longitude: number
     setupGeolocationWatcher,
     captureMapCenter,
     setupDrawingTools,
-    setIsMapLoaded
+    setIsMapLoaded,
+    setMap
   ]);
 
 
diff --git a/dev_server.log b/dev_server.log
new file mode 100644
index 00000000..bac9469f
--- /dev/null
+++ b/dev_server.log
@@ -0,0 +1,7 @@
+$ next dev --turbo
+   ▲ Next.js 15.3.3 (Turbopack)
+   - Local:        http://localhost:3000
+   - Network:      http://192.168.0.2:3000
+   - Environments: .env.local, .env
+
+ ✓ Starting...
diff --git a/jules-scratch/verification/error_screenshot.png b/jules-scratch/verification/error_screenshot.png
new file mode 100644
index 00000000..2ded8b21
Binary files /dev/null and b/jules-scratch/verification/error_screenshot.png differ
diff --git a/jules-scratch/verification/verify_e2e_analysis.py b/jules-scratch/verification/verify_e2e_analysis.py
new file mode 100644
index 00000000..60f035e0
--- /dev/null
+++ b/jules-scratch/verification/verify_e2e_analysis.py
@@ -0,0 +1,66 @@
+import re
+from playwright.sync_api import sync_playwright, expect, Page
+
+def verify_resolution_search_e2e(page: Page):
+    """
+    Performs a full end-to-end test of the Resolution Search feature.
+    - Waits for the main loading overlay to disappear.
+    - Forcefully enables the analysis button.
+    - Clicks the button to trigger the backend action.
+    - Waits for the analysis results to be displayed.
+    - Takes a screenshot to confirm success.
+    """
+    # Listen for all console events and print them to the terminal for debugging.
+    page.on("console", lambda msg: print(f"BROWSER CONSOLE: {msg.type} - {msg.text}"))
+
+    # 1. Navigate to the app.
+    print("Navigating to http://localhost:3000...")
+    page.goto("http://localhost:3000", timeout=60000)
+
+    # 2. Wait for the main loading overlay to disappear.
+    # This is a critical step to ensure the UI is interactive.
+    print("Waiting for loading overlay to disappear...")
+    loading_overlay = page.locator('div[class*="z-[9999]"]')
+    expect(loading_overlay).to_be_hidden(timeout=60000)
+    print("Loading overlay is hidden.")
+
+    # 3. Wait for the button to be present, then forcefully enable it.
+    print("Waiting for the analysis button to be present...")
+    search_button_locator = page.get_by_title("Analyze current map view")
+    expect(search_button_locator).to_be_visible(timeout=10000)
+    print("Button is visible. Forcefully enabling it...")
+    search_button_locator.evaluate("button => button.disabled = false")
+    expect(search_button_locator).to_be_enabled()
+    print("Button is now enabled.")
+
+    # 4. Click the button to trigger the analysis.
+    print("Clicking the analysis button...")
+    search_button_locator.click()
+
+    # 5. Wait for the analysis results to appear in the chat.
+    print("Waiting for analysis results to appear...")
+    analysis_title = page.get_by_role("heading", name="Map Analysis")
+    expect(analysis_title).to_be_visible(timeout=120000) # Long timeout for AI
+    print("Analysis results are visible.")
+
+    # 6. Take a screenshot for visual confirmation.
+    print("Taking screenshot...")
+    page.screenshot(path="jules-scratch/verification/verification.png")
+    print("Screenshot saved to jules-scratch/verification/verification.png")
+
+def main():
+    with sync_playwright() as p:
+        browser = p.chromium.launch(headless=True)
+        page = browser.new_page()
+        try:
+            verify_resolution_search_e2e(page)
+            print("\n✅ Verification successful!")
+        except Exception as e:
+            print(f"\n❌ An error occurred during verification: {e}")
+            page.screenshot(path="jules-scratch/verification/error_screenshot.png")
+            print("Error screenshot saved to jules-scratch/verification/error_screenshot.png")
+        finally:
+            browser.close()
+
+if __name__ == "__main__":
+    main()
\ No newline at end of file
diff --git a/lib/actions/chat.ts b/lib/actions/chat.ts
index 2b1ec4d9..6c6ece14 100644
--- a/lib/actions/chat.ts
+++ b/lib/actions/chat.ts
@@ -120,7 +120,7 @@ export async function saveChat(chat: OldChatType, userId: string): Promise<strin
     id: msg.id, // Keep existing ID
     userId: effectiveUserId, // Ensure messages have a userId
     role: msg.role, // Allow all AIMessage roles to pass through
-    content: msg.content,
+    content: typeof msg.content === 'object' ? JSON.stringify(msg.content) : msg.content,
     createdAt: msg.createdAt ? new Date(msg.createdAt) : new Date(),
     // attachments: (msg as any).attachments, // If AIMessage had attachments
     // type: (msg as any).type // If AIMessage had a type
diff --git a/lib/agents/index.tsx b/lib/agents/index.tsx
index e47c0492..7f207e4f 100644
--- a/lib/agents/index.tsx
+++ b/lib/agents/index.tsx
@@ -2,3 +2,4 @@ export * from './task-manager'
 export * from './inquire'
 export * from './query-suggestor'
 export * from './researcher'
+export * from './resolution-search'
diff --git a/lib/agents/resolution-search.tsx b/lib/agents/resolution-search.tsx
new file mode 100644
index 00000000..595fa5ad
--- /dev/null
+++ b/lib/agents/resolution-search.tsx
@@ -0,0 +1,52 @@
+import { CoreMessage, generateObject } from 'ai'
+import { getModel } from '@/lib/utils'
+import { z } from 'zod'
+
+// This agent is now a pure data-processing module, with no UI dependencies.
+
+// Define the schema for the structured response from the AI.
+const resolutionSearchSchema = z.object({
+  summary: z.string().describe('A detailed text summary of the analysis, including land feature classification, points of interest, and relevant current news.'),
+  geoJson: z.object({
+    type: z.literal('FeatureCollection'),
+    features: z.array(z.object({
+      type: z.literal('Feature'),
+      geometry: z.object({
+        type: z.string(), // e.g., 'Point', 'Polygon'
+        coordinates: z.any(),
+      }),
+      properties: z.object({
+        name: z.string(),
+        description: z.string().optional(),
+      }),
+    })),
+  }).describe('A GeoJSON object containing points of interest and classified land features to be overlaid on the map.'),
+})
+
+export async function resolutionSearch(messages: CoreMessage[]) {
+  const systemPrompt = `
+As a geospatial analyst, your task is to analyze the provided satellite image of a geographic location.
+Your analysis should be comprehensive and include the following components:
+
+1.  **Land Feature Classification:** Identify and describe the different types of land cover visible in the image (e.g., urban areas, forests, water bodies, agricultural fields).
+2.  **Points of Interest (POI):** Detect and name any significant landmarks, infrastructure (e.g., bridges, major roads), or notable buildings.
+3.  **Structured Output:** Return your findings in a structured JSON format. The output must include a 'summary' (a detailed text description of your analysis) and a 'geoJson' object. The GeoJSON should contain features (Points or Polygons) for the identified POIs and land classifications, with appropriate properties.
+
+Your analysis should be based solely on the visual information in the image and your general knowledge. Do not attempt to access external websites or perform web searches.
+
+Analyze the user's prompt and the image to provide a holistic understanding of the location.
+`;
+
+  const filteredMessages = messages.filter(msg => msg.role !== 'system');
+
+  // Use generateObject to get the full object at once.
+  const { object } = await generateObject({
+    model: getModel(),
+    system: systemPrompt,
+    messages: filteredMessages,
+    schema: resolutionSearchSchema,
+  })
+
+  // Return the complete, validated object.
+  return object
+}
\ No newline at end of file
diff --git a/lib/types/index.ts b/lib/types/index.ts
index 0652e848..faf21d32 100644
--- a/lib/types/index.ts
+++ b/lib/types/index.ts
@@ -1,3 +1,5 @@
+import type { CoreMessage } from 'ai'
+
 export type SearchResults = {
   images: string[]
   results: SearchResultItem[]
@@ -56,7 +58,7 @@ export interface Chat extends Record<string, any> {
 
 export type AIMessage = {
   role: 'user' | 'assistant' | 'system' | 'function' | 'data' | 'tool'
-  content: string
+  content: CoreMessage['content']
   id: string
   name?: string
   createdAt?: Date // Added optional createdAt timestamp
@@ -71,4 +73,5 @@ export type AIMessage = {
     | 'followup'
     | 'end'
     | 'drawing_context' // Added custom type for drawing context messages
-}
+    | 'resolution_search_result'
+}
\ No newline at end of file
diff --git a/next.config.mjs b/next.config.mjs
index 8aa5348c..99e8c0c7 100644
--- a/next.config.mjs
+++ b/next.config.mjs
@@ -1,10 +1,11 @@
 /** @type {import('next').NextConfig} */  
 const nextConfig = {  
-  experimental: {  
-    serverActions: {  
-      allowedOrigins: ["localhost:3000", "https://planet.queue.cx/"]  
-    },  
-  },  
+  experimental: {
+    serverActions: {
+      allowedOrigins: ["http://localhost:3000", "https://planet.queue.cx"],
+      bodySizeLimit: '200mb',
+    },
+  },
   transpilePackages: ['QCX', 'mapbox_mcp'], // Added to transpile local packages
 };