@swarmclawai/swarmclaw 1.2.1 → 1.2.2

package/src/app/api/chats/[id]/devserver/route.ts

@@ -1,8 +1,10 @@
 import { NextResponse } from 'next/server'
 import { spawn } from 'child_process'
-import { loadSessions, devServers, localIP } from '@/lib/server/storage'
 import { notFound } from '@/lib/server/collection-helpers'
 import { resolveDevServerLaunchDir } from '@/lib/server/runtime/devserver-launch'
+import { clearDevServer, getDevServer, hasDevServer, registerDevServer, stopDevServer, updateDevServerUrl } from '@/lib/server/runtime/runtime-state'
+import { localIP } from '@/lib/server/runtime/network'
+import { listSessions } from '@/lib/server/sessions/session-repository'
 import { safeParseBody } from '@/lib/server/safe-parse-body'
 import { sleep } from '@/lib/shared-utils'
 import net from 'net'
@@ -56,22 +58,21 @@ async function startDevServer(id: string, session: { cwd: string }): Promise<Dev
       if (match) {
         const detectedPort = match[1]
         detectedUrl = `http://${localIP()}:${detectedPort}`
-        const ds = devServers.get(id)
-        if (ds) ds.url = detectedUrl
+        updateDevServerUrl(id, detectedUrl)
       }
     }
   }
 
   proc.stdout!.on('data', onData)
   proc.stderr!.on('data', onData)
-  proc.on('close', () => { devServers.delete(id); log.info(TAG, `dev server stopped for ${id}`) })
-  proc.on('error', () => devServers.delete(id))
+  proc.on('close', () => { clearDevServer(id); log.info(TAG, `dev server stopped for ${id}`) })
+  proc.on('error', () => clearDevServer(id))
 
-  devServers.set(id, { proc, url: `http://${localIP()}:${port}` })
+  registerDevServer(id, { proc, url: `http://${localIP()}:${port}` })
   log.info(TAG, `starting dev server in ${launch.launchDir} (session cwd=${session.cwd})`)
 
   await sleep(4000)
