diff --git a/.env b/.env
index b454ca74..4a90bba0 100644
--- a/.env
+++ b/.env
@@ -1 +1,2 @@
 DATABASE_URL="postgresql://user:password@host:port/db"
+NEXT_PUBLIC_MAPBOX_ACCESS_TOKEN=pk.eyJ1IjoiZHVtbXkiLCJhIjoiY2p6YTM0eHlyMDAwMDNia3BkY3R6ZzhpbyJ9.dummy
diff --git a/LICENSE b/LICENSE
index 8a29bc5a..3d85d05f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -186,7 +186,7 @@ APPENDIX: How to apply the Apache License to your work.
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-Copyright 2024 Yoshiki Miura
+Copyright 2025 Eric Ngoiya
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/app/actions.tsx b/app/actions.tsx
index a1f5e915..dece59d2 100644
--- a/app/actions.tsx
+++ b/app/actions.tsx
@@ -14,7 +14,13 @@ import { Section } from '@/components/section'
 import { FollowupPanel } from '@/components/followup-panel'
 import { inquire, researcher, taskManager, querySuggestor, resolutionSearch, type DrawnFeature } from '@/lib/agents'
 import { writer } from '@/lib/agents/writer'
-import { saveChat, getSystemPrompt } from '@/lib/actions/chat'
+import {
+  saveChat,
+  getSystemPrompt,
+  updateMessage,
+  deleteMessage,
+  deleteTrailingMessages
+} from '@/lib/actions/chat'
 import { Chat, AIMessage } from '@/lib/types'
 import { UserMessage } from '@/components/user-message'
 import { BotMessage } from '@/components/message'
@@ -75,11 +81,18 @@ async function submit(formData?: FormData, skip?: boolean) {
       { type: 'image', image: dataUrl, mimeType: file.type }
     ];
 
+    const messageId = (formData?.get('id') as string) || nanoid();
     aiState.update({
       ...aiState.get(),
       messages: [
         ...aiState.get().messages,
-        { id: nanoid(), role: 'user', content, type: 'input' }
+        {
+          id: messageId,
+          role: 'user',
+          content,
+          type: 'input',
+          createdAt: new Date()
+        }
       ]
     });
     messages.push({ role: 'user', content });
@@ -152,7 +165,8 @@ async function submit(formData?: FormData, skip?: boolean) {
               id: groupeId,
               role: 'assistant',
               content: analysisResult.summary || 'Analysis complete.',
-              type: 'response'
+              type: 'response',
+              createdAt: new Date()
             },
             {
               id: groupeId,
@@ -161,19 +175,22 @@ async function submit(formData?: FormData, skip?: boolean) {
                 ...analysisResult,
                 image: dataUrl
               }),
-              type: 'resolution_search_result'
+              type: 'resolution_search_result',
+              createdAt: new Date()
             },
             {
               id: groupeId,
               role: 'assistant',
               content: JSON.stringify(relatedQueries),
-              type: 'related'
+              type: 'related',
+              createdAt: new Date()
             },
             {
               id: groupeId,
               role: 'assistant',
               content: 'followup',
-              type: 'followup'
+              type: 'followup',
+              createdAt: new Date()
             }
           ]
         });
@@ -250,18 +267,19 @@ async function submit(formData?: FormData, skip?: boolean) {
           role: 'user',
           content,
           type,
-        },
-      ],
-    });
+          createdAt: new Date()
+        }
+      ]
+    })
 
-    const definitionStream = createStreamableValue();
-    definitionStream.done(definition);
+    const definitionStream = createStreamableValue()
+    definitionStream.done(definition)
 
     const answerSection = (
       <Section title="response">
         <BotMessage content={definitionStream.value} />
       </Section>
-    );
+    )
 
     uiStream.update(answerSection);
 
@@ -276,21 +294,24 @@ async function submit(formData?: FormData, skip?: boolean) {
           role: 'assistant',
           content: definition,
           type: 'response',
+          createdAt: new Date()
         },
         {
           id: groupeId,
           role: 'assistant',
           content: JSON.stringify(relatedQueries),
           type: 'related',
+          createdAt: new Date()
         },
         {
           id: groupeId,
           role: 'assistant',
           content: 'followup',
           type: 'followup',
-        },
-      ],
-    });
+          createdAt: new Date()
+        }
+      ]
+    })
 
     isGenerating.done(false);
     uiStream.done();
@@ -360,16 +381,19 @@ async function submit(formData?: FormData, skip?: boolean) {
     ? 'input_related'
     : 'inquiry'
 
+  const messageId = (formData?.get('id') as string) || nanoid()
+
   if (content) {
     aiState.update({
       ...aiState.get(),
       messages: [
         ...aiState.get().messages,
         {
-          id: nanoid(),
+          id: messageId,
           role: 'user',
           content,
-          type
+          type,
+          createdAt: new Date()
         }
       ]
     })
@@ -379,13 +403,63 @@ async function submit(formData?: FormData, skip?: boolean) {
     } as CoreMessage)
   }
 
-  const userId = 'anonymous'
+  const { getCurrentUserIdOnServer } = await import(
+    '@/lib/auth/get-current-user'
+  )
+  const userId = (await getCurrentUserIdOnServer()) || 'anonymous'
   const currentSystemPrompt = (await getSystemPrompt(userId)) || ''
   const mapProvider = formData?.get('mapProvider') as 'mapbox' | 'google'
 
