@swarmclawai/swarmclaw 0.7.8 → 0.8.0

package/src/app/api/webhooks/route.test.ts

@@ -0,0 +1,272 @@
+import assert from 'node:assert/strict'
+import test, { afterEach } from 'node:test'
+
+import { GET as getWebhookHistory } from './[id]/history/route'
+import { handleWebhookPost } from './[id]/route'
+import {
+  loadAgents,
+  loadSessions,
+  loadWebhookLogs,
+  loadWebhookRetryQueue,
+  loadWebhooks,
+  saveAgents,
+  saveSessions,
+  saveWebhookLogs,
+  saveWebhookRetryQueue,
+  saveWebhooks,
+} from '@/lib/server/storage'
+
+const originalAgents = loadAgents()
+const originalSessions = loadSessions()
+const originalWebhooks = loadWebhooks()
+const originalWebhookLogs = loadWebhookLogs()
+const originalWebhookRetryQueue = loadWebhookRetryQueue()
+
+afterEach(() => {
+  saveAgents(originalAgents)
+  saveSessions(originalSessions)
+  saveWebhooks(originalWebhooks)
+  saveWebhookLogs(originalWebhookLogs)
+  saveWebhookRetryQueue(originalWebhookRetryQueue)
+})
+
+function seedAgent(agentId: string) {
+  const agents = loadAgents()
+  agents[agentId] = {
+    id: agentId,
+    name: 'Webhook Agent',
+    description: 'Test agent for webhook delivery',
+    systemPrompt: 'Handle inbound webhooks.',
+    provider: 'openai',
+    model: 'gpt-4o-mini',
+    credentialId: null,
+    apiEndpoint: null,
+    tools: ['manage_webhooks'],
+    createdAt: 1,
+    updatedAt: 1,
+  }
+  saveAgents(agents)
+}
+
+function seedWebhook(webhookId: string, overrides: Record<string, unknown> = {}) {
+  const webhooks = loadWebhooks()
+  webhooks[webhookId] = {
+    id: webhookId,
+    name: 'Webhook Smoke',
+    source: 'custom',
+    events: ['build.completed'],
+    agentId: 'agent-webhook-smoke',
+    secret: 'secret-smoke',
+    isEnabled: true,
+    createdAt: 1,
+    updatedAt: 1,
+    ...overrides,
+  }
+  saveWebhooks(webhooks)
+}
+
+test('handleWebhookPost creates a session, records success history, and triggers follow-up wiring', async () => {
+  const webhookId = 'wh-success-smoke'
+  seedAgent('agent-webhook-smoke')
+  seedWebhook(webhookId)
+
+  const calls = {
+    runs: [] as Array<Record<string, unknown>>,
+    events: [] as Array<[string, string]>,
+    heartbeats: [] as Array<Record<string, unknown>>,
+  }
+
+  const response = await handleWebhookPost(
+    new Request(`http://local/api/webhooks/${webhookId}?event=build.completed`, {
+      method: 'POST',
+      headers: {
+        'content-type': 'application/json',
+        'x-webhook-secret': 'secret-smoke',
+      },
+      body: JSON.stringify({ event: 'build.completed', payload: { ok: true } }),
+    }),
+    webhookId,
+    {
+      enqueueRun(input) {
+        calls.runs.push(input as Record<string, unknown>)
+        return {
+          runId: 'run-success-smoke',
+          position: 0,
+          promise: Promise.resolve({} as never),
+          abort: () => {},
+        }
+      },
+      enqueueEvent(sessionId, text) {
+        calls.events.push([sessionId, text])
+      },
+      requestHeartbeat(opts) {
+        calls.heartbeats.push(opts as Record<string, unknown>)
+      },
+    },
+  )
+
+  assert.equal(response.status, 200)
+  const payload = await response.json() as Record<string, unknown>
+  assert.equal(payload.ok, true)
+  assert.equal(payload.event, 'build.completed')
+  assert.equal(payload.runId, 'run-success-smoke')
+
+  const sessionId = String(payload.sessionId)
+  const session = loadSessions()[sessionId]
+  assert.ok(session)
+  assert.equal(session.name, `webhook:${webhookId}`)
+  assert.equal(session.agentId, 'agent-webhook-smoke')
+
+  assert.equal(calls.runs.length, 1)
+  assert.equal(calls.runs[0].sessionId, sessionId)
+  assert.equal(calls.runs[0].source, 'webhook')
+  assert.equal(calls.runs[0].mode, 'followup')
+  assert.match(String(calls.runs[0].message), /Webhook event received\./)
+  assert.match(String(calls.runs[0].message), /Event: build\.completed/)
+
+  assert.deepEqual(calls.events, [[sessionId, 'Webhook received: Webhook Smoke (build.completed)']])
+  assert.deepEqual(calls.heartbeats, [{ agentId: 'agent-webhook-smoke', reason: 'webhook' }])
+
+  const logEntries = Object.values(loadWebhookLogs()) as Array<Record<string, unknown>>
+  const successEntry = logEntries.find((entry) => entry.webhookId === webhookId && entry.status === 'success')
+  assert.ok(successEntry)
+  assert.equal(successEntry?.sessionId, sessionId)
+  assert.equal(successEntry?.runId, 'run-success-smoke')
+
+  const historyResponse = await getWebhookHistory(new Request(`http://local/api/webhooks/${webhookId}/history`), {
+    params: Promise.resolve({ id: webhookId }),
+  })
+  assert.equal(historyResponse.status, 200)
+  const history = await historyResponse.json() as Array<Record<string, unknown>>
+  assert.equal(history[0]?.status, 'success')
+  assert.equal(history[0]?.webhookId, webhookId)
+})
+
+test('handleWebhookPost ignores filtered events without dispatching or logging delivery', async () => {
+  const webhookId = 'wh-ignored-smoke'
+  seedAgent('agent-webhook-smoke')
+  seedWebhook(webhookId, { events: ['build.completed'] })
+
+  let runCalls = 0
+  const response = await handleWebhookPost(
+    new Request(`http://local/api/webhooks/${webhookId}`, {
+      method: 'POST',
+      headers: {
+        'content-type': 'application/json',
+        'x-webhook-secret': 'secret-smoke',
+      },
+      body: JSON.stringify({ event: 'build.started' }),
+    }),
+    webhookId,
+    {
+      enqueueRun() {
+        runCalls += 1
+        return {
+          runId: 'should-not-run',
+          position: 0,
+          promise: Promise.resolve({} as never),
+          abort: () => {},
+        }
+      },
+      enqueueEvent() {},
+      requestHeartbeat() {},
+    },
+  )
+
+  assert.equal(response.status, 200)
+  const payload = await response.json() as Record<string, unknown>
+  assert.equal(payload.ignored, true)
+  assert.equal(payload.event, 'build.started')
+  assert.equal(runCalls, 0)
+  assert.equal(Object.values(loadSessions()).some((session: any) => session?.name === `webhook:${webhookId}`), false)
+  assert.equal(Object.values(loadWebhookLogs()).some((entry: any) => entry?.webhookId === webhookId), false)
+})
+
+test('handleWebhookPost rejects disabled webhooks and invalid secrets with error history', async () => {
+  const disabledId = 'wh-disabled-smoke'
+  seedWebhook(disabledId, { isEnabled: false, secret: '' })
+
+  const disabledResponse = await handleWebhookPost(
+    new Request(`http://local/api/webhooks/${disabledId}`, { method: 'POST' }),
+    disabledId,
+    {
+      enqueueRun() {
+        throw new Error('should not dispatch')
+      },
+      enqueueEvent() {},
+      requestHeartbeat() {},
+    },
+  )
+  assert.equal(disabledResponse.status, 409)
+
+  const invalidSecretId = 'wh-secret-smoke'
+  seedAgent('agent-webhook-smoke')
+  seedWebhook(invalidSecretId, { secret: 'top-secret' })
+
+  const invalidSecretResponse = await handleWebhookPost(
+    new Request(`http://local/api/webhooks/${invalidSecretId}`, {
+      method: 'POST',
+      headers: { 'x-webhook-secret': 'wrong-secret' },
+    }),
+    invalidSecretId,
+    {
+      enqueueRun() {
+        throw new Error('should not dispatch')
+      },
+      enqueueEvent() {},
+      requestHeartbeat() {},
+    },
+  )
+  assert.equal(invalidSecretResponse.status, 401)
+
+  const errors = Object.values(loadWebhookLogs()) as Array<Record<string, unknown>>
+  const disabledEntry = errors.find((entry) => entry.webhookId === disabledId)
+  const invalidSecretEntry = errors.find((entry) => entry.webhookId === invalidSecretId)
+  assert.equal(disabledEntry?.error, 'Webhook is disabled')
+  assert.equal(invalidSecretEntry?.error, 'Invalid webhook secret')
+})
+
+test('handleWebhookPost queues retries when run dispatch throws', async () => {
+  const webhookId = 'wh-retry-smoke'
+  seedAgent('agent-webhook-smoke')
+  seedWebhook(webhookId)
+
+  const heartbeats: Array<Record<string, unknown>> = []
+  const response = await handleWebhookPost(
+    new Request(`http://local/api/webhooks/${webhookId}`, {
+      method: 'POST',
+      headers: {
+        'content-type': 'application/json',
+        'x-webhook-secret': 'secret-smoke',
+      },
+      body: JSON.stringify({ event: 'build.completed', payload: { ok: false } }),
+    }),
+    webhookId,
+    {
+      enqueueRun() {
+        throw new Error('dispatch exploded')
+      },
+      enqueueEvent() {},
+      requestHeartbeat(opts) {
+        heartbeats.push(opts as Record<string, unknown>)
+      },
+    },
+  )
+
+  assert.equal(response.status, 200)
+  const payload = await response.json() as Record<string, unknown>
+  assert.equal(payload.retryQueued, true)
+  assert.equal(payload.error, 'dispatch exploded')
+  assert.equal(heartbeats.length, 0)
+
+  const retries = Object.values(loadWebhookRetryQueue()) as Array<Record<string, unknown>>
+  const retryEntry = retries.find((entry) => entry.webhookId === webhookId)
+  assert.ok(retryEntry)
+  assert.equal(retryEntry?.attempts, 1)
+  assert.equal(retryEntry?.deadLettered, false)
+
+  const errorLogs = Object.values(loadWebhookLogs()) as Array<Record<string, unknown>>
+  const retryLog = errorLogs.find((entry) => entry.webhookId === webhookId)
+  assert.ok(retryLog)
+  assert.match(String(retryLog?.error), /Dispatch failed, queued for retry: dispatch exploded/)
+})