-  const ds = devServers.get(id)
+  const ds = getDevServer(id)
   if (!ds) {
     return {
       status: 502,
@@ -99,7 +100,7 @@ async function startDevServer(id: string, session: { cwd: string }): Promise<Dev
 
 export async function POST(req: Request, { params }: { params: Promise<{ id: string }> }) {
   const { id } = await params
-  const sessions = loadSessions()
+  const sessions = listSessions()
   const session = sessions[id]
   if (!session) return notFound()
 
@@ -108,8 +109,8 @@ export async function POST(req: Request, { params }: { params: Promise<{ id: str
   const { action } = body
 
   if (action === 'start') {
-    if (devServers.has(id)) {
-      const ds = devServers.get(id)!
+    if (hasDevServer(id)) {
+      const ds = getDevServer(id)!
       return NextResponse.json({ running: true, url: ds.url })
     }
 
@@ -126,18 +127,11 @@ export async function POST(req: Request, { params }: { params: Promise<{ id: str
     return NextResponse.json(result.body, result.status ? { status: result.status } : undefined)
 
   } else if (action === 'stop') {
-    if (devServers.has(id)) {
-      const ds = devServers.get(id)!
-      try { ds.proc.kill('SIGTERM') } catch {}
-      if (typeof ds.proc.pid === 'number') {
-        try { process.kill(-ds.proc.pid, 'SIGTERM') } catch {}
-      }
-      devServers.delete(id)
-    }
+    stopDevServer(id)
     return NextResponse.json({ running: false })
 
   } else if (action === 'status') {
-    return NextResponse.json({ running: devServers.has(id), url: devServers.get(id)?.url })
+    return NextResponse.json({ running: hasDevServer(id), url: getDevServer(id)?.url })
   }
 
   return NextResponse.json({ running: false })

package/src/app/api/chats/[id]/messages/route.ts

@@ -1,27 +1,25 @@
 import { NextResponse } from 'next/server'
-import { loadStoredItem, upsertStoredItem, active } from '@/lib/server/storage'
 import { notFound } from '@/lib/server/collection-helpers'
 import { materializeStreamingAssistantArtifacts } from '@/lib/chat/chat-streaming-state'
 import { appendSessionNote } from '@/lib/server/session-note'
 import { getSessionRunState } from '@/lib/server/runtime/session-run-manager'
-import type { Message, Session } from '@/types'
+import { getSession, saveSession } from '@/lib/server/sessions/session-repository'
+import type { Message } from '@/types'
 import { safeParseBody } from '@/lib/server/safe-parse-body'
 
 export async function GET(req: Request, { params }: { params: Promise<{ id: string }> }) {
   const { id } = await params
-  const session = loadStoredItem('sessions', id) as Session | null
+  const session = getSession(id)
   if (!session) return notFound()
   session.messages = Array.isArray(session.messages) ? session.messages : []
 
-  // Check both persisted fields AND in-memory runtime state.
-  // The persisted session doesn't have active/currentRunId set during runs —
-  // those are only computed at runtime from the active map and run ledger.
+  // Use persisted fields plus the run ledger. Process-local execution state is
+  // intentionally excluded here so stale registry entries do not block cleanup.
   const sessionClaimsActive = session.active === true
     || (typeof session.currentRunId === 'string' && session.currentRunId.trim().length > 0)
-    || active.has(id)
     || !!getSessionRunState(id).runningRunId
   if (!sessionClaimsActive && materializeStreamingAssistantArtifacts(session.messages)) {
-    upsertStoredItem('sessions', id, session)
+    saveSession(id, session)
   }
 
   const url = new URL(req.url)
@@ -63,7 +61,7 @@ export async function POST(req: Request, { params }: { params: Promise<{ id: str
   if (error) return error
 
   if (body.kind === 'context-clear') {
-    const session = loadStoredItem('sessions', id) as Session | null
+    const session = getSession(id)
     if (!session) return notFound()
 
     session.messages.push({
@@ -72,7 +70,7 @@ export async function POST(req: Request, { params }: { params: Promise<{ id: str
       kind: 'context-clear',
       time: Date.now(),
     })
-    upsertStoredItem('sessions', id, session)
+    saveSession(id, session)
     return NextResponse.json({ ok: true })
   }
 
@@ -84,7 +82,7 @@ export async function POST(req: Request, { params }: { params: Promise<{ id: str
       kind: body.messageKind || 'system',
     })
     if (!inserted) {
-      const session = loadStoredItem('sessions', id) as Session | null
+      const session = getSession(id)
       if (!session) return notFound()
       return NextResponse.json({ error: 'Note text is required' }, { status: 400 })
     }
@@ -98,7 +96,7 @@ export async function PUT(req: Request, { params }: { params: Promise<{ id: stri
   const { id } = await params
   const { data: body, error } = await safeParseBody<{ messageIndex: number; bookmarked: boolean }>(req)
   if (error) return error
-  const session = loadStoredItem('sessions', id) as Session | null
+  const session = getSession(id)
   if (!session) return notFound()
 
   const { messageIndex, bookmarked } = body
@@ -107,7 +105,7 @@ export async function PUT(req: Request, { params }: { params: Promise<{ id: stri
   }
 
   session.messages[messageIndex].bookmarked = bookmarked
-  upsertStoredItem('sessions', id, session)
+  saveSession(id, session)
   return NextResponse.json(session.messages[messageIndex])
 }
 
@@ -115,7 +113,7 @@ export async function DELETE(req: Request, { params }: { params: Promise<{ id: s
   const { id } = await params
   const { data: body, error } = await safeParseBody<{ messageIndex: number }>(req)
   if (error) return error
-  const session = loadStoredItem('sessions', id) as Session | null
+  const session = getSession(id)
   if (!session) return notFound()
 
   const { messageIndex } = body
@@ -129,6 +127,6 @@ export async function DELETE(req: Request, { params }: { params: Promise<{ id: s
   }
 
   session.messages.splice(messageIndex, 1)
-  upsertStoredItem('sessions', id, session)
+  saveSession(id, session)
   return NextResponse.json({ ok: true })
 }

package/src/app/api/chats/[id]/route.ts

@@ -1,10 +1,12 @@
 import { NextResponse } from 'next/server'
-import { loadSession, upsertSession, deleteSession, active, loadAgents } from '@/lib/server/storage'
+import { loadAgents } from '@/lib/server/storage'
 import { notFound } from '@/lib/server/collection-helpers'
 import { normalizeProviderEndpoint } from '@/lib/openclaw/openclaw-endpoint'
 import { resolvePrimaryAgentRoute } from '@/lib/server/agents/agent-runtime-config'
 import { clearMainLoopStateForSession } from '@/lib/server/agents/main-agent-loop'
 import { cleanupSessionProcesses } from '@/lib/server/runtime/process-manager'
+import { deleteSession, getSession, saveSession } from '@/lib/server/sessions/session-repository'
+import { stopActiveSessionProcess } from '@/lib/server/runtime/runtime-state'
 import { getSessionQueueSnapshot, getSessionRunState } from '@/lib/server/runtime/session-run-manager'
 import { normalizeCapabilitySelection } from '@/lib/capability-selection'
 import { enrichSessionWithMissionSummary } from '@/lib/server/missions/mission-service'
@@ -12,12 +14,12 @@ import { safeParseBody } from '@/lib/server/safe-parse-body'
 
 export async function GET(_req: Request, { params }: { params: Promise<{ id: string }> }) {
   const { id } = await params
-  const session = loadSession(id)
+  const session = getSession(id)
   if (!session) return notFound()
 
   const run = getSessionRunState(id)
   const queue = getSessionQueueSnapshot(id)
-  session.active = active.has(id) || !!run.runningRunId
+  session.active = !!run.runningRunId
   session.queuedCount = queue.queueLength
   session.currentRunId = run.runningRunId || null
 
@@ -28,7 +30,7 @@ export async function PUT(req: Request, { params }: { params: Promise<{ id: stri
   const { id } = await params
   const { data: updates, error } = await safeParseBody(req)
   if (error) return error
-  const session = loadSession(id) as Record<string, unknown> | null
+  const session = getSession(id) as Record<string, unknown> | null
   if (!session) return notFound()
 
   if (updates.resetMainLoopState === true) {
@@ -142,17 +144,14 @@ export async function PUT(req: Request, { params }: { params: Promise<{ id: stri
   if (updates.delegateResumeIds !== undefined) session.delegateResumeIds = updates.delegateResumeIds
   if (!Array.isArray(session.messages)) session.messages = []
 
-  upsertSession(id, session)
+  saveSession(id, session)
   return NextResponse.json(enrichSessionWithMissionSummary(session as never))
 }
 
 export async function DELETE(_req: Request, { params }: { params: Promise<{ id: string }> }) {
   const { id } = await params
-  if (!loadSession(id)) return notFound()
-  if (active.has(id)) {
-    try { active.get(id)?.kill() } catch {}
-    active.delete(id)
-  }
+  if (!getSession(id)) return notFound()
+  stopActiveSessionProcess(id)
   cleanupSessionProcesses(id)
   deleteSession(id)
   return new NextResponse('OK')

package/src/app/api/chats/[id]/stop/route.ts

@@ -1,19 +1,17 @@
 import { NextResponse } from 'next/server'
 import { materializeStreamingAssistantArtifacts } from '@/lib/chat/chat-streaming-state'
-import { active, loadStoredItem, upsertStoredItem } from '@/lib/server/storage'
 import { cancelSessionRuns } from '@/lib/server/runtime/session-run-manager'
+import { stopActiveSessionProcess } from '@/lib/server/runtime/runtime-state'
+import { getSession, saveSession } from '@/lib/server/sessions/session-repository'
 import type { Session } from '@/types'
 
 export async function POST(_req: Request, { params }: { params: Promise<{ id: string }> }) {
   const { id } = await params
   const cancel = cancelSessionRuns(id, 'Stopped by user')
-  const session = loadStoredItem('sessions', id) as Session | null
+  const session = getSession(id) as Session | null
   if (session && Array.isArray(session.messages) && materializeStreamingAssistantArtifacts(session.messages)) {
-    upsertStoredItem('sessions', id, session)
-  }
-  if (active.has(id)) {
-    try { active.get(id)?.kill() } catch {}
-    active.delete(id)
+    saveSession(id, session)
   }
+  stopActiveSessionProcess(id)
   return NextResponse.json({ ok: true, ...cancel })
 }

package/src/app/api/chats/messages-route.test.ts

@@ -10,11 +10,13 @@ test('chat messages route materializes stale streaming artifacts even if runtime
     returnedText: string | null
     persistedStreaming: boolean | null
     persistedText: string | null
-  }>(`
-    const storageMod = await import('./src/lib/server/storage')
-    const routeMod = await import('./src/app/api/chats/[id]/messages/route')
-    const storage = storageMod.default || storageMod
-    const route = routeMod.default || routeMod
+	  }>(`
+	    const storageMod = await import('./src/lib/server/storage')
+	    const routeMod = await import('./src/app/api/chats/[id]/messages/route')
+	    const runtimeStateMod = await import('./src/lib/server/runtime/runtime-state')
+	    const storage = storageMod.default || storageMod
+	    const route = routeMod.default || routeMod
+	    const runtimeState = runtimeStateMod.default || runtimeStateMod
 
     storage.upsertStoredItem('sessions', 'session-stale', {
       id: 'session-stale',
@@ -37,7 +39,7 @@ test('chat messages route materializes stale streaming artifacts even if runtime
       ],
     })
 
-    storage.active.set('session-stale', { kill() {} })
+	    runtimeState.registerActiveSessionProcess('session-stale', { kill() {} })
 
     const response = await route.GET(
       new Request('http://local/api/chats/session-stale/messages'),

package/src/app/api/chats/route.ts

@@ -3,9 +3,11 @@ import { genId } from '@/lib/id'
 import os from 'os'
 import path from 'path'
 import { perf } from '@/lib/server/runtime/perf'
-import { loadSessions, saveSessions, deleteSession, active, loadAgents } from '@/lib/server/storage'
+import { loadAgents } from '@/lib/server/storage'
 import { WORKSPACE_DIR } from '@/lib/server/data-dir'
 import { notify } from '@/lib/server/ws-hub'
+import { deleteSession, listSessions, replaceSessions } from '@/lib/server/sessions/session-repository'
+import { stopActiveSessionProcess } from '@/lib/server/runtime/runtime-state'
 import { getSessionQueueSnapshot, getSessionRunState } from '@/lib/server/runtime/session-run-manager'
 import { normalizeProviderEndpoint } from '@/lib/openclaw/openclaw-endpoint'
 import { applyResolvedRoute, resolvePrimaryAgentRoute } from '@/lib/server/agents/agent-runtime-config'
@@ -25,11 +27,11 @@ export async function GET(req: Request) {
   const endPerf = perf.start('api', 'GET /api/chats')
   // Note: pruneThreadConnectorMirrors and materializeStreamingAssistantArtifacts
   // are handled by the daemon periodic health check, not on every list fetch.
-  const sessions = loadSessions()
+  const sessions = listSessions()
   for (const id of Object.keys(sessions)) {
     const run = getSessionRunState(id)
     const queue = getSessionQueueSnapshot(id)
-    sessions[id].active = active.has(id) || !!run.runningRunId
+    sessions[id].active = !!run.runningRunId
     sessions[id].queuedCount = queue.queueLength
     sessions[id].currentRunId = run.runningRunId || null
   }
@@ -59,14 +61,11 @@ export async function DELETE(req: Request) {
   if (!Array.isArray(ids) || !ids.length) {
     return new NextResponse('Missing ids', { status: 400 })
   }
-  const sessions = loadSessions()
+  const sessions = listSessions()
   let deleted = 0
   for (const id of ids) {
     if (!sessions[id]) continue
-    if (active.has(id)) {
-      try { active.get(id)?.kill() } catch {}
-      active.delete(id)
-    }
+    stopActiveSessionProcess(id)
     deleteSession(id)
     deleted += 1
   }
@@ -83,7 +82,7 @@ export async function POST(req: Request) {
   else if (!cwd) cwd = WORKSPACE_DIR
 
   const id = body.id || genId()
-  const sessions = loadSessions()
+  const sessions = listSessions()
   const agent = body.agentId ? loadAgents()[body.agentId] : null
   if (isAgentDisabled(agent)) {
     return NextResponse.json({ error: buildAgentDisabledMessage(agent, 'start chats') }, { status: 409 })
@@ -162,7 +161,7 @@ export async function POST(req: Request) {
   sessions[id] = (body.provider || body.model || body.credentialId || body.apiEndpoint)
     ? nextSession
     : applyResolvedRoute(nextSession, resolvedRoute)
-  saveSessions(sessions)
+  replaceSessions(sessions)
   notify('sessions')
   return NextResponse.json(sessions[id])
 }

package/src/app/api/ip/route.ts

@@ -1,8 +1,8 @@
 import { NextResponse } from 'next/server'
-import { localIP } from '@/lib/server/storage'
+import { localIP } from '@/lib/server/runtime/network'
 export const dynamic = 'force-dynamic'
 
 
-export async function GET(_req: Request) {
+export async function GET() {
   return NextResponse.json({ ip: localIP(), port: parseInt(process.env.PORT || '3000') })
 }

package/src/app/api/preview-server/route.ts

@@ -3,7 +3,7 @@ import { spawn, type ChildProcess } from 'child_process'
 import http from 'http'
 import fs from 'fs'
 import path from 'path'
-import { localIP } from '@/lib/server/storage'
+import { localIP } from '@/lib/server/runtime/network'
 import { resolveDevServerLaunchDir } from '@/lib/server/runtime/devserver-launch'
 import { resolvePathWithinBaseDir } from '@/lib/server/path-utils'
 import { safeParseBody } from '@/lib/server/safe-parse-body'

package/src/app/api/projects/[id]/route.ts

@@ -1,65 +1,26 @@
 import { NextResponse } from 'next/server'
-import { loadProjects, saveProjects, deleteProject, loadAgents, saveAgents, loadTasks, saveTasks, loadSchedules, saveSchedules, loadSkills, saveSkills, loadSecrets, saveSecrets } from '@/lib/server/storage'
-import { mutateItem, deleteItem, notFound, type CollectionOps } from '@/lib/server/collection-helpers'
-import { ensureProjectWorkspace, normalizeProjectPatchInput } from '@/lib/server/project-utils'
-import { notify } from '@/lib/server/ws-hub'
+import { notFound } from '@/lib/server/collection-helpers'
+import { deleteProjectAndDetachReferences, getProject, updateProject } from '@/lib/server/projects/project-service'
 import { safeParseBody } from '@/lib/server/safe-parse-body'
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const ops: CollectionOps<any> = { load: loadProjects, save: saveProjects, deleteFn: deleteProject, topic: 'projects' }
-
 export async function GET(_req: Request, { params }: { params: Promise<{ id: string }> }) {
   const { id } = await params
-  const projects = loadProjects()
-  if (!projects[id]) return notFound()
-  return NextResponse.json(projects[id])
+  const project = getProject(id)
+  if (!project) return notFound()
+  return NextResponse.json(project)
 }
 
 export async function PUT(req: Request, { params }: { params: Promise<{ id: string }> }) {
   const { id } = await params
   const { data: body, error } = await safeParseBody<Record<string, unknown>>(req)
   if (error) return error
-  const result = mutateItem(ops, id, (project) => {
-    const patch = normalizeProjectPatchInput(body && typeof body === 'object' ? body as Record<string, unknown> : {})
-    Object.assign(project, patch, { updatedAt: Date.now() })
-    delete (project as Record<string, unknown>).id
-    project.id = id
-    return project
-  })
+  const result = updateProject(id, body && typeof body === 'object' ? body : {})
   if (!result) return notFound()
-  ensureProjectWorkspace(id, result.name)
   return NextResponse.json(result)
 }
 
 export async function DELETE(_req: Request, { params }: { params: Promise<{ id: string }> }) {
   const { id } = await params
-  if (!deleteItem(ops, id)) return notFound()
-
-  // Clear projectId from referencing entities
-  const clearProjectId = (load: () => Record<string, Record<string, unknown>>, save: (d: Record<string, Record<string, unknown>>) => void, topic: string) => {
-    const items = load()
-    let changed = false
-    for (const item of Object.values(items)) {
-      if (item.projectId === id) {
-        item.projectId = undefined
-        changed = true
-      }
-    }
-    if (changed) {
-      save(items)
-      notify(topic)
-    }
-  }
-
-  clearProjectId(
-    loadAgents as unknown as () => Record<string, Record<string, unknown>>,
-    saveAgents as unknown as (data: Record<string, Record<string, unknown>>) => void,
-    'agents',
-  )
-  clearProjectId(loadTasks as unknown as () => Record<string, Record<string, unknown>>, saveTasks as unknown as (data: Record<string, Record<string, unknown>>) => void, 'tasks')
-  clearProjectId(loadSchedules as unknown as () => Record<string, Record<string, unknown>>, saveSchedules as unknown as (data: Record<string, Record<string, unknown>>) => void, 'schedules')
-  clearProjectId(loadSkills as unknown as () => Record<string, Record<string, unknown>>, saveSkills as unknown as (data: Record<string, Record<string, unknown>>) => void, 'skills')
-  clearProjectId(loadSecrets as unknown as () => Record<string, Record<string, unknown>>, saveSecrets as unknown as (data: Record<string, Record<string, unknown>>) => void, 'secrets')
-
+  if (!deleteProjectAndDetachReferences(id)) return notFound()
   return NextResponse.json({ ok: true })
 }

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

@@ -27,6 +27,7 @@ import { ConfirmDialog } from '@/components/shared/confirm-dialog'
 import { speak } from '@/lib/tts'
 import { api } from '@/lib/app/api-client'
 import { messagesDiffer } from '@/lib/chat/chat-streaming-state'
+import { createAssistantRenderId } from '@/lib/chat/assistant-render-id'
 import { getSessionLastMessage } from '@/lib/chat/session-summary'
 import { getEnabledCapabilityIds, getEnabledToolIds } from '@/lib/capability-selection'
 
@@ -71,6 +72,36 @@ export function ChatArea() {
   const setPreviewContent = useChatStore((s) => s.setPreviewContent)
   const isDesktop = useMediaQuery('(min-width: 768px)')
 
+  const markSessionLocallyIdle = useCallback((targetSessionId: string) => {
+    const appState = useAppStore.getState()
+    const existing = appState.sessions[targetSessionId]
+    if (!existing) return
+    appState.updateSessionInStore({
+      ...existing,
+      active: false,
+      currentRunId: null,
+    })
+  }, [])
+
+  const startServerStreamingPlaceholder = useCallback((targetSessionId: string, phase: 'queued' | 'thinking' | 'connecting' = 'thinking') => {
+    useChatStore.setState((state) => {
+      const sameServerStream = state.streaming
+        && state.streamSource === 'server'
+        && state.streamingSessionId === targetSessionId
+
+      return {
+        streaming: true,
+        streamingSessionId: targetSessionId,
+        streamSource: 'server',
+        streamPhase: sameServerStream ? state.streamPhase : phase,
+        streamText: '',
+        displayText: '',
+        assistantRenderId: sameServerStream && state.assistantRenderId ? state.assistantRenderId : createAssistantRenderId(),
+        thinkingStartTime: sameServerStream && state.thinkingStartTime > 0 ? state.thinkingStartTime : Date.now(),
+      }
+    })
+  }, [])
+
   const currentAgent = useAppStore((s) => {
     const agentId = session?.agentId
     return agentId ? s.agents[agentId] ?? null : null
@@ -178,14 +209,12 @@ export function ChatArea() {
     })
 
     const sessionAtLoad = useAppStore.getState().sessions[requestedSessionId]
-    if (sessionAtLoad?.active) {
-      useChatStore.setState({ streaming: true, streamingSessionId: requestedSessionId, streamSource: 'server', streamText: '' })
-    }
+    if (sessionAtLoad?.active) startServerStreamingPlaceholder(requestedSessionId)
 
     return () => {
       cancelled = true
     }
-  }, [loadQueuedMessages, refreshSession, sessionId, setDevServer, setMessages])
+  }, [loadQueuedMessages, refreshSession, sessionId, setDevServer, setMessages, startServerStreamingPlaceholder])
 
   useEffect(() => {
     if (!sessionId || messagesLoading) return
@@ -195,9 +224,7 @@ export function ChatArea() {
       void refreshSession(requestedSessionId).then(() => {
         if (cancelled || selectActiveSessionId(useAppStore.getState()) !== requestedSessionId) return
         const refreshed = useAppStore.getState().sessions[requestedSessionId]
-        if (refreshed?.active) {
-          useChatStore.setState({ streaming: true, streamingSessionId: requestedSessionId, streamSource: 'server', streamText: '' })
-        }
+        if (refreshed?.active) startServerStreamingPlaceholder(requestedSessionId)
       }).catch((err) => console.error('Failed to refresh session:', err))
 
       void devServer(requestedSessionId, 'status').then((r) => {
@@ -213,7 +240,7 @@ export function ChatArea() {
       cancelled = true
       window.clearTimeout(timer)
     }
-  }, [messagesLoading, refreshSession, sessionId, setDevServer])
+  }, [messagesLoading, refreshSession, sessionId, setDevServer, startServerStreamingPlaceholder])
 
   useEffect(() => {
     if (!sessionId || messagesLoading) return
@@ -292,19 +319,12 @@ export function ChatArea() {
         && !chatState.streaming
         && chatState.streamingSessionId !== sessionId
       ) {
-        useChatStore.setState({
-          streaming: true,
-          streamingSessionId: sessionId,
-          streamSource: 'server',
-          streamPhase: 'thinking',
-          streamText: '',
-          thinkingStartTime: Date.now(),
-        })
+        startServerStreamingPlaceholder(sessionId)
       }
     } catch (err) {
       console.error('Failed to refresh queue:', err)
     }
-  }, [loadQueuedMessages, sessionId])
+  }, [loadQueuedMessages, sessionId, startServerStreamingPlaceholder])
 
   // Subscribe to WS messages for this session — always subscribe when session exists,
   // only enable fallback polling when actively needed
@@ -316,7 +336,7 @@ export function ChatArea() {
   useWs(
     sessionId ? 'runs' : '',
     refreshQueue,
-    sessionId && (isServerActive || queuedCount > 0) ? 10_000 : undefined,
+    sessionId && (isServerActive || queuedCount > 0) ? 2_500 : undefined,
   )
 
   // Listen for stream-end signal from the server — clears streaming state
@@ -325,11 +345,12 @@ export function ChatArea() {
     if (!sessionId) return
     const state = useChatStore.getState()
     if (state.streamSource === 'server' && state.streamingSessionId === sessionId) {
-      useChatStore.setState({ streaming: false, streamingSessionId: null, streamSource: null, streamText: '', displayText: '', streamPhase: 'thinking', streamToolName: '', thinkingText: '', thinkingStartTime: 0 })
+      markSessionLocallyIdle(sessionId)
+      useChatStore.setState({ streaming: false, streamingSessionId: null, streamSource: null, streamText: '', displayText: '', assistantRenderId: null, streamPhase: 'thinking', streamToolName: '', thinkingText: '', thinkingStartTime: 0 })
       void refreshMessages()
       void refreshSession(sessionId)
     }
-  }, [sessionId, refreshMessages, refreshSession])
+  }, [markSessionLocallyIdle, sessionId, refreshMessages, refreshSession])
   useWs(sessionId ? `stream-end:${sessionId}` : '', handleStreamEnd)
 
   // Keep the local typing indicator aligned with the server's active state
@@ -338,7 +359,7 @@ export function ChatArea() {
     const state = useChatStore.getState()
     if (isServerActive) {
       if (!state.streaming && !state.streamText) {
-        useChatStore.setState({ streaming: true, streamingSessionId: sessionId, streamSource: 'server', streamText: '' })
+        startServerStreamingPlaceholder(sessionId)
       }
       return
     }
@@ -349,9 +370,10 @@ export function ChatArea() {
     ) {
       // Server finished — clear all streaming state and fetch final messages
       fetchMessages(sessionId).then(setMessages).catch(() => {})
-      useChatStore.setState({ streaming: false, streamingSessionId: null, streamSource: null, streamText: '', displayText: '', streamPhase: 'thinking', streamToolName: '', thinkingText: '', thinkingStartTime: 0 })
+      markSessionLocallyIdle(sessionId)
+      useChatStore.setState({ streaming: false, streamingSessionId: null, streamSource: null, streamText: '', displayText: '', assistantRenderId: null, streamPhase: 'thinking', streamToolName: '', thinkingText: '', thinkingStartTime: 0 })
     }
-  }, [isServerActive, sessionId, setMessages])
+  }, [isServerActive, markSessionLocallyIdle, sessionId, setMessages, startServerStreamingPlaceholder])
 
   // Poll browser status while session has browser tools
   const hasBrowserTool = getEnabledToolIds(session).includes('browser')

package/src/components/chat/message-bubble.test.ts

@@ -37,6 +37,41 @@ describe('MessageBubble', () => {
     assert.doesNotMatch(html, /streaming-cursor/)
   })
 
+  it('falls back to persisted streaming content when the live stream payload is temporarily empty', async () => {
+    const messageBubbleModule = await import('./message-bubble') as Record<string, unknown>
+    const MessageBubble = (
+      messageBubbleModule.MessageBubble
+      || (messageBubbleModule.default as { MessageBubble?: unknown } | undefined)?.MessageBubble
+      || (messageBubbleModule['module.exports'] as { MessageBubble?: unknown } | undefined)?.MessageBubble
+    ) as typeof import('./message-bubble').MessageBubble | undefined
+    assert.ok(MessageBubble)
+
+    const html = renderToStaticMarkup(
+      React.createElement(MessageBubble, {
+        message: {
+          role: 'assistant',
+          text: 'Recovered persisted partial text',
+          time: Date.now(),
+          kind: 'chat',
+          streaming: true,
+        },
+        assistantName: 'Hal2k-3',
+        agentName: 'Hal2k-3',
+        liveStream: {
+          active: true,
+          phase: 'responding',
+          toolName: '',
+          text: '',
+          thinking: '',
+          toolEvents: [],
+        },
+      }),
+    )
+
+    assert.match(html, /Recovered persisted partial text/)
+    assert.match(html, /streaming-cursor/)
+  })
+
   it('renders upload-linked screenshots inline without duplicating them at the bottom', async () => {
     const messageBubbleModule = await import('./message-bubble') as Record<string, unknown>
     const MessageBubble = (