@swarmclawai/swarmclaw 0.8.2 → 0.8.4

package/src/components/chat/chat-area.tsx

@@ -23,6 +23,7 @@ import { ConfirmDialog } from '@/components/shared/confirm-dialog'
 import { speak } from '@/lib/tts'
 import { api } from '@/lib/api-client'
 import { messagesDiffer } from '@/lib/chat-streaming-state'
+import { getSessionLastMessage } from '@/lib/session-summary'
 
 const DIRECT_PROMPT_SUGGESTIONS = [
   { text: 'What can you help me with?', icon: 'book', gradient: 'from-[#6366F1]/10 to-[#818CF8]/5' },
@@ -47,7 +48,7 @@ export function ChatArea() {
   const currentUser = useAppStore((s) => s.currentUser)
   const setCurrentSession = useAppStore((s) => s.setCurrentSession)
   const removeSessionFromStore = useAppStore((s) => s.removeSession)
-  const loadSessions = useAppStore((s) => s.loadSessions)
+  const refreshSession = useAppStore((s) => s.refreshSession)
   const appSettings = useAppStore((s) => s.appSettings)
   const { messages, setMessages, streaming, streamingSessionId, sendMessage, stopStreaming, devServer: devServerStatus, setDevServer, debugOpen, setDebugOpen, ttsEnabled, previewContent, setPreviewContent } = useChatStore()
   const isDesktop = useMediaQuery('(min-width: 768px)')
@@ -82,13 +83,17 @@ export function ChatArea() {
   const [pluginChatActions, setPluginChatActions] = useState<Array<{ id: string; label: string; action: string; value: string; tooltip?: string }>>([])
   const sessionHasBrowserPlugin = session?.plugins?.includes('browser') === true
 
+  const refreshPluginChatActions = useCallback(() => {
+    api<Array<{ id: string; label: string; action: string; value: string; tooltip?: string }>>('GET', '/plugins/ui?type=chat_actions').then((actions) => {
+      if (Array.isArray(actions)) setPluginChatActions(actions)
+    }).catch(() => {})
+  }, [])
+
   useEffect(() => {
-    if (sessionId) {
-      api<Array<{ id: string; label: string; action: string; value: string; tooltip?: string }>>('GET', '/plugins/ui?type=chat_actions').then(actions => {
-        if (Array.isArray(actions)) setPluginChatActions(actions)
-      }).catch(() => {})
-    }
-  }, [sessionId])
+    void refreshPluginChatActions()
+  }, [refreshPluginChatActions])
+
+  useWs('plugins', refreshPluginChatActions)
 
   // Collect unique connector sources from messages for filter UI
   const { connectorSources, hasDirectMessages } = useMemo(() => {
@@ -131,7 +136,12 @@ export function ChatArea() {
       if (cancelled || useAppStore.getState().currentSessionId !== requestedSessionId) return
       console.error('Failed to load messages:', err)
       const fallbackSession = useAppStore.getState().sessions[requestedSessionId]
-      setMessages(fallbackSession?.messages || [])
+      const fallbackLastMessage = fallbackSession ? getSessionLastMessage(fallbackSession) : null
+      setMessages(
+        fallbackSession?.messages?.length
+          ? fallbackSession.messages
+          : (fallbackLastMessage ? [fallbackLastMessage] : []),
+      )
     }).finally(() => {
       if (cancelled || useAppStore.getState().currentSessionId !== requestedSessionId) return
       setMessagesLoading(false)
@@ -142,30 +152,41 @@ export function ChatArea() {
       useChatStore.setState({ streaming: true, streamingSessionId: requestedSessionId, streamText: '' })
     }
 
-    // Refresh active state from server so returning to a session restores typing indicator.
-    loadSessions().then(() => {
-      if (cancelled || useAppStore.getState().currentSessionId !== requestedSessionId) return
-      const refreshed = useAppStore.getState().sessions[requestedSessionId]
-      if (refreshed?.active) {
-        useChatStore.setState({ streaming: true, streamingSessionId: requestedSessionId, streamText: '' })
-      }
-    }).catch((err) => console.error('Failed to refresh messages:', err))
+    return () => {
+      cancelled = true
+    }
+  }, [refreshSession, sessionId, setDevServer, setMessages])
 
-    devServer(requestedSessionId, 'status').then((r) => {
-      if (cancelled || useAppStore.getState().currentSessionId !== requestedSessionId) return
-      setDevServer(r.running ? r : null)
-    }).catch(() => {
-      if (cancelled || useAppStore.getState().currentSessionId !== requestedSessionId) return
-      setDevServer(null)
-    })
+  useEffect(() => {
+    if (!sessionId || messagesLoading) return
+    let cancelled = false
+    const requestedSessionId = sessionId
+    const timer = window.setTimeout(() => {
+      void refreshSession(requestedSessionId).then(() => {
+        if (cancelled || useAppStore.getState().currentSessionId !== requestedSessionId) return
+        const refreshed = useAppStore.getState().sessions[requestedSessionId]
+        if (refreshed?.active) {
+          useChatStore.setState({ streaming: true, streamingSessionId: requestedSessionId, streamText: '' })
+        }
+      }).catch((err) => console.error('Failed to refresh session:', err))
+
+      void devServer(requestedSessionId, 'status').then((r) => {
+        if (cancelled || useAppStore.getState().currentSessionId !== requestedSessionId) return
+        setDevServer(r.running ? r : null)
+      }).catch(() => {
+        if (cancelled || useAppStore.getState().currentSessionId !== requestedSessionId) return
+        setDevServer(null)
+      })
+    }, 200)
 
     return () => {
       cancelled = true
+      window.clearTimeout(timer)
     }
-  }, [loadSessions, sessionId, setDevServer, setMessages])
+  }, [messagesLoading, refreshSession, sessionId, setDevServer])
 
   useEffect(() => {
-    if (!sessionId) return
+    if (!sessionId || messagesLoading) return
     let cancelled = false
     if (!sessionHasBrowserPlugin) {
       setBrowserActive(false)
@@ -182,7 +203,7 @@ export function ChatArea() {
     return () => {
       cancelled = true
     }
-  }, [sessionHasBrowserPlugin, sessionId])
+  }, [messagesLoading, sessionHasBrowserPlugin, sessionId])
 
   // Auto-poll messages for sessions that are actively running on the server
   const isServerActive = session?.active === true
