@swarmclawai/swarmclaw 1.2.8 → 1.2.9

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

@@ -0,0 +1,147 @@
+import assert from 'node:assert/strict'
+import fs from 'node:fs'
+import os from 'node:os'
+import path from 'node:path'
+import { spawnSync } from 'node:child_process'
+import test from 'node:test'
+
+const repoRoot = path.resolve(path.dirname(new URL(import.meta.url).pathname), '../../../..')
+
+function runWithTempDataDir(script: string) {
+  const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'swarmclaw-wallet-routes-'))
+  try {
+    const result = spawnSync(process.execPath, ['--import', 'tsx', '--input-type=module', '--eval', script], {
+      cwd: repoRoot,
+      env: {
+        ...process.env,
+        CREDENTIAL_SECRET: 'test-credential-secret',
+        DATA_DIR: path.join(tempDir, 'data'),
+        WORKSPACE_DIR: path.join(tempDir, 'workspace'),
+      },
+      encoding: 'utf-8',
+    })
+    assert.equal(result.status, 0, result.stderr || result.stdout || 'subprocess failed')
+    const lines = (result.stdout || '')
+      .trim()
+      .split('\n')
+      .map((line) => line.trim())
+      .filter(Boolean)
+    const jsonLine = [...lines].reverse().find((line) => line.startsWith('{'))
+    return JSON.parse(jsonLine || '{}')
+  } finally {
+    fs.rmSync(tempDir, { recursive: true, force: true })
+  }
+}
+
+test('wallet routes reject unknown agents and invalid addresses while returning safe payloads', () => {
+  const output = runWithTempDataDir(`
+    const storageMod = await import('./src/lib/server/storage')
+    const walletsRouteMod = await import('./src/app/api/wallets/route')
+    const walletsGenerateRouteMod = await import('./src/app/api/wallets/generate/route')
+    const storage = storageMod.default || storageMod
+    const walletsRoute = walletsRouteMod.default || walletsRouteMod
+    const walletsGenerateRoute = walletsGenerateRouteMod.default || walletsGenerateRouteMod
+
+    storage.saveAgents({
+      agent_1: {
+        id: 'agent_1',
+        name: 'Agent One',
+      },
+    })
+
+    const missingAgentResponse = await walletsRoute.POST(new Request('http://local/api/wallets', {
+      method: 'POST',
+      headers: { 'content-type': 'application/json' },
+      body: JSON.stringify({
+        agentId: 'missing-agent',
+        walletAddress: '0x000000000000000000000000000000000000dEaD',
+      }),
+    }))
+    const missingAgentPayload = await missingAgentResponse.json()
+
+    const blankAddressResponse = await walletsRoute.POST(new Request('http://local/api/wallets', {
+      method: 'POST',
+      headers: { 'content-type': 'application/json' },
+      body: JSON.stringify({
+        agentId: 'agent_1',
+        walletAddress: '   ',
+      }),
+    }))
+    const blankAddressPayload = await blankAddressResponse.json()
+
+    const invalidAddressResponse = await walletsRoute.POST(new Request('http://local/api/wallets', {
+      method: 'POST',
+      headers: { 'content-type': 'application/json' },
+      body: JSON.stringify({
+        agentId: 'agent_1',
+        walletAddress: '0x1234',
+      }),
+    }))
+    const invalidAddressPayload = await invalidAddressResponse.json()
+
+    const createResponse = await walletsRoute.POST(new Request('http://local/api/wallets', {
+      method: 'POST',
+      headers: { 'content-type': 'application/json' },
+      body: JSON.stringify({
+        agentId: 'agent_1',
+        walletAddress: '0x000000000000000000000000000000000000dead',
+        label: 'Manual Wallet',
+      }),
+    }))
+    const createPayload = await createResponse.json()
+
+    const generateMissingResponse = await walletsGenerateRoute.POST(new Request('http://local/api/wallets/generate', {
+      method: 'POST',
+      headers: { 'content-type': 'application/json' },
+      body: JSON.stringify({
+        agentId: 'missing-agent',
+      }),
+    }))
+    const generateMissingPayload = await generateMissingResponse.json()
+
+    const generateResponse = await walletsGenerateRoute.POST(new Request('http://local/api/wallets/generate', {
+      method: 'POST',
+      headers: { 'content-type': 'application/json' },
+      body: JSON.stringify({
+        agentId: 'agent_1',
+        label: 'Generated Wallet',
+      }),
+    }))
+    const generatePayload = await generateResponse.json()
+
+    const storedWallets = Object.values(storage.loadWallets())
+    const generatedStoredWallet = storedWallets.find((wallet) => wallet.label === 'Generated Wallet') || null
+
+    console.log(JSON.stringify({
+      missingAgentStatus: missingAgentResponse.status,
+      missingAgentError: missingAgentPayload?.error || null,
+      blankAddressStatus: blankAddressResponse.status,
+      blankAddressError: blankAddressPayload?.error || null,
+      invalidAddressStatus: invalidAddressResponse.status,
+      invalidAddressError: invalidAddressPayload?.error || null,
+      createStatus: createResponse.status,
+      createAddress: createPayload?.walletAddress || null,
+      createHasPrivateKey: Boolean(createPayload && Object.prototype.hasOwnProperty.call(createPayload, 'encryptedPrivateKey')),
+      generateMissingStatus: generateMissingResponse.status,
+      generateMissingError: generateMissingPayload?.error || null,
+      generateStatus: generateResponse.status,
+      generateHasPrivateKey: Boolean(generatePayload && Object.prototype.hasOwnProperty.call(generatePayload, 'encryptedPrivateKey')),
+      storedGeneratedHasPrivateKey: Boolean(generatedStoredWallet?.encryptedPrivateKey),
+    }))
+  `)
+
+  assert.equal(output.missingAgentStatus, 404)
+  assert.match(String(output.missingAgentError || ''), /Agent not found/i)
+  assert.equal(output.blankAddressStatus, 400)
+  assert.equal(output.blankAddressError, 'walletAddress is required')
+  assert.equal(output.invalidAddressStatus, 400)
+  assert.match(String(output.invalidAddressError || ''), /valid Base\/Ethereum address/i)
+  assert.equal(output.createStatus, 201)
+  assert.equal(output.createAddress, '0x000000000000000000000000000000000000dEaD')
+  assert.equal(output.createHasPrivateKey, false)
+  assert.equal(output.generateMissingStatus, 404)
+  assert.match(String(output.generateMissingError || ''), /Agent not found/i)
+  assert.equal(output.generateStatus, 201)
+  assert.equal(output.generateHasPrivateKey, false)
+  assert.equal(output.storedGeneratedHasPrivateKey, true)
+})

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

