@swarmclawai/swarmclaw 1.2.0 → 1.2.1

package/README.md

@@ -190,6 +190,16 @@ The building blocks are the same: **agents, tools, memory, delegation, schedules
 
 ## Release Notes
 
+### v1.2.1 Highlights
+
+- **System health endpoint**: new `/api/system/status` route returns lightweight health summary for external monitoring and uptime checks.
+- **Memory abstracts**: ~100-token LLM summaries attached to memories for efficient proactive recall without loading full content.
+- **Structured logging**: migrated 40+ files from `console.*` to the `log` module for consistent, level-aware logging across the codebase.
+- **Lint baseline improvements**: reduced lint violations from 440 to 414 (-26) through targeted fixes across server and UI code.
+- **Daemon housekeeping**: pruning for subagent processes, orchestrator state, connector sessions, and usage records to prevent resource leaks.
+- **SKILL.md v2.0.0**: comprehensive CLI documentation covering 40+ command groups with examples and usage patterns.
+- **New dev scripts**: added `type-check`, `test`, and `format` scripts to `package.json` for streamlined development workflows.
+
 ### v1.1.9 Highlights
 
 - **Docker build stability**: limit Next.js page data workers to 1 in build mode to prevent `SQLITE_BUSY` contention.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swarmclawai/swarmclaw",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Self-hosted AI runtime for OpenClaw, delegation, autonomy, runtime skills, crypto wallets, and chat platform connectors.",
   "license": "MIT",
   "publishConfig": {
@@ -61,6 +61,9 @@
     "sandbox:build:browser": "docker build -f Dockerfile.sandbox-browser -t swarmclaw-sandbox-browser:bookworm-slim .",
     "benchmark:autonomy": "node ./scripts/benchmark-autonomy-harness.mjs",
     "benchmark:agent-regression": "node --import tsx ./scripts/run-agent-regression-suite.ts",
+    "type-check": "tsc --noEmit",
+    "test": "npm run test:cli && npm run test:setup && npm run test:openclaw",
+    "format": "eslint --fix",
     "lint": "eslint",
     "lint:fix": "eslint --fix",
     "lint:baseline": "node ./scripts/lint-baseline.mjs check",

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

@@ -3,6 +3,9 @@ import { execSync } from 'child_process'
 import { loadSessions } from '@/lib/server/storage'
 import { notFound } from '@/lib/server/collection-helpers'
 import { safeParseBody } from '@/lib/server/safe-parse-body'
+import { log } from '@/lib/server/logger'
+
+const TAG = 'api-deploy'
 
 export async function POST(req: Request, { params }: { params: Promise<{ id: string }> }) {
   const { id } = await params
@@ -21,16 +24,18 @@ export async function POST(req: Request, { params }: { params: Promise<{ id: str
     try {
       execSync(`git commit -m "${msg.replace(/"/g, '\\"')}"`, opts)
       committed = true
-    } catch (ce: any) {
-      if (!(ce.stdout || ce.stderr || '').includes('nothing to commit')) throw ce
+    } catch (ce: unknown) {
+      const ex = ce as { stdout?: string; stderr?: string }
+      if (!(ex.stdout || ex.stderr || '').includes('nothing to commit')) throw ce
     }
     execSync('git push 2>&1', opts)
-    console.log(`[${id}] deployed: ${msg}`)
+    log.info(TAG, `deployed: ${msg}`)
     return NextResponse.json({ ok: true, output: committed ? 'Committed and pushed!' : 'Already committed — pushed to remote!' })
-  } catch (e: any) {
-    console.error(`[${id}] deploy error:`, e.message)
+  } catch (e: unknown) {
+    const ex = e as { stderr?: string; stdout?: string; message?: string }
+    log.error(TAG, `deploy error:`, ex.message)
     return NextResponse.json(
-      { ok: false, error: (e.stderr || e.stdout || e.message).toString().slice(0, 300) },
+      { ok: false, error: (ex.stderr || ex.stdout || ex.message || 'Unknown error').toString().slice(0, 300) },
       { status: 500 },
     )
   }

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

@@ -6,6 +6,9 @@ import { resolveDevServerLaunchDir } from '@/lib/server/runtime/devserver-launch
 import { safeParseBody } from '@/lib/server/safe-parse-body'
 import { sleep } from '@/lib/shared-utils'
 import net from 'net'
+import { log } from '@/lib/server/logger'
+
+const TAG = 'api-devserver'
 
 interface DevServerStartResult {
   status?: number
@@ -61,11 +64,11 @@ async function startDevServer(id: string, session: { cwd: string }): Promise<Dev
 
   proc.stdout!.on('data', onData)
   proc.stderr!.on('data', onData)
-  proc.on('close', () => { devServers.delete(id); console.log(`[${id}] dev server stopped`) })
+  proc.on('close', () => { devServers.delete(id); log.info(TAG, `dev server stopped for ${id}`) })
   proc.on('error', () => devServers.delete(id))
 
   devServers.set(id, { proc, url: `http://${localIP()}:${port}` })
-  console.log(`[${id}] starting dev server in ${launch.launchDir} (session cwd=${session.cwd})`)
+  log.info(TAG, `starting dev server in ${launch.launchDir} (session cwd=${session.cwd})`)
 
   await sleep(4000)
   const ds = devServers.get(id)

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

@@ -1,8 +1,9 @@
 import { NextResponse } from 'next/server'
-import { loadStoredItem, upsertStoredItem } from '@/lib/server/storage'
+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 { safeParseBody } from '@/lib/server/safe-parse-body'
 
@@ -12,8 +13,13 @@ export async function GET(req: Request, { params }: { params: Promise<{ id: stri
   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.
   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)
   }

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

@@ -1,6 +1,9 @@
 import { NextResponse } from 'next/server'
 import { loadCredentials, deleteCredential } from '@/lib/server/storage'
 import { notFound } from '@/lib/server/collection-helpers'
+import { log } from '@/lib/server/logger'
+
+const TAG = 'api-credentials'
 
 export async function DELETE(_req: Request, { params }: { params: Promise<{ id: string }> }) {
   const { id: credId } = await params
@@ -9,6 +12,6 @@ export async function DELETE(_req: Request, { params }: { params: Promise<{ id:
     return notFound()
   }
   deleteCredential(credId)
-  console.log(`[credentials] deleted ${credId}`)
+  log.info(TAG, `deleted ${credId}`)
   return new NextResponse('OK')
 }

package/src/app/api/extensions/marketplace/route.ts

@@ -3,6 +3,9 @@ import { inferExtensionPublisherSourceFromUrl } from '@/lib/extension-sources'
 import { searchClawHub } from '@/lib/server/skills/clawhub-client'
 import type { ExtensionCatalogSource } from '@/types'
 import { errorMessage } from '@/lib/shared-utils'
+import { log } from '@/lib/server/logger'
+
+const TAG = 'api-extensions-marketplace'
 
 export const dynamic = 'force-dynamic'
 
@@ -71,7 +74,7 @@ export async function GET(req: Request) {
         })
       }
     } catch (err: unknown) {
-      console.warn('[extensions-marketplace] Registry failed:', {
+      log.warn(TAG, 'Registry failed:', {
         registryUrl: registry.url,
         error: errorMessage(err),
       })
@@ -93,7 +96,7 @@ export async function GET(req: Request) {
       catalogSource: 'clawhub',
     })))
   } catch (err: unknown) {
-    console.warn('[extensions-marketplace] ClawHub failed:', errorMessage(err))
+    log.warn(TAG, 'ClawHub failed:', errorMessage(err))
   }
 
   allExtensions.sort((a, b) => {

package/src/app/api/memory/maintenance/route.ts

@@ -4,6 +4,9 @@ import { getMemoryDb } from '@/lib/server/memory/memory-db'
 import { loadSettings } from '@/lib/server/storage'
 import { syncAllSessionArchiveMemories } from '@/lib/server/memory/session-archive-memory'
 import { DATA_DIR } from '@/lib/server/data-dir'
+import { log } from '@/lib/server/logger'
+
+const TAG = 'api-memory-maintenance'
 
 function parseBool(value: unknown, fallback: boolean): boolean {
   if (typeof value === 'boolean') return value
@@ -46,7 +49,7 @@ export async function GET(req: Request) {
       archiveExportDir: path.join(DATA_DIR, 'session-archives'),
     })
   } catch (err: unknown) {
-    console.error('[memory/maintenance] GET failed:', err)
+    log.error(TAG, 'GET failed:', err)
     return NextResponse.json({ ok: false, error: String((err as Error)?.message || err) }, { status: 500 })
   }
 }
@@ -77,7 +80,7 @@ export async function POST(req: Request) {
       ...result,
     })
   } catch (err: unknown) {
-    console.error('[memory/maintenance] POST failed:', err)
+    log.error(TAG, 'POST failed:', err)
     return NextResponse.json({ ok: false, error: String((err as Error)?.message || err) }, { status: 500 })
   }
 }

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

@@ -8,6 +8,9 @@ import { resolveDevServerLaunchDir } from '@/lib/server/runtime/devserver-launch
 import { resolvePathWithinBaseDir } from '@/lib/server/path-utils'
 import { safeParseBody } from '@/lib/server/safe-parse-body'
 import { hmrSingleton, sleep } from '@/lib/shared-utils'
+import { log } from '@/lib/server/logger'
+
+const TAG = 'api-preview-server'
 
 // ---------------------------------------------------------------------------
 // MIME types for static server
@@ -181,7 +184,7 @@ function createStaticServer(dir: string): http.Server {
 async function startNpmServer(dir: string, command: string[], port: number, framework?: string): Promise<PreviewServer> {
   // Install deps if node_modules missing
   if (!fs.existsSync(path.join(dir, 'node_modules'))) {
-    console.log(`[preview] Installing dependencies in ${dir}`)
+    log.info(TAG, `Installing dependencies in ${dir}`)
     await new Promise<void>((resolve, reject) => {
       const install = spawn('npm', ['install'], { cwd: dir, stdio: 'pipe' })
       install.on('close', (code) => code === 0 ? resolve() : reject(new Error(`npm install exited ${code}`)))
@@ -206,14 +209,14 @@ async function startNpmServer(dir: string, command: string[], port: number, fram
     env,
   })
 
-  let log = ''
+  let processOutput = ''
   let detectedPort = port
   const urlRe = /https?:\/\/(?:localhost|0\.0\.0\.0|127\.0\.0\.1|[\d.]+):(\d+)/
 
   const onData = (chunk: Buffer) => {
     const text = chunk.toString()
-    log += text
-    if (log.length > 10000) log = log.slice(-5000)
+    processOutput += text
+    if (processOutput.length > 10000) processOutput = processOutput.slice(-5000)
     const match = text.match(urlRe)
     if (match) {
       detectedPort = parseInt(match[1], 10)
@@ -236,7 +239,7 @@ async function startNpmServer(dir: string, command: string[], port: number, fram
 
   proc.on('close', () => {
     servers.delete(dirKey(dir))
-    console.log(`[preview] npm server stopped for ${dir}`)
+    log.info(TAG, `npm server stopped for ${dir}`)
   })
   proc.on('error', () => servers.delete(dirKey(dir)))
 
@@ -246,10 +249,10 @@ async function startNpmServer(dir: string, command: string[], port: number, fram
   await sleep(5000)
   if (proc.exitCode !== null) {
     servers.delete(dirKey(dir))
-    throw new Error(`npm dev server exited early with code ${proc.exitCode}\n${log.slice(-4000)}`)
+    throw new Error(`npm dev server exited early with code ${proc.exitCode}\n${processOutput.slice(-4000)}`)
   }
   entry.port = detectedPort
-  entry.log = log
+  entry.log = processOutput
 
   return entry
 }
@@ -295,7 +298,7 @@ export async function POST(req: Request) {
     const port = await findFreePort()
 
     if (project.type === 'npm' && project.devCommand) {
-      console.log(`[preview] Detected ${project.framework} project in ${launch.launchDir}, running: ${project.devCommand.join(' ')}`)
+      log.info(TAG, `Detected ${project.framework} project in ${launch.launchDir}, running: ${project.devCommand.join(' ')}`)
       try {
         const entry = await startNpmServer(launch.launchDir, project.devCommand, port, project.framework)
         return NextResponse.json({
@@ -305,7 +308,7 @@ export async function POST(req: Request) {
           launchDir: launch.launchDir,
         })
       } catch (err: unknown) {
-        console.error(`[preview] npm server failed, falling back to static:`, err)
+        log.error(TAG, 'npm server failed, falling back to static:', err)
         // Fall through to static server
       }
     }
@@ -319,7 +322,7 @@ export async function POST(req: Request) {
 
     const entry: PreviewServer = { type: 'static', server, port, dir, startedAt: Date.now(), log: '' }
     servers.set(key, entry)
-    console.log(`[preview] Started static server for ${dir} on port ${port}`)
+    log.info(TAG, `Started static server for ${dir} on port ${port}`)
 
     return NextResponse.json(buildResponse(entry))
 
@@ -332,7 +335,7 @@ export async function POST(req: Request) {
       }
       if (srv.server) srv.server.close()
       servers.delete(key)
-      console.log(`[preview] Stopped server for ${launch.launchDir}`)
+      log.info(TAG, `Stopped server for ${launch.launchDir}`)
     }
     return NextResponse.json({ running: false, dir: launch.launchDir })
 

package/src/app/api/system/status/route.ts

@@ -0,0 +1,11 @@
+import { NextResponse } from 'next/server'
+import { getDaemonHealthSummary } from '@/lib/server/runtime/daemon-state'
+import packageJson from '../../../../../package.json'
+
+export async function GET() {
+  const summary = getDaemonHealthSummary()
+  return NextResponse.json({
+    ...summary,
+    version: packageJson.version,
+  })
+}

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

@@ -3,6 +3,9 @@ import fs from 'fs'
 import path from 'path'
 import { genId } from '@/lib/id'
 import { UPLOAD_DIR } from '@/lib/server/storage'
+import { log } from '@/lib/server/logger'
+
+const TAG = 'api-upload'
 
 export async function POST(req: Request) {
   const filename = req.headers.get('x-filename') || 'image.png'
@@ -12,7 +15,7 @@ export async function POST(req: Request) {
 
   if (!fs.existsSync(UPLOAD_DIR)) fs.mkdirSync(UPLOAD_DIR, { recursive: true })
   fs.writeFileSync(filePath, buf)
-  console.log(`[upload] saved ${buf.length} bytes to ${filePath}`)
+  log.info(TAG, `saved ${buf.length} bytes to ${filePath}`)
 
   return NextResponse.json({ path: filePath, size: buf.length, url: `/api/uploads/${name}` })
 }

package/src/cli/index.js

@@ -730,6 +730,13 @@ const COMMAND_GROUPS = [
       cmd('delete-many', 'DELETE', '/uploads', 'Delete uploads by filter/body (filenames, olderThanDays, category, or all)', { expectsJsonBody: true }),
     ],
   },
+  {
+    name: 'system-status',
+    description: 'Lightweight system health summary',
+    commands: [
+      cmd('get', 'GET', '/system/status', 'Get system health summary (safe for external monitors)'),
+    ],
+  },
   {
     name: 'usage',
     description: 'Usage and cost summary',

package/src/cli/spec.js

@@ -496,6 +496,7 @@ const COMMAND_GROUPS = {
     description: 'System and version endpoints',
     commands: {
       ip: { description: 'Get local bind IP/port', method: 'GET', path: '/ip' },
+      status: { description: 'Get lightweight system health summary (safe for external monitors)', method: 'GET', path: '/system/status' },
       usage: { description: 'Get usage summary', method: 'GET', path: '/usage' },
       version: { description: 'Get local/remote git version info', method: 'GET', path: '/version' },
       update: { description: 'Update to latest stable release tag (fallback: main)', method: 'POST', path: '/version/update' },

package/src/components/agents/agent-files-editor.tsx

@@ -1,6 +1,6 @@
 'use client'
 
-import { useCallback, useEffect, useState } from 'react'
+import { useEffect, useState } from 'react'
 import { api } from '@/lib/app/api-client'
 import { errorMessage } from '@/lib/shared-utils'
 import { PersonalityBuilder } from './personality-builder'
@@ -8,6 +8,14 @@ import { PersonalityBuilder } from './personality-builder'
 const FILES = ['SOUL.md', 'IDENTITY.md', 'USER.md', 'TOOLS.md', 'HEARTBEAT.md', 'MEMORY.md', 'AGENTS.md'] as const
 const GUIDED_FILES = new Set(['SOUL.md', 'IDENTITY.md', 'USER.md'])
 
+function makeInitialFiles(): Record<string, FileState> {
+  const initial: Record<string, FileState> = {}
+  for (const f of FILES) {
+    initial[f] = { content: '', original: '', loading: true, saving: false }
+  }
+  return initial
+}
+
 interface FileState {
   content: string
   original: string
@@ -22,45 +30,49 @@ interface Props {
 
 export function AgentFilesEditor({ agentId }: Props) {
   const [activeTab, setActiveTab] = useState<string>(FILES[0])
-  const [files, setFiles] = useState<Record<string, FileState>>({})
+  const [files, setFiles] = useState<Record<string, FileState>>(makeInitialFiles)
   const [guidedMode, setGuidedMode] = useState(false)
 
-  const loadFiles = useCallback(async () => {
-    const initial: Record<string, FileState> = {}
-    for (const f of FILES) {
-      initial[f] = { content: '', original: '', loading: true, saving: false }
-    }
-    setFiles(initial)
+  // Reset to loading state when agentId changes
+  const [prevAgentId, setPrevAgentId] = useState(agentId)
+  if (agentId !== prevAgentId) {
+    setPrevAgentId(agentId)
+    setFiles(makeInitialFiles())
+  }
 
-    try {
-      const result = await api<Record<string, { content: string; error?: string }>>('GET', `/openclaw/agent-files?agentId=${agentId}`)
-      setFiles((prev) => {
-        const next = { ...prev }
-        for (const [name, data] of Object.entries(result)) {
-          next[name] = {
-            content: data.content,
-            original: data.content,
-            loading: false,
-            saving: false,
-            error: data.error,
+  useEffect(() => {
+    let cancelled = false
+    api<Record<string, { content: string; error?: string }>>('GET', `/openclaw/agent-files?agentId=${agentId}`)
+      .then((result) => {
+        if (cancelled) return
+        setFiles((prev) => {
+          const next = { ...prev }
+          for (const [name, data] of Object.entries(result)) {
+            next[name] = {
+              content: data.content,
+              original: data.content,
+              loading: false,
+              saving: false,
+              error: data.error,
+            }
           }
-        }
-        return next
+          return next
+        })
       })
-    } catch (err: unknown) {
-      const message = errorMessage(err)
-      setFiles((prev) => {
-        const next = { ...prev }
-        for (const f of FILES) {
-          next[f] = { ...next[f], loading: false, error: message }
-        }
-        return next
+      .catch((err: unknown) => {
+        if (cancelled) return
+        const message = errorMessage(err)
+        setFiles((prev) => {
+          const next = { ...prev }
+          for (const f of FILES) {
+            next[f] = { ...next[f], loading: false, error: message }
+          }
+          return next
+        })
       })
-    }
+    return () => { cancelled = true }
   }, [agentId])
 
-  useEffect(() => { loadFiles() }, [loadFiles])
-
   const handleContentChange = (filename: string, content: string) => {
     setFiles((prev) => ({
       ...prev,

package/src/components/agents/personality-builder.tsx

@@ -1,8 +1,7 @@
 'use client'
 
-import { useEffect, useMemo, useState } from 'react'
+import { useMemo, useState } from 'react'
 import type { PersonalityDraft } from '@/types'
-import { api } from '@/lib/app/api-client'
 import {
   parseIdentityMd, serializeIdentityMd,
   parseUserMd, serializeUserMd,
@@ -19,12 +18,12 @@ interface Props {
 const inputClass = 'w-full px-3 py-2 rounded-[10px] border border-white/[0.06] bg-black/20 text-[13px] text-text outline-none placeholder:text-text-3/40 focus:border-white/[0.12] transition-colors'
 const labelClass = 'block text-[11px] font-600 uppercase tracking-wider text-text-3/50 mb-1'
 
-export function PersonalityBuilder({ agentId: _agentId, fileType, content, onSave }: Props) {
+export function PersonalityBuilder({ fileType, content, onSave }: Props) {
   const [draft, setDraft] = useState<Record<string, string>>({})
   const [initialDraft, setInitialDraft] = useState<Record<string, string>>({})
   const [saveState, setSaveState] = useState<'idle' | 'saved'>('idle')
 
-  useEffect(() => {
+  const parsedContent = useMemo(() => {
     let parsed: Record<string, string> = {}
     if (fileType === 'IDENTITY.md') {
       const p = parseIdentityMd(content)
@@ -36,11 +35,18 @@ export function PersonalityBuilder({ agentId: _agentId, fileType, content, onSav
       const p = parseSoulMd(content)
       parsed = { coreTruths: p.coreTruths || '', boundaries: p.boundaries || '', vibe: p.vibe || '', continuity: p.continuity || '' }
     }
-    setDraft(parsed)
-    setInitialDraft(parsed)
-    setSaveState('idle')
+    return parsed
   }, [content, fileType])
 
+  // Reset form when content/fileType changes (render-time state adjustment)
+  const [syncKey, setSyncKey] = useState({ content, fileType })
+  if (content !== syncKey.content || fileType !== syncKey.fileType) {
+    setSyncKey({ content, fileType })
+    setDraft(parsedContent)
+    setInitialDraft(parsedContent)
+    setSaveState('idle')
+  }
+
   const isDirty = useMemo(() => {
     return Object.keys(draft).some((k) => draft[k] !== (initialDraft[k] ?? ''))
   }, [draft, initialDraft])

package/src/components/agents/trash-list.tsx

@@ -12,7 +12,7 @@ export function TrashList() {
   const loadAgents = useAppStore((s) => s.loadAgents)
   const [confirmPermanent, setConfirmPermanent] = useState<Agent | null>(null)
 
-  useEffect(() => { loadTrashedAgents() }, [])  
+  useEffect(() => { loadTrashedAgents() }, [loadTrashedAgents])
 
   const handleRestore = async (id: string) => {
     await api('POST', '/agents/trash', { id })

package/src/components/chat/message-bubble.tsx

@@ -418,6 +418,7 @@ export const MessageBubble = memo(function MessageBubble({ message, assistantNam
   const effectiveThinking = !isUser
     ? (liveStreamActive ? (liveStream?.thinking?.trim() ? liveStream.thinking : undefined) : message.thinking)
     : undefined
+
   const sourceText = liveStreamActive ? (liveStream?.text || '') : message.text
   const connectorDeliveryTranscript = !isUser && message.kind === 'connector-delivery'
     ? (message.source?.deliveryTranscript?.trim() || '')

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

@@ -100,13 +100,6 @@ const LiveStreamBubble = memo(function LiveStreamBubble(props: LiveStreamBubbleP
   return <MessageBubble {...props} liveStream={liveStream} />
 })
 
-interface LastMessageMomentOverlayProps {
-  messages: Message[]
-  sessionId: string | null
-  agentId?: string | null
-  streaming: boolean
-  children: (momentOverlay: React.ReactNode, currentMoment: { kind: string } | null) => React.ReactNode
-}
 
 function useLastMessageMoment(messages: Message[], sessionId: string | null, agentId: string | null | undefined, streaming: boolean) {
   type MomentType = { kind: 'heartbeat' } | { kind: 'tool'; key: string; name: string; input: string }
@@ -117,31 +110,24 @@ function useLastMessageMoment(messages: Message[], sessionId: string | null, age
     setCurrentMoment({ kind: 'heartbeat' })
   })
 
-  const prevToolKeyRef = useRef<string | null>(null)
-  const seededMomentSessionRef = useRef<string | null>(null)
-
-  useEffect(() => {
-    if (!sessionId) {
-      seededMomentSessionRef.current = null
-      prevToolKeyRef.current = null
-      setCurrentMoment(null)
-      return
-    }
-
-    if (seededMomentSessionRef.current === sessionId) return
-    seededMomentSessionRef.current = sessionId
-    prevToolKeyRef.current = getLatestAssistantToolMoment(messages)?.key || null
-    setCurrentMoment(null)
-  }, [messages, sessionId])
-
-  useEffect(() => {
-    if (!sessionId || seededMomentSessionRef.current !== sessionId) return
+  const [trackedSessionId, setTrackedSessionId] = useState<string | null>(null)
+  const [trackedToolKey, setTrackedToolKey] = useState<string | null>(null)
+
+  // Render-time: respond to sessionId/messages changes (avoids set-state-in-effect)
+  if (sessionId !== trackedSessionId) {
+    setTrackedSessionId(sessionId)
+    const initialKey = sessionId
+      ? getLatestAssistantToolMoment(messages)?.key || null
+      : null
+    setTrackedToolKey(initialKey)
+    if (currentMoment !== null) setCurrentMoment(null)
+  } else if (sessionId) {
     const moment = getLatestAssistantToolMoment(messages)
-    if (!moment) return
-    if (moment.key === prevToolKeyRef.current) return
-    prevToolKeyRef.current = moment.key
-    setCurrentMoment({ kind: 'tool', key: moment.key, name: moment.name, input: moment.input })
-  }, [messages, sessionId])
+    if (moment && moment.key !== trackedToolKey) {
+      setTrackedToolKey(moment.key)
+      setCurrentMoment({ kind: 'tool', key: moment.key, name: moment.name, input: moment.input })
+    }
+  }
 
   const momentOverlay = useMemo(() => {
     if (streaming || !currentMoment) return null
@@ -161,13 +147,6 @@ function useLastMessageMoment(messages: Message[], sessionId: string | null, age
   return { currentMoment, momentOverlay }
 }
 
-interface Props {
-  messages: Message[]
-  streaming: boolean
-  connectorFilter?: string | null
-  loading?: boolean
-}
-
 interface LiveThinkingLaneProps {
   show: boolean
   assistantName?: string
@@ -195,6 +174,13 @@ const LiveThinkingLane = memo(function LiveThinkingLane({
   )
 })
 
+interface Props {
+  messages: Message[]
+  streaming: boolean
+  connectorFilter?: string | null
+  loading?: boolean
+}
+
 export function MessageList({ messages, streaming, connectorFilter = null, loading = false }: Props) {
   const scrollRef = useRef<HTMLDivElement>(null)
   const [showScrollToBottom, setShowScrollToBottom] = useState(false)
@@ -232,7 +218,7 @@ export function MessageList({ messages, streaming, connectorFilter = null, loadi
   const showGatewayOverlay = isOpenClaw && gatewayStatus === 'disconnected'
 
   // Moment overlay for last assistant message (heartbeat or tool events)
-  const { currentMoment, momentOverlay: lastMomentOverlay } = useLastMessageMoment(messages, sessionId, agent?.id, streaming)
+  const { momentOverlay: lastMomentOverlay } = useLastMessageMoment(messages, sessionId, agent?.id, streaming)
 
   // Unread count tracking
   const unreadRef = useRef(0)