@@ -214,7 +235,7 @@ export function ChatArea() {
           }
         }
       }
-      if (isServerActiveRef.current) await loadSessions()
+      if (isServerActiveRef.current) await refreshSession(sessionId)
     } catch (err) { console.error('Failed to refresh messages:', err) }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [sessionId])
@@ -279,8 +300,8 @@ export function ChatArea() {
     if (!sessionId) return
     await clearMessages(sessionId)
     setMessages([])
-    loadSessions()
-  }, [loadSessions, sessionId, setMessages])
+    await refreshSession(sessionId)
+  }, [refreshSession, sessionId, setMessages])
 
   const handleDelete = useCallback(async () => {
     setConfirmDelete(false)

package/src/components/chat/chat-card.tsx

@@ -4,6 +4,7 @@ import { useState } from 'react'
 import { DEFAULT_HEARTBEAT_INTERVAL_SEC } from '@/lib/heartbeat-defaults'
 import type { Session } from '@/types'
 import { api } from '@/lib/api-client'
+import { getSessionLastAssistantAt, getSessionLastMessage } from '@/lib/session-summary'
 import { useAppStore } from '@/stores/use-app-store'
 import { useChatStore } from '@/stores/use-chat-store'
 import { ConfirmDialog } from '@/components/shared/confirm-dialog'
@@ -69,9 +70,7 @@ export function ChatCard({ session, active, onClick }: Props) {
     }
   }
 
-  const last = session.messages?.length
-    ? session.messages[session.messages.length - 1]
-    : null
+  const last = getSessionLastMessage(session)
   const preview = last
     ? (last.role === 'user' ? 'You: ' : '') + last.text.slice(0, 70)
     : 'No messages'
@@ -132,12 +131,10 @@ export function ChatCard({ session, active, onClick }: Props) {
         )}
         {(() => {
           const lastRead = lastReadTimestamps[session.id] || 0
-          const unread = (session.messages || []).filter(
-            (m) => m.role === 'assistant' && (m.time || 0) > lastRead,
-          ).length
+          const unread = (getSessionLastAssistantAt(session) || 0) > lastRead ? 1 : 0
           return unread > 0 ? (
             <span className="shrink-0 min-w-[18px] h-[18px] flex items-center justify-center rounded-full bg-accent-bright text-white text-[10px] font-600 px-1">
-              {unread > 99 ? '99+' : unread}
+              {unread}
             </span>
           ) : null
         })()}

