Restore Branch History and Integrate Latest Fixes

app/actions.tsx

@@ -47,6 +47,7 @@ async function submit(formData?: FormData, skip?: boolean) {
   const action = formData?.get('action') as string;
   if (action === 'resolution_search') {
     const file = formData?.get('file') as File;
+    const timezone = (formData?.get('timezone') as string) || 'UTC';
     if (!file) {
       throw new Error('No file provided for resolution search.');
     }
@@ -60,7 +61,8 @@ async function submit(formData?: FormData, skip?: boolean) {
         message.role !== 'tool' &&
         message.type !== 'followup' &&
         message.type !== 'related' &&
-        message.type !== 'end'
+        message.type !== 'end' &&
+        message.type !== 'resolution_search_result'
     );
 
     // The user's prompt for this action is static.
@@ -82,74 +84,97 @@ async function submit(formData?: FormData, skip?: boolean) {
     });
     messages.push({ role: 'user', content });
 
-    // Call the simplified agent, which now returns data directly.
-    const analysisResult = await resolutionSearch(messages) as any;
+    // Create a streamable value for the summary.
+    const summaryStream = createStreamableValue<string>('');
 
-    // Create a streamable value for the summary and mark it as done.
-    const summaryStream = createStreamableValue<string>();
-    summaryStream.done(analysisResult.summary || 'Analysis complete.');
+    async function processResolutionSearch() {
+      try {
+        // Call the simplified agent, which now returns a stream result.
+        const streamResult = await resolutionSearch(messages, timezone);
 
-    // Update the UI stream with the BotMessage component.
-    uiStream.update(
-      <BotMessage content={summaryStream.value} />
-    );
+        for await (const partialObject of streamResult.partialObjectStream) {
+          if (partialObject.summary) {
+            summaryStream.update(partialObject.summary);
+          }
+        }
 
-    messages.push({ role: 'assistant', content: analysisResult.summary || 'Analysis complete.' });
+        const analysisResult = await streamResult.object;
 
-    const sanitizedMessages: CoreMessage[] = messages.map(m => {
-      if (Array.isArray(m.content)) {
-        return {
-          ...m,
-          content: m.content.filter(part => part.type !== 'image')
-        } as CoreMessage
-      }
-      return m
-    })
+        // Mark the summary stream as done with the result.
+        summaryStream.done(analysisResult.summary || 'Analysis complete.');
 
-    const relatedQueries = await querySuggestor(uiStream, sanitizedMessages);
-    uiStream.append(
-        <Section title="Follow-up">
+        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')
+            } as CoreMessage
+          }
+          return m
+        })
+
+        const relatedQueries = await querySuggestor(uiStream, sanitizedMessages);
+        uiStream.append(
+          <Section title="Follow-up">
             <FollowupPanel />
-        </Section>
-    );
+          </Section>
+        );
 
-    await new Promise(resolve => setTimeout(resolve, 500));
+        await new Promise(resolve => setTimeout(resolve, 500));
 
-    const groupeId = nanoid();
+        const groupeId = nanoid();
 
-    aiState.done({
-        ...aiState.get(),
-        messages: [
+        aiState.done({
+          ...aiState.get(),
+          messages: [
             ...aiState.get().messages,
             {
-                id: groupeId,
-                role: 'assistant',
-                content: analysisResult.summary || 'Analysis complete.',
-                type: 'response'
+              id: groupeId,
+              role: 'assistant',
+              content: analysisResult.summary || 'Analysis complete.',
+              type: 'response'
             },
             {
-                id: groupeId,
-                role: 'assistant',
-                content: JSON.stringify(analysisResult),
-                type: 'resolution_search_result'
+              id: groupeId,
+              role: 'assistant',
+              content: JSON.stringify(analysisResult),
+              type: 'resolution_search_result'
             },
             {
-                id: groupeId,
-                role: 'assistant',
-                content: JSON.stringify(relatedQueries),
-                type: 'related'
+              id: groupeId,
+              role: 'assistant',
+              content: JSON.stringify(relatedQueries),
+              type: 'related'
             },
             {
-                id: groupeId,
-                role: 'assistant',
-                content: 'followup',
-                type: 'followup'
+              id: groupeId,
+              role: 'assistant',
+              content: 'followup',
+              type: 'followup'
             }
-        ]
-    });
+          ]
+        });
+      } catch (error) {
+        console.error('Error in resolution search:', error);
+        summaryStream.error(error);
+      } finally {
+        isGenerating.done(false);
+        uiStream.done();
+      }
+    }
+
+    // Start the background process without awaiting it.
+    processResolutionSearch();
+
+    // Immediately update the UI stream with the BotMessage component.
+    uiStream.update(
+      <Section title="response">
+        <BotMessage content={summaryStream.value} />
+      </Section>
+    );
 
-    isGenerating.done(false);
-    uiStream.done();
     return {
       id: nanoid(),
       isGenerating: isGenerating.value,
@@ -163,7 +188,8 @@ async function submit(formData?: FormData, skip?: boolean) {
       message.role !== 'tool' &&
       message.type !== 'followup' &&
       message.type !== 'related' &&
-      message.type !== 'end'
+      message.type !== 'end' &&
+      message.type !== 'resolution_search_result'
   )
 
   const groupeId = nanoid()
@@ -295,7 +321,7 @@ async function submit(formData?: FormData, skip?: boolean) {
   const hasImage = messageParts.some(part => part.type === 'image')
   // Properly type the content based on whether it contains images
   const content: CoreMessage['content'] = hasImage
-    ? messageParts as CoreMessage['content']
+    ? (messageParts as CoreMessage['content'])
     : messageParts.map(part => part.text).join('\n')
 
   const type = skip
@@ -340,7 +366,7 @@ async function submit(formData?: FormData, skip?: boolean) {
   const mapProvider = formData?.get('mapProvider') as 'mapbox' | 'google'
 
   async function processEvents() {
-    let action: any = { object: { next: 'proceed' } }
+    let action: { object: { next: string } } = { object: { next: 'proceed' } }
     if (!skip) {
       const taskManagerResult = await taskManager(messages)
       if (taskManagerResult) {
@@ -371,7 +397,7 @@ async function submit(formData?: FormData, skip?: boolean) {
     let answer = ''
     let toolOutputs: ToolResultPart[] = []
     let errorOccurred = false
-    const streamText = createStreamableValue<string>()
+    const streamText = createStreamableValue<string>('')
     uiStream.update(<Spinner />)
 
     while (
@@ -646,7 +672,9 @@ export const getUIStateFromAIState = (aiState: Chat) => {
                 )
               }
             case 'related':
-              const relatedQueries = createStreamableValue<RelatedQueries>()
+              const relatedQueries = createStreamableValue<RelatedQueries>({
+                items: []
+              })
               relatedQueries.done(JSON.parse(content as string))
               return {
                 id,

app/layout.tsx

@@ -12,7 +12,10 @@ import { SpeedInsights } from "@vercel/speed-insights/next"
 import { Toaster } from '@/components/ui/sonner'
 import { MapToggleProvider } from '@/components/map-toggle-context'
 import { ProfileToggleProvider } from '@/components/profile-toggle-context'
+import { UsageToggleProvider } from '@/components/usage-toggle-context'
 import { CalendarToggleProvider } from '@/components/calendar-toggle-context'
+import { HistoryToggleProvider } from '@/components/history-toggle-context'
+import { HistorySidebar } from '@/components/history-sidebar'
 import { MapLoadingProvider } from '@/components/map-loading-context';
 import ConditionalLottie from '@/components/conditional-lottie';
 import { MapProvider } from '@/components/map/map-context'