package/src/cli/index.js

@@ -586,6 +586,7 @@ const COMMAND_GROUPS = [
       cmd('delete', 'DELETE', '/tasks/:id', 'Delete task'),
       cmd('purge', 'DELETE', '/tasks', 'Bulk delete tasks', { expectsJsonBody: true }),
       cmd('approve', 'POST', '/tasks/:id/approve', 'Approve or reject a pending tool execution', { expectsJsonBody: true }),
+      cmd('import-github', 'POST', '/tasks/import/github', 'Import GitHub issues into tasks', { expectsJsonBody: true }),
       cmd('metrics', 'GET', '/tasks/metrics', 'Get task board metrics (supports --query range=24h|7d|30d)'),
     ],
   },

package/src/cli/spec.js

@@ -447,6 +447,7 @@ const COMMAND_GROUPS = {
       delete: { description: 'Archive task', method: 'DELETE', path: '/tasks/:id', params: ['id'] },
       archive: { description: 'Archive task', method: 'DELETE', path: '/tasks/:id', params: ['id'] },
       approve: { description: 'Approve or reject a pending tool execution', method: 'POST', path: '/tasks/:id/approve', params: ['id'] },
+      'import-github': { description: 'Import GitHub issues into tasks', method: 'POST', path: '/tasks/import/github' },
       metrics: { description: 'Get task board metrics (supports --query range=24h|7d|30d)', method: 'GET', path: '/tasks/metrics' },
     },
   },

