Merge Resolution Search Enhancement (f89e3f7) into Main #490

coderabbitai · 2026-02-04T12:06:49Z

🧹 Nitpick | 🔵 Trivial

Double JSON.stringify creates nested string encoding.

The image data is stringified twice: once at line 173 and again as part of the outer JSON.stringify at line 171. While the read-side (lines 732-739) handles this with a try/catch fallback, consider storing the image object directly to simplify parsing:

♻️ Alternative approach

content: JSON.stringify({ ...analysisResult, - image: JSON.stringify({ mapbox: mapboxDataUrl, google: googleDataUrl }) + image: { mapbox: mapboxDataUrl, google: googleDataUrl } }),

Then update the read side:

- const imageData = analysisResult.image as string; + const imageData = analysisResult.image; let mapboxSrc = ''; let googleSrc = ''; if (imageData) { - try { - const parsed = JSON.parse(imageData); - mapboxSrc = parsed.mapbox || ''; - googleSrc = parsed.google || ''; - } catch (e) { - mapboxSrc = imageData; - } + if (typeof imageData === 'string') { + // Legacy format fallback + mapboxSrc = imageData; + } else { + mapboxSrc = imageData.mapbox || ''; + googleSrc = imageData.google || ''; + } }

🤖 Prompt for AI Agents

In `@app/actions.tsx` around lines 171 - 174, The image field is being JSON.stringified twice causing nested string encoding; update the payload construction in app/actions.tsx where you build content (the object that spreads analysisResult) so that image is stored as an object (image: { mapbox: mapboxDataUrl, google: googleDataUrl }) instead of JSON.stringify(...), and then update the read-side parsing logic that inspects analysisResult.image (the code around the current try/catch at lines ~732-739) to expect and handle an object directly (remove the extra JSON.parse attempt or fall back only if a string is encountered).

coderabbitai · 2026-02-04T12:06:49Z

⚠️ Potential issue | 🟠 Major

Missing isGenerating.done(false) and uiStream.done() on success path.

In the processResolutionSearch function, the catch block calls isGenerating.done(false) and uiStream.done(), but the success path (after aiState.done()) does not. This could leave streams in an incomplete state.

🐛 Proposed fix

} ] }) + isGenerating.done(false) + uiStream.done() } catch (error) { console.error('Failed to process resolution search:', error); summaryStream.done('An error occurred during analysis.'); isGenerating.done(false); uiStream.done(); }

🤖 Prompt for AI Agents

In `@app/actions.tsx` around lines 191 - 196, The success path in processResolutionSearch currently calls aiState.done() but doesn't call isGenerating.done(false) and uiStream.done(), leaving streams incomplete; update the success branch (after aiState.done()) to also call isGenerating.done(false) and uiStream.done() and ensure summaryStream.done(...) is invoked consistently (mirror the catch block cleanup) so all three streams (isGenerating, uiStream, summaryStream) are completed on both success and error.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Merge Resolution Search Enhancement (f89e3f7) into Main #490

Uh oh!

Diff view

Diff view

There are no files selected for viewing

coderabbitai bot Feb 4, 2026

Uh oh!

coderabbitai bot Feb 4, 2026

Uh oh!

Uh oh!

-Original file line number
+Diff line change
@@ Expand Up / @@ -13,27 +13,25 @@ import { Spinner } from '@/components/ui/spinner' @@
     import { Section } from '@/components/section'
     import { FollowupPanel } from '@/components/followup-panel'
     import { inquire, researcher, taskManager, querySuggestor, resolutionSearch, type DrawnFeature } 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'
-    import { saveChat, getSystemPrompt } from '@/lib/actions/chat' // Added getSystemPrompt
+    import { saveChat, getSystemPrompt } from '@/lib/actions/chat'
     import { Chat, AIMessage } from '@/lib/types'
     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 { ResolutionImage } from '@/components/resolution-image'
     import { CopilotDisplay } from '@/components/copilot-display'
     import RetrieveSection from '@/components/retrieve-section'
     import { VideoSearchSection } from '@/components/video-search-section'
