@swarmclawai/swarmclaw 1.8.11 → 1.8.13

package/README.md

@@ -8,13 +8,13 @@
   <img src="https://raw.githubusercontent.com/swarmclawai/swarmclaw/main/public/branding/swarmclaw-org-avatar.png" alt="SwarmClaw lobster logo" width="120" />
 </p>
 
-<p align="center"><strong>Self-hosted runtime for autonomous AI agents.</strong> Multi-provider, MCP-native, with memory, skills, delegation, and schedules.</p>
+<p align="center"><strong>The self-hosted AI agent runtime and multi-agent framework for autonomous agents.</strong> Open-source agent swarms with durable agent memory, MCP tools, skills, delegation, schedules, and 23+ LLM providers — a practical Claude Code and LangChain alternative.</p>
 
 <p align="center">
   <img src="doc/assets/screenshots/org-chart.png" alt="SwarmClaw org chart with delegation and live agent activity" width="900" />
 </p>
 
-SwarmClaw is a self-hosted AI runtime for OpenClaw and multi-agent work. It helps you run autonomous agents and orchestrators with heartbeats, schedules, delegation, memory, runtime skills, and reviewed conversation-to-skill learning across OpenClaw gateways and other providers.
+SwarmClaw is an open-source, self-hosted AI agent runtime and multi-agent framework. Run autonomous AI agents, agent swarms, and orchestrators with heartbeats, schedules, delegation, agent memory, runtime skills, and reviewed conversation-to-skill learning — across OpenClaw gateways, Claude, GPT, Gemini, OpenRouter, Ollama, and 23+ other providers. Use it as your AI agent dashboard, agent orchestration platform, and home base for self-hosted multi-agent AI workflows.
 
 GitHub: https://github.com/swarmclawai/swarmclaw  
 Docs: https://swarmclaw.ai/docs  
@@ -399,6 +399,22 @@ Operational docs: https://swarmclaw.ai/docs/observability
 
 ## Releases
 
