@swarmclawai/swarmclaw 0.7.2 → 0.7.4

package/src/stores/use-app-store.ts

@@ -1,7 +1,7 @@
 'use client'
 
 import { create } from 'zustand'
-import type { Sessions, Session, NetworkInfo, Directory, ProviderInfo, Credentials, Agent, Schedule, AppView, BoardTask, AppSettings, OrchestratorSecret, ProviderConfig, Skill, Connector, Webhook, McpServerConfig, PluginMeta, Project, FleetFilter, ActivityEntry, AppNotification, ApprovalRequest } from '../types'
+import type { Sessions, Session, NetworkInfo, Directory, ProviderInfo, Credentials, Agent, Schedule, AppView, BoardTask, AppSettings, OrchestratorSecret, ProviderConfig, Skill, Connector, Webhook, McpServerConfig, PluginMeta, Project, FleetFilter, ActivityEntry, AppNotification, ApprovalRequest, GatewayProfile, ExternalAgentRuntime } from '../types'
 import { fetchChats, fetchDirs, fetchProviders, fetchCredentials } from '../lib/chats'
 import { fetchAgents } from '../lib/agents'
 import { fetchSchedules } from '../lib/schedules'
@@ -43,9 +43,6 @@ interface AppState {
   settingsOpen: boolean
   setSettingsOpen: (open: boolean) => void
 
-  newSessionOpen: boolean
-  setNewSessionOpen: (open: boolean) => void
-
   activeView: AppView
   setActiveView: (view: AppView) => void
 
@@ -79,6 +76,10 @@ interface AppState {
   triggerMemoryRefresh: () => void
   memoryAgentFilter: string | null
   setMemoryAgentFilter: (agentId: string | null) => void
+  memoryTierFilter: 'all' | 'working' | 'durable' | 'archive'
+  setMemoryTierFilter: (tier: 'all' | 'working' | 'durable' | 'archive') => void
+  memoryScopeFilter: 'all' | 'global' | 'agent' | 'session' | 'project'
+  setMemoryScopeFilter: (scope: 'all' | 'global' | 'agent' | 'session' | 'project') => void
 
   appSettings: AppSettings
   loadSettings: () => Promise<void>
@@ -112,6 +113,13 @@ interface AppState {
   editingProviderId: string | null
   setEditingProviderId: (id: string | null) => void
 
+  gatewayProfiles: GatewayProfile[]
+  loadGatewayProfiles: () => Promise<void>
+  gatewaySheetOpen: boolean
+  setGatewaySheetOpen: (open: boolean) => void
+  editingGatewayId: string | null
+  setEditingGatewayId: (id: string | null) => void
+
   // Skills
   skills: Record<string, Skill>
   loadSkills: () => Promise<void>
@@ -215,6 +223,9 @@ interface AppState {
   walletPanelAgentId: string | null
   setWalletPanelAgentId: (id: string | null) => void
 
+  externalAgents: ExternalAgentRuntime[]
+  loadExternalAgents: () => Promise<void>
+
 }
 
 export const useAppStore = create<AppState>((set, get) => ({
@@ -325,9 +336,6 @@ export const useAppStore = create<AppState>((set, get) => ({
   settingsOpen: false,
   setSettingsOpen: (open) => set({ settingsOpen: open }),
 
-  newSessionOpen: false,
-  setNewSessionOpen: (open) => set({ newSessionOpen: open }),
-
   activeView: 'home',
   setActiveView: (view) => set({ activeView: view }),
 
@@ -400,6 +408,10 @@ export const useAppStore = create<AppState>((set, get) => ({
   triggerMemoryRefresh: () => set((s) => ({ memoryRefreshKey: s.memoryRefreshKey + 1 })),
   memoryAgentFilter: null,
   setMemoryAgentFilter: (agentId) => set({ memoryAgentFilter: agentId }),
+  memoryTierFilter: 'all',
+  setMemoryTierFilter: (tier) => set({ memoryTierFilter: tier }),
+  memoryScopeFilter: 'all',
+  setMemoryScopeFilter: (scope) => set({ memoryScopeFilter: scope }),
 
   appSettings: {},
   loadSettings: async () => {
@@ -496,6 +508,20 @@ export const useAppStore = create<AppState>((set, get) => ({
   editingProviderId: null,
   setEditingProviderId: (id) => set({ editingProviderId: id }),
 
+  gatewayProfiles: [],
+  loadGatewayProfiles: async () => {
+    try {
+      const gatewayProfiles = await api<GatewayProfile[]>('GET', '/gateways')
+      set({ gatewayProfiles })
+    } catch {
+      // ignore
+    }
+  },
+  gatewaySheetOpen: false,
+  setGatewaySheetOpen: (open) => set({ gatewaySheetOpen: open }),
+  editingGatewayId: null,
+  setEditingGatewayId: (id) => set({ editingGatewayId: id }),
+
   // Skills
   skills: {},
   loadSkills: async () => {
@@ -718,4 +744,14 @@ export const useAppStore = create<AppState>((set, get) => ({
   walletPanelAgentId: null,
   setWalletPanelAgentId: (id) => set({ walletPanelAgentId: id }),
 
+  externalAgents: [],
+  loadExternalAgents: async () => {
+    try {
+      const externalAgents = await api<ExternalAgentRuntime[]>('GET', '/external-agents')
+      set({ externalAgents })
+    } catch {
+      // ignore
+    }
+  },
+
 }))

package/src/stores/use-chat-store.ts

@@ -3,6 +3,7 @@
 import { create } from 'zustand'
 import type { Message, DevServerStatus, SSEEvent, ChatTraceBlock } from '../types'
 import { streamChat } from '../lib/chat'
+import { mergeCompletedAssistantMessage } from '../lib/chat-streaming-state'
 import { speak } from '../lib/tts'
 import { getStoredAccessKey } from '../lib/api-client'
 import { useAppStore } from './use-app-store'
@@ -306,6 +307,11 @@ export const useChatStore = create<ChatState>((set, get) => ({
       } else if (event.t === 'tool_call') {
         const id = `tc-${++toolCallCounter}`
         set((s) => ({
+          ...(s.toolEvents[s.toolEvents.length - 1]?.name === (event.toolName || 'unknown')
+            && s.toolEvents[s.toolEvents.length - 1]?.input === (event.toolInput || '')
+            && s.toolEvents[s.toolEvents.length - 1]?.status === 'running'
+              ? {}
+              : {
           streamPhase: 'tool' as const,
           streamToolName: event.toolName || 'unknown',
           toolEvents: [...s.toolEvents, {
@@ -314,6 +320,7 @@ export const useChatStore = create<ChatState>((set, get) => ({
             input: event.toolInput || '',
             status: 'running',
           }],
+              }),
         }))
       } else if (event.t === 'tool_result') {
         const soundOn = get().soundEnabled
@@ -322,6 +329,22 @@ export const useChatStore = create<ChatState>((set, get) => ({
           const idx = events.findLastIndex(
             (e) => e.name === event.toolName && e.status === 'running',
           )
+          if (idx === -1) {
+            const last = events[events.length - 1]
+            const output = event.toolOutput || ''
+            const isError = /^(Error:|error:|ECONNREFUSED|ETIMEDOUT|timeout|failed)/i.test(output.trim())
+              || output.includes('ECONNREFUSED')
+              || output.includes('ETIMEDOUT')
+              || output.includes('Error:')
+            if (
+              last
+              && last.name === event.toolName
+              && last.output === output
+              && last.status === (isError ? 'error' : 'done')
+            ) {
+              return { toolEvents: events }
+            }
+          }
           if (idx !== -1) {
             const output = event.toolOutput || ''
             const isError = /^(Error:|error:|ECONNREFUSED|ETIMEDOUT|timeout|failed)/i.test(output.trim())
@@ -348,7 +371,13 @@ export const useChatStore = create<ChatState>((set, get) => ({
       } else if (event.t === 'status') {
         try {
           const parsed = JSON.parse(event.text || '{}')
-          set({ agentStatus: parsed })
+          if (
+            parsed
+            && typeof parsed === 'object'
+            && ['goal', 'status', 'summary', 'nextAction'].some((key) => key in parsed)
+          ) {
+            set({ agentStatus: parsed })
+          }
         } catch {
           // ignore malformed status
         }
@@ -377,7 +406,7 @@ export const useChatStore = create<ChatState>((set, get) => ({
         suggestions: suggestions || undefined,
       }
       set((s) => ({
-        messages: [...s.messages, assistantMsg],
+        messages: mergeCompletedAssistantMessage(s.messages, assistantMsg),
         streaming: false,
         streamingSessionId: null,
         streamText: '',

package/src/stores/use-chatroom-store.ts

@@ -11,13 +11,25 @@ interface ToolEvent {
   output?: string
 }
 
-interface StreamingAgent {
+export interface StreamingAgent {
   text: string
   name: string
   error?: string
   toolEvents: ToolEvent[]
 }
 
+interface QueuedChatroomMessage {
+  id: string
+  chatroomId: string
+  text: string
+  pendingFiles: PendingFile[]
+  replyingTo: ChatroomMessage | null
+}
+
+function nextQueuedId() {
+  return `queued-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`
+}
+
 interface ChatroomState {
   chatrooms: Record<string, Chatroom>
   currentChatroomId: string | null
@@ -36,6 +48,10 @@ interface ChatroomState {
   replyingTo: ChatroomMessage | null
   setReplyingTo: (msg: ChatroomMessage | null) => void
 
+  queuedMessages: QueuedChatroomMessage[]
+  removeQueuedMessage: (id: string) => void
+  shiftQueuedMessage: () => QueuedChatroomMessage | undefined
+
   loadChatrooms: () => Promise<void>
   createChatroom: (data: { name: string; description?: string; agentIds?: string[]; chatMode?: 'sequential' | 'parallel'; autoAddress?: boolean; routingRules?: ChatroomRoutingRule[] }) => Promise<Chatroom>
   updateChatroom: (id: string, data: Partial<Chatroom>) => Promise<void>
@@ -73,6 +89,15 @@ export const useChatroomStore = create<ChatroomState>((set, get) => ({
   // Reply-to
   replyingTo: null,
   setReplyingTo: (msg) => set({ replyingTo: msg }),
+  queuedMessages: [],
+  removeQueuedMessage: (id) => set((s) => ({ queuedMessages: s.queuedMessages.filter((item) => item.id !== id) })),
+  shiftQueuedMessage: () => {
+    const queue = get().queuedMessages
+    if (!queue.length) return undefined
+    const next = queue[0]
+    set({ queuedMessages: queue.slice(1) })
+    return next
+  },
 
   loadChatrooms: async () => {
     const chatrooms = await api<Record<string, Chatroom>>('GET', '/chatrooms')
@@ -106,9 +131,26 @@ export const useChatroomStore = create<ChatroomState>((set, get) => ({
 
   sendMessage: async (text) => {
     const { currentChatroomId, streaming, pendingFiles, replyingTo } = get()
-    if (!currentChatroomId || streaming || (!text.trim() && !pendingFiles.length)) return
-
-    set({ streaming: true, streamingAgents: new Map(), pendingFiles: [], replyingTo: null })
+    if (!currentChatroomId || (!text.trim() && !pendingFiles.length)) return
+    const targetChatroomId = currentChatroomId
+
+    if (streaming) {
+      set((s) => ({
+        queuedMessages: [
+          ...s.queuedMessages,
+          {
+            id: nextQueuedId(),
+            chatroomId: targetChatroomId,
+            text,
+            pendingFiles: [...pendingFiles],
+            replyingTo,
+          },
+        ],
+        pendingFiles: [],
+        replyingTo: null,
+      }))
+      return
+    }
 
     const imagePath = pendingFiles.length > 0 && pendingFiles[0].file.type.startsWith('image/')
       ? pendingFiles[0].path
@@ -116,10 +158,12 @@ export const useChatroomStore = create<ChatroomState>((set, get) => ({
     const attachedFiles = pendingFiles.length > 0
       ? pendingFiles.map((f) => f.path)
       : undefined
+    const optimisticText = text.trim() || 'See attached file(s).'
+    let started = false
 
     const key = getStoredAccessKey()
     try {
-      const res = await fetch(`/api/chatrooms/${currentChatroomId}/chat`, {
+      const res = await fetch(`/api/chatrooms/${targetChatroomId}/chat`, {
         method: 'POST',
         headers: {
           'Content-Type': 'application/json',
@@ -134,10 +178,43 @@ export const useChatroomStore = create<ChatroomState>((set, get) => ({
       })
 
       if (!res.ok || !res.body) {
-        set({ streaming: false })
         return
       }
 
+      started = true
+      set((s) => {
+        const existingChatroom = s.chatrooms[targetChatroomId]
+        const optimisticMessage: ChatroomMessage = {
+          id: `local-${Date.now()}`,
+          senderId: 'user',
+          senderName: 'You',
+          role: 'user',
+          text: optimisticText,
+          mentions: [],
+          reactions: [],
+          time: Date.now(),
+          ...(imagePath ? { imagePath } : {}),
+          ...(attachedFiles ? { attachedFiles } : {}),
+          ...(replyingTo ? { replyToId: replyingTo.id } : {}),
+        }
+        return {
+          streaming: true,
+          streamingAgents: new Map(),
+          pendingFiles: [],
+          replyingTo: null,
+          chatrooms: existingChatroom
+            ? {
+                ...s.chatrooms,
+                [targetChatroomId]: {
+                  ...existingChatroom,
+                  messages: [...existingChatroom.messages, optimisticMessage],
+                  updatedAt: optimisticMessage.time,
+                },
+              }
+            : s.chatrooms,
+        }
+      })
+
       const reader = res.body.getReader()
       const decoder = new TextDecoder()
       let buf = ''
@@ -220,13 +297,6 @@ export const useChatroomStore = create<ChatroomState>((set, get) => ({
                   return { streamingAgents: agents }
                 })
               }
-              try {
-                const { currentChatroomId: cid } = get()
-                if (cid) {
-                  const chatroom = await api<Chatroom>('GET', `/chatrooms/${cid}`)
-                  set((s) => ({ chatrooms: { ...s.chatrooms, [cid]: chatroom } }))
-                }
-              } catch { /* will catch on next WS push */ }
             } else if (event.t === 'done') {
               break
             }
@@ -236,31 +306,88 @@ export const useChatroomStore = create<ChatroomState>((set, get) => ({
         }
       }
     } finally {
-      set({ streaming: false, streamingAgents: new Map() })
-      try {
-        const { currentChatroomId: cid } = get()
-        if (cid) {
-          const chatroom = await api<Chatroom>('GET', `/chatrooms/${cid}`)
-          set((s) => ({ chatrooms: { ...s.chatrooms, [cid]: chatroom } }))
+      if (started) {
+        set({ streaming: false, streamingAgents: new Map() })
+        try {
+          const chatroom = await api<Chatroom>('GET', `/chatrooms/${targetChatroomId}`)
+          set((s) => ({ chatrooms: { ...s.chatrooms, [targetChatroomId]: chatroom } }))
+        } catch { /* ignore */ }
+
+        const nextQueued = get().shiftQueuedMessage()
+        if (nextQueued) {
+          if (get().currentChatroomId !== nextQueued.chatroomId) {
+            set((s) => ({ queuedMessages: [nextQueued, ...s.queuedMessages] }))
+            return
+          }
+          set({ pendingFiles: nextQueued.pendingFiles, replyingTo: nextQueued.replyingTo })
+          setTimeout(() => {
+            void get().sendMessage(nextQueued.text)
+          }, 100)
         }
-      } catch { /* ignore */ }
+      }
     }
   },
 
   toggleReaction: async (messageId, emoji) => {
     const { currentChatroomId } = get()
     if (!currentChatroomId) return
-    await api('POST', `/chatrooms/${currentChatroomId}/reactions`, { messageId, emoji })
-    const chatroom = await api<Chatroom>('GET', `/chatrooms/${currentChatroomId}`)
-    set((s) => ({ chatrooms: { ...s.chatrooms, [currentChatroomId]: chatroom } }))
+    const previous = get().chatrooms[currentChatroomId]
+    if (previous) {
+      set((s) => ({
+        chatrooms: {
+          ...s.chatrooms,
+          [currentChatroomId]: {
+            ...previous,
+            messages: previous.messages.map((message) => {
+              if (message.id !== messageId) return message
+              const existing = message.reactions.find((reaction) => reaction.emoji === emoji && reaction.reactorId === 'user')
+              return {
+                ...message,
+                reactions: existing
+                  ? message.reactions.filter((reaction) => !(reaction.emoji === emoji && reaction.reactorId === 'user'))
+                  : [...message.reactions, { emoji, reactorId: 'user', time: Date.now() }],
+              }
+            }),
+          },
+        },
+      }))
+    }
+    try {
+      const chatroom = await api<Chatroom>('POST', `/chatrooms/${currentChatroomId}/reactions`, { messageId, emoji })
+      set((s) => ({ chatrooms: { ...s.chatrooms, [currentChatroomId]: chatroom } }))
+    } catch {
+      if (previous) {
+        set((s) => ({ chatrooms: { ...s.chatrooms, [currentChatroomId]: previous } }))
+      }
+    }
   },
 
   togglePin: async (messageId) => {
     const { currentChatroomId } = get()
     if (!currentChatroomId) return
-    await api('POST', `/chatrooms/${currentChatroomId}/pins`, { messageId })
-    const chatroom = await api<Chatroom>('GET', `/chatrooms/${currentChatroomId}`)
-    set((s) => ({ chatrooms: { ...s.chatrooms, [currentChatroomId]: chatroom } }))
+    const previous = get().chatrooms[currentChatroomId]
+    if (previous) {
+      const pinnedMessageIds = previous.pinnedMessageIds || []
+      set((s) => ({
+        chatrooms: {
+          ...s.chatrooms,
+          [currentChatroomId]: {
+            ...previous,
+            pinnedMessageIds: pinnedMessageIds.includes(messageId)
+              ? pinnedMessageIds.filter((id) => id !== messageId)
+              : [...pinnedMessageIds, messageId],
+          },
+        },
+      }))
+    }
+    try {
+      const chatroom = await api<Chatroom>('POST', `/chatrooms/${currentChatroomId}/pins`, { messageId })
+      set((s) => ({ chatrooms: { ...s.chatrooms, [currentChatroomId]: chatroom } }))
+    } catch {
+      if (previous) {
+        set((s) => ({ chatrooms: { ...s.chatrooms, [currentChatroomId]: previous } }))
+      }
+    }
   },
 
   addMember: async (agentId) => {