-    import { MapQueryHandler } from '@/components/map/map-query-handler' // Add this import
+    import { MapQueryHandler } from '@/components/map/map-query-handler'
     // Define the type for related queries
     type RelatedQueries = {
       items: { query: string }[]
     }
-    // Removed mcp parameter from submit, as geospatialTool now handles its client.
     async function submit(formData?: FormData, skip?: boolean) {
       'use server'
@@ Expand All / @@ -43,8 +41,18 @@ async function submit(formData?: FormData, skip?: boolean) { @@
       const isCollapsed = createStreamableValue(false)
       const action = formData?.get('action') as string;
-      if (action === 'resolution_search') {
-        const file = formData?.get('file') as File;
+      const drawnFeaturesString = formData?.get('drawnFeatures') as string;
+      let drawnFeatures: DrawnFeature[] = [];
+      try {
+        drawnFeatures = drawnFeaturesString ? JSON.parse(drawnFeaturesString) : [];
+      } catch (e) {
+        console.error('Failed to parse drawnFeatures:', e);
+      }
+        if (action === 'resolution_search') {
+        const mapboxFile = formData?.get('mapboxFile') as File;
+        const googleFile = formData?.get('googleFile') as File;
+        const legacyFile = formData?.get('file') as File;
         const timezone = (formData?.get('timezone') as string) || 'UTC';
         const drawnFeaturesString = formData?.get('drawnFeatures') as string;
         let drawnFeatures: DrawnFeature[] = [];
@@ Expand All @@
           console.error('Failed to parse drawnFeatures:', e);
         }
-        if (!file) {
-          throw new Error('No file provided for resolution search.');
+        let mapboxDataUrl = '';
+        let googleDataUrl = '';
+        if (mapboxFile) {
+          const buffer = await mapboxFile.arrayBuffer();
+          mapboxDataUrl = `data:${mapboxFile.type};base64,${Buffer.from(buffer).toString('base64')}`;
+        }
+        if (googleFile) {
+          const buffer = await googleFile.arrayBuffer();
+          googleDataUrl = `data:${googleFile.type};base64,${Buffer.from(buffer).toString('base64')}`;
+        }
+        // Fallback if only 'file' was provided (backward compatibility)
+        if (!mapboxDataUrl && !googleDataUrl && legacyFile) {
+          const buffer = await legacyFile.arrayBuffer();
+          mapboxDataUrl = `data:${legacyFile.type};base64,${Buffer.from(buffer).toString('base64')}`;
         }
-        const buffer = await file.arrayBuffer();
-        const dataUrl = `data:${file.type};base64,${Buffer.from(buffer).toString('base64')}`;
+        if (!mapboxDataUrl && !googleDataUrl) {
+          throw new Error('No files provided for resolution search.');
+        }
-        // Get the current messages, excluding tool-related ones.
         const messages: CoreMessage[] = [...(aiState.get().messages as any[])].filter(
           message =>
             message.role !== 'tool' &&
@@ Expand All @@
             message.type !== 'resolution_search_result'
         );
-        // The user's prompt for this action is static.
         const userInput = 'Analyze this map view.';
+        const contentParts: any[] = [{ type: 'text', text: userInput }]
+        if (mapboxDataUrl) {
+          contentParts.push({ type: 'image', image: mapboxDataUrl, mimeType: 'image/png' })
+        }
+        if (googleDataUrl) {
+          contentParts.push({ type: 'image', image: googleDataUrl, mimeType: 'image/png' })
+        }
-        // Construct the multimodal content for the user message.
-        const content: CoreMessage['content'] = [
-          { type: 'text', text: userInput },
-          { type: 'image', image: dataUrl, mimeType: file.type }
-        ];
+        const content = contentParts as any
-        // Add the new user message to the AI state.
         aiState.update({
           ...aiState.get(),
           messages: [
@@ Expand All @@
         });
         messages.push({ role: 'user', content });
-        // Create a streamable value for the summary.
-        const summaryStream = createStreamableValue<string>('');
+        const summaryStream = createStreamableValue<string>('Analyzing map view...');
+        const groupeId = nanoid();
         async function processResolutionSearch() {
           try {
-            // Call the simplified agent, which now returns a stream.
             const streamResult = await resolutionSearch(messages, timezone, drawnFeatures);
             let fullSummary = '';
@@ Expand All @@
             }
             const analysisResult = await streamResult.object;
-            // Mark the summary stream as done with the result.
             summaryStream.done(analysisResult.summary || 'Analysis complete.');
+            if (analysisResult.geoJson) {
+              uiStream.append(
+                <GeoJsonLayer
+                  id={groupeId}
+                  data={analysisResult.geoJson as FeatureCollection}
+                />
+              );
+            }
             messages.push({ role: 'assistant', content: analysisResult.summary || 'Analysis complete.' });
             const sanitizedMessages: CoreMessage[] = messages.map(m => {
               if (Array.isArray(m.content)) {
                 return {
                   ...m,
-                  content: m.content.filter(part => part.type !== 'image')
+                  content: m.content.filter((part: any) => part.type !== 'image')
                 } as CoreMessage
               }
               return m
             })
+            const currentMessages = aiState.get().messages;
+            const sanitizedHistory = currentMessages.map(m => {
+              if (m.role === "user" && Array.isArray(m.content)) {
+                return {
+                  ...m,
+                  content: m.content.map((part: any) =>
+                    part.type === "image" ? { ...part, image: "IMAGE_PROCESSED" } : part
+                  )
+                }
+              }
+              return m
+            });
             const relatedQueries = await querySuggestor(uiStream, sanitizedMessages);
             uiStream.append(
               <Section title="Follow-up">
@@ Expand All @@
             await new Promise(resolve => setTimeout(resolve, 500));
-            const groupeId = nanoid();
             aiState.done({
               ...aiState.get(),
               messages: [
-                ...aiState.get().messages,
+                ...sanitizedHistory,
                 {
                   id: groupeId,
                   role: 'assistant',
@@ Expand All @@
                 {
                   id: groupeId,
                   role: 'assistant',
-                  content: JSON.stringify(analysisResult),
+                  content: JSON.stringify({
+                    ...analysisResult,
+                    image: JSON.stringify({ mapbox: mapboxDataUrl, google: googleDataUrl })
+                  }),
                   type: 'resolution_search_result'
                 },
                 {
@@ Expand All @@
                   type: 'followup'
                 }
               ]
-            });
+            })
           } catch (error) {
-            console.error('Error in resolution search:', error);
-            summaryStream.error(error);
-          } finally {
+            console.error('Failed to process resolution search:', error);
+            summaryStream.done('An error occurred during analysis.');
             isGenerating.done(false);
             uiStream.done();
           }
         }
-        // Start the background process without awaiting it.
         processResolutionSearch();
-        // Immediately update the UI stream with the BotMessage component.
         uiStream.update(
           <Section title="response">
+            <ResolutionImage mapboxSrc={mapboxDataUrl} googleSrc={googleDataUrl} />
             <BotMessage content={summaryStream.value} />
           </Section>
         );
@@ Expand All @@
           message.type !== 'related' &&
           message.type !== 'end' &&
           message.type !== 'resolution_search_result'
-      )
+      ).map(m => {
+        if (Array.isArray(m.content)) {
+          return {
+            ...m,
+            content: m.content.filter((part: any) =>
+              part.type !== "image" || (typeof part.image === "string" && part.image.startsWith("data:"))
+            )
+          } as any
+        }
+        return m
+      })
       const groupeId = nanoid()
       const useSpecificAPI = process.env.USE_SPECIFIC_API_FOR_WRITER === 'true'
@@ Expand Down Expand Up @@
           </Section>
         );
-        uiStream.append(answerSection);
+        uiStream.update(answerSection);
-        const groupeId = nanoid();
         const relatedQueries = { items: [] };
         aiState.done({
@@ Expand Down Expand Up @@
       }
       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.map(part => part.text).join('\n')
@@ Expand Down Expand Up @@
       const userId = 'anonymous'
       const currentSystemPrompt = (await getSystemPrompt(userId)) || ''
       const mapProvider = formData?.get('mapProvider') as 'mapbox' | 'google'
       async function processEvents() {
@@ Expand Down Expand Up @@
             streamText,
             messages,
             mapProvider,
-            useSpecificAPI
+            useSpecificAPI,
+            drawnFeatures
           )
           answer = fullResponse
           toolOutputs = toolResponses
@@ Expand Down Expand Up @@
                 case 'input_related':
                   let messageContent: string | any[]
                   try {
-                    // For backward compatibility with old messages that stored a JSON string
                     const json = JSON.parse(content as string)
                     messageContent =
                       type === 'input' ? json.input : json.related_query
                   } catch (e) {
-                    // New messages will store the content array or string directly
                     messageContent = content
                   }
                   return {
@@ Expand All @@
               }
               break
             case 'assistant':
-              const answer = createStreamableValue()
-              answer.done(content)
+              const answer = createStreamableValue(content as string)
+              answer.done(content as string)
               switch (type) {
                 case 'response':
                   return {
@@ Expand All @@
                     )
                   }
                 case 'related':
-                  const relatedQueries = createStreamableValue<RelatedQueries>()
+                  const relatedQueries = createStreamableValue<RelatedQueries>({
+                    items: []
+                  })
                   relatedQueries.done(JSON.parse(content as string))
                   return {
                     id,
@@ Expand All @@
                       </Section>
                     )
                   }
-                case 'resolution_search_result': {
+                            case 'resolution_search_result': {
                   const analysisResult = JSON.parse(content as string);
                   const geoJson = analysisResult.geoJson as FeatureCollection;
+                  const imageData = analysisResult.image as string;
+                  let mapboxSrc = '';
+                  let googleSrc = '';
+                  if (imageData) {
+                    try {
+                      const parsed = JSON.parse(imageData);
+                      mapboxSrc = parsed.mapbox || '';
+                      googleSrc = parsed.google || '';
+                    } catch (e) {
+                      // Fallback for older image format which was just a single string
+                      mapboxSrc = imageData;
+                    }
+                  }
                   return {
                     id,
                     component: (
                       <>
+                        {(mapboxSrc || googleSrc) && (
+                          <ResolutionImage mapboxSrc={mapboxSrc} googleSrc={googleSrc} />
+                        )}
                         {geoJson && (
                           <GeoJsonLayer id={id} data={geoJson} />
                         )}
@@ Expand All @@
             case 'tool':
               try {
                 const toolOutput = JSON.parse(content as string)
-                const isCollapsed = createStreamableValue()
+                const isCollapsed = createStreamableValue(true)
                 isCollapsed.done(true)
                 if (
                   toolOutput.type === 'MAP_QUERY_TRIGGER' &&
                   name === 'geospatialQueryTool'
                 ) {
+                  const mapUrl = toolOutput.mcp_response?.mapUrl;
+                  const placeName = toolOutput.mcp_response?.location?.place_name;
                   return {
                     id,
-                    component: <MapQueryHandler toolOutput={toolOutput} />,
+                    component: (
+                      <>
+                        {mapUrl && (
+                          <ResolutionImage
+                            src={mapUrl}
+                            className="mb-0"
+                            alt={placeName ? `Map of ${placeName}` : 'Map Preview'}
+                          />
+                        )}
+                        <MapQueryHandler toolOutput={toolOutput} />
+                      </>
+                    ),
                     isCollapsed: false
                   }
                 }
-                const searchResults = createStreamableValue()
+                const searchResults = createStreamableValue(
+                  JSON.stringify(toolOutput)
+                )
                 searchResults.done(JSON.stringify(toolOutput))
                 switch (name) {
                   case 'search':
@@ Expand Down @@

Uh oh!

Merge Resolution Search Enhancement (f89e3f7) into Main #490

Are you sure you want to change the base?

Uh oh!

Merge Resolution Search Enhancement (f89e3f7) into Main #490

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

coderabbitai bot Feb 4, 2026

Choose a reason for hiding this comment

Uh oh!

coderabbitai bot Feb 4, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!