@@ -1,109 +1,27 @@
 import { NextResponse } from 'next/server'
 import { safeParseBody } from '@/lib/server/safe-parse-body'
-import { loadAgents, loadSettings, loadWallets } from '@/lib/server/storage'
-import { createAgentWallet, getAgentActiveWalletId, getWalletPortfolioSnapshot, stripWalletPrivateKey } from '@/lib/server/wallet/wallet-service'
-import { buildEmptyWalletPortfolio } from '@/lib/server/wallet/wallet-portfolio'
-import type { AgentWallet, WalletPortfolioSummary } from '@/types'
-import { errorMessage } from '@/lib/shared-utils'
+import { listWalletsSafe, createWallet, WalletServiceError } from '@/lib/server/wallets/wallet-service'
 export const dynamic = 'force-dynamic'
-const WALLET_LIST_PORTFOLIO_TIMEOUT_MS = 1500
 
-function withPortfolio(
-  wallet: AgentWallet,
-  portfolio: {
-    balanceAtomic: string
-    balanceFormatted: string
-    balanceSymbol: string
-    balanceDisplay: string
-    balanceLamports?: number
-    balanceSol?: number
-    assets: unknown[]
-    summary: WalletPortfolioSummary
-  },
-  isActive: boolean,
-) {
-  return {
-    ...stripWalletPrivateKey(wallet as unknown as Record<string, unknown>),
-    balanceAtomic: portfolio.balanceAtomic,
-    balanceFormatted: portfolio.balanceFormatted,
-    balanceSymbol: portfolio.balanceSymbol,
-    balanceDisplay: portfolio.balanceDisplay,
-    balanceLamports: portfolio.balanceLamports,
-    balanceSol: portfolio.balanceSol,
-    assets: portfolio.assets,
-    portfolioSummary: portfolio.summary,
-    isActive,
-  }
-}
-
-export async function GET(req: Request) {
-  const wallets = loadWallets() as Record<string, AgentWallet>
-  const agents = loadAgents()
-  const { searchParams } = new URL(req.url)
-  const agentId = searchParams.get('agentId')?.trim() || ''
-  const walletEntries = Object.entries(wallets)
-    .filter(([, wallet]) => !agentId || wallet.agentId === agentId)
-  const entries = await Promise.all(
-    walletEntries.map(async ([id, wallet]) => {
-      let portfolio = buildEmptyWalletPortfolio(wallet)
-      try {
-        portfolio = await getWalletPortfolioSnapshot(wallet, {
-          timeoutMs: WALLET_LIST_PORTFOLIO_TIMEOUT_MS,
-          allowStale: true,
-        })
-      } catch {
-        // Slow or failed RPC discovery — return empty/stale portfolio for list view
-      }
-      const activeWalletId = getAgentActiveWalletId(agents[wallet.agentId])
-      return [id, withPortfolio(wallet, portfolio, activeWalletId === wallet.id)] as const
-    }),
-  )
-  return NextResponse.json(Object.fromEntries(entries))
-}
-
-interface WalletCreateBody {
-  agentId: string
-  chain?: string | null
-  provider?: string | null
-  label?: string
-  requireApproval?: boolean
-  spendingLimitAtomic?: string | number | null
-  spendingLimitLamports?: string | number | null
-  dailyLimitAtomic?: string | number | null
-  dailyLimitLamports?: string | number | null
+export async function GET() {
+  return NextResponse.json(listWalletsSafe())
 }
 
 export async function POST(req: Request) {
-  const { data: body, error } = await safeParseBody<WalletCreateBody>(req)
+  const { data: body, error } = await safeParseBody(req)
   if (error) return error
-  const settings = loadSettings()
   try {
-    const wallet = createAgentWallet({
-      agentId: body.agentId,
-      chain: body.chain,
-      provider: body.provider,
-      label: body.label,
-      requireApproval: typeof body.requireApproval === 'boolean'
-        ? body.requireApproval
-        : settings.walletApprovalsEnabled !== false,
-      spendingLimitAtomic: body.spendingLimitAtomic ?? body.spendingLimitLamports,
-      dailyLimitAtomic: body.dailyLimitAtomic ?? body.dailyLimitLamports,
+    const wallet = await createWallet({
+      agentId: typeof body.agentId === 'string' ? body.agentId : '',
+      walletAddress: typeof body.walletAddress === 'string' ? body.walletAddress : '',
+      label: typeof body.label === 'string' ? body.label : undefined,
     })
-    return NextResponse.json(stripWalletPrivateKey(wallet as unknown as Record<string, unknown>))
-  } catch (err: unknown) {
-    const message = errorMessage(err)
-    if (message === 'agentId is required') {
-      return NextResponse.json({ error: message }, { status: 400 })
-    }
-    if (/^Unsupported wallet chain or provider: /.test(message)) {
-      return NextResponse.json({ error: message }, { status: 400 })
-    }
-    if (message === 'Agent not found') {
-      return NextResponse.json({ error: message }, { status: 404 })
-    }
-    if (/^Agent already has a (solana|ethereum) wallet$/.test(message)) {
-      return NextResponse.json({ error: message }, { status: 409 })
+    return NextResponse.json(wallet, { status: 201 })
+  } catch (err) {
+    if (err instanceof WalletServiceError) {
+      return NextResponse.json({ error: err.message }, { status: err.status })
     }
+    const message = err instanceof Error ? err.message : 'Failed to create wallet'
     return NextResponse.json({ error: message }, { status: 500 })
   }
 }

package/src/app/autonomy/page.tsx

@@ -7,7 +7,7 @@ import { StatCard } from '@/components/ui/stat-card'
 import { isOrchestratorEligible } from '@/lib/orchestrator-config'
 import { timeAgo } from '@/lib/time-format'
 import { useWs } from '@/hooks/use-ws'
-import type { Agent, ApprovalRequest, EstopState, Mission, SupervisorIncident } from '@/types'
+import type { Agent, ApprovalRequest, EstopState, SupervisorIncident } from '@/types'
 
 type EstopResponse = EstopState & {
   ok?: boolean
@@ -108,7 +108,6 @@ function previewIncidentDetails(value: string): string {
 export default function AutonomyPage() {
   const [estop, setEstop] = useState<EstopResponse | null>(null)
   const [incidents, setIncidents] = useState<SupervisorIncident[]>([])
-  const [missions, setMissions] = useState<Mission[]>([])
   const [agents, setAgents] = useState<Agent[]>([])
   const [loading, setLoading] = useState(true)
   const [refreshing, setRefreshing] = useState(false)
@@ -122,15 +121,13 @@ export default function AutonomyPage() {
     if (mode === 'initial') setLoading(true)
     else setRefreshing(true)
     try {
-      const [estopState, incidentList, missionList, agentMap] = await Promise.all([
+      const [estopState, incidentList, agentMap] = await Promise.all([
         api<EstopResponse>('GET', '/autonomy/estop'),
         api<SupervisorIncident[]>('GET', '/autonomy/incidents?limit=60'),
-        api<Mission[]>('GET', '/missions?status=non_terminal&limit=20'),
         api<Record<string, Agent>>('GET', '/agents'),
       ])
       setEstop(estopState)
       setIncidents(Array.isArray(incidentList) ? incidentList : [])
-      setMissions(Array.isArray(missionList) ? missionList : [])
       setAgents(agentMap ? Object.values(agentMap) : [])
       setRefreshedAt(Date.now())
       setError(null)
@@ -287,14 +284,6 @@ export default function AutonomyPage() {
     () => [...incidents].sort((left, right) => right.createdAt - left.createdAt),
     [incidents],
   )
-  const activeMissions = useMemo(
-    () => [...missions].sort((left, right) => right.updatedAt - left.updatedAt),
-    [missions],
-  )
-  const blockedMissions = activeMissions.filter((mission) =>
-    mission.status === 'waiting' || mission.status === 'failed' || mission.status === 'cancelled',
-  )
-
   const filteredIncidents = useMemo(() => {
     if (incidentFilter === 'high') return sortedIncidents.filter((incident) => incident.severity === 'high')
     if (incidentFilter === 'runtime_failure') return sortedIncidents.filter((incident) => incident.kind === 'runtime_failure')
@@ -491,50 +480,6 @@ export default function AutonomyPage() {
           </div>
         )}
 
-        <section className="rounded-[20px] border border-white/[0.06] bg-surface p-5">
-          <div className="mb-4 flex items-start justify-between gap-4">
-            <div>
-              <h2 className="font-display text-[18px] font-700 tracking-[-0.02em] text-text">Active Missions</h2>
-              <p className="mt-1 text-[12px] leading-[1.7] text-text-3/72">
-                Durable goals that are still running or waiting. Waiting missions surface here so operators can see blockers without digging through incidents.
-              </p>
-            </div>
-            <div className="rounded-full border border-white/[0.08] bg-white/[0.03] px-3 py-1 text-[11px] text-text-3/72">
-              {activeMissions.length} active
-              {blockedMissions.length > 0 ? ` · ${blockedMissions.length} waiting` : ''}
-            </div>
-          </div>
-
-          {activeMissions.length === 0 ? (
-            <div className="rounded-[16px] border border-white/[0.06] bg-white/[0.02] px-4 py-3 text-[12px] text-text-3/70">
-              No durable missions are active right now.
-            </div>
-          ) : (
-            <div className="grid gap-3 lg:grid-cols-2">
-              {activeMissions.slice(0, 6).map((mission) => {
-                const waiting = mission.status === 'waiting' || mission.status === 'failed' || mission.status === 'cancelled'
-                return (
-                  <div
-                    key={mission.id}
-                    className={`rounded-[16px] border p-4 ${waiting ? 'border-amber-500/18 bg-amber-500/[0.05]' : 'border-white/[0.06] bg-white/[0.02]'}`}
-                  >
-                    <div className="mb-2 flex items-center justify-between gap-3">
-                      <span className={`rounded-full px-2.5 py-1 text-[10px] font-700 uppercase tracking-[0.08em] ${waiting ? 'bg-amber-500/12 text-amber-300' : 'bg-emerald-500/12 text-emerald-300'}`}>
-                        {mission.status}
-                      </span>
-                      <span className="text-[11px] text-text-3/65">{timeAgo(mission.updatedAt, now)}</span>
-                    </div>
-                    <div className="text-[14px] font-600 text-text">{mission.objective}</div>
-                    <div className="mt-2 text-[12px] leading-[1.7] text-text-3/72">
-                      {mission.waitState?.reason || mission.currentStep || mission.verifierSummary || mission.plannerSummary || 'Mission active.'}
-                    </div>
-                  </div>
-                )
-              })}
-            </div>
-          )}
-        </section>
-
         <section className="rounded-[20px] border border-white/[0.06] bg-surface p-5">
           <div className="mb-4 flex items-start justify-between gap-4">
             <div>

package/src/app/protocols/page.tsx

@@ -4,7 +4,6 @@ import { useCallback, useEffect, useMemo, useState } from 'react'
 import { useRouter, useSearchParams } from 'next/navigation'
 import { useAgentsQuery } from '@/features/agents/queries'
 import { useChatroomsQuery } from '@/features/chatrooms/queries'
-import { useMissionsQuery } from '@/features/missions/queries'
 import {
   useCreateProtocolRunMutation,
   useDeleteProtocolTemplateMutation,
@@ -21,7 +20,6 @@ import { timeAgo } from '@/lib/time-format'
 import type {
   BoardTask,
   Chatroom,
-  Mission,
   ProtocolRun,
   ProtocolRunEvent,
   ProtocolStepDefinition,
@@ -33,7 +31,6 @@ type ProtocolRunDetail = {
   template: ProtocolTemplate | null
   transcript: Chatroom | null
   parentChatroom: Chatroom | null
-  linkedMission: Mission | null
   linkedTask: BoardTask | null
   events: ProtocolRunEvent[]
 }
@@ -153,7 +150,6 @@ export default function ProtocolsPage() {
     facilitatorAgentId: '',
     participantAgentIds: [] as string[],
     parentChatroomId: '',
-    missionId: '',
     taskId: '',
     autoStart: true,
   })
@@ -162,7 +158,6 @@ export default function ProtocolsPage() {
   const runsQuery = useProtocolRunsQuery({ limit: 120 })
   const agentsQuery = useAgentsQuery()
   const chatroomsQuery = useChatroomsQuery()
-  const missionsQuery = useMissionsQuery({ limit: 80 })
   const tasksQuery = useTasksQuery({ includeArchived: true })
   const detailQuery = useProtocolRunDetailQuery(selectedRunId, { enabled: Boolean(selectedRunId) })
   const createRunMutation = useCreateProtocolRunMutation()
@@ -174,14 +169,12 @@ export default function ProtocolsPage() {
   const detail = detailQuery.data ?? null
   const agents = agentsQuery.data ?? {}
   const chatrooms = chatroomsQuery.data ?? {}
-  const missions = missionsQuery.data ?? []
   const tasks = tasksQuery.data ?? {}
   const loading = (
     templatesQuery.isLoading
     || runsQuery.isLoading
     || agentsQuery.isLoading
     || chatroomsQuery.isLoading
-    || missionsQuery.isLoading
     || tasksQuery.isLoading
   )
   const detailLoading = detailQuery.isLoading || detailQuery.isFetching
@@ -190,7 +183,6 @@ export default function ProtocolsPage() {
     runsQuery.error,
     agentsQuery.error,
     chatroomsQuery.error,
-    missionsQuery.error,
     tasksQuery.error,
     detailQuery.error,
   ].find(Boolean)
@@ -237,7 +229,6 @@ export default function ProtocolsPage() {
         participantAgentIds: form.participantAgentIds,
         facilitatorAgentId: form.facilitatorAgentId || null,
         parentChatroomId: form.parentChatroomId || null,
-        missionId: form.missionId || null,
         taskId: form.taskId || null,
         autoStart: form.autoStart,
         config: {
@@ -364,7 +355,7 @@ export default function ProtocolsPage() {
                 </div>
                 <h1 className="mt-4 font-display text-[34px] font-700 tracking-[-0.03em] text-text">Bounded Collaboration Runs</h1>
                 <p className="mt-3 max-w-[720px] text-[15px] leading-relaxed text-text-3/72">
-                  Start structured sessions from chats, chatrooms, tasks, missions, or schedules. Runs stay temporary and bounded, while templates remain reusable for the next time you need them.
+                  Start structured sessions from chats, chatrooms, tasks, or schedules. Runs stay temporary and bounded, while templates remain reusable for the next time you need them.
                 </p>
               </div>
               <div className="w-full max-w-[520px] rounded-[20px] border border-white/[0.06] bg-surface/70 p-4">
@@ -372,7 +363,7 @@ export default function ProtocolsPage() {
                   <div>
                     <div className="text-[11px] font-700 uppercase tracking-[0.12em] text-text-3/55">Launch and Templates</div>
                     <div className="mt-1 text-[13px] leading-relaxed text-text-3/68">
-                      Start from here when you need a blank run. Normal use should start from the chat, task, mission, or chatroom you are already in.
+                      Start from here when you need a blank run. Normal use should start from the chat, task, or chatroom you are already in.
                     </div>
                   </div>
                   <div className="flex flex-wrap gap-2">
@@ -471,16 +462,6 @@ export default function ProtocolsPage() {
                           <option key={chatroom.id} value={chatroom.id}>{chatroom.name}</option>
                         ))}
                       </select>
-                      <select
-                        value={form.missionId}
-                        onChange={(event) => setForm((current) => ({ ...current, missionId: event.target.value }))}
-                        className="rounded-[12px] border border-white/[0.06] bg-white/[0.04] px-3 py-2.5 text-[14px] text-text outline-none"
-                      >
-                        <option value="">No linked mission</option>
-                        {missions.map((mission) => (
-                          <option key={mission.id} value={mission.id}>{mission.objective}</option>
-                        ))}
-                      </select>
                       <select
                         value={form.taskId}
                         onChange={(event) => setForm((current) => ({ ...current, taskId: event.target.value }))}

package/src/app/settings/page.tsx

@@ -11,7 +11,6 @@ import { ThemeSection } from '@/views/settings/section-theme'
 import { RuntimeLoopSection } from '@/views/settings/section-runtime-loop'
 import { SupervisorReflectionSection } from '@/views/settings/section-supervisor-reflection'
 import { CapabilityPolicySection } from '@/views/settings/section-capability-policy'
-import { WalletsSection } from '@/views/settings/section-wallets'
 import { StorageSection } from '@/views/settings/section-storage'
 import { VoiceSection } from '@/views/settings/section-voice'
 import { WebSearchSection } from '@/views/settings/section-web-search'
@@ -149,14 +148,6 @@ export default function SettingsRoute() {
       keywords: ['storage', 'uploads', 'disk', 'cleanup', 'files'],
       render: () => <StorageSection {...sectionProps} />,
     },
-    {
-      id: 'wallets',
-      tabId: 'general',
-      title: 'Wallets',
-      description: 'Control global wallet approval behavior and auto-execution defaults.',
-      keywords: ['wallet', 'wallets', 'approval', 'approvals', 'crypto', 'send'],
-      render: () => <WalletsSection {...sectionProps} />,
-    },
     {
       id: 'theme',
       tabId: 'appearance',

package/src/app/wallets/page.tsx

@@ -1,12 +1,112 @@
 'use client'
 
-import { WalletPanel } from '@/components/wallets/wallet-panel'
-import { MainContent } from '@/components/layout/main-content'
+import { useEffect, useState } from 'react'
+import { useAppStore } from '@/stores/use-app-store'
+import { WalletList } from '@/components/wallets/wallet-list'
+import { api } from '@/lib/app/api-client'
+import type { SafeWallet } from '@/types'
 
 export default function WalletsPage() {
+  const agents = useAppStore((s) => s.agents)
+  const loadAgents = useAppStore((s) => s.loadAgents)
+  const loadWallets = useAppStore((s) => s.loadWallets)
+  const [generating, setGenerating] = useState(false)
+  const [showPicker, setShowPicker] = useState(false)
+  const [error, setError] = useState<string | null>(null)
+
+  useEffect(() => {
+    loadAgents()
+    loadWallets()
+  }, [loadAgents, loadWallets])
+
+  const agentList = Object.values(agents)
+
+  const handleGenerate = async (agentId?: string) => {
+    const targetId = agentId || agentList[0]?.id
+    if (!targetId) {
+      setError('Create an agent first')
+      setTimeout(() => setError(null), 3000)
+      return
+    }
+    setGenerating(true)
+    setShowPicker(false)
+    setError(null)
+    try {
+      await api<SafeWallet>('POST', '/wallets/generate', { agentId: targetId })
+      loadWallets()
+    } catch (err) {
+      setError(err instanceof Error ? err.message : 'Failed to generate wallet')
+      setTimeout(() => setError(null), 4000)
+    } finally {
+      setGenerating(false)
+    }
+  }
+
   return (
-    <MainContent>
-      <WalletPanel />
-    </MainContent>
+    <div className="flex-1 flex flex-col h-full">
+      <div className="flex items-center px-6 pt-5 pb-3 shrink-0">
+        <h2 className="font-display text-[14px] font-600 text-text-2 tracking-[-0.01em] capitalize flex-1">
+          Wallets
+        </h2>
+        <div className="relative">
+          <button
+            onClick={() => {
+              if (agentList.length <= 1) {
+                handleGenerate()
+              } else {
+                setShowPicker(!showPicker)
+              }
+            }}
+            disabled={generating}
+            className="flex items-center gap-1.5 px-2.5 py-1.5 rounded-[8px] text-[11px] font-600 text-accent-bright bg-accent-soft hover:bg-accent-bright/15 transition-all cursor-pointer disabled:opacity-50"
+            style={{ fontFamily: 'inherit' }}
+          >
+            {generating ? (
+              <svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2.5" strokeLinecap="round" className="animate-spin">
+                <path d="M21 12a9 9 0 1 1-6.219-8.56" />
+              </svg>
+            ) : (
+              <svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2.5" strokeLinecap="round">
+                <line x1="12" y1="5" x2="12" y2="19" /><line x1="5" y1="12" x2="19" y2="12" />
+              </svg>
+            )}
+            {generating ? 'Generating...' : 'Generate Wallet'}
+          </button>
+
+          {/* Agent picker dropdown */}
+          {showPicker && (
+            <>
+              <div className="fixed inset-0 z-40" onClick={() => setShowPicker(false)} />
+              <div className="absolute right-0 top-full mt-1 z-50 w-56 rounded-[12px] bg-surface border border-white/[0.08] shadow-xl overflow-hidden">
+                <div className="px-3 py-2 border-b border-white/[0.06]">
+                  <span className="text-[11px] font-600 text-text-3">Select Agent</span>
+                </div>
+                <div className="max-h-48 overflow-y-auto py-1">
+                  {agentList.map((agent) => (
+                    <button
+                      key={agent.id}
+                      onClick={() => handleGenerate(agent.id)}
+                      className="w-full text-left px-3 py-2 flex items-center gap-2 hover:bg-white/[0.04] transition-colors cursor-pointer"
+                      style={{ fontFamily: 'inherit' }}
+                    >
+                      <span className="text-[14px]">{agent.emoji || '🤖'}</span>
+                      <span className="text-[12px] font-600 text-text truncate">{agent.name}</span>
+                    </button>
+                  ))}
+                </div>
+              </div>
+            </>
+          )}
+        </div>
+      </div>
+
+      {error && (
+        <div className="mx-6 mb-2 px-3 py-2 rounded-[10px] bg-red-500/10 border border-red-500/20 text-[12px] text-red-400 font-600">
+          {error}
+        </div>
+      )}
+
+      <WalletList />
+    </div>
   )
 }