-  async function processEvents() {
+  processChatWorkflow({
+    aiState,
+    uiStream,
+    isGenerating,
+    isCollapsed,
+    messages,
+    groupeId,
+    currentSystemPrompt,
+    mapProvider,
+    useSpecificAPI,
+    maxMessages,
+    skipTaskManager: skip
+  })
+
+  return {
+    id: nanoid(),
+    isGenerating: isGenerating.value,
+    component: uiStream.value,
+    isCollapsed: isCollapsed.value
+  }
+}
+
+async function processChatWorkflow({
+  aiState,
+  uiStream,
+  isGenerating,
+  isCollapsed,
+  messages,
+  groupeId,
+  currentSystemPrompt,
+  mapProvider,
+  useSpecificAPI,
+  maxMessages,
+  skipTaskManager = false
+}: {
+  aiState: any
+  uiStream: any
+  isGenerating: any
+  isCollapsed: any
+  messages: CoreMessage[]
+  groupeId: string
+  currentSystemPrompt: string
+  mapProvider: any
+  useSpecificAPI: boolean
+  maxMessages: number
+  skipTaskManager?: boolean
+}) {
+  try {
     let action: any = { object: { next: 'proceed' } }
-    if (!skip) {
+    if (!skipTaskManager) {
       const taskManagerResult = await taskManager(messages)
       if (taskManagerResult) {
         action.object = taskManagerResult.object
@@ -394,9 +468,6 @@ async function submit(formData?: FormData, skip?: boolean) {
 
     if (action.object.next === 'inquire') {
       const inquiry = await inquire(uiStream, messages)
-      uiStream.done()
-      isGenerating.done()
-      isCollapsed.done(false)
       aiState.done({
         ...aiState.get(),
         messages: [
@@ -404,10 +475,14 @@ async function submit(formData?: FormData, skip?: boolean) {
           {
             id: nanoid(),
             role: 'assistant',
-            content: `inquiry: ${inquiry?.question}`
+            content: `inquiry: ${inquiry?.question}`,
+            createdAt: new Date()
           }
         ]
       })
+      isGenerating.done(false)
+      isCollapsed.done(false)
+      uiStream.done()
       return
     }
 
@@ -415,26 +490,32 @@ async function submit(formData?: FormData, skip?: boolean) {
     let answer = ''
     let toolOutputs: ToolResultPart[] = []
     let errorOccurred = false
-    const streamText = createStreamableValue<string>()
-    uiStream.update(<Spinner />)
+    const streamText = createStreamableValue('')
+
+    const answerSection = (
+      <Section title="response">
+        <BotMessage content={streamText.value} />
+      </Section>
+    )
+
+    uiStream.update(answerSection)
 
     while (
       useSpecificAPI
         ? answer.length === 0
         : answer.length === 0 && !errorOccurred
     ) {
-      const { fullResponse, hasError, toolResponses } = await researcher(
+      const researcherResult = await researcher(
         currentSystemPrompt,
         uiStream,
         streamText,
         messages,
         mapProvider,
-        useSpecificAPI,
-        drawnFeatures
+        useSpecificAPI
       )
-      answer = fullResponse
-      toolOutputs = toolResponses
-      errorOccurred = hasError
+      answer = researcherResult.fullResponse
+      toolOutputs = researcherResult.toolResponses
+      errorOccurred = researcherResult.hasError
 
       if (toolOutputs.length > 0) {
         toolOutputs.map(output => {
@@ -452,22 +533,24 @@ async function submit(formData?: FormData, skip?: boolean) {
             ]
           })
         })
+      } else {
+        // If no tool calls and researcher finished, break to possibly call writer or end
+        break
       }
     }
 
     if (useSpecificAPI && answer.length === 0) {
-      const modifiedMessages = aiState
-        .get()
-        .messages.map(msg =>
+      const modifiedMessages = (aiState.get().messages as AIMessage[]).map(
+        (msg: AIMessage) =>
           msg.role === 'tool'
-            ? {
+            ? ({
                 ...msg,
                 role: 'assistant',
                 content: JSON.stringify(msg.content),
                 type: 'tool'
-              }
+              } as AIMessage)
             : msg
-        ) as CoreMessage[]
+      ) as CoreMessage[]
       const latestMessages = modifiedMessages.slice(maxMessages * -1)
       answer = await writer(
         currentSystemPrompt,
@@ -479,7 +562,12 @@ async function submit(formData?: FormData, skip?: boolean) {
       streamText.done()
     }
 
-    if (!errorOccurred) {
+    if (answer.length === 0 && !errorOccurred) {
+      answer = "I'm sorry, I couldn't generate a response. Please try again."
+      streamText.done(answer)
+    }
+
+    if (!errorOccurred || answer.length > 0) {
       const relatedQueries = await querySuggestor(uiStream, messages)
       uiStream.append(
         <Section title="Follow-up">
@@ -497,29 +585,138 @@ async function submit(formData?: FormData, skip?: boolean) {
             id: groupeId,
             role: 'assistant',
             content: answer,
-            type: 'response'
+            type: 'response',
+            createdAt: new Date()
           },
           {
             id: groupeId,
             role: 'assistant',
             content: JSON.stringify(relatedQueries),
-            type: 'related'
+            type: 'related',
+            createdAt: new Date()
           },
           {
             id: groupeId,
             role: 'assistant',
             content: 'followup',
-            type: 'followup'
+            type: 'followup',
+            createdAt: new Date()
           }
         ]
       })
     }
+  } catch (error) {
+    console.error('Error in processChatWorkflow:', error)
+    uiStream.append(
+      <div className="p-4 bg-destructive/10 border border-destructive/20 rounded-lg text-destructive text-sm">
+        An error occurred while generating the response. Please try again.
+      </div>
+    )
+    aiState.done(aiState.get())
+  } finally {
+    isGenerating.done(false)
+    uiStream.done()
+  }
+}
 
+async function resubmit(
+  messageId: string,
+  content: string,
+  mapProvider: 'mapbox' | 'google' = 'mapbox'
+) {
+  'use server'
+
+  const aiState = getMutableAIState<typeof AI>()
+  const uiStream = createStreamableUI()
+  const isGenerating = createStreamableValue(true)
+  const isCollapsed = createStreamableValue(false)
+
+  const messages = aiState.get().messages
+  const index = messages.findIndex(m => m.id === messageId)
+
+  if (index === -1) {
     isGenerating.done(false)
     uiStream.done()
+    return {
+      id: nanoid(),
+      isGenerating: isGenerating.value,
+      component: null,
+      isCollapsed: isCollapsed.value
+    }
+  }
+
+  const editedMessage = messages[index]
+  const chatId = aiState.get().chatId
+
+  if (editedMessage.createdAt) {
+    await deleteTrailingMessages(chatId, new Date(editedMessage.createdAt))
+  }
+  const truncatedMessages = messages.slice(0, index + 1)
+  const editedMessageInState = truncatedMessages[index]
+
+  if (Array.isArray(editedMessageInState.content)) {
+    const textPart = editedMessageInState.content.find(p => p.type === 'text') as
+      | { type: 'text'; text: string }
+      | undefined
+    if (textPart) {
+      textPart.text = content
+    }
+  } else {
+    editedMessageInState.content = content
   }
 
-  processEvents()
+  await updateMessage(
+    messageId,
+    typeof editedMessageInState.content === 'object'
+      ? JSON.stringify(editedMessageInState.content)
+      : editedMessageInState.content
+  )
+
+  aiState.update({
+    ...aiState.get(),
+    messages: truncatedMessages
+  })
+
+  const coreMessages: CoreMessage[] = truncatedMessages
+    .filter(
+      message =>
+        message.role !== 'tool' &&
+        message.type !== 'followup' &&
+        message.type !== 'related' &&
+        message.type !== 'end' &&
+        message.type !== 'resolution_search_result'
+    )
+    .map(m => {
+      return {
+        role: m.role as 'user' | 'assistant' | 'system' | 'tool',
+        content: m.content
+      } as CoreMessage
+    })
+
+  const groupeId = nanoid()
+  const useSpecificAPI = process.env.USE_SPECIFIC_API_FOR_WRITER === 'true'
+  const maxMessages = useSpecificAPI ? 5 : 10
+  coreMessages.splice(0, Math.max(coreMessages.length - maxMessages, 0))
+
+  const { getCurrentUserIdOnServer } = await import(
+    '@/lib/auth/get-current-user'
+  )
+  const userId = (await getCurrentUserIdOnServer()) || 'anonymous'
+  const currentSystemPrompt = (await getSystemPrompt(userId)) || ''
+
+  processChatWorkflow({
+    aiState,
+    uiStream,
+    isGenerating,
+    isCollapsed,
+    messages: coreMessages,
+    groupeId,
+    currentSystemPrompt,
+    mapProvider,
+    useSpecificAPI,
+    maxMessages,
+    skipTaskManager: true // Usually we want to skip task manager on resubmit
+  })
 
   return {
     id: nanoid(),
@@ -529,6 +726,30 @@ async function submit(formData?: FormData, skip?: boolean) {
   }
 }
 
+async function deleteMessageAction(messageId: string) {
+  'use server'
+
+  const aiState = getMutableAIState<typeof AI>()
+  const messages = aiState.get().messages
+  const index = messages.findIndex(m => m.id === messageId)
+
+  if (index !== -1) {
+    const messageToDelete = messages[index]
+    const chatId = aiState.get().chatId
+
+    if (messageToDelete.createdAt) {
+      await deleteTrailingMessages(chatId, new Date(messageToDelete.createdAt))
+    }
+    await deleteMessage(messageId)
+
+    const truncatedMessages = messages.slice(0, index)
+    aiState.done({
+      ...aiState.get(),
+      messages: truncatedMessages
+    })
+  }
+}
+
 async function clearChat() {
   'use server'
 
@@ -560,88 +781,7 @@ const initialAIState: AIState = {
 
 const initialUIState: UIState = []
 
-export const AI = createAI<AIState, UIState>({
-  actions: {
-    submit,
-    clearChat
-  },
-  initialUIState,
-  initialAIState,
-  onGetUIState: async () => {
-    'use server'
-
-    const aiState = getAIState() as AIState
-    if (aiState) {
-      const uiState = getUIStateFromAIState(aiState)
-      return uiState
-    }
-    return initialUIState
-  },
-  onSetAIState: async ({ state }) => {
-    'use server'
-
-    if (!state.messages.some(e => e.type === 'response')) {
-      return
-    }
-
-    const { chatId, messages } = state
-    const createdAt = new Date()
-    const path = `/search/${chatId}`
-
-    let title = 'Untitled Chat'
-    if (messages.length > 0) {
-      const firstMessageContent = messages[0].content
-      if (typeof firstMessageContent === 'string') {
-        try {
-          const parsedContent = JSON.parse(firstMessageContent)
-          title = parsedContent.input?.substring(0, 100) || 'Untitled Chat'
-        } catch (e) {
-          title = firstMessageContent.substring(0, 100)
-        }
-      } else if (Array.isArray(firstMessageContent)) {
-        const textPart = (
-          firstMessageContent as { type: string; text?: string }[]
-        ).find(p => p.type === 'text')
-        title =
-          textPart && textPart.text
-            ? textPart.text.substring(0, 100)
-            : 'Image Message'
-      }
-    }
-
-    const updatedMessages: AIMessage[] = [
-      ...messages,
-      {
-        id: nanoid(),
-        role: 'assistant',
-        content: `end`,
-        type: 'end'
-      }
-    ]
-
-    const { getCurrentUserIdOnServer } = await import(
-      '@/lib/auth/get-current-user'
-    )
-    const actualUserId = await getCurrentUserIdOnServer()
-
-    if (!actualUserId) {
-      console.error('onSetAIState: User not authenticated. Chat not saved.')
-      return
-    }
-
-    const chat: Chat = {
-      id: chatId,
-      createdAt,
-      userId: actualUserId,
-      path,
-      title,
-      messages: updatedMessages
-    }
-    await saveChat(chat, actualUserId)
-  }
-})
-
-export const getUIStateFromAIState = (aiState: AIState): UIState => {
+const getUIStateFromAIState = (aiState: AIState): UIState => {
   const chatId = aiState.chatId
   const isSharePage = aiState.isSharePage
   return aiState.messages
@@ -673,6 +813,7 @@ export const getUIStateFromAIState = (aiState: AIState): UIState => {
                 id,
                 component: (
                   <UserMessage
+                    id={id}
                     content={messageContent}
                     chatId={chatId}
                     showShare={index === 0 && !isSharePage}
@@ -689,136 +830,75 @@ export const getUIStateFromAIState = (aiState: AIState): UIState => {
         case 'assistant':
           const answer = createStreamableValue(content as string)
           answer.done(content as string)
+
           switch (type) {
             case 'response':
               return {
                 id,
-                component: (
-                  <Section title="response">
-                    <BotMessage content={answer.value} />
-                  </Section>
-                )
+                component: <BotMessage content={answer.value} />
               }
             case 'related':
-              const relatedQueries = createStreamableValue<RelatedQueries>({
-                items: []
-              })
+              const relatedQueries = createStreamableValue(
+                JSON.parse(content as string)
+              )
               relatedQueries.done(JSON.parse(content as string))
               return {
                 id,
-                component: (
-                  <Section title="Related" separator={true}>
-                    <SearchRelated relatedQueries={relatedQueries.value} />
-                  </Section>
-                )
+                component: <SearchRelated relatedQueries={relatedQueries.value} />
               }
             case 'followup':
               return {
                 id,
                 component: (
-                  <Section title="Follow-up" className="pb-8">
+                  <Section title="Follow-up" isCollapsed={isSharePage}>
                     <FollowupPanel />
                   </Section>
                 )
               }
-            case 'resolution_search_result': {
-              const analysisResult = JSON.parse(content as string);
-              const geoJson = analysisResult.geoJson as FeatureCollection;
-              const image = analysisResult.image as string;
-
-              return {
-                id,
-                component: (
-                  <>
-                    {image && <ResolutionImage src={image} />}
-                    {geoJson && (
-                      <GeoJsonLayer id={id} data={geoJson} />
-                    )}
-                  </>
-                )
-              }
-            }
           }
           break
         case 'tool':
           try {
-            const toolOutput = JSON.parse(content as string)
-            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: (
-                  <>
-                    {mapUrl && (
-                      <ResolutionImage
-                        src={mapUrl}
-                        className="mb-0"
-                        alt={placeName ? `Map of ${placeName}` : 'Map Preview'}
-                      />
-                    )}
-                    <MapQueryHandler toolOutput={toolOutput} />
-                  </>
-                ),
-                isCollapsed: false
-              }
-            }
-
-            const searchResults = createStreamableValue(
-              JSON.stringify(toolOutput)
-            )
-            searchResults.done(JSON.stringify(toolOutput))
+            const toolResult = JSON.parse(content as string)
             switch (name) {
               case 'search':
                 return {
                   id,
-                  component: <SearchSection result={searchResults.value} />,
-                  isCollapsed: isCollapsed.value
+                  component: <SearchSection result={toolResult} />,
+                  isCollapsed: createStreamableValue(true).value
                 }
               case 'retrieve':
                 return {
                   id,
-                  component: <RetrieveSection data={toolOutput} />,
-                  isCollapsed: isCollapsed.value
+                  component: <RetrieveSection data={toolResult} />,
+                  isCollapsed: createStreamableValue(true).value
                 }
               case 'videoSearch':
                 return {
                   id,
-                  component: (
-                    <VideoSearchSection result={searchResults.value} />
-                  ),
-                  isCollapsed: isCollapsed.value
+                  component: <VideoSearchSection result={toolResult} />,
+                  isCollapsed: createStreamableValue(true).value
                 }
-              default:
-                console.warn(
-                  `Unhandled tool result in getUIStateFromAIState: ${name}`
-                )
-                return { id, component: null }
-            }
-          } catch (error) {
-            console.error(
-              'Error parsing tool content in getUIStateFromAIState:',
-              error
-            )
-            return {
-              id,
-              component: null
             }
+          } catch (e) {
+            return null
           }
           break
-        default:
-          return {
-            id,
-            component: null
-          }
       }
+      return null
     })
     .filter(message => message !== null) as UIState
 }
+
+export const AI = createAI<AIState, UIState>({
+  actions: {
+    submit,
+    resubmit,
+    deleteMessageAction,
+    clearChat
+  },
+  initialUIState,
+  initialAIState,
+  unmaskRequiredConfigs: true,
+  onGetUIState: getUIStateFromAIState
+})
diff --git a/components/chat-panel.tsx b/components/chat-panel.tsx
index 7d877ccd..6cf2ee97 100644
--- a/components/chat-panel.tsx
+++ b/components/chat-panel.tsx
@@ -34,10 +34,13 @@ export const ChatPanel = forwardRef<ChatPanelRef, ChatPanelProps>(({ messages, i
   const [isMobile, setIsMobile] = useState(false)
   const [selectedFile, setSelectedFile] = useState<File | null>(null)
   const [suggestions, setSuggestionsState] = useState<PartialRelated | null>(null)
-  const setSuggestions = useCallback((s: PartialRelated | null) => {
-    setSuggestionsState(s)
-    onSuggestionsChange?.(s)
-  }, [onSuggestionsChange, setSuggestionsState])
+  const setSuggestions = useCallback(
+    (s: PartialRelated | null) => {
+      setSuggestionsState(s)
+      onSuggestionsChange?.(s)
+    },
+    [onSuggestionsChange, setSuggestionsState]
+  )
   const { mapData } = useMapData()
   const debounceTimeoutRef = useRef<NodeJS.Timeout | null>(null)
   const inputRef = useRef<HTMLTextAreaElement>(null)
@@ -102,15 +105,17 @@ export const ChatPanel = forwardRef<ChatPanelRef, ChatPanelProps>(({ messages, i
       })
     }
 
+    const id = nanoid()
     setMessages(currentMessages => [
       ...currentMessages,
       {
-        id: nanoid(),
-        component: <UserMessage content={content} />
+        id,
+        component: <UserMessage id={id} content={content} />
       }
     ])
 
     const formData = new FormData(e.currentTarget)
+    formData.append('id', id)
     if (selectedFile) {
       formData.append('file', selectedFile)
     }
diff --git a/components/followup-panel.tsx b/components/followup-panel.tsx
index a11f585f..fab3f01d 100644
--- a/components/followup-panel.tsx
+++ b/components/followup-panel.tsx
@@ -19,10 +19,11 @@ export function FollowupPanel() {
     event.preventDefault()
     const formData = new FormData(event.currentTarget as HTMLFormElement)
 
+    const id = Date.now().toString()
     const userMessage = {
-      id: Date.now(),
+      id,
       isGenerating: false,
-      component: <UserMessage content={input} />
+      component: <UserMessage id={id} content={input} />
     }
 
     // Include drawn features in the form data
diff --git a/components/header-search-button.tsx b/components/header-search-button.tsx
index 69fda09a..5a5c72b9 100644
--- a/components/header-search-button.tsx
+++ b/components/header-search-button.tsx
@@ -48,11 +48,12 @@ export function HeaderSearchButton() {
     setIsAnalyzing(true)
 
     try {
+      const id = nanoid()
       setMessages(currentMessages => [
         ...currentMessages,
         {
-          id: nanoid(),
-          component: <UserMessage content={[{ type: 'text', text: 'Analyze this map view.' }]} />
+          id,
+          component: <UserMessage id={id} content={[{ type: 'text', text: 'Analyze this map view.' }]} />
         }
       ])
 
diff --git a/components/map/mapbox-map.tsx b/components/map/mapbox-map.tsx
index eecd7f54..3220af7c 100644
--- a/components/map/mapbox-map.tsx
+++ b/components/map/mapbox-map.tsx
@@ -467,7 +467,16 @@ export const Mapbox: React.FC<{ position?: { latitude: number; longitude: number
         geolocationWatchIdRef.current = null
       }
     }
-  }, [setMap, setIsMapLoaded, captureMapCenter, handleUserInteraction, stopRotation])
+  }, [
+    setMap,
+    setIsMapLoaded,
+    captureMapCenter,
+    handleUserInteraction,
+    stopRotation,
+    mapData.cameraState,
+    position?.latitude,
+    position?.longitude
+  ])
 
   // Handle map mode changes
   useEffect(() => {
diff --git a/components/search-related.tsx b/components/search-related.tsx
index a03901c5..9d557e14 100644
--- a/components/search-related.tsx
+++ b/components/search-related.tsx
@@ -29,9 +29,10 @@ export const SearchRelated: React.FC<SearchRelatedProps> = ({
     const formData = new FormData()
     formData.append('related_query', query)
 
+    const id = nanoid()
     const userMessage = {
-      id: nanoid(),
-      component: <UserMessage content={query} />
+      id,
+      component: <UserMessage content={query} id={id} />
     }
 
     const responseMessage = await submit(formData)
diff --git a/components/user-message.tsx b/components/user-message.tsx
index 03b8ea8d..5d0aff23 100644
--- a/components/user-message.tsx
+++ b/components/user-message.tsx
@@ -1,23 +1,50 @@
-import React from 'react'
+'use client'
+
+import React, { useState } from 'react'
 import Image from 'next/image'
 import { ChatShare } from './chat-share'
+import { useActions, useUIState } from 'ai/rsc'
+import { AI } from '@/app/actions'
+import { useSettingsStore } from '@/lib/store/settings'
+import { Button } from './ui/button'
+import { Pencil, Copy, Trash2, Check, X } from 'lucide-react'
+import { toast } from 'sonner'
+import Textarea from 'react-textarea-autosize'
+import {
+  AlertDialog,
+  AlertDialogAction,
+  AlertDialogCancel,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogFooter,
+  AlertDialogHeader,
+  AlertDialogTitle,
+  AlertDialogTrigger
+} from './ui/alert-dialog'
 
 type UserMessageContentPart =
   | { type: 'text'; text: string }
   | { type: 'image'; image: string } // data URL
 
 type UserMessageProps = {
+  id?: string
   content: string | UserMessageContentPart[]
   chatId?: string
   showShare?: boolean
 }
 
 export const UserMessage: React.FC<UserMessageProps> = ({
+  id,
   content,
   chatId,
   showShare = false
 }) => {
   const enableShare = process.env.ENABLE_SHARE === 'true'
+  const { resubmit, deleteMessageAction } = useActions()
+  const [, setMessages] = useUIState<typeof AI>()
+
+  const [isEditing, setIsEditing] = useState(false)
+  const [editContent, setEditContent] = useState('')
 
   // Normalize content to an array
   const contentArray =
@@ -31,23 +58,142 @@ export const UserMessage: React.FC<UserMessageProps> = ({
     (part): part is { type: 'image'; image: string } => part.type === 'image'
   )?.image
 
+  const handleEdit = () => {
+    setEditContent(textPart || '')
+    setIsEditing(true)
+  }
+
+  const copyToClipboard = () => {
+    if (textPart) {
+      navigator.clipboard.writeText(textPart)
+      toast.success('Copied to clipboard')
+    }
+  }
+
+  const { mapProvider } = useSettingsStore()
+
+  const handleSave = async () => {
+    if (!id || !editContent.trim()) return
+
+    setIsEditing(false)
+
+    // Truncate UI state
+    setMessages(currentMessages => {
+      const index = currentMessages.findIndex(m => m.id === id)
+      return currentMessages.slice(0, index + 1)
+    })
+
+    const response = await resubmit(id, editContent, mapProvider)
+    setMessages(currentMessages => [...currentMessages, response])
+  }
+
+  const handleDelete = async () => {
+    if (!id) return
+
+    // Truncate UI state
+    setMessages(currentMessages => {
+      const index = currentMessages.findIndex(m => m.id === id)
+      return currentMessages.slice(0, index)
+    })
+
+    await deleteMessageAction(id)
+  }
+
   return (
-    <div className="flex items-start w-full space-x-3 mt-2">
-      <div className="flex-1 space-y-2">
-        {imagePart && (
-          <div className="p-2 border rounded-lg bg-muted w-fit">
-            <Image
-              src={imagePart}
-              alt="attachment"
-              width={300}
-              height={300}
-              className="max-w-xs max-h-64 rounded-md object-contain"
-            />
-          </div>
-        )}
-        {textPart && <div className="text-xl break-words">{textPart}</div>}
+    <div className="group flex flex-col items-start w-full mt-2">
+      <div className="flex items-start w-full space-x-3">
+        <div className="flex-1 space-y-2">
+          {imagePart && (
+            <div className="p-2 border rounded-lg bg-muted w-fit">
+              <Image
+                src={imagePart}
+                alt="attachment"
+                width={300}
+                height={300}
+                className="max-w-xs max-h-64 rounded-md object-contain"
+              />
+            </div>
+          )}
+          {isEditing ? (
+            <div className="space-y-2">
+              <Textarea
+                className="w-full p-2 text-xl break-words bg-background border rounded-md focus:outline-none focus:ring-2 focus:ring-ring"
+                value={editContent}
+                onChange={e => setEditContent(e.target.value)}
+                autoFocus
+              />
+              <div className="flex space-x-2">
+                <Button size="sm" onClick={handleSave}>
+                  <Check className="h-4 w-4 mr-1" />
+                  Save
+                </Button>
+                <Button size="sm" variant="ghost" onClick={() => setIsEditing(false)}>
+                  <X className="h-4 w-4 mr-1" />
+                  Cancel
+                </Button>
+              </div>
+            </div>
+          ) : (
+            textPart && (
+              <div className="text-xl break-words p-3 bg-background border border-border rounded-2xl rounded-tl-none inline-block shadow-sm">
+                {textPart}
+              </div>
+            )
+          )}
+        </div>
+        {enableShare && showShare && chatId && <ChatShare chatId={chatId} />}
       </div>
-      {enableShare && showShare && chatId && <ChatShare chatId={chatId} />}
+
+      {!isEditing && id && (
+        <div className="flex items-center space-x-0.5 opacity-40 hover:opacity-100 group-hover:opacity-100 focus-within:opacity-100 transition-opacity mt-1 ml-1">
+          <Button
+            variant="ghost"
+            size="icon"
+            onClick={handleEdit}
+            className="h-7 w-7 hover:bg-muted"
+          >
+            <Pencil className="h-3.5 w-3.5 text-muted-foreground" />
+          </Button>
+
+          <Button
+            variant="ghost"
+            size="icon"
+            onClick={copyToClipboard}
+            className="h-7 w-7 hover:bg-muted"
+          >
+            <Copy className="h-3.5 w-3.5 text-muted-foreground" />
+          </Button>
+
+          <AlertDialog>
+            <AlertDialogTrigger asChild>
+              <Button
+                variant="ghost"
+                size="icon"
+                className="h-7 w-7 hover:bg-destructive/10"
+              >
+                <Trash2 className="h-3.5 w-3.5 text-destructive/80 hover:text-destructive" />
+              </Button>
+            </AlertDialogTrigger>
+            <AlertDialogContent>
+              <AlertDialogHeader>
+                <AlertDialogTitle>Delete message?</AlertDialogTitle>
+                <AlertDialogDescription>
+                  This will delete this message and all subsequent messages in this chat.
+                </AlertDialogDescription>
+              </AlertDialogHeader>
+              <AlertDialogFooter>
+                <AlertDialogCancel>Cancel</AlertDialogCancel>
+                <AlertDialogAction
+                  onClick={handleDelete}
+                  className="bg-destructive text-destructive-foreground hover:bg-destructive/90"
+                >
+                  Delete
+                </AlertDialogAction>
+              </AlertDialogFooter>
+            </AlertDialogContent>
+          </AlertDialog>
+        </div>
+      )}
     </div>
   )
 }
diff --git a/lib/actions/chat-db.ts b/lib/actions/chat-db.ts
index 4f0559ec..f25972b0 100644
--- a/lib/actions/chat-db.ts
+++ b/lib/actions/chat-db.ts
@@ -1,6 +1,6 @@
 import { db } from '@/lib/db';
 import { chats, messages, users } from '@/lib/db/schema';
-import { eq, desc, and, sql, asc } from 'drizzle-orm'; // Added asc
+import { eq, desc, and, sql, asc, gt } from 'drizzle-orm'; // Added asc, gt
 import { alias } from 'drizzle-orm/pg-core';
 import { getCurrentUserIdOnServer } from '@/lib/auth/get-current-user'; // We'll use this to ensure user-specific actions
 
@@ -119,7 +119,17 @@ export async function saveChat(chatData: NewChat, messagesData: Omit<NewMessage,
         chatId: chatId!, // Ensure chatId is set for all messages
         userId: msg.userId || chatData.userId!, // Ensure userId is set
       }));
-      await tx.insert(messages).values(messagesToInsert);
+      await tx
+        .insert(messages)
+        .values(messagesToInsert)
+        .onConflictDoUpdate({
+          target: messages.id,
+          set: {
+            content: sql`EXCLUDED.content`,
+            role: sql`EXCLUDED.role`,
+            createdAt: sql`EXCLUDED.created_at`
+          }
+        });
     }
     return chatId;
   });
@@ -213,11 +223,63 @@ export async function getMessagesByChatId(chatId: string): Promise<Message[]> {
   }
 }
 
-// More granular functions might be needed based on PR #533 specifics:
-// - updateMessage(messageId: string, updates: Partial<NewMessage>): Promise<Message | null>
-// - deleteMessage(messageId: string, userId: string): Promise<boolean>
-// - deleteTrailingMessages(chatId: string, lastKeptMessageId: string): Promise<void>
-// These are placeholders for now and can be implemented if subsequent steps show they are directly part of PR #533's changes.
-// The PR mentions "feat: Add message update and trailing deletion logic" and "refactor(chat): Adjust message edit logic".
+/**
+ * Updates an existing message.
+ * @param messageId - The ID of the message to update.
+ * @param updates - The updates to apply.
+ * @returns The updated message object or null if error.
+ */
+export async function updateMessage(
+  messageId: string,
+  updates: Partial<NewMessage>
+): Promise<Message | null> {
+  try {
+    const result = await db
+      .update(messages)
+      .set(updates)
+      .where(eq(messages.id, messageId))
+      .returning();
+    return result[0] || null;
+  } catch (error) {
+    console.error('Error updating message:', error);
+    return null;
+  }
+}
+
+/**
+ * Deletes a specific message.
+ * @param messageId - The ID of the message to delete.
+ * @returns True if deletion was successful, false otherwise.
+ */
+export async function deleteMessage(messageId: string): Promise<boolean> {
+  try {
+    const result = await db
+      .delete(messages)
+      .where(eq(messages.id, messageId))
+      .returning({ id: messages.id });
+    return result.length > 0;
+  } catch (error) {
+    console.error('Error deleting message:', error);
+    return false;
+  }
+}
+
+/**
+ * Deletes all messages in a chat created after a certain message.
+ * @param chatId - The ID of the chat.
+ * @param createdAt - The timestamp after which messages should be deleted.
+ */
+export async function deleteTrailingMessages(
+  chatId: string,
+  createdAt: Date
+): Promise<void> {
+  try {
+    await db
+      .delete(messages)
+      .where(and(eq(messages.chatId, chatId), gt(messages.createdAt, createdAt)));
+  } catch (error) {
+    console.error('Error deleting trailing messages:', error);
+  }
+}
 
 console.log('Chat DB actions loaded. Ensure getCurrentUserId() is correctly implemented for server-side usage if applicable.');
diff --git a/lib/actions/chat.ts b/lib/actions/chat.ts
index c257d6e8..3d4f6df9 100644
--- a/lib/actions/chat.ts
+++ b/lib/actions/chat.ts
@@ -10,6 +10,9 @@ import {
   saveChat as dbSaveChat,
   createMessage as dbCreateMessage,
   getMessagesByChatId as dbGetMessagesByChatId, // Added
+  updateMessage as dbUpdateMessage,
+  deleteMessage as dbDeleteMessage,
+  deleteTrailingMessages as dbDeleteTrailingMessages,
   type Chat as DrizzleChat,
   type Message as DrizzleMessage, // Added
   type NewChat as DbNewChat,
@@ -162,6 +165,32 @@ export async function saveChat(chat: OldChatType, userId: string): Promise<strin
 //   return null;
 // }
 
+export async function updateMessage(messageId: string, content: string): Promise<DrizzleMessage | null> {
+  try {
+    return await dbUpdateMessage(messageId, { content });
+  } catch (error) {
+    console.error(`Error updating message ${messageId}:`, error);
+    return null;
+  }
+}
+
+export async function deleteMessage(messageId: string): Promise<boolean> {
+  try {
+    return await dbDeleteMessage(messageId);
+  } catch (error) {
+    console.error(`Error deleting message ${messageId}:`, error);
+    return false;
+  }
+}
+
+export async function deleteTrailingMessages(chatId: string, createdAt: Date): Promise<void> {
+  try {
+    await dbDeleteTrailingMessages(chatId, createdAt);
+  } catch (error) {
+    console.error(`Error deleting trailing messages for chat ${chatId}:`, error);
+  }
+}
+
 export async function updateDrawingContext(chatId: string, contextData: { drawnFeatures: any[], cameraState: any }) {
   'use server';
   console.log('[Action] updateDrawingContext called for chatId:', chatId);
diff --git a/lib/agents/researcher.tsx b/lib/agents/researcher.tsx
index ce801af4..7f7a382e 100644
--- a/lib/agents/researcher.tsx
+++ b/lib/agents/researcher.tsx
@@ -111,15 +111,13 @@ export async function researcher(
   )
 
   const result = await nonexperimental_streamText({
-    model: (await getModel(hasImage)) as LanguageModel,
+    model: (await getModel(useSpecificModel, hasImage)) as LanguageModel,
     maxTokens: 4096,
     system: systemPromptToUse,
     messages,
     tools: getTools({ uiStream, fullResponse, mapProvider }),
   })
 
-  uiStream.update(null) // remove spinner
-
   const toolCalls: ToolCallPart[] = []
   const toolResponses: ToolResultPart[] = []
 
@@ -127,24 +125,18 @@ export async function researcher(
     switch (delta.type) {
       case 'text-delta':
         if (delta.textDelta) {
-          if (fullResponse.length === 0 && delta.textDelta.length > 0) {
-            uiStream.update(answerSection)
-          }
           fullResponse += delta.textDelta
           streamText.update(fullResponse)
         }
         break
 
       case 'tool-call':
-        toolCalls.push(delta)
+        toolCalls.push(delta as ToolCallPart)
         break
 
       case 'tool-result':
-        if (!useSpecificModel && toolResponses.length === 0 && delta.result) {
-          uiStream.append(answerSection)
-        }
         if (!delta.result) hasError = true
-        toolResponses.push(delta)
+        toolResponses.push(delta as ToolResultPart)
         break
 
       case 'error':
diff --git a/lib/agents/resolution-search.tsx b/lib/agents/resolution-search.tsx
index 737551e8..14c08e63 100644
--- a/lib/agents/resolution-search.tsx
+++ b/lib/agents/resolution-search.tsx
@@ -71,7 +71,7 @@ Analyze the user's prompt and the image to provide a holistic understanding of t
 
   // Use streamObject to get partial results.
   return streamObject({
-    model: await getModel(hasImage),
+    model: await getModel(false, hasImage),
     system: systemPrompt,
     messages: filteredMessages,
     schema: resolutionSearchSchema,
diff --git a/lib/utils/index.ts b/lib/utils/index.ts
index f9b7eeb5..5737ec71 100644
--- a/lib/utils/index.ts
+++ b/lib/utils/index.ts
@@ -15,8 +15,8 @@ export function generateUUID(): string {
   return uuidv4();
 }
 
-export async function getModel(requireVision: boolean = false) {
-  const selectedModel = await getSelectedModel();
+export async function getModel(useSpecificAPI: boolean = false, requireVision: boolean = false) {
+  const selectedModel = useSpecificAPI ? (process.env.SPECIFIC_API_MODEL || 'Gemini 3') : await getSelectedModel();
 
   const xaiApiKey = process.env.XAI_API_KEY;
   const gemini3ProApiKey = process.env.GEMINI_3_PRO_API_KEY;
@@ -35,7 +35,7 @@ export async function getModel(requireVision: boolean = false) {
             baseURL: 'https://api.x.ai/v1',
           });
           try {
-            return xai('grok-4-fast-non-reasoning');
+            return xai(requireVision ? 'grok-vision-beta' : 'grok-beta');
           } catch (error) {
             console.error('Selected model "Grok 4.2" is configured but failed to initialize.', error);
             throw new Error('Failed to initialize selected model.');
@@ -50,7 +50,7 @@ export async function getModel(requireVision: boolean = false) {
             apiKey: gemini3ProApiKey,
           });
           try {
-            return google('gemini-3-pro-preview');
+            return google(requireVision ? 'gemini-1.5-pro' : 'gemini-1.5-pro');
           } catch (error) {
             console.error('Selected model "Gemini 3" is configured but failed to initialize.', error);
             throw new Error('Failed to initialize selected model.');
@@ -79,7 +79,7 @@ export async function getModel(requireVision: boolean = false) {
       baseURL: 'https://api.x.ai/v1',
     });
     try {
-      return xai('grok-4-fast-non-reasoning');
+      return xai(requireVision ? 'grok-vision-beta' : 'grok-beta');
     } catch (error) {
       console.warn('xAI API unavailable, falling back to next provider:');
     }
@@ -90,7 +90,7 @@ export async function getModel(requireVision: boolean = false) {
       apiKey: gemini3ProApiKey,
     });
     try {
-      return google('gemini-3-pro-preview');
+      return google(requireVision ? 'gemini-1.5-pro' : 'gemini-1.5-pro');
     } catch (error) {
       console.warn('Gemini 3 Pro API unavailable, falling back to next provider:', error);
     }
diff --git a/server.log b/server.log
deleted file mode 100644
index 45044476..00000000
--- a/server.log
+++ /dev/null
@@ -1,11 +0,0 @@
-$ next dev --turbo
- ⚠ Port 3000 is in use, using available port 3003 instead.
-   ▲ Next.js 15.3.6 (Turbopack)
-   - Local:        http://localhost:3003
-   - Network:      http://192.168.0.2:3003
-   - Environments: .env.local, .env
-
- ✓ Starting...
- ○ Compiling middleware ...
- ✓ Compiled middleware in 648ms
- ✓ Ready in 2.5s