@swarmclawai/swarmclaw 0.7.2 → 0.7.4

package/src/cli/index.test.js

@@ -163,6 +163,37 @@ test('runCli sends authenticated request and emits compact JSON when --json is s
   assert.equal(stderr.toString(), '')
 })
 
+test('runCli falls back to platform-api-key.txt when env key is missing', async () => {
+  const stdout = makeWritable()
+  const stderr = makeWritable()
+  const calls = []
+
+  const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'swarmclaw-cli-keyfile-'))
+  fs.writeFileSync(path.join(tmpDir, 'platform-api-key.txt'), 'file-key\n', 'utf8')
+
+  const fetchImpl = async (url, init) => {
+    calls.push({ url: String(url), init })
+    return jsonResponse({ ok: true })
+  }
+
+  const exitCode = await runCli(
+    ['runs', 'list', '--json'],
+    {
+      fetchImpl,
+      stdout,
+      stderr,
+      env: {},
+      cwd: tmpDir,
+    }
+  )
+
+  assert.equal(exitCode, 0)
+  assert.equal(calls[0].init.headers['X-Access-Key'], 'file-key')
+  assert.equal(stderr.toString(), '')
+
+  fs.rmSync(tmpDir, { recursive: true, force: true })
+})
+
 test('upload command sends binary body and x-filename header', async () => {
   const stdout = makeWritable()
   const stderr = makeWritable()
@@ -197,6 +228,32 @@ test('upload command sends binary body and x-filename header', async () => {
   fs.rmSync(tmpDir, { recursive: true, force: true })
 })
 
+test('binary responses require --out when stdout is a TTY', async () => {
+  const stdout = makeWritable()
+  stdout.isTTY = true
+  const stderr = makeWritable()
+
+  const fetchImpl = async () =>
+    new Response(Buffer.from('hello'), {
+      status: 200,
+      headers: { 'content-type': 'application/octet-stream' },
+    })
+
+  const exitCode = await runCli(
+    ['uploads', 'get', 'artifact.bin'],
+    {
+      fetchImpl,
+      stdout,
+      stderr,
+      env: {},
+      cwd: process.cwd(),
+    }
+  )
+
+  assert.equal(exitCode, 1)
+  assert.match(stderr.toString(), /binary response requires --out <file>/i)
+})
+
 test('wait polls run endpoint until terminal state', async () => {
   const stdout = makeWritable()
   const stderr = makeWritable()
@@ -236,6 +293,144 @@ test('wait polls run endpoint until terminal state', async () => {
   assert.match(stdout.toString(), /"status": "completed"/)
 })
 
+test('runCli parses CRLF-delimited SSE events correctly', async () => {
+  const stdout = makeWritable()
+  const stderr = makeWritable()
+
+  const fetchImpl = async () => new Response(
+    'data: {"t":"md","text":"first"}\r\n\r\ndata: {"t":"md","text":"second"}\r\n\r\n',
+    {
+      status: 200,
+      headers: { 'content-type': 'text/event-stream' },
+    }
+  )
+
+  const exitCode = await runCli(
+    ['chatrooms', 'chat', 'room-1', '--data', '{}'],
+    {
+      fetchImpl,
+      stdout,
+      stderr,
+      env: {},
+      cwd: process.cwd(),
+    }
+  )
+
+  assert.equal(exitCode, 0)
+  assert.equal(stdout.toString(), 'first\nsecond\n')
+  assert.equal(stderr.toString(), '')
+})
+
+test('binary responses require --out when stdout is a TTY', async () => {
+  const stdout = makeWritable()
+  stdout.isTTY = true
+  const stderr = makeWritable()
+
+  const fetchImpl = async () => new Response(Buffer.from('ok'), {
+    status: 200,
+    headers: { 'content-type': 'application/octet-stream' },
+  })
+
+  const exitCode = await runCli(
+    ['memory-images', 'get', 'image-1.png'],
+    {
+      fetchImpl,
+      stdout,
+      stderr,
+      env: {},
+      cwd: process.cwd(),
+    }
+  )
+
+  assert.equal(exitCode, 1)
+  assert.equal(stdout.toString(), '')
+  assert.match(stderr.toString(), /binary response requires --out <file>/i)
+})
+
+test('client-side collection lookups fail cleanly when the entity is missing', async () => {
+  const stdout = makeWritable()
+  const stderr = makeWritable()
+
+  const fetchImpl = async () => jsonResponse([{ id: 'agent-2', name: 'Other Agent' }])
+
+  const exitCode = await runCli(
+    ['agents', 'get', 'agent-1'],
+    {
+      fetchImpl,
+      stdout,
+      stderr,
+      env: {},
+      cwd: process.cwd(),
+    }
+  )
+
+  assert.equal(exitCode, 1)
+  assert.equal(stdout.toString(), '')
+  assert.match(stderr.toString(), /entity not found for id: agent-1/i)
+})
+
+test('runCli loads request JSON from @file inputs', async () => {
+  const stdout = makeWritable()
+  const stderr = makeWritable()
+  const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'swarmclaw-cli-data-'))
+  const dataPath = path.join(tmpDir, 'payload.json')
+  fs.writeFileSync(dataPath, JSON.stringify({ title: 'From file', status: 'backlog' }), 'utf8')
+
+  const calls = []
+  const fetchImpl = async (url, init) => {
+    calls.push({ url: String(url), init })
+    return jsonResponse({ ok: true })
+  }
+
+  const exitCode = await runCli(
+    ['tasks', 'create', '--data', `@${dataPath}`],
+    {
+      fetchImpl,
+      stdout,
+      stderr,
+      env: {},
+      cwd: process.cwd(),
+    }
+  )
+
+  assert.equal(exitCode, 0)
+  assert.equal(calls.length, 1)
+  assert.equal(calls[0].init.headers['Content-Type'], 'application/json')
+  assert.deepEqual(JSON.parse(calls[0].init.body), { title: 'From file', status: 'backlog' })
+
+  fs.rmSync(tmpDir, { recursive: true, force: true })
+})
+
+test('runCli falls back to platform-api-key.txt when no env key is provided', async () => {
+  const stdout = makeWritable()
+  const stderr = makeWritable()
+  const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'swarmclaw-cli-key-'))
+  fs.writeFileSync(path.join(tmpDir, 'platform-api-key.txt'), 'file-key\n', 'utf8')
+
+  const calls = []
+  const fetchImpl = async (url, init) => {
+    calls.push({ url: String(url), init })
+    return jsonResponse({ ok: true })
+  }
+
+  const exitCode = await runCli(
+    ['runs', 'list'],
+    {
+      fetchImpl,
+      stdout,
+      stderr,
+      env: {},
+      cwd: tmpDir,
+    }
+  )
+
+  assert.equal(exitCode, 0)
+  assert.equal(calls.length, 1)
+  assert.equal(calls[0].init.headers['X-Access-Key'], 'file-key')
+
+  fs.rmSync(tmpDir, { recursive: true, force: true })
+})
+
 test('all command definitions execute with a mocked API transport', async () => {
   const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'swarmclaw-cli-all-'))
   const uploadPath = path.join(tmpDir, 'upload.txt')

