fix(ambient-ui): address review — lazy export, orphan fix, build fix

- Defer message fetch for export to on-click (was eager on every render)
- Remove non-deterministic orphan tool_result fallback (always standalone)
- Replace useSearchParams with window.location to fix SSG build failure
- Memoize adapter in useSendMessage via useRef
- Remove dead TOOL_CALL_START/ARGS from _SKIP_TYPES
- Add comment explaining empty assistant message drop

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: jsell-rh

components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/[sessionId]/_components/session-header.tsx

@@ -6,7 +6,6 @@ import { ExternalLink, Square, RotateCcw, Download, Trash2, MoreVertical } from
 import type { DomainSession } from '@/domain/types'
 import { getPreviewAnnotations } from '@/domain/annotations'
 import { useStopSession, useStartSession, useDeleteSession } from '@/queries/use-sessions'
-import { useSessionMessages } from '@/queries/use-session-messages'
 import { useSendFeedback } from '@/queries/use-send-feedback'
 import { PhaseBadge } from '../../_components/phase-badge'
 import { formatDuration, formatRelativeTime } from '@/lib/format-timestamp'
@@ -45,7 +44,6 @@ export function SessionHeader({ session }: { session: DomainSession }) {
   const startSession = useStartSession()
   const deleteSession = useDeleteSession()
   const sendFeedback = useSendFeedback()
-  const { data: messages } = useSessionMessages(session.id)
 
   const preview = getPreviewAnnotations(session.annotations)
   const canStop = STOPPABLE_PHASES.has(session.phase)
@@ -65,7 +63,11 @@ export function SessionHeader({ session }: { session: DomainSession }) {
     setDeleteDialogOpen(false)
   }, [deleteSession, session.id, router, projectId])
 
