@swarmclawai/swarmclaw 0.8.4 → 0.8.7

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

@@ -1,6 +1,6 @@
 import { NextResponse } from 'next/server'
 import { getCheckpointSaver } from '@/lib/server/langgraph-checkpoint'
-import { loadSessions, saveSessions } from '@/lib/server/storage'
+import { loadSession, upsertSession } from '@/lib/server/storage'
 import { notify } from '@/lib/server/ws-hub'
 
 export const dynamic = 'force-dynamic'
@@ -9,28 +9,27 @@ export const dynamic = 'force-dynamic'
 export async function POST(req: Request, { params }: { params: Promise<{ id: string }> }) {
   const { id: sessionId } = await params
   const { checkpointId, timestamp } = await req.json()
-  
+
   if (!checkpointId || !timestamp) {
     return NextResponse.json({ error: 'checkpointId and timestamp are required' }, { status: 400 })
   }
 
   const saver = getCheckpointSaver()
-  
+
   // 1. Delete all checkpoints after the target one
   await saver.deleteCheckpointsAfter(sessionId, timestamp)
 
   // 2. Truncate messages in the session to match the timestamp
   // Both timestamp (from checkpoint.ts → getTime()) and Message.time use epoch milliseconds
-  const sessions = loadSessions()
-  const session = sessions[sessionId]
+  const session = loadSession(sessionId)
   if (session) {
     session.messages = session.messages.filter((m: { time: number }) => m.time <= timestamp)
     session.lastActiveAt = Date.now()
-    saveSessions(sessions)
+    upsertSession(sessionId, session)
   }
 
   notify(`messages:${sessionId}`)
   notify('sessions')
-  
+
   return NextResponse.json({ ok: true, restoredTo: checkpointId })
 }

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

@@ -1,11 +1,10 @@
 import { NextResponse } from 'next/server'