package/src/cli/index.ts

@@ -2,6 +2,8 @@
 
 import { Command } from 'commander'
 import { pathToFileURL } from 'node:url'
+import fs from 'node:fs'
+import path from 'node:path'
 import {
   SETUP_PROVIDERS,
   DEFAULT_AGENTS,
@@ -17,7 +19,6 @@ interface CliContext {
 
 interface SetupAuthStatus {
   firstTime?: boolean
-  key?: string
 }
 
 interface SetupProviderCheckResponse {
@@ -34,7 +35,21 @@ const DEFAULT_BASE_URL =
   || process.env.SWARMCLAW_BASE_URL
   || 'http://localhost:3456'
 
-const DEFAULT_ACCESS_KEY = process.env.SWARMCLAW_ACCESS_KEY || ''
+function resolveDefaultAccessKey(cwd: string = process.cwd()): string {
+  const envKey = (
+    process.env.SWARMCLAW_ACCESS_KEY
+    || process.env.SWARMCLAW_API_KEY
+    || process.env.SC_ACCESS_KEY
+    || ''
+  ).trim()
+  if (envKey) return envKey
+
+  const keyFile = path.join(cwd, 'platform-api-key.txt')
+  if (!fs.existsSync(keyFile)) return ''
+  return fs.readFileSync(keyFile, 'utf8').trim()
+}
+
+const DEFAULT_ACCESS_KEY = resolveDefaultAccessKey()
 
 function normalizeBaseUrl(value: string): string {
   const trimmed = value.trim()
@@ -208,19 +223,13 @@ async function resolveSetupAccessKey(ctx: CliContext): Promise<{
   }
 
   const status = await apiRequestWithAccessKey<SetupAuthStatus>(ctx, 'GET', '/auth', undefined)
-  const discoveredKey = typeof status?.key === 'string' ? status.key.trim() : ''
   const firstTime = status?.firstTime === true
 
-  if (!firstTime || !discoveredKey) {
-    throw new Error('No access key provided. Pass --key (or SWARMCLAW_ACCESS_KEY), or run setup on a fresh first-time instance.')
+  if (firstTime) {
+    throw new Error('No access key provided. Read the generated key from the launch terminal or .env.local, then pass --key, set SWARMCLAW_ACCESS_KEY / SWARMCLAW_API_KEY, or use platform-api-key.txt.')
   }
 
-  await apiRequestWithAccessKey(ctx, 'POST', '/auth', discoveredKey, { key: discoveredKey })
-  return {
-    accessKey: discoveredKey,
-    firstTime: true,
-    autoDiscovered: true,
-  }
+  throw new Error('No access key provided. Pass --key, set SWARMCLAW_ACCESS_KEY / SWARMCLAW_API_KEY, or use platform-api-key.txt.')
 }
 
 function printResult(value: unknown, rawOutput: boolean): void {
@@ -1364,7 +1373,7 @@ export async function runCli(argv: string[] = process.argv.slice(2)): Promise<nu
       ? null
       : checkForUpdate(
           normalizeBaseUrl(process.env.SWARMCLAW_URL || process.env.SWARMCLAW_BASE_URL || 'http://localhost:3456'),
-          (process.env.SWARMCLAW_ACCESS_KEY || '').trim(),
+          resolveDefaultAccessKey(),
         )
 
     await program.parseAsync(['node', 'swarmclaw', ...argv])

package/src/cli/server-cmd.test.js

@@ -0,0 +1,59 @@
+'use strict'
+/* eslint-disable @typescript-eslint/no-require-imports */
+
+const test = require('node:test')
+const assert = require('node:assert/strict')
+const fs = require('node:fs')
+const os = require('node:os')
+const path = require('node:path')
+
+function loadServerCmdForHome(homeDir) {
+  const modPath = require.resolve('../../bin/server-cmd.js')
+  const previousHome = process.env.SWARMCLAW_HOME
+  process.env.SWARMCLAW_HOME = homeDir
+  delete require.cache[modPath]
+  const loaded = require(modPath)
+  if (previousHome === undefined) delete process.env.SWARMCLAW_HOME
+  else process.env.SWARMCLAW_HOME = previousHome
+  delete require.cache[modPath]
+  return loaded
+}
+
+test('needsBuild returns true when no build marker exists', () => {
+  const homeDir = fs.mkdtempSync(path.join(os.tmpdir(), 'swarmclaw-server-home-'))
+  const serverCmd = loadServerCmdForHome(homeDir)
+  assert.equal(serverCmd.needsBuild(false), true)
+  fs.rmSync(homeDir, { recursive: true, force: true })
+})
+
+test('needsBuild returns false when build marker version matches and standalone server exists', () => {
+  const homeDir = fs.mkdtempSync(path.join(os.tmpdir(), 'swarmclaw-server-home-'))
+  const serverCmd = loadServerCmdForHome(homeDir)
+
+  fs.mkdirSync(path.join(homeDir, '.next', 'standalone'), { recursive: true })
+  fs.writeFileSync(path.join(homeDir, '.next', 'standalone', 'server.js'), 'console.log("ok")\n', 'utf8')
+  fs.writeFileSync(
+    path.join(homeDir, '.built'),
+    JSON.stringify({ builtAt: new Date().toISOString(), version: serverCmd.getVersion() }),
+    'utf8',
+  )
+
+  assert.equal(serverCmd.needsBuild(false), false)
+  fs.rmSync(homeDir, { recursive: true, force: true })
+})
+
+test('needsBuild returns true when build marker version is stale', () => {
+  const homeDir = fs.mkdtempSync(path.join(os.tmpdir(), 'swarmclaw-server-home-'))
+  const serverCmd = loadServerCmdForHome(homeDir)
+
+  fs.mkdirSync(path.join(homeDir, '.next', 'standalone'), { recursive: true })
+  fs.writeFileSync(path.join(homeDir, '.next', 'standalone', 'server.js'), 'console.log("ok")\n', 'utf8')
+  fs.writeFileSync(
+    path.join(homeDir, '.built'),
+    JSON.stringify({ builtAt: new Date().toISOString(), version: '0.0.0-test' }),
+    'utf8',
+  )
+
+  assert.equal(serverCmd.needsBuild(false), true)
+  fs.rmSync(homeDir, { recursive: true, force: true })
+})

package/src/cli/spec.js

@@ -127,6 +127,16 @@ const COMMAND_GROUPS = {
       },
     },
   },
+  'external-agents': {
+    description: 'Manage external agent runtimes',
+    commands: {
+      list: { description: 'List external agent runtimes', method: 'GET', path: '/external-agents' },
+      create: { description: 'Register an external agent runtime', method: 'POST', path: '/external-agents' },
+      update: { description: 'Update an external agent runtime', method: 'PUT', path: '/external-agents/:id', params: ['id'] },
+      delete: { description: 'Delete an external agent runtime', method: 'DELETE', path: '/external-agents/:id', params: ['id'] },
+      heartbeat: { description: 'Record an external agent heartbeat', method: 'POST', path: '/external-agents/:id/heartbeat', params: ['id'] },
+    },
+  },
   uploads: {
     description: 'Manage uploaded artifacts',
     commands: {
@@ -143,6 +153,16 @@ const COMMAND_GROUPS = {
       open: { description: 'Open a local file path via host default app/browser', method: 'POST', path: '/files/open' },
     },
   },
+  gateways: {
+    description: 'Manage named OpenClaw gateway profiles',
+    commands: {
+      list: { description: 'List configured gateway profiles', method: 'GET', path: '/gateways' },
+      create: { description: 'Create a gateway profile', method: 'POST', path: '/gateways' },
+      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'] },
+    },
+  },
   logs: {
     description: 'Application logs',
     commands: {
@@ -291,8 +311,6 @@ const COMMAND_GROUPS = {
       'messages-delete': { description: 'Delete a message from a chat', method: 'DELETE', path: '/chats/:id/messages', params: ['id'] },
       fork: { description: 'Fork chat from a specific message index', method: 'POST', path: '/chats/:id/fork', params: ['id'] },
       'edit-resend': { description: 'Edit and resend from a specific message index', method: 'POST', path: '/chats/:id/edit-resend', params: ['id'] },
-      'main-loop': { description: 'Get main mission loop state for a chat', method: 'GET', path: '/chats/:id/main-loop', params: ['id'] },
-      'main-loop-action': { description: 'Control main mission loop (pause/resume/set_goal/set_mode/clear_events/nudge)', method: 'POST', path: '/chats/:id/main-loop', params: ['id'] },
       chat: { description: 'Send chat message (SSE stream)', method: 'POST', path: '/chats/:id/chat', params: ['id'], stream: true, waitable: true },
       stop: { description: 'Cancel active/running chat work', method: 'POST', path: '/chats/:id/stop', params: ['id'] },
       clear: { description: 'Clear chat history', method: 'POST', path: '/chats/:id/clear', params: ['id'] },

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

@@ -37,6 +37,7 @@ export function AgentCard({ agent, isDefault, isRunning, isOnline, isSelected, o
   const setCurrentSession = useAppStore((s) => s.setCurrentSession)
   const setActiveView = useAppStore((s) => s.setActiveView)
   const setMessages = useChatStore((s) => s.setMessages)
+  const sendMessage = useChatStore((s) => s.sendMessage)
   const togglePinAgent = useAppStore((s) => s.togglePinAgent)
   const [running, setRunning] = useState(false)
   const [dialogOpen, setDialogOpen] = useState(false)
@@ -61,6 +62,7 @@ export function AgentCard({ agent, isDefault, isRunning, isOnline, isSelected, o
       budget: typeof agent.dailyBudget === 'number' && agent.dailyBudget > 0 ? agent.dailyBudget : null,
     },
   ].filter((entry) => entry.budget !== null)
+  const canDelegateToAgents = agent.platformAssignScope === 'all'
   useWs(`heartbeat:agent:${agent.id}`, () => {
     setHeartbeatPulse(true)
     setTimeout(() => setHeartbeatPulse(false), 1500)
@@ -78,19 +80,20 @@ export function AgentCard({ agent, isDefault, isRunning, isOnline, isSelected, o
   }
 
   const handleConfirmRun = async () => {
-    if (!taskInput.trim()) return
+    const task = taskInput.trim()
+    if (!task) return
     setDialogOpen(false)
     setRunning(true)
     try {
-      const result = await api<{ ok: boolean; sessionId: string }>('POST', '/orchestrator/run', { agentId: agent.id, task: taskInput })
-      if (result.sessionId) {
-        await loadSessions()
-        setMessages([])
-        setCurrentSession(result.sessionId)
-        setActiveView('agents')
-      }
+      const session = await api<{ id: string }>('POST', `/agents/${agent.id}/thread`, { user: 'default' })
+      if (!session?.id) throw new Error('Agent thread not available')
+      await loadSessions()
+      setMessages([])
+      setCurrentSession(session.id)
+      setActiveView('agents')
+      await sendMessage(task)
     } catch (err) {
-      console.error('Orchestrator run failed:', err)
+      console.error('Agent task run failed:', err)
     }
     setRunning(false)
   }
@@ -199,7 +202,7 @@ export function AgentCard({ agent, isDefault, isRunning, isOnline, isSelected, o
               default
             </span>
           )}
-          {agent.isOrchestrator && (
+          {canDelegateToAgents && (
             <button
               onClick={handleRunClick}
               disabled={running}
@@ -210,7 +213,7 @@ export function AgentCard({ agent, isDefault, isRunning, isOnline, isSelected, o
               {running ? '...' : 'Run'}
             </button>
           )}
-          {agent.isOrchestrator && (
+          {canDelegateToAgents && (
             <span className="shrink-0 text-[10px] font-600 uppercase tracking-wider text-amber-400/80 bg-amber-400/[0.08] px-2 py-0.5 rounded-[6px] flex items-center gap-1">
               <svg width="10" height="10" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2.5" strokeLinecap="round"><path d="M16 3h5v5"/><path d="M21 3l-7 7"/><path d="M8 21H3v-5"/><path d="M3 21l7-7"/></svg>
               delegates
@@ -299,7 +302,7 @@ export function AgentCard({ agent, isDefault, isRunning, isOnline, isSelected, o
       <Dialog open={dialogOpen} onOpenChange={setDialogOpen}>
         <DialogContent className="sm:max-w-[420px]">
           <DialogHeader>
-            <DialogTitle>Run Orchestrator</DialogTitle>
+            <DialogTitle>Run Agent</DialogTitle>
           </DialogHeader>
           <div className="py-3">
             <label className="block text-[12px] font-600 text-text-3 mb-2">Task for {agent.name}</label>

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

@@ -135,6 +135,17 @@ export function AgentChatList({ inSidebar, onSelect }: Props) {
     })
   }, [sortedAgents, chatFilter, sessions, runningAgentIds, streamingSessionId, chatroomActiveAgentIds])
 
+  const defaultAgent = useMemo(() => {
+    const id = appSettings.defaultAgentId
+    return id ? agents[id] || null : null
+  }, [appSettings.defaultAgentId, agents])
+
+  const defaultAgentVisible = !!defaultAgent && filteredAgents.some((agent) => agent.id === defaultAgent.id)
+  const listAgents = useMemo(
+    () => (defaultAgentVisible ? filteredAgents.filter((agent) => agent.id !== defaultAgent?.id) : filteredAgents),
+    [defaultAgent?.id, defaultAgentVisible, filteredAgents],
+  )
+
   // FLIP: animate row position changes
   useLayoutEffect(() => {
     const prevTop = previousTopRef.current
@@ -258,7 +269,91 @@ export function AgentChatList({ inSidebar, onSelect }: Props) {
         </div>
       )}
       <div className="flex flex-col gap-0.5 px-2 pb-4">
-        {filteredAgents.map((agent) => {
+        {defaultAgentVisible && defaultAgent && (() => {
+          const threadSession = defaultAgent.threadSessionId ? sessions[defaultAgent.threadSessionId] as Session | undefined : undefined
+          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 isTyping = streamingSessionId === defaultAgent.threadSessionId
+          const preview = lastMsg?.text?.slice(0, 100)?.replace(/\n/g, ' ') || 'Your primary shortcut chat.'
+          const isActive = currentAgentId === defaultAgent.id
+
+          return (
+            <div className="mb-2 px-2">
+              <div className="px-2 pb-1 text-[10px] font-700 uppercase tracking-[0.12em] text-accent-bright/65">
+                Default Agent
+              </div>
+              <div
+                className={`group/row relative w-full text-left py-3.5 px-4 rounded-[14px] cursor-pointer transition-all duration-150 border
+                  ${isActive
+                    ? 'bg-accent-soft border-accent-bright/25'
+                    : 'bg-accent-soft/40 border-accent-bright/15 hover:bg-accent-soft/55'}`}
+                onClick={() => bulkMode ? toggleSelected(defaultAgent.id) : handleSelect(defaultAgent)}
+              >
+                <div className="flex items-center gap-3">
+                  {bulkMode && (
+                    <div className={`w-5 h-5 rounded-[6px] border-2 flex items-center justify-center shrink-0 transition-colors
+                      ${selectedIds.has(defaultAgent.id) ? 'bg-accent-bright border-accent-bright' : 'border-white/20 bg-transparent'}`}>
+                      {selectedIds.has(defaultAgent.id) && (
+                        <svg width="10" height="10" viewBox="0 0 24 24" fill="none" stroke="white" strokeWidth="3" strokeLinecap="round" strokeLinejoin="round">
+                          <polyline points="20 6 9 17 4 12" />
+                        </svg>
+                      )}
+                    </div>
+                  )}
+                  <div className="relative shrink-0">
+                    <AgentAvatar seed={defaultAgent.avatarSeed || null} avatarUrl={defaultAgent.avatarUrl} name={defaultAgent.name} size={38} />
+                    <div className={`absolute -bottom-0.5 -right-0.5 w-2.5 h-2.5 rounded-full border-2 border-bg ${
+                      isWorking ? 'bg-emerald-400 shadow-[0_0_6px_rgba(52,211,153,0.4)]' : 'bg-text-3/30'
+                    }`} />
+                  </div>
+                  <div className="flex-1 min-w-0">
+                    <div className="flex items-center gap-2">
+                      <span className="font-display text-[14px] font-700 truncate text-text tracking-[-0.01em]">
+                        {defaultAgent.name}
+                      </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>
+                    </div>
+                    {isTyping ? (
+                      <div className="text-[12px] text-accent-bright/80 mt-1 flex items-center gap-1.5">
+                        <span className="flex gap-0.5">
+                          <span className="w-1 h-1 rounded-full bg-accent-bright/70 animate-bounce [animation-delay:0ms]" />
+                          <span className="w-1 h-1 rounded-full bg-accent-bright/70 animate-bounce [animation-delay:150ms]" />
+                          <span className="w-1 h-1 rounded-full bg-accent-bright/70 animate-bounce [animation-delay:300ms]" />
+                        </span>
+                        Typing...
+                      </div>
+                    ) : (
+                      <div className="text-[12px] text-text-3/70 mt-1 truncate">
+                        {preview}
+                      </div>
+                    )}
+                  </div>
+                  <button
+                    onClick={async (e) => {
+                      e.stopPropagation()
+                      await updateSettings({ defaultAgentId: null })
+                      toast.success('Default agent cleared')
+                    }}
+                    aria-label="Remove as default agent"
+                    title="Default agent — click to clear"
+                    className="shrink-0 p-1 rounded-[6px] transition-all bg-transparent border-none cursor-pointer hover:bg-white/[0.06] text-accent-bright"
+                    style={{ fontFamily: 'inherit' }}
+                  >
+                    <svg width="11" height="11" viewBox="0 0 24 24" fill="currentColor" stroke="currentColor" strokeWidth="2" strokeLinecap="round">
+                      <path d="M3 9l9-7 9 7v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z" />
+                      <path d="M9 22V12h6v10" fill="rgba(0,0,0,0.3)" stroke="none" />
+                    </svg>
+                  </button>
+                </div>
+              </div>
+            </div>
+          )
+        })()}
+        {listAgents.map((agent) => {
           const threadSession = agent.threadSessionId ? sessions[agent.threadSessionId] as Session | undefined : undefined
           const lastMsg = threadSession?.messages?.at(-1)
           const isActive = currentAgentId === agent.id
@@ -300,6 +395,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>
+                    {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
+                      </span>
+                    )}
                     <span className="text-[10px] text-text-3/60 font-mono shrink-0">
                       {(threadSession?.model || agent.model)
                         ? (threadSession?.model || agent.model)!.split('/').pop()?.split(':')[0]