-  const handleExport = useCallback(() => {
+  const handleExport = useCallback(async () => {
+    const { createSessionMessagesAdapterWithFetch } = await import('@/adapters/session-messages')
+    const adapter = createSessionMessagesAdapterWithFetch()
+    const result = await adapter.list(session.id, { size: 1000 })
+
     const exportData = {
       session: {
         id: session.id,
@@ -77,7 +79,7 @@ export function SessionHeader({ session }: { session: DomainSession }) {
         startTime: session.startTime,
         completionTime: session.completionTime,
       },
-      messages: messages ?? [],
+      messages: result.items,
       exportedAt: new Date().toISOString(),
     }
 
@@ -92,7 +94,7 @@ export function SessionHeader({ session }: { session: DomainSession }) {
     link.click()
     document.body.removeChild(link)
     URL.revokeObjectURL(url)
-  }, [session, messages])
+  }, [session])
 
   return (
     <>

components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/[sessionId]/page.tsx

@@ -1,6 +1,7 @@
 'use client'
 
-import { useParams, useSearchParams } from 'next/navigation'
+import { useState } from 'react'
+import { useParams } from 'next/navigation'
 import { Skeleton } from '@/components/ui/skeleton'
 import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs'
 import { useSession } from '@/queries/use-sessions'
@@ -11,11 +12,14 @@ import { ChatTab } from './_components/chat-tab'
 
 export default function SessionDetailPage() {
   const { sessionId } = useParams<{ projectId: string; sessionId: string }>()
-  const searchParams = useSearchParams()
-  const activeTab = searchParams.get('tab') ?? 'phase'
+  const [activeTab, setActiveTab] = useState(() => {
+    if (typeof window === 'undefined') return 'phase'
+    return new URL(window.location.href).searchParams.get('tab') ?? 'phase'
+  })
   const { data: session, isLoading, error } = useSession(sessionId)
 
   const handleTabChange = (value: string) => {
+    setActiveTab(value)
     const url = new URL(window.location.href)
     url.searchParams.set('tab', value)
     window.history.replaceState({}, '', url.toString())
@@ -41,7 +45,7 @@ export default function SessionDetailPage() {
   return (
     <div className="space-y-6">
       <SessionHeader session={session} />
-      <Tabs defaultValue={activeTab} onValueChange={handleTabChange}>
+      <Tabs value={activeTab} onValueChange={handleTabChange}>
         <TabsList className="w-full *:flex-1">
           <TabsTrigger value="phase">Phase</TabsTrigger>
           <TabsTrigger value="logs">Logs</TabsTrigger>

components/ambient-ui/src/components/chat-messages.tsx

@@ -120,6 +120,9 @@ export function enrichMessages(messages: DomainSessionMessage[]): DomainSessionM
           }
         }
       }
+      // Empty assistant messages with no extractable text are dropped — the
+      // runner sometimes pushes an empty "assistant" record alongside a system
+      // event that contains the actual response in last_assistant_message.
       continue
     }
     enriched.push(msg)
@@ -166,12 +169,7 @@ export function groupChatItems(messages: DomainSessionMessage[]): ChatItem[] {
       if (toolCallId && pendingToolUses.has(toolCallId)) {
         pendingToolUses.get(toolCallId)!.toolResult = msg
       } else {
-        const lastPending = Array.from(pendingToolUses.values()).pop()
-        if (lastPending && !lastPending.toolResult) {
-          lastPending.toolResult = msg
-        } else {
-          items.push({ kind: 'message', message: msg })
-        }
+        items.push({ kind: 'message', message: msg })
       }
     } else {
       items.push({ kind: 'message', message: msg })

components/ambient-ui/src/components/chat-sidebar-context.tsx

@@ -5,11 +5,9 @@ import {
   useContext,
   useState,
   useCallback,
-  useEffect,
   useMemo,
   type ReactNode,
 } from 'react'
-import { useSearchParams, useRouter, usePathname } from 'next/navigation'
 
 type ChatSidebarState = {
   openSessionId: string | null
@@ -20,6 +18,11 @@ type ChatSidebarState = {
 
 const ChatSidebarContext = createContext<ChatSidebarState | null>(null)
 
+function readChatParam(): string | null {
+  if (typeof window === 'undefined') return null
+  return new URL(window.location.href).searchParams.get('chat')
+}
+
 function updateChatParam(sessionId: string | null) {
   const url = new URL(window.location.href)
   if (sessionId) {
@@ -31,9 +34,7 @@ function updateChatParam(sessionId: string | null) {
 }
 
 export function ChatSidebarProvider({ children }: { children: ReactNode }) {
-  const searchParams = useSearchParams()
-  const initialChat = searchParams.get('chat')
-  const [openSessionId, setOpenSessionId] = useState<string | null>(initialChat)
+  const [openSessionId, setOpenSessionId] = useState<string | null>(readChatParam)
 
   const openSidebar = useCallback((sessionId: string) => {
     setOpenSessionId(sessionId)

components/ambient-ui/src/queries/use-send-message.ts

@@ -1,12 +1,17 @@
 'use client'
 
+import { useRef } from 'react'
 import { useMutation, useQueryClient } from '@tanstack/react-query'
 import type { SessionMessagesPort } from '@/ports/session-messages'
 import { createSessionMessagesAdapterWithFetch } from '@/adapters/session-messages'
 import { queryKeys } from './query-keys'
 
 export function useSendMessage(sessionId: string, port?: SessionMessagesPort) {
-  const adapter = port ?? createSessionMessagesAdapterWithFetch()
+  const defaultPortRef = useRef<SessionMessagesPort | null>(null)
+  if (!defaultPortRef.current && !port) {
+    defaultPortRef.current = createSessionMessagesAdapterWithFetch()
+  }
+  const adapter = port ?? defaultPortRef.current!
   const queryClient = useQueryClient()
 
   return useMutation({

components/runners/ambient-runner/ambient_runner/bridges/claude/operational_events.py

@@ -31,11 +31,9 @@
     "RUN_ERROR": "error",
 }
 
-# TOOL_CALL_START and TOOL_CALL_ARGS are accumulated, pushed on TOOL_CALL_END.
+# TOOL_CALL_START and TOOL_CALL_ARGS are handled by explicit early returns in consume().
 _SKIP_TYPES = frozenset(
     {
-        "TOOL_CALL_START",
-        "TOOL_CALL_ARGS",
         "TEXT_MESSAGE_START",
         "TEXT_MESSAGE_CONTENT",
         "TEXT_MESSAGE_END",