Restore and persist durable geospatial drawing context

app/actions.tsx

@@ -12,9 +12,14 @@ 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, resolutionSearch, type DrawnFeature } from '@/lib/agents'
+import { taskManager } from '@/lib/agents/task-manager'
+import { inquire } from '@/lib/agents/inquire'
+import { querySuggestor } from '@/lib/agents/query-suggestor'
+import { researcher } from '@/lib/agents/researcher'
+import { resolutionSearch, type DrawnFeature } from '@/lib/agents/resolution-search'
 import { writer } from '@/lib/agents/writer'
 import { saveChat, getSystemPrompt, generateReportContext } from '@/lib/actions/chat'
+
 import { Chat, AIMessage } from '@/lib/types'
 import { UserMessage } from '@/components/user-message'
 import { BotMessage } from '@/components/message'
@@ -50,6 +55,43 @@ async function submit(formData?: FormData, skip?: boolean) {
  console.error('Failed to parse drawnFeatures:', e);
  }
 
+ // PERSISTENCE: Always append drawing_context for durable feature history
+ if (drawnFeatures.length > 0) {
+ aiState.update({
+ ...aiState.get(),
+ messages: [
+ ...aiState.get().messages,
+ {
+ id: nanoid(),
+ role: 'data',
+ content: JSON.stringify(drawnFeatures),
+ type: 'drawing_context'
+ }
+ ]
+ });
+ }
+
+ // PERSISTENCE: build merged drawing set from all historical drawing_context messages
+ const mergedDrawnFeatures = [...drawnFeatures];
+ const historicalDrawingContexts = aiState.get().messages.filter(m => m.type === 'drawing_context');
+ historicalDrawingContexts.forEach(m => {
+ try {
+ const historicalFeatures = JSON.parse(m.content as string) as DrawnFeature[];
+ historicalFeatures.forEach(hf => {
+ if (!mergedDrawnFeatures.some(f => f.id === hf.id)) {
+ mergedDrawnFeatures.push(hf);
+ }
+ });
+ } catch (e) {
+ console.error('Failed to parse historical drawing context:', e);
+ }
+ });
+
+ const { getCurrentUserIdOnServer } = await import(
+ "@/lib/auth/get-current-user"
+ )
+ const userId = (await getCurrentUserIdOnServer()) || "anonymous";
+
  if (action === 'generate_report_context') {
  const messagesString = formData?.get('messages');
  if (typeof messagesString !== 'string') {
@@ -92,6 +134,7 @@ async function submit(formData?: FormData, skip?: boolean) {
  message.type !== 'followup' &&
  message.type !== 'related' &&
  message.type !== 'end' &&
+ message.type !== 'drawing_context' &&
  message.type !== 'resolution_search_result'
  );
 
@@ -115,7 +158,7 @@ async function submit(formData?: FormData, skip?: boolean) {
 
  async function processResolutionSearch() {
  try {
- const streamResult = await resolutionSearch(messages, timezone, drawnFeatures, location);
+ const streamResult = await resolutionSearch(messages, timezone, mergedDrawnFeatures, location);
 
  let fullSummary = '';
  for await (const partialObject of streamResult.partialObjectStream) {
@@ -192,7 +235,7 @@ async function submit(formData?: FormData, skip?: boolean) {
  aiState.done({
  ...aiState.get(),
  messages: [
- ...aiState.get().messages,
+ ...sanitizedHistory,
  {
  id: groupeId,
  role: 'assistant',
@@ -357,6 +400,7 @@ async function submit(formData?: FormData, skip?: boolean) {
  message.type !== 'followup' &&
  message.type !== 'related' &&
  message.type !== 'end' &&
+ message.type !== 'drawing_context' &&
  message.type !== 'resolution_search_result'
  )
  .map((m: any) => {
@@ -488,7 +532,6 @@ async function submit(formData?: FormData, skip?: boolean) {
  } as CoreMessage)
  }
 
- const userId = 'anonymous'
  const currentSystemPrompt = (await getSystemPrompt(userId)) || ''
  const mapProvider = formData?.get('mapProvider') as 'mapbox' | 'google'
 
@@ -539,7 +582,7 @@ async function submit(formData?: FormData, skip?: boolean) {
  messages,
  mapProvider,
  useSpecificAPI,
-drawnFeatures
+mergedDrawnFeatures
  )
  answer = fullResponse
  toolOutputs = toolResponses
@@ -729,7 +772,7 @@ export const AI = createAI<AIState, UIState>({
  ]
 
  const { getCurrentUserIdOnServer } = await import(
-'@/lib/auth/get-current-user'
+"@/lib/auth/get-current-user"
  )
  const actualUserId = await getCurrentUserIdOnServer()
 

app/search/[id]/page.tsx

@@ -14,11 +14,14 @@ export interface SearchPageProps {
 }
 
 export async function generateMetadata({ params }: SearchPageProps) {
- const { id } = await params; // Keep as is for now
- // TODO: Metadata generation might need authenticated user if chats are private
- // For now, assuming getChat can be called or it handles anon access for metadata appropriately
- const userId = await getCurrentUserIdOnServer(); // Attempt to get user for metadata
- const chat = await getChat(id, userId || 'anonymous'); // Pass userId or 'anonymous' if none
+ const { id } = await params;
+ const userId = await getCurrentUserIdOnServer();
+
+ if (!userId) {
+ return { title: 'Search' };
+ }
+
+ const chat = await getChat(id, userId);
  return {
  title: chat?.title?.toString().slice(0, 50) || 'Search',
  };
@@ -59,16 +62,32 @@ export default async function SearchPage({ params }: SearchPageProps) {
  };
  });
 
+ // PERSISTENCE: Seed map context from latest persisted drawing data
+ const latestDrawingContext = [...dbMessages]
+ .reverse()
+ .find(m => m.role === 'data');
+
+ let initialMapData = undefined;
+ if (latestDrawingContext) {
+ try {
+ const parsed = JSON.parse(latestDrawingContext.content as string);
+ initialMapData = {
+ drawnFeatures: parsed.drawnFeatures || [],
+ cameraState: parsed.cameraState,
+ };
+ } catch (e) {
+ console.error('Failed to parse latest drawing context:', e);
+ }
+ }
+
  return (
  <AI
  initialAIState={{
  chatId: chat.id,
- messages: initialMessages, // Use the transformed messages from the database
- // isSharePage: true, // This was in PR#533, but share functionality is removed.
- // If needed for styling or other logic, it can be set.
+ messages: initialMessages,
  }}
  >
- <MapDataProvider>
+ <MapDataProvider initialData={initialMapData}>
  <Chat id={id} />
  </MapDataProvider>
  </AI>

components/chat.tsx

@@ -17,7 +17,7 @@ import { useProfileToggle, ProfileToggleEnum } from "@/components/profile-toggle
 import { useUsageToggle } from "@/components/usage-toggle-context";
 import SettingsView from "@/components/settings/settings-view";
 import { UsageView } from "@/components/usage-view";
-import { MapDataProvider, useMapData } from './map/map-data-context'; // Add this and useMapData
+import { useMapData } from './map/map-data-context'; // Add this and useMapData
 import { updateDrawingContext } from '@/lib/actions/chat'; // Import the server action
 import dynamic from 'next/dynamic'
 import { HeaderSearchButton } from './header-search-button'
@@ -137,7 +137,7 @@ export function Chat({ id }: ChatProps) {
  // Mobile layout
  if (isMobile) {
  return (
- <MapDataProvider> {/* Add Provider */}
+ <>
  <HeaderSearchButton />
  <div className="mobile-layout-container">
  <div className="mobile-map-section">
@@ -177,13 +177,13 @@ export function Chat({ id }: ChatProps) {
  )}
  </div>
  </div>
- </MapDataProvider>
+ </>
  );
  }
 
  // Desktop layout
  return (
- <MapDataProvider> {/* Add Provider */}
+ <>
  <HeaderSearchButton />
  <div className="flex justify-start items-start">
  {/* This is the new div for scrolling */}
@@ -223,6 +223,6 @@ export function Chat({ id }: ChatProps) {
  {activeView ? <SettingsView /> : isUsageOpen ? <UsageView /> : <MapProvider />}
  </div>
  </div>
- </MapDataProvider>
+ </>
  );
 }

components/map/map-data-context.tsx

@@ -38,8 +38,8 @@ interface MapDataContextType {
 
 const MapDataContext = createContext<MapDataContextType | undefined>(undefined);
 
-export const MapDataProvider: React.FC<{ children: ReactNode}> = ({ children }) => {
- const [mapData, setMapData] = useState<MapData>({ drawnFeatures: [], markers: [] });
+export const MapDataProvider: React.FC<{ children: ReactNode; initialData?: MapData }> = ({ children, initialData }) => {
+ const [mapData, setMapData] = useState<MapData>(initialData || { drawnFeatures: [], markers: [] });
 
  return (
  <MapDataContext.Provider value={{ mapData, setMapData }}>

components/resolution-carousel.tsx

@@ -17,6 +17,7 @@ import { UserMessage } from './user-message'
 import { toast } from 'sonner'
 import { CompareSlider } from './compare-slider'
 import { compressImage } from '@/lib/utils/image-utils'
+import { useMapData } from './map/map-data-context'
 
 interface ResolutionCarouselProps {
  mapboxImage?: string | null
@@ -28,6 +29,7 @@ export function ResolutionCarousel({ mapboxImage, googleImage, initialImage }: R
  const actions = useActions<typeof AI>() as any
  const [, setMessages] = useUIState<typeof AI>()
  const [isAnalyzing, setIsAnalyzing] = React.useState(false)
+ const { mapData } = useMapData()
 
  const handleQCXAnalysis = async () => {
  if (!googleImage) return
@@ -52,6 +54,14 @@ export function ResolutionCarousel({ mapboxImage, googleImage, initialImage }: R
  const formData = new FormData()
  formData.append('file', blob, 'google_analysis.png')
  formData.append('action', 'resolution_search')
+ formData.append('timezone', mapData.currentTimezone || 'UTC')
+ formData.append('drawnFeatures', JSON.stringify(mapData.drawnFeatures || []))
+
+ const center = mapData.cameraState?.center || mapData.targetPosition;
+ if (center) {
+ formData.append('latitude', center.lat.toString())
+ formData.append('longitude', center.lng.toString())
+ }
 
  const responseMessage = await actions.submit(formData)
  setMessages((currentMessages: any[]) => [...currentMessages, responseMessage as any])

lib/actions/chat-db.ts

@@ -20,7 +20,7 @@ export type NewMessage = typeof messages.$inferInsert;
  * @returns The chat object if found and accessible, otherwise null.
  */
 export async function getChat(id: string, userId: string): Promise<Chat | null> {
- if (!userId) {
+ if (!userId || userId === 'anonymous') {
  console.warn('getChat called without userId');
  // Potentially allow fetching public chats if userId is null for anonymous users
  const result = await db.select().from(chats).where(and(eq(chats.id, id), eq(chats.visibility, 'public'))).limit(1);
@@ -51,7 +51,7 @@ export async function getChatsPage(
  limit: number = 20,
  offset: number = 0
 ): Promise<{ chats: Chat[]; nextOffset: number | null }> {
- if (!userId) {
+ if (!userId || userId === 'anonymous') {
  console.error('getChatsPage called without userId.');
  return { chats: [], nextOffset: null };
  }

lib/actions/chat.ts

@@ -99,8 +99,8 @@ export async function getChats(userId?: string | null): Promise<DrizzleChat[]> {
 }
 
 export async function getChat(id: string, userId: string): Promise<DrizzleChat | null> {
- if (!userId) {
- console.warn('getChat called without userId.')
+ if (!userId || userId === 'anonymous') {
+ console.warn('getChat: Invalid or missing userId.');
  return null;
  }
  try {
@@ -185,8 +185,8 @@ export async function saveChat(chat: OldChatType, userId: string): Promise<strin
 
 export async function updateDrawingContext(chatId: string, contextData: { drawnFeatures: any[], cameraState: any }) {
  const userId = await getCurrentUserIdOnServer();
- if (!userId) {
- console.error('updateDrawingContext: Could not get current user ID.');
+ if (!userId || userId === 'anonymous') {
+ console.error('updateDrawingContext: Invalid or missing user ID.');
  return { error: 'User not authenticated' };
  }
 

lib/auth/get-current-user.ts

@@ -58,24 +58,24 @@ export async function getSupabaseUserAndSessionOnServer(): Promise<{
  return { user: null, session: null, error: new Error('Missing Supabase environment variables') };
  }
 
- const cookieStore = cookies();
+ const cookieStore = await cookies();
  const supabase = createServerClient(supabaseUrl, supabaseAnonKey, {
  cookies: {
  async get(name: string): Promise<string | undefined> {
- const cookie = (await cookieStore).get(name); // Use the correct get method
+ const cookie = cookieStore.get(name); // Use the correct get method
  return cookie?.value; // Return the value or undefined
  },
  async set(name: string, value: string, options: CookieOptions): Promise<void> {
  try {
- const store = await cookieStore;
+ const store = cookieStore;
  store.set({ name, value, ...options }); // Set cookie with options
  } catch (error) {
  // console.warn(`[Auth] Failed to set cookie ${name}:`, error);
  }
  },
  async remove(name: string, options: CookieOptions): Promise<void> {
  try {
- const store = await cookieStore;
+ const store = cookieStore;
  store.set({ name, value: '', ...options, maxAge: 0 }); // Delete cookie by setting maxAge to 0
  } catch (error) {
  // console.warn(`[Auth] Failed to delete cookie ${name}:`, error);