+### v1.8.13 Highlights
+
+Task retry and host execute hotfix for issues [#68](https://github.com/swarmclawai/swarmclaw/issues/68) and [#69](https://github.com/swarmclawai/swarmclaw/issues/69).
+
+- **Per-agent host execute.** Agents configured with `executeConfig.backend = "host"` now pass that setting into the runtime `execute` tool, so `persistent=true` uses the documented host backend.
+- **Scheduled task validation.** Schedule-created tasks no longer get auto-classified as implementation tasks for quality gates unless they explicitly opt into a task quality gate.
+- **Retry loop guard.** A task that fails again with the same retry reason is dead-lettered instead of spending another run on identical work.
+
+### v1.8.12 Highlights
+
+Gateway Fleet Command release: SwarmClaw now treats OpenClaw gateways as an operator surface instead of a background provider detail.
+
+- **Fleet topology API.** Added gateway topology endpoints that collect OpenClaw nodes, node pairings, device pairings, sessions, presence, and best-effort RPC errors in one server-side snapshot.
+- **Provider console controls.** The Providers screen can refresh a whole gateway fleet or a single gateway topology, showing sessions, presence, pending pairings, and topology warnings alongside deploy and runtime health.
+- **Operations Pulse coverage.** Degraded gateways, stale topology, failed topology refreshes, and pending OpenClaw pairings now appear in the shared operator triage queue.
+
 ### v1.8.11 Highlights
 
 DeepSeek tool-use hotfix for issue [#67](https://github.com/swarmclawai/swarmclaw/issues/67).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swarmclawai/swarmclaw",
-  "version": "1.8.11",
+  "version": "1.8.13",
   "description": "Build and run autonomous AI agents with OpenClaw, Hermes, multiple model providers, orchestration, delegation, memory, skills, schedules, and chat connectors.",
   "main": "electron-dist/main.js",
   "license": "MIT",
@@ -86,8 +86,8 @@
     "cli": "node ./bin/swarmclaw.js",
     "test:cli": "node --test src/cli/*.test.js bin/*.test.js scripts/electron-after-pack.test.mjs scripts/postinstall.test.mjs scripts/run-next-build.test.mjs scripts/run-next-typegen.test.mjs",
     "test:setup": "tsx --test src/app/api/setup/check-provider/route.test.ts src/lib/server/provider-model-discovery.test.ts src/components/auth/setup-wizard/utils.test.ts src/components/auth/setup-wizard/types.test.ts src/hooks/setup-done-detection.test.ts src/lib/setup-defaults.test.ts src/lib/server/storage-auth.test.ts src/lib/server/storage-auth-docker.test.ts",
-    "test:openclaw": "tsx --test src/lib/openclaw/openclaw-agent-id.test.ts src/lib/openclaw/openclaw-endpoint.test.ts src/lib/server/agents/agent-runtime-config.test.ts src/lib/server/build-llm.test.ts src/lib/server/connectors/connector-routing.test.ts src/lib/server/connectors/openclaw.test.ts src/lib/server/connectors/swarmdock.test.ts src/lib/server/gateway/protocol.test.ts src/lib/server/llm-response-cache.test.ts src/lib/server/mcp-conformance.test.ts src/lib/server/openclaw/agent-resolver.test.ts src/lib/server/openclaw/deploy.test.ts src/lib/server/openclaw/skills-normalize.test.ts src/lib/server/session-tools/openclaw-nodes.test.ts src/lib/server/session-tools/swarmdock.test.ts src/lib/server/tasks/task-quality-gate.test.ts src/lib/server/tasks/task-validation.test.ts src/lib/server/tool-capability-policy.test.ts src/lib/providers/openai.test.ts src/lib/providers/openclaw-exports.test.ts src/app/api/openclaw/dashboard-url/route.test.ts",
-    "test:runtime": "tsx --test src/lib/a2a/agent-card.test.ts src/lib/strip-internal-metadata.test.ts src/lib/provider-sets.test.ts src/lib/providers/opencode-cli.test.ts src/lib/providers/cli-provider-metadata.test.ts src/lib/providers/cli-utils.test.ts src/lib/providers/generic-cli.test.ts src/lib/server/cli-provider-readiness.test.ts src/lib/server/provider-health.test.ts src/lib/server/mcp-gateway-runtime.test.ts src/lib/server/mcp-connection-pool.test.ts src/lib/server/knowledge-sources.test.ts src/lib/server/chat-execution/chat-execution-grounding.test.ts src/lib/server/chat-execution/chat-turn-preparation.test.ts src/lib/server/chat-execution/iteration-timers.test.ts src/lib/server/chat-execution/post-stream-finalization.test.ts src/lib/server/chats/clear-undo-snapshots.test.ts src/lib/server/connectors/email.test.ts src/lib/server/protocols/protocol-service.test.ts src/lib/server/runtime/run-ledger.test.ts src/lib/server/runs/run-brief.test.ts src/lib/server/operations/operation-pulse.test.ts src/lib/server/artifacts/artifact-resolver.test.ts src/lib/server/observability/otel-config.test.ts src/lib/server/safe-parse-body.test.ts src/lib/server/missions/mission-templates.test.ts src/lib/server/sharing/share-link-repository.test.ts src/lib/server/sharing/share-resolver.test.ts src/lib/app/view-constants.test.ts src/lib/quality/quality-summary.test.ts src/app/api/approvals/route.test.ts src/app/api/agents/agents-route.test.ts src/app/api/tasks/tasks-route.test.ts src/app/api/chats/chat-route.test.ts src/app/api/chats/clear-route.test.ts src/app/api/chats/compact-route.test.ts src/app/api/chats/context-status-route.test.ts src/app/api/connectors/connector-doctor-route.test.ts src/app/api/healthz/route.test.ts src/app/api/logs/route.test.ts src/app/api/providers/[id]/route.test.ts src/app/api/tts/route.test.ts",
+    "test:openclaw": "tsx --test src/lib/openclaw/openclaw-agent-id.test.ts src/lib/openclaw/openclaw-endpoint.test.ts src/lib/server/agents/agent-runtime-config.test.ts src/lib/server/build-llm.test.ts src/lib/server/connectors/connector-routing.test.ts src/lib/server/connectors/openclaw.test.ts src/lib/server/connectors/swarmdock.test.ts src/lib/server/gateway/protocol.test.ts src/lib/server/gateways/gateway-topology.test.ts src/lib/server/llm-response-cache.test.ts src/lib/server/mcp-conformance.test.ts src/lib/server/openclaw/agent-resolver.test.ts src/lib/server/openclaw/deploy.test.ts src/lib/server/openclaw/skills-normalize.test.ts src/lib/server/session-tools/openclaw-nodes.test.ts src/lib/server/session-tools/swarmdock.test.ts src/lib/server/tasks/task-quality-gate.test.ts src/lib/server/tasks/task-validation.test.ts src/lib/server/tool-capability-policy.test.ts src/lib/providers/openai.test.ts src/lib/providers/openclaw-exports.test.ts src/app/api/gateways/topology-route.test.ts src/app/api/openclaw/dashboard-url/route.test.ts",
+    "test:runtime": "tsx --test src/lib/a2a/agent-card.test.ts src/lib/strip-internal-metadata.test.ts src/lib/provider-sets.test.ts src/lib/providers/opencode-cli.test.ts src/lib/providers/cli-provider-metadata.test.ts src/lib/providers/cli-utils.test.ts src/lib/providers/generic-cli.test.ts src/lib/server/cli-provider-readiness.test.ts src/lib/server/provider-health.test.ts src/lib/server/mcp-gateway-runtime.test.ts src/lib/server/mcp-connection-pool.test.ts src/lib/server/knowledge-sources.test.ts src/lib/server/chat-execution/chat-execution-grounding.test.ts src/lib/server/chat-execution/chat-turn-preparation.test.ts src/lib/server/chat-execution/iteration-timers.test.ts src/lib/server/chat-execution/post-stream-finalization.test.ts src/lib/server/chats/clear-undo-snapshots.test.ts src/lib/server/connectors/email.test.ts src/lib/server/protocols/protocol-service.test.ts src/lib/server/runtime/run-ledger.test.ts src/lib/server/runtime/queue-retry-policy.test.ts src/lib/server/runs/run-brief.test.ts src/lib/server/operations/operation-pulse.test.ts src/lib/server/artifacts/artifact-resolver.test.ts src/lib/server/observability/otel-config.test.ts src/lib/server/safe-parse-body.test.ts src/lib/server/missions/mission-templates.test.ts src/lib/server/sharing/share-link-repository.test.ts src/lib/server/sharing/share-resolver.test.ts src/lib/server/session-tools/execute.test.ts src/lib/app/view-constants.test.ts src/lib/quality/quality-summary.test.ts src/app/api/approvals/route.test.ts src/app/api/agents/agents-route.test.ts src/app/api/tasks/tasks-route.test.ts src/app/api/chats/chat-route.test.ts src/app/api/chats/clear-route.test.ts src/app/api/chats/compact-route.test.ts src/app/api/chats/context-status-route.test.ts src/app/api/connectors/connector-doctor-route.test.ts src/app/api/healthz/route.test.ts src/app/api/logs/route.test.ts src/app/api/providers/[id]/route.test.ts src/app/api/tts/route.test.ts",
     "test:builder": "tsx --test src/features/protocols/builder/utils/nodes-to-template.test.ts src/features/protocols/builder/utils/template-to-nodes.test.ts src/features/protocols/builder/validators/dag-validator.test.ts",
     "test:e2e": "node --import tsx scripts/browser-e2e-smoke.ts",
     "test:mcp:conformance": "node --import tsx ./scripts/mcp-conformance-check.ts",

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

@@ -0,0 +1,13 @@
+import { NextResponse } from 'next/server'
+
+import { notFound } from '@/lib/server/collection-helpers'
+import { getOpenClawGatewayTopology } from '@/lib/server/gateways/gateway-topology'
+
+export const dynamic = 'force-dynamic'
+
+export async function GET(_req: Request, { params }: { params: Promise<{ id: string }> }) {
+  const { id } = await params
+  const topology = await getOpenClawGatewayTopology(id)
+  if (!topology) return notFound()
+  return NextResponse.json(topology)
+}

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

@@ -0,0 +1,9 @@
+import { NextResponse } from 'next/server'
+
+import { getOpenClawGatewayFleetTopology } from '@/lib/server/gateways/gateway-topology'
+
+export const dynamic = 'force-dynamic'
+
+export async function GET() {
+  return NextResponse.json(await getOpenClawGatewayFleetTopology())
+}

package/src/app/api/gateways/topology-route.test.ts

@@ -0,0 +1,37 @@
+import assert from 'node:assert/strict'
+import test from 'node:test'
+
+import { runWithTempDataDir } from '@/lib/server/test-utils/run-with-temp-data-dir'
+
+test('gateway topology route returns 404 for unknown profiles', () => {
+  const output = runWithTempDataDir<{ status: number; body: { error: string } }>(`
+    const routeMod = await import('./src/app/api/gateways/[id]/topology/route')
+    const route = routeMod.default || routeMod
+    const response = await route.GET(
+      new Request('http://local/api/gateways/missing/topology'),
+      { params: Promise.resolve({ id: 'missing' }) },
+    )
+    console.log(JSON.stringify({ status: response.status, body: await response.json() }))
+  `, { prefix: 'swarmclaw-gateway-topology-route-test-' })
+
+  assert.equal(output.status, 404)
+  assert.equal(output.body.error, 'Not found')
+})
+
+test('gateway fleet route reports empty totals when no OpenClaw profiles exist', () => {
+  const output = runWithTempDataDir<{
+    status: number
+    body: { gateways: unknown[]; totals: { gatewayCount: number; nodeCount: number; hasErrors: boolean } }
+  }>(`
+    const routeMod = await import('./src/app/api/gateways/fleet/route')
+    const route = routeMod.default || routeMod
+    const response = await route.GET(new Request('http://local/api/gateways/fleet'))
+    console.log(JSON.stringify({ status: response.status, body: await response.json() }))
+  `, { prefix: 'swarmclaw-gateway-fleet-route-test-' })
+
+  assert.equal(output.status, 200)
+  assert.equal(output.body.gateways.length, 0)
+  assert.equal(output.body.totals.gatewayCount, 0)
+  assert.equal(output.body.totals.nodeCount, 0)
+  assert.equal(output.body.totals.hasErrors, false)
+})

package/src/cli/index.js

@@ -272,6 +272,8 @@ const COMMAND_GROUPS = [
       cmd('update', 'PUT', '/gateways/:id', 'Update a gateway profile', { expectsJsonBody: true }),
       cmd('delete', 'DELETE', '/gateways/:id', 'Delete a gateway profile'),
       cmd('health', 'GET', '/gateways/:id/health', 'Run a gateway health check'),
+      cmd('topology', 'GET', '/gateways/:id/topology', 'Refresh and return one gateway topology snapshot'),
+      cmd('fleet', 'GET', '/gateways/fleet', 'Refresh and return fleet-wide gateway topology'),
     ],
   },
   {

package/src/cli/spec.js

@@ -220,6 +220,8 @@ const COMMAND_GROUPS = {
       update: { description: 'Update a gateway profile', method: 'PUT', path: '/gateways/:id', params: ['id'] },
       delete: { description: 'Delete a gateway profile', method: 'DELETE', path: '/gateways/:id', params: ['id'] },
       health: { description: 'Run a gateway health check', method: 'GET', path: '/gateways/:id/health', params: ['id'] },
+      topology: { description: 'Refresh and return one gateway topology snapshot', method: 'GET', path: '/gateways/:id/topology', params: ['id'] },
+      fleet: { description: 'Refresh and return fleet-wide gateway topology', method: 'GET', path: '/gateways/fleet' },
     },
   },
   logs: {

package/src/components/gateways/gateway-sheet.tsx

@@ -7,6 +7,9 @@ import { useAppStore } from '@/stores/use-app-store'
 import { toast } from 'sonner'
 import type {
   OpenClawDevicePairRequest,
+  OpenClawGatewayPresenceEntry,
+  OpenClawGatewayRpcError,
+  OpenClawGatewaySession,
   OpenClawNode,
   OpenClawNodePairRequest,
   OpenClawPairedDevice,
@@ -76,6 +79,9 @@ export function GatewaySheet() {
   const [nodePairings, setNodePairings] = useState<OpenClawNodePairRequest[]>([])
   const [devicePairings, setDevicePairings] = useState<OpenClawDevicePairRequest[]>([])
   const [pairedDevices, setPairedDevices] = useState<OpenClawPairedDevice[]>([])
+  const [gatewaySessions, setGatewaySessions] = useState<OpenClawGatewaySession[]>([])
+  const [gatewayPresence, setGatewayPresence] = useState<OpenClawGatewayPresenceEntry[]>([])
+  const [gatewayTopologyErrors, setGatewayTopologyErrors] = useState<OpenClawGatewayRpcError[]>([])
   const [invokeNodeId, setInvokeNodeId] = useState('')
   const [invokeCommand, setInvokeCommand] = useState('')
   const [invokeParamsText, setInvokeParamsText] = useState('{}')
@@ -113,6 +119,9 @@ export function GatewaySheet() {
     setNodePairings([])
     setDevicePairings([])
     setPairedDevices([])
+    setGatewaySessions([])
+    setGatewayPresence([])
+    setGatewayTopologyErrors([])
     setInvokeNodeId('')
     setInvokeCommand('')
     setInvokeParamsText('{}')
@@ -130,6 +139,9 @@ export function GatewaySheet() {
       setNodePairings(result.nodePairings)
       setDevicePairings(result.devicePairings)
       setPairedDevices(result.pairedDevices)
+      setGatewaySessions(result.sessions)
+      setGatewayPresence(result.presence)
+      setGatewayTopologyErrors(result.errors)
       if (result.nodes[0]) {
         setInvokeNodeId((current) => current || result.nodes[0].nodeId)
         setInvokeCommand((current) => current || result.nodes[0].commands?.[0] || '')
@@ -532,6 +544,37 @@ export function GatewaySheet() {
             </div>
           )}
 
+          <div className="mb-4 grid grid-cols-2 gap-2 md:grid-cols-4">
+            <div className="rounded-[12px] border border-white/[0.06] bg-white/[0.025] px-3 py-2">
+              <div className="text-[10px] font-700 uppercase tracking-[0.1em] text-text-3/55">Nodes</div>
+              <div className="mt-1 font-display text-[18px] font-700 text-text">{nodes.filter((node) => node.connected).length}/{nodes.length}</div>
+            </div>
+            <div className="rounded-[12px] border border-white/[0.06] bg-white/[0.025] px-3 py-2">
+              <div className="text-[10px] font-700 uppercase tracking-[0.1em] text-text-3/55">Pairings</div>
+              <div className="mt-1 font-display text-[18px] font-700 text-amber-300">{nodePairings.length + devicePairings.length}</div>
+            </div>
+            <div className="rounded-[12px] border border-white/[0.06] bg-white/[0.025] px-3 py-2">
+              <div className="text-[10px] font-700 uppercase tracking-[0.1em] text-text-3/55">Sessions</div>
+              <div className="mt-1 font-display text-[18px] font-700 text-text">{gatewaySessions.length}</div>
+            </div>
+            <div className={`rounded-[12px] border px-3 py-2 ${
+              gatewayTopologyErrors.length > 0
+                ? 'border-rose-400/20 bg-rose-400/[0.06]'
+                : 'border-white/[0.06] bg-white/[0.025]'
+            }`}>
+              <div className="text-[10px] font-700 uppercase tracking-[0.1em] text-text-3/55">Presence</div>
+              <div className={gatewayTopologyErrors.length > 0 ? 'mt-1 font-display text-[18px] font-700 text-rose-200' : 'mt-1 font-display text-[18px] font-700 text-text'}>
+                {gatewayPresence.length}
+              </div>
+            </div>
+          </div>
+
+          {gatewayTopologyErrors.length > 0 && (
+            <div className="mb-4 rounded-[12px] border border-rose-400/20 bg-rose-400/[0.06] px-3 py-2 text-[12px] text-rose-200">
+              {gatewayTopologyErrors[0]?.method}: {gatewayTopologyErrors[0]?.message}
+            </div>
+          )}
+
           <div className="grid grid-cols-1 xl:grid-cols-2 gap-4">
             <div className="space-y-4">
               <div className="rounded-[14px] border border-white/[0.06] bg-surface p-4">

package/src/components/operations/operations-pulse-panel.tsx

@@ -2,7 +2,7 @@
 
 import { useCallback, useEffect, useMemo, useState } from 'react'
 import { useRouter } from 'next/navigation'
-import { AlertTriangle, CheckCircle2, Clock, PlugZap, RefreshCw } from 'lucide-react'
+import { AlertTriangle, CheckCircle2, Clock, PlugZap, RadioTower, RefreshCw } from 'lucide-react'
 import { api } from '@/lib/app/api-client'
 import { cn } from '@/lib/utils'
 import type { OperationPulse, OperationPulseAction, OperationPulseRange, OperationPulseSeverity } from '@/types'
@@ -39,6 +39,7 @@ function Kpi({ label, value, danger = false }: { label: string; value: number; d
 function actionIcon(action: OperationPulseAction) {
   if (action.severity === 'high') return <AlertTriangle size={15} />
   if (action.kind === 'connector') return <PlugZap size={15} />
+  if (action.kind === 'gateway') return <RadioTower size={15} />
   if (action.kind === 'mission') return <Clock size={15} />
   return <CheckCircle2 size={15} />
 }
@@ -82,6 +83,7 @@ export function OperationsPulsePanel({
     return pulse.kpis.failedRuns === 0
       && pulse.kpis.pendingApprovals === 0
       && pulse.kpis.connectorAttention === 0
+      && pulse.kpis.gatewayAttention === 0
       && pulse.kpis.budgetWarnings === 0
   }, [pulse])
 
@@ -92,7 +94,7 @@ export function OperationsPulsePanel({
           <div className="text-[10px] font-700 uppercase tracking-[0.16em] text-accent-bright/70">Operations Pulse</div>
           <h2 className="mt-1 font-display text-[16px] font-700 tracking-normal text-text">What needs operator attention next</h2>
           <p className="mt-1 max-w-[680px] text-[12px] leading-relaxed text-text-3/68">
-            Missions, runs, approvals, connector readiness, and budget pressure rolled into one triage queue.
+            Missions, runs, approvals, connector readiness, OpenClaw gateways, and budget pressure rolled into one triage queue.
           </p>
         </div>
         <div className="flex flex-wrap items-center gap-2">
@@ -130,12 +132,13 @@ export function OperationsPulsePanel({
         </div>
       ) : (
         <>
-          <div className={cn('mt-4 grid gap-2', compact ? 'grid-cols-2 md:grid-cols-3 xl:grid-cols-6' : 'grid-cols-2 sm:grid-cols-3 xl:grid-cols-6')}>
+          <div className={cn('mt-4 grid gap-2', compact ? 'grid-cols-2 md:grid-cols-4 xl:grid-cols-7' : 'grid-cols-2 sm:grid-cols-3 xl:grid-cols-7')}>
             <Kpi label="Missions" value={pulse.kpis.activeMissions} />
             <Kpi label="Running" value={pulse.kpis.runningRuns} />
             <Kpi label="Failed" value={pulse.kpis.failedRuns} danger />
             <Kpi label="Approvals" value={pulse.kpis.pendingApprovals} />
             <Kpi label="Connectors" value={pulse.kpis.connectorAttention} danger />
+            <Kpi label="Gateways" value={pulse.kpis.gatewayAttention} danger />
             <Kpi label="Budgets" value={pulse.kpis.budgetWarnings} />
           </div>
 

package/src/components/providers/provider-list.tsx

@@ -1,6 +1,6 @@
 'use client'
 
-import { useState } from 'react'
+import { useMemo, useState } from 'react'
 import { toast } from 'sonner'
 import { OpenClawDeployPanel } from '@/components/openclaw/openclaw-deploy-panel'
 import { useAppStore } from '@/stores/use-app-store'
@@ -14,8 +14,10 @@ import { useCredentialsQuery, useCreateCredentialMutation } from '@/features/cre
 import {
   useCloneGatewayProfileMutation,
   useDeleteGatewayProfileMutation,
+  useGatewayFleetTopologyQuery,
   useGatewayHealthCheckMutation,
   useGatewayProfilesQuery,
+  useRefreshGatewayTopologyMutation,
   useSaveGatewayProfileMutation,
   useVerifyOpenClawDeployMutation,
 } from '@/features/gateways/queries'
@@ -52,6 +54,7 @@ export function ProviderList({ inSidebar }: { inSidebar?: boolean }) {
   const providersQuery = useProvidersQuery()
   const providerConfigsQuery = useProviderConfigsQuery()
   const gatewayProfilesQuery = useGatewayProfilesQuery()
+  const gatewayFleetTopologyQuery = useGatewayFleetTopologyQuery({ enabled: false })
   const externalAgentsQuery = useExternalAgentsQuery()
   const credentialsQuery = useCredentialsQuery()
   const toggleProviderMutation = useToggleProviderMutation()
@@ -60,6 +63,7 @@ export function ProviderList({ inSidebar }: { inSidebar?: boolean }) {
   const saveGatewayMutation = useSaveGatewayProfileMutation()
   const deleteGatewayMutation = useDeleteGatewayProfileMutation()
   const healthCheckGatewayMutation = useGatewayHealthCheckMutation()
+  const refreshGatewayTopologyMutation = useRefreshGatewayTopologyMutation()
   const verifyDeployMutation = useVerifyOpenClawDeployMutation()
   const cloneGatewayMutation = useCloneGatewayProfileMutation()
   const runtimeActionMutation = useExternalAgentRuntimeMutation()
@@ -67,6 +71,7 @@ export function ProviderList({ inSidebar }: { inSidebar?: boolean }) {
   const providers = providersQuery.data ?? []
   const providerConfigs = providerConfigsQuery.data ?? []
   const gatewayProfiles = gatewayProfilesQuery.data ?? []
+  const gatewayFleetTopology = gatewayFleetTopologyQuery.data ?? null
   const externalAgents = externalAgentsQuery.data ?? []
   const credentials = credentialsQuery.data ?? {}
   const savingDeploy = createCredentialMutation.isPending
@@ -103,6 +108,31 @@ export function ProviderList({ inSidebar }: { inSidebar?: boolean }) {
     await healthCheckGatewayMutation.mutateAsync(id)
   }
 
+  const handleRefreshGatewayTopology = async (e: React.MouseEvent, id: string) => {
+    e.stopPropagation()
+    try {
+      const result = await refreshGatewayTopologyMutation.mutateAsync(id)
+      if (result.errors.length > 0) {
+        toast.warning(`Topology refreshed with ${result.errors.length} warning${result.errors.length === 1 ? '' : 's'}`)
+      } else {
+        toast.success('Gateway topology refreshed')
+      }
+    } catch (err: unknown) {
+      toast.error(err instanceof Error ? err.message : 'Failed to refresh gateway topology')
+    }
+  }
+
+  const handleRefreshFleetTopology = async () => {
+    const result = await gatewayFleetTopologyQuery.refetch()
+    if (result.error) {
+      toast.error(result.error instanceof Error ? result.error.message : 'Failed to refresh fleet topology')
+      return
+    }
+    const errors = result.data?.totals.lastTopologyErrorCount || 0
+    if (errors > 0) toast.warning(`Fleet topology refreshed with ${errors} warning${errors === 1 ? '' : 's'}`)
+    else toast.success('Fleet topology refreshed')
+  }
+
   const handleDeployApply = (patch: { endpoint?: string; token?: string; name?: string; notes?: string; deployment?: GatewayProfile['deployment'] | Record<string, unknown> | null }) => {
     if (!patch.endpoint) return
     setDeployDraft({
@@ -246,6 +276,9 @@ export function ProviderList({ inSidebar }: { inSidebar?: boolean }) {
   const enabledItems = allItems.filter((item) => item.isEnabled)
   const disabledItems = allItems.filter((item) => !item.isEnabled)
   const gatewayNameById = new Map(gatewayProfiles.map((gateway) => [gateway.id, gateway.name]))
+  const topologyByGatewayId = useMemo(() => new Map(
+    (gatewayFleetTopology?.gateways || []).map((topology) => [topology.profile.id, topology]),
+  ), [gatewayFleetTopology])
   const runtimeHealthByGateway = externalAgents.reduce<Record<string, { total: number; active: number; lastHeartbeatAt: number | null }>>((acc, runtime) => {
     if (!runtime.gatewayProfileId) return acc
     const current = acc[runtime.gatewayProfileId] || { total: 0, active: 0, lastHeartbeatAt: null }
@@ -417,6 +450,14 @@ export function ProviderList({ inSidebar }: { inSidebar?: boolean }) {
         <div className="text-[12px] font-700 uppercase tracking-[0.08em] text-text-3/60">OpenClaw Gateways</div>
         {!inSidebar && (
           <div className="flex items-center gap-2">
+            <button
+              type="button"
+              onClick={() => void handleRefreshFleetTopology()}
+              disabled={gatewayFleetTopologyQuery.isFetching}
+              className="px-3 py-1.5 rounded-[8px] border border-white/[0.08] bg-transparent text-[11px] font-700 text-text-2 hover:bg-white/[0.04] transition-all cursor-pointer disabled:opacity-40"
+            >
+              {gatewayFleetTopologyQuery.isFetching ? 'Refreshing…' : 'Refresh Fleet'}
+            </button>
             <button
               type="button"
               onClick={() => handleEditGateway(null)}
@@ -427,6 +468,34 @@ export function ProviderList({ inSidebar }: { inSidebar?: boolean }) {
           </div>
         )}
       </div>
+      {!inSidebar && gatewayFleetTopology && (
+        <div className="mb-4 rounded-[14px] border border-white/[0.06] bg-white/[0.02] px-4 py-3">
+          <div className="flex flex-wrap items-center justify-between gap-3">
+            <div>
+              <div className="text-[12px] font-800 text-text">Gateway fleet topology</div>
+              <div className="mt-1 text-[11px] text-text-3/70">
+                {gatewayFleetTopology.totals.connectedGatewayCount}/{gatewayFleetTopology.totals.gatewayCount} gateways connected ·{' '}
+                {gatewayFleetTopology.totals.connectedNodeCount}/{gatewayFleetTopology.totals.nodeCount} nodes connected
+              </div>
+            </div>
+            <div className="flex flex-wrap gap-2 text-[11px] text-text-3/70">
+              <span className="rounded-full border border-white/[0.06] bg-white/[0.03] px-2.5 py-1">
+                {gatewayFleetTopology.totals.sessionCount || 0} sessions
+              </span>
+              <span className="rounded-full border border-white/[0.06] bg-white/[0.03] px-2.5 py-1">
+                {gatewayFleetTopology.totals.presenceCount || 0} presence
+              </span>
+              <span className={`rounded-full border px-2.5 py-1 ${
+                gatewayFleetTopology.totals.pendingPairingCount > 0
+                  ? 'border-amber-400/20 bg-amber-400/[0.06] text-amber-300'
+                  : 'border-white/[0.06] bg-white/[0.03]'
+              }`}>
+                {gatewayFleetTopology.totals.pendingPairingCount || 0} pending pairings
+              </span>
+            </div>
+          </div>
+        </div>
+      )}
       {!inSidebar && (
         <div className="mb-4 rounded-[16px] border border-white/[0.06] bg-white/[0.02] p-4">
           <OpenClawDeployPanel
@@ -462,7 +531,11 @@ export function ProviderList({ inSidebar }: { inSidebar?: boolean }) {
           (() => {
             const runtimeStats = runtimeHealthByGateway[gateway.id] || { total: 0, active: 0, lastHeartbeatAt: null }
             const deployment = gateway.deployment || null
-            const stats = gateway.stats || null
+            const topology = topologyByGatewayId.get(gateway.id) || null
+            const stats = topology?.stats || gateway.stats || null
+            const topologyErrors = topology?.errors || []
+            const pendingPairings = (stats?.pendingNodePairings || 0) + (stats?.pendingDevicePairings || 0)
+            const topologyErrorCount = topologyErrors.length || stats?.lastTopologyErrorCount || 0
             return (
           <div
             key={gateway.id}
@@ -529,6 +602,12 @@ export function ProviderList({ inSidebar }: { inSidebar?: boolean }) {
                     {stats?.connectedNodeCount ?? 0}/{stats?.nodeCount ?? 0} nodes · {stats?.pairedDeviceCount ?? 0} devices
                   </div>
                 </div>
+                <div className="rounded-[10px] border border-white/[0.05] bg-white/[0.02] px-3 py-2">
+                  <div className="uppercase tracking-[0.08em] text-text-3/50">Sessions</div>
+                  <div className="mt-1 text-text-2">
+                    {stats?.sessionCount ?? 0} sessions · {stats?.presenceCount ?? 0} presence
+                  </div>
+                </div>
                 <div className="rounded-[10px] border border-white/[0.05] bg-white/[0.02] px-3 py-2">
                   <div className="uppercase tracking-[0.08em] text-text-3/50">Runtimes</div>
                   <div className="mt-1 text-text-2">
@@ -537,6 +616,17 @@ export function ProviderList({ inSidebar }: { inSidebar?: boolean }) {
                 </div>
               </div>
             )}
+            {!inSidebar && (pendingPairings > 0 || topologyErrorCount > 0) && (
+              <div className={`mt-3 rounded-[10px] border px-3 py-2 text-[11px] leading-relaxed ${
+                topologyErrorCount > 0
+                  ? 'border-rose-400/20 bg-rose-400/[0.06] text-rose-200'
+                  : 'border-amber-400/20 bg-amber-400/[0.06] text-amber-200'
+              }`}>
+                {topologyErrorCount > 0
+                  ? `Topology warning: ${topologyErrors[0]?.message || stats?.lastTopologyError || `${topologyErrorCount} refresh errors`}`
+                  : `${pendingPairings} pending OpenClaw pairing request${pendingPairings === 1 ? '' : 's'}`}
+              </div>
+            )}
             {!inSidebar && deployment?.lastVerifiedMessage && (
               <div className="mt-3 text-[11px] text-text-3/60">
                 {deployment.lastVerifiedMessage}
@@ -547,6 +637,13 @@ export function ProviderList({ inSidebar }: { inSidebar?: boolean }) {
                 <button onClick={(e) => void handleHealthCheckGateway(e, gateway.id)} className="px-2.5 py-1.5 rounded-[8px] border border-white/[0.08] bg-transparent text-[11px] font-700 text-text-2 hover:bg-white/[0.04] cursor-pointer transition-all">
                   Health
                 </button>
+                <button
+                  onClick={(e) => void handleRefreshGatewayTopology(e, gateway.id)}
+                  disabled={refreshGatewayTopologyMutation.isPending}
+                  className="px-2.5 py-1.5 rounded-[8px] border border-white/[0.08] bg-transparent text-[11px] font-700 text-text-2 hover:bg-white/[0.04] cursor-pointer transition-all disabled:opacity-40"
+                >
+                  Topology
+                </button>
                 <button onClick={(e) => void handleCloneGateway(e, gateway)} className="px-2.5 py-1.5 rounded-[8px] border border-white/[0.08] bg-transparent text-[11px] font-700 text-text-2 hover:bg-white/[0.04] cursor-pointer transition-all">
                   Clone
                 </button>

package/src/features/gateways/queries.ts

@@ -4,6 +4,11 @@ import { credentialQueryKeys } from '@/features/credentials/queries'
 import type {
   GatewayProfile,
   OpenClawDevicePairRequest,
+  OpenClawGatewayFleetTopology,
+  OpenClawGatewayPresenceEntry,
+  OpenClawGatewayRpcError,
+  OpenClawGatewaySession,
+  OpenClawGatewayTopology,
   OpenClawNode,
   OpenClawNodePairRequest,
   OpenClawPairedDevice,
@@ -27,15 +32,6 @@ export interface GatewayRpcResponse<T> {
   error?: string
 }
 
-interface NodeListResult {
-  nodes?: OpenClawNode[]
-}
-
-interface PairingListResult<T> {
-  pending?: T[]
-  paired?: OpenClawPairedDevice[]
-}
-
 interface SaveGatewayProfileInput {
   id?: string | null
   payload: Record<string, unknown>
@@ -62,6 +58,10 @@ export interface RefreshGatewayTopologyResult {
   nodePairings: OpenClawNodePairRequest[]
   devicePairings: OpenClawDevicePairRequest[]
   pairedDevices: OpenClawPairedDevice[]
+  sessions: OpenClawGatewaySession[]
+  presence: OpenClawGatewayPresenceEntry[]
+  errors: OpenClawGatewayRpcError[]
+  topology: OpenClawGatewayTopology
 }
 
 async function invalidateGatewayQueries(queryClient: ReturnType<typeof useQueryClient>) {
@@ -71,6 +71,8 @@ async function invalidateGatewayQueries(queryClient: ReturnType<typeof useQueryC
 export const gatewayQueryKeys = {
   all: ['gateways'] as const,
   profiles: () => ['gateways', 'profiles'] as const,
+  fleet: () => ['gateways', 'fleet'] as const,
+  topology: (id: string) => ['gateways', 'topology', id] as const,
 }
 
 export function useGatewayProfilesQuery(options: QueryOptions = {}) {
@@ -126,6 +128,15 @@ export function useGatewayHealthCheckMutation() {
   })
 }
 
+export function useGatewayFleetTopologyQuery(options: QueryOptions = {}) {
+  return useQuery<OpenClawGatewayFleetTopology>({
+    queryKey: gatewayQueryKeys.fleet(),
+    queryFn: () => api<OpenClawGatewayFleetTopology>('GET', '/gateways/fleet'),
+    enabled: options.enabled,
+    staleTime: 30_000,
+  })
+}
+
 export function useVerifyOpenClawDeployMutation() {
   return useMutation<VerifyOpenClawDeployResult, Error, VerifyOpenClawDeployInput>({
     mutationFn: ({ endpoint, token }) =>
@@ -170,48 +181,24 @@ export function useRefreshGatewayTopologyMutation() {
   const queryClient = useQueryClient()
   return useMutation<RefreshGatewayTopologyResult, Error, string>({
     mutationFn: async (profileId) => {
-      const [nodesRes, nodePairRes, devicePairRes] = await Promise.all([
-        api<GatewayRpcResponse<NodeListResult>>('POST', '/openclaw/gateway', {
-          method: 'node.list',
-          params: { profileId },
-        }),
-        api<GatewayRpcResponse<PairingListResult<OpenClawNodePairRequest>>>('POST', '/openclaw/gateway', {
-          method: 'node.pair.list',
-          params: { profileId },
-        }),
-        api<GatewayRpcResponse<PairingListResult<OpenClawDevicePairRequest>>>('POST', '/openclaw/gateway', {
-          method: 'device.pair.list',
-          params: { profileId },
-        }),
-      ])
-
-      if (nodesRes.error) throw new Error(nodesRes.error)
-      if (nodePairRes.error) throw new Error(nodePairRes.error)
-      if (devicePairRes.error) throw new Error(devicePairRes.error)
-
-      const nodes = Array.isArray(nodesRes.result?.nodes) ? nodesRes.result.nodes : []
-      const nodePairings = Array.isArray(nodePairRes.result?.pending) ? nodePairRes.result.pending : []
-      const devicePairings = Array.isArray(devicePairRes.result?.pending) ? devicePairRes.result.pending : []
-      const pairedDevices = Array.isArray(devicePairRes.result?.paired) ? devicePairRes.result.paired : []
-      const stats = {
-        nodeCount: nodes.length,
-        connectedNodeCount: nodes.filter((node) => node.connected).length,
-        pendingNodePairings: nodePairings.length,
-        pairedDeviceCount: pairedDevices.length,
-        pendingDevicePairings: devicePairings.length,
-      }
-
-      void api('PUT', `/gateways/${profileId}`, { stats }).catch(() => {})
+      const topology = await api<OpenClawGatewayTopology>('GET', `/gateways/${profileId}/topology`)
 
       return {
-        nodes,
-        nodePairings,
-        devicePairings,
-        pairedDevices,
+        nodes: topology.nodes,
+        nodePairings: topology.nodePairings,
+        devicePairings: topology.devicePairings,
+        pairedDevices: topology.pairedDevices,
+        sessions: topology.sessions,
+        presence: topology.presence,
+        errors: topology.errors,
+        topology,
       }
     },
-    onSuccess: async () => {
-      await invalidateGatewayQueries(queryClient)
+    onSuccess: async (_result, profileId) => {
+      await Promise.all([
+        invalidateGatewayQueries(queryClient),
+        queryClient.invalidateQueries({ queryKey: gatewayQueryKeys.topology(profileId) }),
+      ])
     },
   })
 }

package/src/lib/server/gateways/gateway-profile-service.ts

@@ -68,6 +68,11 @@ function normalizeStats(value: unknown): OpenClawGatewayStats | null {
     pairedDeviceCount: normalizeNullableNumber(stats.pairedDeviceCount) ?? undefined,
     pendingDevicePairings: normalizeNullableNumber(stats.pendingDevicePairings) ?? undefined,
     externalRuntimeCount: normalizeNullableNumber(stats.externalRuntimeCount) ?? undefined,
+    sessionCount: normalizeNullableNumber(stats.sessionCount) ?? undefined,
+    presenceCount: normalizeNullableNumber(stats.presenceCount) ?? undefined,
+    lastTopologyCheckedAt: normalizeNullableNumber(stats.lastTopologyCheckedAt) ?? undefined,
+    lastTopologyErrorCount: normalizeNullableNumber(stats.lastTopologyErrorCount) ?? undefined,
+    lastTopologyError: normalizeText(stats.lastTopologyError),
   }
 }