package/src/components/agents/agent-card.tsx

@@ -63,6 +63,7 @@ export function AgentCard({ agent, isDefault, isRunning, isOnline, isSelected, o
     },
   ].filter((entry) => entry.budget !== null)
   const canDelegateToAgents = agent.platformAssignScope === 'all'
+  const agentDisabled = agent.disabled === true
   useWs(`heartbeat:agent:${agent.id}`, () => {
     setHeartbeatPulse(true)
     setTimeout(() => setHeartbeatPulse(false), 1500)
@@ -125,6 +126,7 @@ export function AgentCard({ agent, isDefault, isRunning, isOnline, isSelected, o
         onClick={handleClick}
         className={`group relative py-3.5 px-4 cursor-pointer rounded-[14px]
           transition-all duration-200 active:scale-[0.98]
+          ${agentDisabled ? 'opacity-70' : ''}
           ${isSelected
             ? 'bg-white/[0.04] border border-white/[0.08]'
             : 'bg-transparent border border-transparent hover:bg-white/[0.05] hover:border-white/[0.08]'}`}
@@ -197,6 +199,11 @@ export function AgentCard({ agent, isDefault, isRunning, isOnline, isSelected, o
               {pendingApprovalCount} {pendingApprovalCount === 1 ? 'approval' : 'approvals'}
             </span>
           )}
+          {agentDisabled && (
+            <span className="shrink-0 text-[10px] font-600 uppercase tracking-wider text-amber-300 bg-amber-400/[0.08] border border-amber-400/15 px-2 py-0.5 rounded-[6px]">
+              disabled
+            </span>
+          )}
           {isDefault && (
             <span className="shrink-0 text-[10px] font-600 uppercase tracking-wider text-accent-bright bg-accent-soft px-2 py-0.5 rounded-[6px]">
               default
@@ -205,12 +212,12 @@ export function AgentCard({ agent, isDefault, isRunning, isOnline, isSelected, o
           {canDelegateToAgents && (
             <button
               onClick={handleRunClick}
-              disabled={running}
+              disabled={running || agentDisabled}
               className="shrink-0 text-[10px] font-600 uppercase tracking-wider px-2.5 py-1 rounded-[6px] cursor-pointer
                 transition-all border-none bg-accent-bright/20 text-accent-bright hover:bg-accent-bright/30 disabled:opacity-40"
               style={{ fontFamily: 'inherit' }}
             >
-              {running ? '...' : 'Run'}
+              {agentDisabled ? 'Off' : running ? '...' : 'Run'}
             </button>
           )}
           {canDelegateToAgents && (

package/src/components/agents/agent-chat-list.tsx

@@ -167,6 +167,10 @@ export function AgentChatList({ inSidebar, onSelect }: Props) {
   }, [filteredAgents.map((a) => a.id).join(',')])
 
   const handleSelect = async (agent: Agent) => {
+    if (agent.disabled === true && !agent.threadSessionId) {
+      toast.error(`${agent.name} is disabled. Re-enable it to start a new chat.`)
+      return
+    }
     await setCurrentAgent(agent.id)
     // Load messages for the thread
     const state = useAppStore.getState()
@@ -274,7 +278,8 @@ export function AgentChatList({ inSidebar, onSelect }: Props) {
           const lastMsg = threadSession?.messages?.at(-1)
           const heartbeatOn = defaultAgent.heartbeatEnabled === true && (defaultAgent.plugins?.length ?? 0) > 0
           const recentlyActive = (threadSession?.lastActiveAt ?? 0) > Date.now() - 30 * 60 * 1000
-          const isWorking = runningAgentIds.has(defaultAgent.id) || (threadSession?.active ?? false) || heartbeatOn || recentlyActive || chatroomActiveAgentIds.has(defaultAgent.id)
+          const isDisabled = defaultAgent.disabled === true
+          const isWorking = !isDisabled && (runningAgentIds.has(defaultAgent.id) || (threadSession?.active ?? false) || heartbeatOn || recentlyActive || chatroomActiveAgentIds.has(defaultAgent.id))
           const isTyping = streamingSessionId === defaultAgent.threadSessionId
           const preview = lastMsg?.text?.slice(0, 100)?.replace(/\n/g, ' ') || 'Your primary shortcut chat.'
           const isActive = currentAgentId === defaultAgent.id
@@ -313,6 +318,11 @@ export function AgentChatList({ inSidebar, onSelect }: Props) {
                       <span className="font-display text-[14px] font-700 truncate text-text tracking-[-0.01em]">
                         {defaultAgent.name}
                       </span>
+                      {isDisabled && (
+                        <span className="px-1.5 py-0.5 rounded-[6px] bg-amber-400/[0.08] text-amber-300 text-[9px] font-700 uppercase tracking-[0.08em]">
+                          Disabled
+                        </span>
+                      )}
                       <span className="px-1.5 py-0.5 rounded-[6px] bg-accent-bright/12 text-accent-bright text-[9px] font-700 uppercase tracking-[0.08em]">
                         Shortcut
                       </span>
@@ -359,7 +369,8 @@ export function AgentChatList({ inSidebar, onSelect }: Props) {
           const isActive = currentAgentId === agent.id
           const heartbeatOn = agent.heartbeatEnabled === true && (agent.plugins?.length ?? 0) > 0
           const recentlyActive = (threadSession?.lastActiveAt ?? 0) > Date.now() - 30 * 60 * 1000
-          const isWorking = runningAgentIds.has(agent.id) || (threadSession?.active ?? false) || heartbeatOn || recentlyActive || chatroomActiveAgentIds.has(agent.id)
+          const isDisabled = agent.disabled === true
+          const isWorking = !isDisabled && (runningAgentIds.has(agent.id) || (threadSession?.active ?? false) || heartbeatOn || recentlyActive || chatroomActiveAgentIds.has(agent.id))
           const isTyping = streamingSessionId === agent.threadSessionId
           const preview = lastMsg?.text?.slice(0, 80)?.replace(/\n/g, ' ') || ''
 
@@ -395,6 +406,11 @@ export function AgentChatList({ inSidebar, onSelect }: Props) {
                     <span className="font-display text-[13.5px] font-600 truncate flex-1 tracking-[-0.01em]">
                       {agent.name}
                     </span>
+                    {isDisabled && (
+                      <span className="px-1.5 py-0.5 rounded-[6px] bg-amber-400/[0.08] text-amber-300 text-[9px] font-700 uppercase tracking-[0.08em] shrink-0">
+                        Disabled
+                      </span>
+                    )}
                     {appSettings.defaultAgentId === agent.id && (
                       <span className="px-1.5 py-0.5 rounded-[6px] bg-accent-bright/10 text-accent-bright text-[9px] font-700 uppercase tracking-[0.08em] shrink-0">
                         Default

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

@@ -70,6 +70,7 @@ export function AgentList({ inSidebar }: Props) {
     const ids = new Set<string>()
     const recentThreshold = now - 30 * 60 * 1000
     for (const a of Object.values(agents)) {
+      if (a.disabled === true) continue
       if (a.heartbeatEnabled === true && (a.plugins?.length ?? 0) > 0) { ids.add(a.id); continue }
       // Check if any session for this agent was active in the last 30 minutes
       for (const s of Object.values(sessions)) {

package/src/components/agents/agent-sheet.tsx

@@ -1,6 +1,6 @@
 'use client'
 
-import { useEffect, useRef, useState } from 'react'
+import { useCallback, useEffect, useRef, useState } from 'react'
 import { useAppStore } from '@/stores/use-app-store'
 import { createAgent, updateAgent, deleteAgent } from '@/lib/agents'
 import { api } from '@/lib/api-client'
@@ -18,11 +18,19 @@ import { copyTextToClipboard } from '@/lib/clipboard'
 import { SectionLabel } from '@/components/shared/section-label'
 import { SoulLibraryPicker } from './soul-library-picker'
 import { HintTip } from '@/components/shared/hint-tip'
+import { isOllamaCloudModel } from '@/lib/ollama-model'
 
 const HB_PRESETS = [1800, 3600, 7200, 21600, 43200] as const
 const FALLBACK_ELEVENLABS_VOICE_ID = 'JBFqnCBsd6RMkjVDRZzb'
 
 type AgentSheetSectionId = 'overview' | 'instructions' | 'model' | 'tools'
+type SafeAgentWallet = Omit<AgentWallet, 'encryptedPrivateKey'> & {
+  balanceAtomic?: string
+  balanceLamports?: number
+  balanceFormatted?: string
+  balanceSymbol?: string
+  isActive?: boolean
+}
 
 function SectionCard({
   title,
@@ -190,6 +198,7 @@ export function AgentSheet() {
   const [memoryScopeMode, setMemoryScopeMode] = useState<'auto' | 'all' | 'global' | 'agent' | 'session' | 'project'>('auto')
   const [memoryTierPreference, setMemoryTierPreference] = useState<'working' | 'durable' | 'archive' | 'blended'>('blended')
   const [autoRecovery, setAutoRecovery] = useState(false)
+  const [disabled, setDisabled] = useState(false)
   const [voiceId, setVoiceId] = useState('')
   const [heartbeatEnabled, setHeartbeatEnabled] = useState(false)
   const [heartbeatIntervalSec, setHeartbeatIntervalSec] = useState('')  // '' = default (30m)
@@ -211,7 +220,7 @@ export function AgentSheet() {
   const [dailyBudget, setDailyBudget] = useState('')
   const [monthlyBudget, setMonthlyBudget] = useState('')
   const [budgetAction, setBudgetAction] = useState<'warn' | 'block'>('warn')
-  const [agentWallet, setAgentWallet] = useState<(Omit<AgentWallet, 'encryptedPrivateKey'> & { balanceLamports?: number; balanceSol?: number }) | null>(null)
+  const [agentWallets, setAgentWallets] = useState<SafeAgentWallet[]>([])
   const [addingKey, setAddingKey] = useState(false)
   const [newKeyName, setNewKeyName] = useState('')
   const [newKeyValue, setNewKeyValue] = useState('')
@@ -245,6 +254,21 @@ export function AgentSheet() {
     e.target.value = ''
   }
 
+  const loadAgentWallets = useCallback(async (agentId: string) => {
+    try {
+      const wallets = await api<Record<string, SafeAgentWallet>>('GET', `/wallets?agentId=${encodeURIComponent(agentId)}`)
+      const matches = Object.values(wallets)
+        .filter((wallet) => wallet.agentId === agentId)
+        .sort((a, b) => {
+          if ((a.isActive ? 1 : 0) !== (b.isActive ? 1 : 0)) return a.isActive ? -1 : 1
+          return a.chain.localeCompare(b.chain)
+        })
+      setAgentWallets(matches)
+    } catch {
+      setAgentWallets([])
+    }
+  }, [])
+
   const currentProvider = providers.find((p) => p.id === provider)
   const providerCredentials = Object.values(credentials).filter((c) => c.provider === provider)
   const openclawCredentials = Object.values(credentials).filter((c) => c.provider === 'openclaw')
@@ -307,7 +331,11 @@ export function AgentSheet() {
         setFallbackCredentialIds(editing.fallbackCredentialIds || [])
         setCapabilities(Array.isArray(editing.capabilities) ? editing.capabilities : [])
         setCapInput('')
-        setOllamaMode(editing.credentialId && editing.provider === 'ollama' ? 'cloud' : 'local')
+        setOllamaMode(
+          editing.provider === 'ollama' && (Boolean(editing.credentialId) || isOllamaCloudModel(editing.model))
+            ? 'cloud'
+            : 'local'
+        )
         setOpenclawEnabled(editing.provider === 'openclaw')
         setProjectId(editing.projectId)
         setAvatarSeed(editing.avatarSeed || crypto.randomUUID().slice(0, 8))
@@ -316,6 +344,7 @@ export function AgentSheet() {
         setMemoryScopeMode(editing.memoryScopeMode || 'auto')
         setMemoryTierPreference(editing.memoryTierPreference || 'blended')
         setAutoRecovery(editing.autoRecovery || false)
+        setDisabled(editing.disabled === true)
         setVoiceId(editing.elevenLabsVoiceId || '')
         setHeartbeatEnabled(editing.heartbeatEnabled || false)
         setHeartbeatIntervalSec(parseDurationToSec(editing.heartbeatInterval, editing.heartbeatIntervalSec))
@@ -341,14 +370,7 @@ export function AgentSheet() {
         setDailyBudget(typeof editing.dailyBudget === 'number' && editing.dailyBudget > 0 ? String(editing.dailyBudget) : '')
         setMonthlyBudget(typeof editing.monthlyBudget === 'number' && editing.monthlyBudget > 0 ? String(editing.monthlyBudget) : '')
         setBudgetAction(editing.budgetAction || 'warn')
-        // Load wallet if agent has one
-        if (editing.walletId) {
-          api<Omit<AgentWallet, 'encryptedPrivateKey'> & { balanceLamports?: number; balanceSol?: number }>('GET', `/wallets/${editing.walletId}`)
-            .then(setAgentWallet)
-            .catch(() => setAgentWallet(null))
-        } else {
-          setAgentWallet(null)
-        }
+        void loadAgentWallets(editing.id)
       } else {
         setName('')
         setDescription('')
@@ -383,6 +405,7 @@ export function AgentSheet() {
         setMemoryScopeMode('auto')
         setMemoryTierPreference('blended')
         setAutoRecovery(false)
+        setDisabled(false)
         setVoiceId('')
         setHeartbeatEnabled(false)
         setHeartbeatIntervalSec('')
@@ -404,6 +427,7 @@ export function AgentSheet() {
         setDailyBudget('')
         setMonthlyBudget('')
         setBudgetAction('warn')
+        setAgentWallets([])
       }
     }
   // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -571,6 +595,7 @@ export function AgentSheet() {
       memoryScopeMode,
       memoryTierPreference,
       autoRecovery,
+      disabled,
       elevenLabsVoiceId: voiceId.trim() || null,
       heartbeatEnabled,
       heartbeatInterval: heartbeatIntervalSec ? formatHbDuration(Number(heartbeatIntervalSec)) : null,
@@ -744,9 +769,18 @@ export function AgentSheet() {
     <BottomSheet open={open} onClose={onClose} wide>
       <div className="mb-10 flex items-start justify-between">
         <div>
-          <h2 className="font-display text-[28px] font-700 tracking-[-0.03em] mb-2">
-            {editing ? 'Edit Agent' : 'New Agent'}
-          </h2>
+          <div className="mb-2 flex flex-wrap items-center gap-2">
+            <h2 className="font-display text-[28px] font-700 tracking-[-0.03em]">
+              {editing ? 'Edit Agent' : 'New Agent'}
+            </h2>
+            <span className={`rounded-[999px] px-2.5 py-1 text-[10px] font-700 uppercase tracking-[0.1em] ${
+              disabled
+                ? 'border border-amber-400/20 bg-amber-400/[0.08] text-amber-300'
+                : 'border border-emerald-400/20 bg-emerald-400/[0.08] text-emerald-300'
+            }`}>
+              {disabled ? 'Disabled' : 'Enabled'}
+            </span>
+          </div>
           <p className="text-[14px] text-text-3">Define an AI agent and optional multi-agent delegation behavior</p>
         </div>
         <div className="flex items-center gap-3 mt-1.5">
@@ -1029,6 +1063,28 @@ export function AgentSheet() {
         <p className="text-[11px] text-text-3/70 mt-1.5">Use working for fast recent context, durable for facts/preferences, and archive for long-lived history.</p>
       </div>
 
+      {/* Auto-Recovery */}
+      <div className="mb-8">
+        <div className="flex items-center justify-between mb-1.5">
+          <label className="flex items-center gap-2 font-display text-[12px] font-600 text-text-2 uppercase tracking-[0.08em]">
+            Agent Availability
+            <HintTip text="Disabled agents stay visible, but cannot take chats, heartbeats, schedules, or queued work until re-enabled." />
+          </label>
+          <div
+            onClick={() => setDisabled(!disabled)}
+            className={`w-9 h-5 rounded-full transition-all relative cursor-pointer ${disabled ? 'bg-amber-400' : 'bg-accent-bright'}`}
+          >
+            <div className={`absolute top-0.5 w-4 h-4 rounded-full bg-white transition-all ${disabled ? 'left-0.5' : 'left-[18px]'}`} />
+          </div>
+        </div>
+        <p className="text-[11px] text-text-3/70">
+          {disabled
+            ? 'This agent is paused. Existing chats remain viewable, but new work is blocked until you switch it back on.'
+            : 'This agent is active and can accept chats, heartbeats, schedules, and queued work.'}
+          {' '}Gateway and remote runtime shutdown stay managed separately in Providers and OpenClaw Deploy.
+        </p>
+      </div>
+
       {/* Auto-Recovery */}
       <div className="mb-8">
         <div className="flex items-center justify-between mb-1.5">
@@ -1261,18 +1317,11 @@ export function AgentSheet() {
       {editingId && (
         <WalletSection
           agentId={editingId}
-          wallet={agentWallet}
+          wallets={agentWallets}
+          activeWalletId={editing?.activeWalletId || editing?.walletId || agentWallets.find((wallet) => wallet.isActive)?.id || null}
           onWalletCreated={async () => {
             await loadAgents()
-            // Fetch the wallet for this agent
-            try {
-              const wallets = await api<Record<string, Omit<AgentWallet, 'encryptedPrivateKey'>>>('GET', '/wallets')
-              const match = Object.values(wallets).find((w) => w.agentId === editingId)
-              if (match) {
-                const detail = await api<Omit<AgentWallet, 'encryptedPrivateKey'> & { balanceLamports?: number; balanceSol?: number }>('GET', `/wallets/${match.id}`)
-                setAgentWallet(detail)
-              }
-            } catch { /* ignore */ }
+            await loadAgentWallets(editingId)
           }}
         />
       )}