-import { loadSessions, saveSessions } from '@/lib/server/storage'
+import { loadSession, upsertSession } from '@/lib/server/storage'
 import { notFound } from '@/lib/server/collection-helpers'
 
 export async function POST(_req: Request, { params }: { params: Promise<{ id: string }> }) {
   const { id } = await params
-  const sessions = loadSessions()
-  const session = sessions[id]
+  const session = loadSession(id)
   if (!session) return notFound()
 
   const msgs = session.messages
@@ -23,7 +22,7 @@ export async function POST(_req: Request, { params }: { params: Promise<{ id: st
 
   // Remove the last user message too — it will be re-sent by the client
   msgs.pop()
-  saveSessions(sessions)
+  upsertSession(id, session)
 
   return NextResponse.json({ message, imagePath })
 }

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

@@ -1,5 +1,5 @@
 import { NextResponse } from 'next/server'
-import { loadSessions, saveSessions, deleteSession, active, loadAgents, loadStoredItem } from '@/lib/server/storage'
+import { loadSession, upsertSession, deleteSession, active, loadAgents } from '@/lib/server/storage'
 import { notFound } from '@/lib/server/collection-helpers'
 import { normalizeProviderEndpoint } from '@/lib/openclaw-endpoint'
 import { resolvePrimaryAgentRoute } from '@/lib/server/agent-runtime-config'
@@ -8,7 +8,7 @@ import type { Session } from '@/types'
 
 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 = loadSession(id)
   if (!session) return notFound()
 
   const run = getSessionRunState(id)
@@ -22,109 +22,108 @@ export async function GET(_req: Request, { params }: { params: Promise<{ id: str
 export async function PUT(req: Request, { params }: { params: Promise<{ id: string }> }) {
   const { id } = await params
   const updates = await req.json()
-  const sessions = loadSessions()
-  if (!sessions[id]) return notFound()
+  const session = loadSession(id) as Record<string, unknown> | null
+  if (!session) return notFound()
 
   const agentIdUpdateProvided = updates.agentId !== undefined
-  let nextAgentId = sessions[id].agentId
+  let nextAgentId = session.agentId
   if (agentIdUpdateProvided) {
-    sessions[id].agentId = updates.agentId
+    session.agentId = updates.agentId
     nextAgentId = updates.agentId
   }
 
-  const linkedAgent = nextAgentId ? loadAgents()[nextAgentId] : null
+  const linkedAgent = nextAgentId ? loadAgents()[nextAgentId as string] : null
   const routePreferredGatewayTags = updates.routePreferredGatewayTags !== undefined
     ? (Array.isArray(updates.routePreferredGatewayTags)
       ? updates.routePreferredGatewayTags.filter((tag: unknown): tag is string => typeof tag === 'string' && tag.trim().length > 0)
       : [])
-    : (sessions[id].routePreferredGatewayTags || [])
+    : ((session.routePreferredGatewayTags as string[]) || [])
   const routePreferredGatewayUseCase = updates.routePreferredGatewayUseCase !== undefined
     ? (typeof updates.routePreferredGatewayUseCase === 'string' && updates.routePreferredGatewayUseCase.trim()
       ? updates.routePreferredGatewayUseCase.trim()
       : null)
-    : (sessions[id].routePreferredGatewayUseCase || null)
+    : ((session.routePreferredGatewayUseCase as string | null) || null)
   const linkedRoute = linkedAgent ? resolvePrimaryAgentRoute(linkedAgent, undefined, {
     preferredGatewayTags: routePreferredGatewayTags,
     preferredGatewayUseCase: routePreferredGatewayUseCase,
   }) : null
 
-  if (updates.name !== undefined) sessions[id].name = updates.name
-  if (updates.cwd !== undefined) sessions[id].cwd = updates.cwd
-  if (updates.provider !== undefined) sessions[id].provider = updates.provider
-  else if (agentIdUpdateProvided && linkedAgent?.provider) sessions[id].provider = linkedAgent.provider
+  if (updates.name !== undefined) session.name = updates.name
+  if (updates.cwd !== undefined) session.cwd = updates.cwd
+  if (updates.provider !== undefined) session.provider = updates.provider
+  else if (agentIdUpdateProvided && linkedAgent?.provider) session.provider = linkedAgent.provider
 
-  if (updates.model !== undefined) sessions[id].model = updates.model
-  else if (agentIdUpdateProvided && linkedRoute?.model) sessions[id].model = linkedRoute.model
-  else if (agentIdUpdateProvided && linkedAgent?.model !== undefined) sessions[id].model = linkedAgent.model
+  if (updates.model !== undefined) session.model = updates.model
+  else if (agentIdUpdateProvided && linkedRoute?.model) session.model = linkedRoute.model
+  else if (agentIdUpdateProvided && linkedAgent?.model !== undefined) session.model = linkedAgent.model
 
-  if (updates.credentialId !== undefined) sessions[id].credentialId = updates.credentialId
-  else if (agentIdUpdateProvided && linkedRoute) sessions[id].credentialId = linkedRoute.credentialId ?? null
-  else if (agentIdUpdateProvided && linkedAgent) sessions[id].credentialId = linkedAgent.credentialId ?? null
+  if (updates.credentialId !== undefined) session.credentialId = updates.credentialId
+  else if (agentIdUpdateProvided && linkedRoute) session.credentialId = linkedRoute.credentialId ?? null
+  else if (agentIdUpdateProvided && linkedAgent) session.credentialId = linkedAgent.credentialId ?? null
 
-  if (updates.fallbackCredentialIds !== undefined) sessions[id].fallbackCredentialIds = updates.fallbackCredentialIds
-  else if (agentIdUpdateProvided && linkedRoute) sessions[id].fallbackCredentialIds = [...linkedRoute.fallbackCredentialIds]
+  if (updates.fallbackCredentialIds !== undefined) session.fallbackCredentialIds = updates.fallbackCredentialIds
+  else if (agentIdUpdateProvided && linkedRoute) session.fallbackCredentialIds = [...linkedRoute.fallbackCredentialIds]
 
-  if (updates.gatewayProfileId !== undefined) sessions[id].gatewayProfileId = updates.gatewayProfileId
-  else if (agentIdUpdateProvided && linkedRoute) sessions[id].gatewayProfileId = linkedRoute.gatewayProfileId ?? null
+  if (updates.gatewayProfileId !== undefined) session.gatewayProfileId = updates.gatewayProfileId
+  else if (agentIdUpdateProvided && linkedRoute) session.gatewayProfileId = linkedRoute.gatewayProfileId ?? null
 
   if (updates.routePreferredGatewayTags !== undefined) {
-    sessions[id].routePreferredGatewayTags = routePreferredGatewayTags
+    session.routePreferredGatewayTags = routePreferredGatewayTags
   }
   if (updates.routePreferredGatewayUseCase !== undefined) {
-    sessions[id].routePreferredGatewayUseCase = routePreferredGatewayUseCase
+    session.routePreferredGatewayUseCase = routePreferredGatewayUseCase
   }
 
-  if (updates.plugins !== undefined) sessions[id].plugins = updates.plugins
-  else if (agentIdUpdateProvided && linkedAgent) sessions[id].plugins = Array.isArray(linkedAgent.plugins) ? linkedAgent.plugins : []
+  if (updates.plugins !== undefined) session.plugins = updates.plugins
+  else if (agentIdUpdateProvided && linkedAgent) session.plugins = Array.isArray(linkedAgent.plugins) ? linkedAgent.plugins : []
 
   if (updates.apiEndpoint !== undefined) {
-    sessions[id].apiEndpoint = normalizeProviderEndpoint(
-      updates.provider || sessions[id].provider,
+    session.apiEndpoint = normalizeProviderEndpoint(
+      (updates.provider || session.provider) as string,
       updates.apiEndpoint,
     )
   } else if (agentIdUpdateProvided && linkedRoute) {
-    sessions[id].apiEndpoint = linkedRoute.apiEndpoint ?? null
+    session.apiEndpoint = linkedRoute.apiEndpoint ?? null
   } else if (agentIdUpdateProvided && linkedAgent) {
-    sessions[id].apiEndpoint = normalizeProviderEndpoint(
+    session.apiEndpoint = normalizeProviderEndpoint(
       linkedAgent.provider,
       linkedAgent.apiEndpoint ?? null,
     )
   }
-  if (updates.heartbeatEnabled !== undefined) sessions[id].heartbeatEnabled = updates.heartbeatEnabled
-  if (updates.heartbeatIntervalSec !== undefined) sessions[id].heartbeatIntervalSec = updates.heartbeatIntervalSec
-  if (updates.sessionResetMode !== undefined) sessions[id].sessionResetMode = updates.sessionResetMode
-  if (updates.sessionIdleTimeoutSec !== undefined) sessions[id].sessionIdleTimeoutSec = updates.sessionIdleTimeoutSec
-  if (updates.sessionMaxAgeSec !== undefined) sessions[id].sessionMaxAgeSec = updates.sessionMaxAgeSec
-  if (updates.sessionDailyResetAt !== undefined) sessions[id].sessionDailyResetAt = updates.sessionDailyResetAt
-  if (updates.sessionResetTimezone !== undefined) sessions[id].sessionResetTimezone = updates.sessionResetTimezone
-  if (updates.thinkingLevel !== undefined) sessions[id].thinkingLevel = updates.thinkingLevel
-  if (updates.connectorThinkLevel !== undefined) sessions[id].connectorThinkLevel = updates.connectorThinkLevel
-  if (updates.connectorSessionScope !== undefined) sessions[id].connectorSessionScope = updates.connectorSessionScope
-  if (updates.connectorReplyMode !== undefined) sessions[id].connectorReplyMode = updates.connectorReplyMode
-  if (updates.connectorThreadBinding !== undefined) sessions[id].connectorThreadBinding = updates.connectorThreadBinding
-  if (updates.connectorGroupPolicy !== undefined) sessions[id].connectorGroupPolicy = updates.connectorGroupPolicy
-  if (updates.connectorIdleTimeoutSec !== undefined) sessions[id].connectorIdleTimeoutSec = updates.connectorIdleTimeoutSec
-  if (updates.connectorMaxAgeSec !== undefined) sessions[id].connectorMaxAgeSec = updates.connectorMaxAgeSec
-  if (updates.connectorContext !== undefined) sessions[id].connectorContext = updates.connectorContext
-  if (updates.identityState !== undefined) sessions[id].identityState = updates.identityState
-  if (updates.sessionArchiveState !== undefined) sessions[id].sessionArchiveState = updates.sessionArchiveState
-  if (updates.lastSessionResetAt !== undefined) sessions[id].lastSessionResetAt = updates.lastSessionResetAt
-  if (updates.lastSessionResetReason !== undefined) sessions[id].lastSessionResetReason = updates.lastSessionResetReason
-  if (updates.pinned !== undefined) sessions[id].pinned = !!updates.pinned
-  if (updates.claudeSessionId !== undefined) sessions[id].claudeSessionId = updates.claudeSessionId
-  if (updates.codexThreadId !== undefined) sessions[id].codexThreadId = updates.codexThreadId
-  if (updates.opencodeSessionId !== undefined) sessions[id].opencodeSessionId = updates.opencodeSessionId
-  if (updates.delegateResumeIds !== undefined) sessions[id].delegateResumeIds = updates.delegateResumeIds
-  if (!Array.isArray(sessions[id].messages)) sessions[id].messages = []
-
-  saveSessions(sessions)
-  return NextResponse.json(sessions[id])
+  if (updates.heartbeatEnabled !== undefined) session.heartbeatEnabled = updates.heartbeatEnabled
+  if (updates.heartbeatIntervalSec !== undefined) session.heartbeatIntervalSec = updates.heartbeatIntervalSec
+  if (updates.sessionResetMode !== undefined) session.sessionResetMode = updates.sessionResetMode
+  if (updates.sessionIdleTimeoutSec !== undefined) session.sessionIdleTimeoutSec = updates.sessionIdleTimeoutSec
+  if (updates.sessionMaxAgeSec !== undefined) session.sessionMaxAgeSec = updates.sessionMaxAgeSec
+  if (updates.sessionDailyResetAt !== undefined) session.sessionDailyResetAt = updates.sessionDailyResetAt
+  if (updates.sessionResetTimezone !== undefined) session.sessionResetTimezone = updates.sessionResetTimezone
+  if (updates.thinkingLevel !== undefined) session.thinkingLevel = updates.thinkingLevel
+  if (updates.connectorThinkLevel !== undefined) session.connectorThinkLevel = updates.connectorThinkLevel
+  if (updates.connectorSessionScope !== undefined) session.connectorSessionScope = updates.connectorSessionScope
+  if (updates.connectorReplyMode !== undefined) session.connectorReplyMode = updates.connectorReplyMode
+  if (updates.connectorThreadBinding !== undefined) session.connectorThreadBinding = updates.connectorThreadBinding
+  if (updates.connectorGroupPolicy !== undefined) session.connectorGroupPolicy = updates.connectorGroupPolicy
+  if (updates.connectorIdleTimeoutSec !== undefined) session.connectorIdleTimeoutSec = updates.connectorIdleTimeoutSec
+  if (updates.connectorMaxAgeSec !== undefined) session.connectorMaxAgeSec = updates.connectorMaxAgeSec
+  if (updates.connectorContext !== undefined) session.connectorContext = updates.connectorContext
+  if (updates.identityState !== undefined) session.identityState = updates.identityState
+  if (updates.sessionArchiveState !== undefined) session.sessionArchiveState = updates.sessionArchiveState
+  if (updates.lastSessionResetAt !== undefined) session.lastSessionResetAt = updates.lastSessionResetAt
+  if (updates.lastSessionResetReason !== undefined) session.lastSessionResetReason = updates.lastSessionResetReason
+  if (updates.pinned !== undefined) session.pinned = !!updates.pinned
+  if (updates.claudeSessionId !== undefined) session.claudeSessionId = updates.claudeSessionId
+  if (updates.codexThreadId !== undefined) session.codexThreadId = updates.codexThreadId
+  if (updates.opencodeSessionId !== undefined) session.opencodeSessionId = updates.opencodeSessionId
+  if (updates.delegateResumeIds !== undefined) session.delegateResumeIds = updates.delegateResumeIds
+  if (!Array.isArray(session.messages)) session.messages = []
+
+  upsertSession(id, session)
+  return NextResponse.json(session)
 }
 
 export async function DELETE(_req: Request, { params }: { params: Promise<{ id: string }> }) {
   const { id } = await params
-  const sessions = loadSessions()
-  if (!sessions[id]) return notFound()
+  if (!loadSession(id)) return notFound()
   if (active.has(id)) {
     try { active.get(id)?.kill() } catch {}
     active.delete(id)

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

@@ -2,6 +2,7 @@ import { NextResponse } from 'next/server'
 import { genId } from '@/lib/id'
 import os from 'os'
 import path from 'path'
+import { perf } from '@/lib/server/perf'
 import { loadSessions, saveSessions, deleteSession, active, loadAgents, upsertStoredItem } from '@/lib/server/storage'
 import { WORKSPACE_DIR } from '@/lib/server/data-dir'
 import { notify } from '@/lib/server/ws-hub'
@@ -20,6 +21,7 @@ async function ensureDaemonIfNeeded(source: string) {
 
 
 export async function GET(req: Request) {
+  const endPerf = perf.start('api', 'GET /api/chats')
   const sessions = loadSessions()
   const changedSessionIds: string[] = []
   for (const id of Object.keys(sessions)) {
@@ -45,12 +47,16 @@ export async function GET(req: Request) {
 
   const { searchParams } = new URL(req.url)
   const limitParam = searchParams.get('limit')
-  if (!limitParam) return NextResponse.json(summarized)
+  if (!limitParam) {
+    endPerf({ count: Object.keys(summarized).length })
+    return NextResponse.json(summarized)
+  }
 
   const limit = Math.max(1, Number(limitParam) || 50)
   const offset = Math.max(0, Number(searchParams.get('offset')) || 0)
   const all = Object.values(summarized).sort((a, b) => (b.lastActiveAt ?? b.createdAt) - (a.lastActiveAt ?? a.createdAt))
   const items = all.slice(offset, offset + limit)
+  endPerf({ count: items.length, total: all.length })
   return NextResponse.json({ items, total: all.length, hasMore: offset + limit < all.length })
 }
 

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

@@ -1,8 +1,9 @@
 import { NextResponse } from 'next/server'
-import { loadConnectors, saveConnectors, logActivity } from '@/lib/server/storage'
+import { loadConnectors, logActivity, upsertStoredItem, deleteStoredItem } from '@/lib/server/storage'
 import { notify } from '@/lib/server/ws-hub'
 import { notFound } from '@/lib/server/collection-helpers'
 import { ensureDaemonStarted } from '@/lib/server/daemon-state'
+import { errorMessage } from '@/lib/shared-utils'
 
 export async function GET(_req: Request, { params }: { params: Promise<{ id: string }> }) {
   ensureDaemonStarted('api/connectors/[id]:get')
@@ -68,7 +69,7 @@ export async function PUT(req: Request, { params }: { params: Promise<{ id: stri
     } catch (err: unknown) {
       // Re-read to get the error state saved by startConnector
       const fresh = loadConnectors()
-      return NextResponse.json(fresh[id] || { error: err instanceof Error ? err.message : String(err) }, { status: 500 })
+      return NextResponse.json(fresh[id] || { error: errorMessage(err) }, { status: 500 })
     }
     // Re-read the connector after manager modified it
     const fresh = loadConnectors()
@@ -82,11 +83,10 @@ export async function PUT(req: Request, { params }: { params: Promise<{ id: stri
   if (body.chatroomId !== undefined) connector.chatroomId = body.chatroomId
   if (body.credentialId !== undefined) connector.credentialId = body.credentialId
   if (body.config !== undefined) connector.config = body.config
-  if (body.isEnabled !== undefined) connector.isEnabled = body.isEnabled
-  connector.updatedAt = Date.now()
+  if (body.isEnabled !== undefined) (connector as any).isEnabled = body.isEnabled
+  (connector as any).updatedAt = Date.now()
 
-  connectors[id] = connector
-  saveConnectors(connectors)
+  upsertStoredItem('connectors', id, connector)
 
   try {
     const manager = await import('@/lib/server/connectors/manager')
@@ -133,8 +133,7 @@ export async function DELETE(_req: Request, { params }: { params: Promise<{ id:
     clearConnectorPairingState(id)
   } catch { /* ignore */ }
 
-  delete connectors[id]
-  saveConnectors(connectors)
+  deleteStoredItem('connectors', id)
   notify('connectors')
   return NextResponse.json({ ok: true })
 }

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

@@ -1,6 +1,7 @@
 import { NextResponse } from 'next/server'
 import { genId } from '@/lib/id'
-import { loadConnectors, saveConnectors } from '@/lib/server/storage'
+import { perf } from '@/lib/server/perf'
+import { loadConnectors, upsertStoredItem } from '@/lib/server/storage'
 import { notify } from '@/lib/server/ws-hub'
 import { ensureDaemonStarted } from '@/lib/server/daemon-state'
 import { ConnectorCreateSchema, formatZodError } from '@/lib/validation/schemas'
@@ -10,6 +11,7 @@ export const dynamic = 'force-dynamic'
 
 
 export async function GET() {
+  const endPerf = perf.start('api', 'GET /api/connectors')
   ensureDaemonStarted('api/connectors:get')
   const connectors = loadConnectors()
   // Merge runtime status from manager
@@ -39,6 +41,7 @@ export async function GET() {
       }
     }
   } catch { /* manager not loaded yet */ }
+  endPerf({ count: Object.keys(connectors).length })
   return NextResponse.json(connectors)
 }
 
@@ -50,7 +53,6 @@ export async function POST(req: Request) {
     return NextResponse.json(formatZodError(parsed.error as z.ZodError), { status: 400 })
   }
   const body = parsed.data
-  const connectors = loadConnectors()
   const id = genId()
 
   const connector: Connector = {
@@ -68,8 +70,7 @@ export async function POST(req: Request) {
     updatedAt: Date.now(),
   }
 
-  connectors[id] = connector
-  saveConnectors(connectors)
+  upsertStoredItem('connectors', id, connector)
   notify('connectors')
 
   // Auto-start if connector has credentials (or is WhatsApp which uses QR)

package/src/app/api/eval/run/route.ts

@@ -2,6 +2,7 @@ import { NextResponse } from 'next/server'
 import { z } from 'zod'
 import { runEvalScenario } from '@/lib/server/eval/runner'
 import { listEvalRuns } from '@/lib/server/eval/store'
+import { errorMessage } from '@/lib/shared-utils'
 
 const RunSchema = z.object({
   scenarioId: z.string().min(1),
@@ -23,7 +24,7 @@ export async function POST(req: Request) {
     return NextResponse.json(result)
   } catch (err: unknown) {
     return NextResponse.json(
-      { error: err instanceof Error ? err.message : String(err) },
+      { error: errorMessage(err) },
       { status: 500 },
     )
   }

package/src/app/api/eval/suite/route.ts

@@ -1,6 +1,7 @@
 import { NextResponse } from 'next/server'
 import { z } from 'zod'
 import { runEvalSuite } from '@/lib/server/eval/runner'
+import { errorMessage } from '@/lib/shared-utils'
 
 const SuiteSchema = z.object({
   agentId: z.string().min(1),
@@ -22,7 +23,7 @@ export async function POST(req: Request) {
     return NextResponse.json(result)
   } catch (err: unknown) {
     return NextResponse.json(
-      { error: err instanceof Error ? err.message : String(err) },
+      { error: errorMessage(err) },
       { status: 500 },
     )
   }

package/src/app/api/external-agents/route.test.ts

@@ -42,7 +42,7 @@ test('external agent register + heartbeat derives gateway metadata in listing',
     discoveredPort: 19999,
     deployment: {
       method: 'imported',
-      managedBy: 'external',
+      managedBy: "external" as any,
       useCase: 'single-vps',
       exposure: 'private-lan',
       targetHost: '127.0.0.1',

package/src/app/api/external-agents/route.ts

@@ -14,9 +14,9 @@ function withDerivedStatus(record: ExternalAgentRuntime): ExternalAgentRuntime {
   if (!lastSeenAt) return { ...record, status: record.status || 'offline' }
   if (record.status === 'offline') return record
   const gateways = loadGatewayProfiles()
-  const gateway = record.gatewayProfileId ? gateways[record.gatewayProfileId] as Record<string, unknown> | undefined : undefined
+  const gateway = record.gatewayProfileId ? gateways[record.gatewayProfileId] as any : undefined
   const gatewayTags = Array.isArray(gateway?.tags)
-    ? gateway?.tags.filter((tag): tag is string => typeof tag === 'string' && tag.trim().length > 0)
+    ? (gateway as any)?.tags?.filter((tag: any): tag is string => typeof tag === 'string' && tag.trim().length > 0)
     : []
   const gatewayUseCase = gateway?.deployment && typeof gateway.deployment === 'object' && typeof (gateway.deployment as Record<string, unknown>).useCase === 'string'
     ? (gateway.deployment as Record<string, unknown>).useCase as string

package/src/app/api/files/serve/route.ts

@@ -16,7 +16,7 @@ const MIME_MAP: Record<string, string> = {
   '.webp': 'image/webp',
   '.txt': 'text/plain',
   '.md': 'text/markdown',
-  '.ts': 'text/plain',
+  '': 'text/plain',
   '.tsx': 'text/plain',
   '.jsx': 'text/plain',
   '.py': 'text/plain',

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

@@ -1,6 +1,6 @@
 import { NextResponse } from 'next/server'
 import { normalizeOpenClawEndpoint } from '@/lib/openclaw-endpoint'
-import { loadAgents, loadGatewayProfiles, saveAgents, saveGatewayProfiles } from '@/lib/server/storage'
+import { loadAgents, loadGatewayProfiles, saveGatewayProfiles, upsertAgent } from '@/lib/server/storage'
 import { mutateItem, notFound, type CollectionOps } from '@/lib/server/collection-helpers'
 import type { Agent, AgentRoutingTarget, GatewayProfile, OpenClawDeploymentConfig, OpenClawGatewayStats } from '@/types'
 
@@ -109,11 +109,12 @@ export async function DELETE(_req: Request, { params }: { params: Promise<{ id:
   saveGatewayProfiles(gateways)
 
   const agents = loadAgents({ includeTrashed: true })
-  let agentChanged = false
+  const changedAgents: Agent[] = []
   for (const agent of Object.values(agents) as Agent[]) {
+    let changed = false
     if (agent.gatewayProfileId === id) {
       agent.gatewayProfileId = null
-      agentChanged = true
+      changed = true
     }
     if (Array.isArray(agent.routingTargets)) {
       const nextTargets = agent.routingTargets.map((target: AgentRoutingTarget) => (
@@ -123,11 +124,12 @@ export async function DELETE(_req: Request, { params }: { params: Promise<{ id:
       ))
       if (JSON.stringify(nextTargets) !== JSON.stringify(agent.routingTargets)) {
         agent.routingTargets = nextTargets
-        agentChanged = true
+        changed = true
       }
     }
+    if (changed) changedAgents.push(agent)
   }
-  if (agentChanged) saveAgents(agents)
+  for (const agent of changedAgents) upsertAgent(agent.id, agent)
 
   return NextResponse.json({ ok: true })
 }

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

@@ -79,7 +79,7 @@ export async function POST(req: Request) {
   const isDefault = body.isDefault === true
 
   if (isDefault) {
-    for (const gateway of Object.values(gateways) as Array<Record<string, unknown>>) {
+    for (const gateway of Object.values(gateways) as any[]) {
       gateway.isDefault = false
     }
   }

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

@@ -7,7 +7,7 @@ import { UPLOAD_DIR } from '@/lib/server/storage'
 const TEXT_EXTS = new Set([
   '.txt', '.md', '.markdown', '.csv', '.tsv', '.json', '.jsonl',
   '.html', '.htm', '.xml', '.yaml', '.yml', '.toml', '.ini', '.cfg',
-  '.js', '.ts', '.tsx', '.jsx', '.py', '.go', '.rs', '.java', '.c', '.cpp', '.h',
+  '.js', '', '.tsx', '.jsx', '.py', '.go', '.rs', '.java', '.c', '.cpp', '.h',
   '.rb', '.php', '.sh', '.bash', '.zsh', '.sql', '.r', '.swift', '.kt',
   '.env', '.log', '.conf', '.properties', '.gitignore', '.dockerignore',
 ])

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

@@ -1,8 +1,6 @@
 import { NextResponse } from 'next/server'
 import fs from 'fs'
-import path from 'path'
-
-const LOG_FILE = path.join(process.cwd(), 'data', 'app.log')
+import { APP_LOG_PATH } from '@/lib/server/data-dir'
 
 export async function GET(req: Request) {
   const { searchParams } = new URL(req.url)
@@ -11,11 +9,11 @@ export async function GET(req: Request) {
   const search = searchParams.get('search') || ''
 
   try {
-    if (!fs.existsSync(LOG_FILE)) {
+    if (!fs.existsSync(APP_LOG_PATH)) {
       return NextResponse.json({ entries: [], total: 0 })
     }
 
-    const content = fs.readFileSync(LOG_FILE, 'utf8')
+    const content = fs.readFileSync(APP_LOG_PATH, 'utf8')
     let allLines = content.split('\n').filter(Boolean)
 
     // Filter by level
@@ -42,8 +40,8 @@ export async function GET(req: Request) {
 
 export async function DELETE() {
   try {
-    if (fs.existsSync(LOG_FILE)) {
-      fs.writeFileSync(LOG_FILE, '')
+    if (fs.existsSync(APP_LOG_PATH)) {
+      fs.writeFileSync(APP_LOG_PATH, '')
     }
     return NextResponse.json({ ok: true })
   } catch (err: any) {

package/src/app/api/memory-images/[filename]/route.ts

@@ -1,10 +1,9 @@
 import { NextResponse } from 'next/server'
 import { notFound } from '@/lib/server/collection-helpers'
+import { MEMORY_IMAGES_DIR } from '@/lib/server/data-dir'
 import fs from 'fs'
 import path from 'path'
 
-const IMAGES_DIR = path.join(process.cwd(), 'data', 'memory-images')
-
 const MIME_TYPES: Record<string, string> = {
   '.png': 'image/png',
   '.jpg': 'image/jpeg',
@@ -18,7 +17,7 @@ const MIME_TYPES: Record<string, string> = {
 export async function GET(_req: Request, { params }: { params: Promise<{ filename: string }> }) {
   const { filename } = await params
   const safeName = filename.replace(/[^a-zA-Z0-9._-]/g, '')
-  const filePath = path.join(IMAGES_DIR, safeName)
+  const filePath = path.join(MEMORY_IMAGES_DIR, safeName)
 
   if (!fs.existsSync(filePath)) {
     return notFound()

package/src/app/api/openclaw/agent-files/route.ts

@@ -1,6 +1,7 @@
 import { NextResponse } from 'next/server'
 import { ensureGatewayConnected } from '@/lib/server/openclaw-gateway'
 import { resolveOpenClawGatewayAgentId } from '@/lib/server/openclaw-agent-resolver'
+import { errorMessage } from '@/lib/shared-utils'
 
 const AGENT_FILES = ['SOUL.md', 'IDENTITY.md', 'USER.md', 'TOOLS.md', 'HEARTBEAT.md', 'MEMORY.md', 'AGENTS.md'] as const
 
@@ -21,7 +22,7 @@ export async function GET(req: Request) {
   try {
     gatewayAgentId = await resolveOpenClawGatewayAgentId(agentId, gw)
   } catch (err: unknown) {
-    const message = err instanceof Error ? err.message : String(err)
+    const message = errorMessage(err)
     const status = message.includes('not an OpenClaw agent') ? 400 : 404
     return NextResponse.json({ error: message }, { status })
   }
@@ -36,7 +37,7 @@ export async function GET(req: Request) {
         }) as { file?: { content?: string } } | undefined
         files[filename] = { content: result?.file?.content ?? '' }
       } catch (err: unknown) {
-        files[filename] = { content: '', error: err instanceof Error ? err.message : String(err) }
+        files[filename] = { content: '', error: errorMessage(err) }
       }
     }),
   )
@@ -69,7 +70,7 @@ export async function PUT(req: Request) {
     })
     return NextResponse.json({ ok: true })
   } catch (err: unknown) {
-    const message = err instanceof Error ? err.message : String(err)
+    const message = errorMessage(err)
     const status = message.includes('not an OpenClaw agent')
       ? 400
       : message.includes('not found')

package/src/app/api/openclaw/approvals/route.ts

@@ -1,6 +1,7 @@
 import { NextResponse } from 'next/server'
 import { ensureGatewayConnected, getGateway } from '@/lib/server/openclaw-gateway'
 import type { PendingExecApproval, ExecApprovalDecision } from '@/types'
+import { errorMessage, hmrSingleton } from '@/lib/shared-utils'
 
 /** GET — fetch pending execution approvals from gateway */
 export async function GET() {
@@ -18,9 +19,7 @@ export async function GET() {
 }
 
 /* ── Conflict-detection: track recently resolved approval IDs in-process ── */
-const resolvedKey = '__swarmclaw_resolved_approvals__'
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const resolved: Map<string, number> = (globalThis as any)[resolvedKey] ?? ((globalThis as any)[resolvedKey] = new Map<string, number>())
+const resolved: Map<string, number> = hmrSingleton('__swarmclaw_resolved_approvals__', () => new Map<string, number>())
 const RESOLVED_TTL_MS = 5 * 60 * 1000
 
 function pruneResolved() {
@@ -60,7 +59,7 @@ export async function POST(req: Request) {
     resolved.set(id, Date.now())
     return NextResponse.json({ ok: true })
   } catch (err: unknown) {
-    const message = err instanceof Error ? err.message : String(err)
+    const message = errorMessage(err)
     return NextResponse.json({ error: message }, { status: 502 })
   }
 }