@swarmclawai/swarmclaw 0.7.1 → 0.7.3

package/src/proxy.ts

@@ -1,5 +1,6 @@
 import { NextResponse } from 'next/server'
 import type { NextRequest } from 'next/server'
+import { AUTH_COOKIE_NAME } from '@/lib/auth'
 
 /* ------------------------------------------------------------------ */
 /*  Rate-limit state — HMR-safe via globalThis                        */
@@ -44,7 +45,7 @@ function getClientIp(request: NextRequest): string {
 /* ------------------------------------------------------------------ */
 
 /** Access key auth proxy with brute-force rate limiting.
- *  Checks X-Access-Key header or ?key= param on all /api/ routes except /api/auth.
+ *  Checks X-Access-Key header or auth cookie on all /api/ routes except /api/auth.
  *  The key is validated against the ACCESS_KEY env var.
  *  After 5 failed attempts from a single IP the client is locked out for 15 minutes.
  */
@@ -55,11 +56,10 @@ export function proxy(request: NextRequest) {
   const isConnectorWebhook = request.method === 'POST'
     && /^\/api\/connectors\/[^/]+\/webhook\/?$/.test(pathname)
 
-  // Only protect API routes (not auth, uploads served as static assets, or inbound webhooks)
+  // Only protect API routes (not auth or inbound webhooks)
   if (
     !pathname.startsWith('/api/')
     || pathname === '/api/auth'
-    || pathname.startsWith('/api/uploads/')
     || isWebhookTrigger
     || isConnectorWebhook
   ) {
@@ -88,8 +88,8 @@ export function proxy(request: NextRequest) {
   }
 
   const providedKey =
-    request.headers.get('x-access-key')
-    || request.nextUrl.searchParams.get('key')
+    request.headers.get('x-access-key')?.trim()
+    || request.cookies.get(AUTH_COOKIE_NAME)?.value?.trim()
     || ''
 
   if (providedKey !== accessKey) {

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

@@ -2,7 +2,7 @@
 
 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 { fetchSessions, fetchDirs, fetchProviders, fetchCredentials } from '../lib/sessions'
+import { fetchChats, fetchDirs, fetchProviders, fetchCredentials } from '../lib/chats'
 import { fetchAgents } from '../lib/agents'
 import { fetchSchedules } from '../lib/schedules'
 import { fetchTasks } from '../lib/tasks'
@@ -43,9 +43,6 @@ interface AppState {
   settingsOpen: boolean
   setSettingsOpen: (open: boolean) => void
 
-  newSessionOpen: boolean
-  setNewSessionOpen: (open: boolean) => void
-
   activeView: AppView
   setActiveView: (view: AppView) => void
 
@@ -235,7 +232,7 @@ export const useAppStore = create<AppState>((set, get) => ({
   currentSessionId: null,
   loadSessions: async () => {
     try {
-      const sessions = await fetchSessions()
+      const sessions = await fetchChats()
       set({ sessions })
     } catch {
       // ignore
@@ -249,7 +246,7 @@ export const useAppStore = create<AppState>((set, get) => ({
   },
   clearSessions: async (ids) => {
     if (!ids.length) return
-    await api('DELETE', '/sessions', { ids })
+    await api('DELETE', '/chats', { ids })
     const sessions = { ...get().sessions }
     for (const id of ids) delete sessions[id]
     set({ sessions, currentSessionId: ids.includes(get().currentSessionId!) ? null : get().currentSessionId })
@@ -260,7 +257,7 @@ export const useAppStore = create<AppState>((set, get) => ({
       sessions[id] = { ...sessions[id], pinned: !sessions[id].pinned }
       set({ sessions })
       // Persist to server
-      void api('PUT', `/sessions/${id}`, { pinned: sessions[id].pinned })
+      void api('PUT', `/chats/${id}`, { pinned: sessions[id].pinned })
     }
   },
   updateSessionInStore: (session) => {
@@ -268,7 +265,7 @@ export const useAppStore = create<AppState>((set, get) => ({
   },
   forkSession: async (sessionId, messageIndex) => {
     try {
-      const forked = await api<Session>('POST', `/sessions/${sessionId}/fork`, { messageIndex })
+      const forked = await api<Session>('POST', `/chats/${sessionId}/fork`, { messageIndex })
       if (!forked?.id) return null
       await get().loadSessions()
       set({ currentSessionId: forked.id })
@@ -325,9 +322,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 }),
 

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: '',
@@ -407,7 +436,7 @@ export const useChatStore = create<ChatState>((set, get) => ({
     if (!sessionId) return
     try {
       const key = getStoredAccessKey()
-      const res = await fetch(`/api/sessions/${sessionId}/edit-resend`, {
+      const res = await fetch(`/api/chats/${sessionId}/edit-resend`, {
         method: 'POST',
         headers: {
           'Content-Type': 'application/json',
@@ -417,7 +446,7 @@ export const useChatStore = create<ChatState>((set, get) => ({
       })
       if (!res.ok) return
       // Reload messages from server (truncated)
-      const msgsRes = await fetch(`/api/sessions/${sessionId}/messages`, {
+      const msgsRes = await fetch(`/api/chats/${sessionId}/messages`, {
         headers: key ? { 'X-Access-Key': key } : undefined,
       })
       if (msgsRes.ok) {
@@ -437,7 +466,7 @@ export const useChatStore = create<ChatState>((set, get) => ({
     if (!sessionId) return
     try {
       const key = getStoredAccessKey()
-      const res = await fetch(`/api/sessions/${sessionId}/retry`, {
+      const res = await fetch(`/api/chats/${sessionId}/retry`, {
         method: 'POST',
         headers: key ? { 'X-Access-Key': key } : undefined,
       })
@@ -445,7 +474,7 @@ export const useChatStore = create<ChatState>((set, get) => ({
       const { message, imagePath } = await res.json()
       if (!message) return
       // Reload messages from server (without the popped ones)
-      const msgsRes = await fetch(`/api/sessions/${sessionId}/messages`, {
+      const msgsRes = await fetch(`/api/chats/${sessionId}/messages`, {
         headers: key ? { 'X-Access-Key': key } : undefined,
       })
       if (msgsRes.ok) {
@@ -546,7 +575,7 @@ export const useChatStore = create<ChatState>((set, get) => ({
     set((s) => ({ messages: [...s.messages, marker] }))
     try {
       const key = getStoredAccessKey()
-      await fetch(`/api/sessions/${sessionId}/messages`, {
+      await fetch(`/api/chats/${sessionId}/messages`, {
         method: 'POST',
         headers: { 'Content-Type': 'application/json', ...(key ? { 'X-Access-Key': key } : {}) },
         body: JSON.stringify({ kind: 'context-clear' }),
@@ -569,7 +598,7 @@ export const useChatStore = create<ChatState>((set, get) => ({
       const key = getStoredAccessKey()
       // Find the earliest message's original index (startIndex tracked on initial load)
       const currentStartIndex = totalMessages - messages.length
-      const res = await fetch(`/api/sessions/${sessionId}/messages?limit=100&before=${currentStartIndex}`, {
+      const res = await fetch(`/api/chats/${sessionId}/messages?limit=100&before=${currentStartIndex}`, {
         headers: key ? { 'X-Access-Key': key } : undefined,
       })
       if (res.ok) {
@@ -593,7 +622,7 @@ export const useChatStore = create<ChatState>((set, get) => ({
     if (sessionId) {
       try {
         const key = getStoredAccessKey()
-        await fetch(`/api/sessions/${sessionId}/stop`, {
+        await fetch(`/api/chats/${sessionId}/stop`, {
           method: 'POST',
           headers: key ? { 'X-Access-Key': key } : undefined,
         })