package/src/components/chat/chat-header.tsx

@@ -138,7 +138,7 @@ export function ChatHeader({ session, streaming, onStop, onMenuToggle, onBack, m
   const setMemoryAgentFilter = useAppStore((s) => s.setMemoryAgentFilter)
   const setSidebarOpen = useAppStore((s) => s.setSidebarOpen)
   const appSettings = useAppStore((s) => s.appSettings)
-  const loadSessions = useAppStore((s) => s.loadSessions)
+  const refreshSession = useAppStore((s) => s.refreshSession)
   const loadAgents = useAppStore((s) => s.loadAgents)
   const inspectorOpen = useAppStore((s) => s.inspectorOpen)
   const setInspectorOpen = useAppStore((s) => s.setInspectorOpen)
@@ -174,11 +174,17 @@ export function ChatHeader({ session, streaming, onStop, onMenuToggle, onBack, m
   const agentWalletIds = useMemo(() => getAgentWalletIds(agent), [agent])
   const activeWalletId = useMemo(() => getAgentActiveWalletId(agent), [agent])
 
-  useEffect(() => {
-    api<Array<{ id: string; label: string; icon?: string }>>('GET', `/plugins/ui?type=header&sessionId=${session.id}`).then(widgets => {
+  const refreshHeaderWidgets = useCallback(() => {
+    api<Array<{ id: string; label: string; icon?: string }>>('GET', '/plugins/ui?type=header').then((widgets) => {
       if (Array.isArray(widgets)) setHeaderWidgets(widgets)
     }).catch(() => {})
-  }, [session.id])
+  }, [])
+
+  useEffect(() => {
+    void refreshHeaderWidgets()
+  }, [refreshHeaderWidgets])
+
+  useWs('plugins', refreshHeaderWidgets)
 
   const fetchWalletBalance = useCallback(async () => {
     if (!activeWalletId) {
@@ -186,7 +192,7 @@ export function ChatHeader({ session, streaming, onStop, onMenuToggle, onBack, m
       return
     }
     try {
-      const data = await api<{ balanceFormatted?: string; balanceSymbol?: string; portfolioSummary?: { nonZeroAssets?: number } }>('GET', `/wallets/${activeWalletId}`)
+      const data = await api<{ balanceFormatted?: string; balanceSymbol?: string; portfolioSummary?: { nonZeroAssets?: number } }>('GET', `/wallets/${activeWalletId}?cached=1`)
       if (data.balanceFormatted && data.balanceSymbol) {
         setWalletBalance({
           formatted: data.balanceFormatted,
@@ -340,7 +346,7 @@ export function ChatHeader({ session, streaming, onStop, onMenuToggle, onBack, m
         opencodeSessionId: null,
         delegateResumeIds: { claudeCode: null, codex: null, opencode: null, gemini: null },
       })
-      await loadSessions()
+      await refreshSession(session.id)
     } catch { /* best-effort */ }
   }
 
@@ -401,10 +407,10 @@ export function ChatHeader({ session, streaming, onStop, onMenuToggle, onBack, m
         await api('PUT', `/agents/${session.agentId}`, { heartbeatEnabled: next })
         // Clear any stale session-level override so the agent value wins
         await api('PUT', `/chats/${session.id}`, { heartbeatEnabled: null })
-        await Promise.all([loadAgents(), loadSessions()])
+        await Promise.all([loadAgents(), refreshSession(session.id)])
       } else {
         await api('PUT', `/chats/${session.id}`, { heartbeatEnabled: next })
-        await loadSessions()
+        await refreshSession(session.id)
       }
       toast.success(`Heartbeat ${next ? 'enabled' : 'disabled'}`)
     } finally {
@@ -425,10 +431,10 @@ export function ChatHeader({ session, streaming, onStop, onMenuToggle, onBack, m
         })
         // Clear stale session-level overrides
         await api('PUT', `/chats/${session.id}`, { heartbeatIntervalSec: null, heartbeatEnabled: null })
-        await Promise.all([loadAgents(), loadSessions()])
+        await Promise.all([loadAgents(), refreshSession(session.id)])
       } else {
         await api('PUT', `/chats/${session.id}`, { heartbeatIntervalSec: sec })
-        await loadSessions()
+        await refreshSession(session.id)
       }
     } finally {
       setHeartbeatSaving(false)
@@ -455,7 +461,7 @@ export function ChatHeader({ session, streaming, onStop, onMenuToggle, onBack, m
         { sessionKey: openclawSessionKey, epoch: preview.epoch, localSessionId: session.id },
       )
       setSyncResult(result.merged > 0 ? `Synced ${result.merged} message${result.merged !== 1 ? 's' : ''}.` : 'Already up to date.')
-      if (result.merged > 0) await loadSessions()
+      if (result.merged > 0) await refreshSession(session.id)
     } catch (err: unknown) {
       setSyncResult(err instanceof Error ? err.message : 'Sync failed.')
     } finally {
@@ -548,7 +554,7 @@ export function ChatHeader({ session, streaming, onStop, onMenuToggle, onBack, m
     setModelSwitcherOpen(false)
     try {
       await api('PUT', `/chats/${session.id}`, { provider: nextProvider, model: nextModel })
-      await loadSessions()
+      await refreshSession(session.id)
     } catch (err: unknown) {
       toast.error(err instanceof Error ? err.message : 'Failed to switch model')
     }
@@ -863,7 +869,7 @@ export function ChatHeader({ session, streaming, onStop, onMenuToggle, onBack, m
                 </Tip>
                 {hbDropdownOpen && (
                   <div className="absolute top-full right-0 mt-1 py-1 rounded-[10px] border border-white/[0.06] bg-bg/95 backdrop-blur-md shadow-lg z-50 min-w-[88px]">
-                    {[...(typeof window !== 'undefined' && window.location.hostname === 'localhost' ? [10, 15, 30, 60] : []), 1800, 3600, 7200, 21600, 43200].map((sec) => (
+                    {[...(typeof window !== 'undefined' && window.location.hostname === 'localhost' ? [60, 300] : []), 1800, 3600, 7200, 21600, 43200].map((sec) => (
                       <button
                         key={sec}
                         onClick={() => handleSelectHeartbeatInterval(sec)}

package/src/components/chat/chat-list.tsx

@@ -5,6 +5,7 @@ import { useAppStore } from '@/stores/use-app-store'
 import { useChatStore } from '@/stores/use-chat-store'
 import { ChatCard } from './chat-card'
 import { fetchMessages } from '@/lib/chats'
+import { getSessionLastAssistantAt, getSessionLastMessage, getSessionMessageCount } from '@/lib/session-summary'
 import { isLocalhostBrowser, isVisibleSessionForViewer } from '@/lib/local-observability'
 import { toast } from 'sonner'
 import { Skeleton } from '@/components/shared/skeleton'
@@ -25,7 +26,6 @@ export function ChatList({ inSidebar, onSelect }: Props) {
   const currentUser = useAppStore((s) => s.currentUser)
   const currentSessionId = useAppStore((s) => s.currentSessionId)
   const setCurrentSession = useAppStore((s) => s.setCurrentSession)
-  const loadSessions = useAppStore((s) => s.loadSessions)
   const loadConnectors = useAppStore((s) => s.loadConnectors)
   const setAgentSheetOpen = useAppStore((s) => s.setAgentSheetOpen)
   const clearSessions = useAppStore((s) => s.clearSessions)
@@ -49,7 +49,10 @@ export function ChatList({ inSidebar, onSelect }: Props) {
   }, [sessions, loaded])
 
   useEffect(() => {
-    void loadConnectors()
+    const timer = window.setTimeout(() => {
+      void loadConnectors()
+    }, 1200)
+    return () => window.clearTimeout(timer)
   }, [loadConnectors])
 
   useEffect(() => {
@@ -65,13 +68,11 @@ export function ChatList({ inSidebar, onSelect }: Props) {
   const filtered = useMemo(() => {
     return allUserSessions
       .filter((s) => {
-        const unreadCount = (s.messages || []).filter(
-          (m) => m.role === 'assistant' && (m.time || 0) > (lastReadTimestamps[s.id] || 0),
-        ).length
+        const unreadCount = (getSessionLastAssistantAt(s) || 0) > (lastReadTimestamps[s.id] || 0) ? 1 : 0
         if (search) {
           const agent = s.agentId ? agents[s.agentId] : null
           const connector = Object.values(connectors).find((item) => item.chatroomId == null && item.agentId === s.agentId && item.isEnabled !== false)
-          const lastMessage = s.messages?.[s.messages.length - 1]
+          const lastMessage = getSessionLastMessage(s)
           const haystack = [
             s.name,
             agent?.name,
@@ -99,7 +100,7 @@ export function ChatList({ inSidebar, onSelect }: Props) {
         if (!a.pinned && b.pinned) return 1
         // Then by sort mode
         if (sortMode === 'name') return a.name.localeCompare(b.name)
-        if (sortMode === 'messages') return (b.messages?.length || 0) - (a.messages?.length || 0)
+        if (sortMode === 'messages') return getSessionMessageCount(b) - getSessionMessageCount(a)
         return (b.lastActiveAt || 0) - (a.lastActiveAt || 0)
       })
   }, [agents, allUserSessions, connectors, lastReadTimestamps, search, sortMode, typeFilter])
@@ -114,9 +115,10 @@ export function ChatList({ inSidebar, onSelect }: Props) {
       const msgs = await fetchMessages(id)
       setMessages(msgs)
     } catch {
-      setMessages(sessions[id]?.messages || [])
+      const fallback = sessions[id]
+      const fallbackLastMessage = fallback ? getSessionLastMessage(fallback) : null
+      setMessages(fallback?.messages?.length ? fallback.messages : (fallbackLastMessage ? [fallbackLastMessage] : []))
     }
-    await loadSessions()
     onSelect?.()
   }
 

package/src/components/chat/chat-tool-toggles.tsx

@@ -22,7 +22,7 @@ interface Props {
 export function ChatToolToggles({ session }: Props) {
   const [open, setOpen] = useState(false)
   const ref = useRef<HTMLDivElement>(null)
-  const loadSessions = useAppStore((s) => s.loadSessions)
+  const refreshSession = useAppStore((s) => s.refreshSession)
   const agents = useAppStore((s) => s.agents)
   const skills = useAppStore((s) => s.skills)
 
@@ -46,7 +46,7 @@ export function ChatToolToggles({ session }: Props) {
       ? sessionTools.filter((t) => t !== toolId)
       : [...sessionTools, toolId]
     await api('PUT', `/chats/${session.id}`, { plugins: updated })
-    loadSessions()
+    await refreshSession(session.id)
   }
 
   const enabledCount = sessionTools.length

package/src/components/home/home-view.tsx

@@ -7,6 +7,7 @@ import { useChatStore } from '@/stores/use-chat-store'
 import { AgentAvatar } from '@/components/agents/agent-avatar'
 import { api } from '@/lib/api-client'
 import { isLocalhostBrowser, isVisibleSessionForViewer } from '@/lib/local-observability'
+import { getSessionLastMessage } from '@/lib/session-summary'
 import { getNotificationActivityAt, getNotificationOccurrenceCount } from '@/lib/notification-utils'
 import type { Agent, Session, ActivityEntry, BoardTask, AppNotification } from '@/types'
 import { HintTip } from '@/components/shared/hint-tip'
@@ -150,7 +151,9 @@ export function HomeView() {
     void loadActivity({ limit: 8 })
     void loadSchedules()
     void loadNotifications()
-    void loadConnectors()
+    const connectorTimer = window.setTimeout(() => {
+      void loadConnectors()
+    }, 1200)
     api<{ records: Array<{ estimatedCost: number }>; timeSeries: Array<{ cost: number; bucket: string }> }>('GET', '/usage?range=7d')
       .then((data) => {
         const series = (data.timeSeries || []).map((pt: { cost: number; bucket?: string }) => ({ cost: pt.cost, bucket: pt.bucket || '' }))
@@ -160,6 +163,7 @@ export function HomeView() {
         setTodayCost(todayPt?.cost || 0)
       })
       .catch(() => {})
+    return () => window.clearTimeout(connectorTimer)
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])
 
@@ -563,7 +567,7 @@ export function HomeView() {
             <div className="flex flex-col gap-1">
               {recentChats.map((session) => {
                 const agent = session.agentId ? agents[session.agentId] : null
-                const lastMsg = session.messages?.[session.messages.length - 1]
+                const lastMsg = getSessionLastMessage(session)
                 const displayName = agent?.name || 'Chat'
                 return (
                   <button

package/src/components/layout/app-layout.tsx

@@ -155,9 +155,8 @@ export function AppLayout() {
   useEffect(() => {
     loadApprovals()
     void loadExecApprovals()
+    pruneExecApprovals()
     const interval = setInterval(() => {
-      loadApprovals()
-      void loadExecApprovals()
       pruneExecApprovals()
     }, 10000)
     return () => clearInterval(interval)
@@ -256,7 +255,7 @@ export function AppLayout() {
 
   useEffect(() => { refreshPluginState() }, [refreshPluginState])
 
-  useWs('plugins', refreshPluginState)
+  useWs('plugins', refreshPluginState, 30000)
 
   const [railExpanded, setRailExpanded] = useState(() => {
     const stored = safeStorageGet(RAIL_EXPANDED_KEY)

package/src/hooks/use-ws.ts

@@ -8,18 +8,42 @@ import { usePageActive } from './use-page-active'
  * Subscribe to a WebSocket topic. Calls `handler` on push events.
  * Falls back to polling at `fallbackMs` when WS is disconnected.
  */
-export function useWs(topic: string, handler: () => void, fallbackMs?: number) {
+export function useWs(topic: string, handler: () => void | Promise<void>, fallbackMs?: number) {
   const isActive = usePageActive()
   const handlerRef = useRef(handler)
-  handlerRef.current = handler
   const fallbackMsRef = useRef(fallbackMs)
-  fallbackMsRef.current = fallbackMs
+  const inFlightRef = useRef<Promise<void> | null>(null)
+  const wasActiveRef = useRef(isActive)
+
+  useEffect(() => {
+    handlerRef.current = handler
+    fallbackMsRef.current = fallbackMs
+  }, [handler, fallbackMs])
+
+  const runHandler = () => {
+    if (inFlightRef.current) return
+    try {
+      const result = handlerRef.current()
+      if (result && typeof (result as PromiseLike<void>).then === 'function') {
+        const promise = Promise.resolve(result)
+          .catch(() => {})
+          .finally(() => {
+            if (inFlightRef.current === promise) {
+              inFlightRef.current = null
+            }
+          })
+        inFlightRef.current = promise
+      }
+    } catch {
+      // Individual handlers already own their error reporting
+    }
+  }
 
   // WS subscription — only re-runs when topic changes
   useEffect(() => {
     if (!topic) return
 
-    const cb = () => handlerRef.current()
+    const cb = () => runHandler()
     subscribeWs(topic, cb)
     return () => { unsubscribeWs(topic, cb) }
   }, [topic])
@@ -30,12 +54,15 @@ export function useWs(topic: string, handler: () => void, fallbackMs?: number) {
     if (!topic) return
 
     let fallbackId: ReturnType<typeof setInterval> | null = null
-    const cb = () => handlerRef.current()
+    const cb = () => runHandler()
+
+    const becameActive = !wasActiveRef.current && isActive
+    wasActiveRef.current = isActive
 
     // When page becomes visible again, fire an immediate refresh —
     // but only for topics that use fallback polling (i.e. data-fetch topics).
     // Event-only topics (like heartbeat pulses) should never fire from this effect.
-    if (isActive && fallbackMsRef.current && fallbackMsRef.current > 0) {
+    if (becameActive && fallbackMsRef.current && fallbackMsRef.current > 0 && !isWsConnected()) {
       cb()
     }
 
@@ -75,6 +102,5 @@ export function useWs(topic: string, handler: () => void, fallbackMs?: number) {
       stopFallback()
       clearInterval(checkId)
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [topic, isActive])
 }

package/src/instrumentation.ts

@@ -1,24 +1,34 @@
 export async function register() {
   if (process.env.NEXT_RUNTIME === 'nodejs') {
-    const { startScheduler } = await import('./lib/server/scheduler')
-    const { resumeQueue } = await import('./lib/server/queue')
     const { initWsServer, closeWsServer } = await import('./lib/server/ws-hub')
-    const { stopDaemon } = await import('./lib/server/daemon-state')
-    startScheduler()
-    resumeQueue()
+    const { ensureDaemonStarted } = await import('./lib/server/daemon-state')
+    ensureDaemonStarted('instrumentation')
+
     initWsServer()
 
     // Graceful shutdown: stop background services and close WS connections
-    let shuttingDown = false
+    const shutdownState = (
+      (globalThis as Record<string, unknown>).__swarmclaw_shutdown_state__
+      ??= { registered: false, shuttingDown: false }
+    ) as { registered: boolean; shuttingDown: boolean }
+
     const shutdown = async (signal: string) => {
-      if (shuttingDown) return
-      shuttingDown = true
+      if (shutdownState.shuttingDown) return
+      shutdownState.shuttingDown = true
       console.log(`[server] ${signal} received, shutting down gracefully...`)
-      stopDaemon({ source: signal })
+      try {
+        const { stopDaemon } = await import('./lib/server/daemon-state')
+        stopDaemon({ source: signal })
+      } catch (err) {
+        console.error('[instrumentation] Failed to stop daemon during shutdown:', err)
+      }
       await closeWsServer()
       process.exit(0)
     }
-    process.on('SIGTERM', () => shutdown('SIGTERM'))
-    process.on('SIGINT', () => shutdown('SIGINT'))
+    if (!shutdownState.registered) {
+      process.on('SIGTERM', () => { void shutdown('SIGTERM') })
+      process.on('SIGINT', () => { void shutdown('SIGINT') })
+      shutdownState.registered = true
+    }
   }
 }

package/src/lib/api-client.test.ts

@@ -0,0 +1,49 @@
+import test from 'node:test'
+import assert from 'node:assert/strict'
+
+import { api } from './api-client'
+
+const originalFetch = global.fetch
+
+test.afterEach(() => {
+  global.fetch = originalFetch
+})
+
+test('dedupes concurrent GET requests for the same path', async () => {
+  let calls = 0
+  global.fetch = (async () => {
+    calls += 1
+    await new Promise((resolve) => setTimeout(resolve, 25))
+    return new Response(JSON.stringify({ ok: true }), {
+      headers: { 'content-type': 'application/json' },
+      status: 200,
+    })
+  }) as typeof fetch
+
+  const [first, second] = await Promise.all([
+    api<{ ok: boolean }>('GET', '/dedupe-check'),
+    api<{ ok: boolean }>('GET', '/dedupe-check'),
+  ])
+
+  assert.deepEqual(first, { ok: true })
+  assert.deepEqual(second, { ok: true })
+  assert.equal(calls, 1)
+})
+
+test('does not dedupe non-GET requests', async () => {
+  let calls = 0
+  global.fetch = (async () => {
+    calls += 1
+    return new Response(JSON.stringify({ ok: true }), {
+      headers: { 'content-type': 'application/json' },
+      status: 200,
+    })
+  }) as typeof fetch
+
+  await Promise.all([
+    api<{ ok: boolean }>('POST', '/dedupe-check', { hello: 'one' }),
+    api<{ ok: boolean }>('POST', '/dedupe-check', { hello: 'two' }),
+  ])
+
+  assert.equal(calls, 2)
+})