@swarmclawai/swarmclaw 0.7.2 → 0.7.3

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

@@ -1,5 +1,5 @@
 import { NextResponse } from 'next/server'
-import { loadSettings, saveSettings } from '@/lib/server/storage'
+import { loadPublicSettings, loadSettings, saveSettings } from '@/lib/server/storage'
 import { DEFAULT_DELEGATION_MAX_DEPTH } from '@/lib/runtime-loop'
 export const dynamic = 'force-dynamic'
 
@@ -20,6 +20,9 @@ const TASK_QG_MIN_RESULT_MIN = 10
 const TASK_QG_MIN_RESULT_MAX = 2000
 const TASK_QG_MIN_EVIDENCE_MIN = 0
 const TASK_QG_MIN_EVIDENCE_MAX = 8
+const SESSION_RESET_TIMEOUT_MIN = 0
+const SESSION_RESET_TIMEOUT_MAX = 365 * 24 * 60 * 60
+const SECRET_SETTING_KEYS = ['elevenLabsApiKey', 'tavilyApiKey', 'braveApiKey'] as const
 
 function parseIntSetting(value: unknown, fallback: number, min: number, max: number): number {
   const parsed = typeof value === 'number'
@@ -42,13 +45,25 @@ function parseBoolSetting(value: unknown, fallback: boolean): boolean {
 }
 
 export async function GET(_req: Request) {
-  return NextResponse.json(loadSettings())
+  return NextResponse.json(loadPublicSettings())
 }
 
 export async function PUT(req: Request) {
-  const body = await req.json()
+  const body = await req.json() as Record<string, unknown>
+  const sanitizedBody: Record<string, unknown> = { ...body }
+
+  delete sanitizedBody.__encryptedAppSettings
+
+  for (const key of SECRET_SETTING_KEYS) {
+    const configuredKey = `${key}Configured`
+    if (sanitizedBody[key] === null && sanitizedBody[configuredKey] === true) {
+      delete sanitizedBody[key]
+    }
+    delete sanitizedBody[configuredKey]
+  }
+
   const settings = loadSettings()
-  Object.assign(settings, body)
+  Object.assign(settings, sanitizedBody)
 
   const nextDepth = parseIntSetting(
     settings.memoryReferenceDepth ?? settings.memoryMaxDepth,
@@ -116,16 +131,43 @@ export async function PUT(req: Request) {
   settings.taskQualityGateRequireArtifact = parseBoolSetting(settings.taskQualityGateRequireArtifact, false)
   settings.taskQualityGateRequireReport = parseBoolSetting(settings.taskQualityGateRequireReport, false)
   settings.integrityMonitorEnabled = parseBoolSetting(settings.integrityMonitorEnabled, true)
+  settings.sessionResetMode = settings.sessionResetMode === 'daily' ? 'daily' : settings.sessionResetMode === 'idle' ? 'idle' : null
+  settings.sessionIdleTimeoutSec = parseIntSetting(
+    settings.sessionIdleTimeoutSec,
+    12 * 60 * 60,
+    SESSION_RESET_TIMEOUT_MIN,
+    SESSION_RESET_TIMEOUT_MAX,
+  )
+  settings.sessionMaxAgeSec = parseIntSetting(
+    settings.sessionMaxAgeSec,
+    7 * 24 * 60 * 60,
+    SESSION_RESET_TIMEOUT_MIN,
+    SESSION_RESET_TIMEOUT_MAX,
+  )
+  if (typeof settings.sessionDailyResetAt === 'string') settings.sessionDailyResetAt = settings.sessionDailyResetAt.trim() || null
+  if (typeof settings.sessionResetTimezone === 'string') settings.sessionResetTimezone = settings.sessionResetTimezone.trim() || null
 
   saveSettings(settings)
 
   // Restart heartbeat service when heartbeat-related settings change
-  const heartbeatKeys = ['heartbeatIntervalSec', 'heartbeatInterval', 'heartbeatPrompt', 'heartbeatEnabled', 'heartbeatActiveStart', 'heartbeatActiveEnd']
-  if (heartbeatKeys.some((k) => k in body)) {
+  const heartbeatKeys = [
+    'heartbeatIntervalSec',
+    'heartbeatInterval',
+    'heartbeatPrompt',
+    'heartbeatEnabled',
+    'heartbeatActiveStart',
+    'heartbeatActiveEnd',
+    'sessionResetMode',
+    'sessionIdleTimeoutSec',
+    'sessionMaxAgeSec',
+    'sessionDailyResetAt',
+    'sessionResetTimezone',
+  ]
+  if (heartbeatKeys.some((k) => k in sanitizedBody)) {
     import('@/lib/server/heartbeat-service').then(({ restartHeartbeatService }) => {
       restartHeartbeatService()
     }).catch(() => { /* heartbeat service may not be initialized yet */ })
   }
 
-  return NextResponse.json(settings)
+  return NextResponse.json(loadPublicSettings())
 }

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

@@ -1,6 +1,6 @@
 import { genId } from '@/lib/id'
 import { NextResponse } from 'next/server'
-import { loadTasks, saveTasks, logActivity, loadSettings } from '@/lib/server/storage'
+import { loadAgents, loadSettings, loadTasks, logActivity, upsertStoredItems, upsertTask } from '@/lib/server/storage'
 import { notFound } from '@/lib/server/collection-helpers'
 import { disableSessionHeartbeat, enqueueTask, recoverStalledRunningTasks, validateCompletedTasksQueue } from '@/lib/server/queue'
 import { ensureTaskCompletionReport } from '@/lib/server/task-reports'
@@ -13,6 +13,7 @@ import { requestHeartbeatNow } from '@/lib/server/heartbeat-wake'
 import { validateDag, cascadeUnblock } from '@/lib/server/dag-validation'
 import { getPluginManager } from '@/lib/server/plugins'
 import { normalizeTaskQualityGate } from '@/lib/server/task-quality-gate'
+import '@/lib/server/builtin-plugins'
 
 export async function GET(_req: Request, { params }: { params: Promise<{ id: string }> }) {
   // Keep completed queue integrity even if daemon is not running.
@@ -90,7 +91,7 @@ export async function PUT(req: Request, { params }: { params: Promise<{ id: stri
     }
   }
 
-  saveTasks(tasks)
+  upsertTask(id, tasks[id])
   logActivity({ entityType: 'task', entityId: id, action: 'updated', actor: 'user', summary: `Task updated: "${tasks[id].title}" (${prevStatus} → ${tasks[id].status})` })
   if (prevStatus !== tasks[id].status) {
     pushMainLoopEventToMainSessions({
@@ -111,7 +112,12 @@ export async function PUT(req: Request, { params }: { params: Promise<{ id: stri
     })
     
     if (tasks[id].status === 'completed') {
-      getPluginManager().runHook('onTaskComplete', { taskId: id, result: tasks[id].result })
+      const agentPlugins = tasks[id].agentId ? (loadAgents()[tasks[id].agentId]?.plugins || []) : []
+      getPluginManager().runHook(
+        'onTaskComplete',
+        { taskId: id, result: tasks[id].result },
+        { enabledIds: agentPlugins },
+      )
     }
 
     // Enqueue system event + heartbeat wake
@@ -131,7 +137,7 @@ export async function PUT(req: Request, { params }: { params: Promise<{ id: stri
       // Revert status change and reject
       tasks[id].status = prevStatus
       tasks[id].updatedAt = Date.now()
-      saveTasks(tasks)
+      upsertTask(id, tasks[id])
       return NextResponse.json(
         { error: 'Cannot queue: blocked by incomplete tasks', blockedBy: incompleteBlocker },
         { status: 409 },
@@ -143,7 +149,10 @@ export async function PUT(req: Request, { params }: { params: Promise<{ id: stri
   if (tasks[id].status === 'completed') {
     const unblockedIds = cascadeUnblock(tasks, id)
     if (unblockedIds.length > 0) {
-      saveTasks(tasks)
+      upsertStoredItems('tasks', [
+        [id, tasks[id]],
+        ...unblockedIds.map((uid) => [uid, tasks[uid]] as [string, any]),
+      ])
       for (const uid of unblockedIds) {
         enqueueTask(uid)
       }
@@ -168,7 +177,7 @@ export async function DELETE(_req: Request, { params }: { params: Promise<{ id:
   tasks[id].status = 'archived'
   tasks[id].archivedAt = Date.now()
   tasks[id].updatedAt = Date.now()
-  saveTasks(tasks)
+  upsertTask(id, tasks[id])
   logActivity({ entityType: 'task', entityId: id, action: 'deleted', actor: 'user', summary: `Task archived: "${tasks[id].title}"` })
   pushMainLoopEventToMainSessions({
     type: 'task_archived',

package/src/app/api/tasks/bulk/route.ts

@@ -1,5 +1,5 @@
 import { NextResponse } from 'next/server'
-import { loadTasks, saveTasks, logActivity } from '@/lib/server/storage'
+import { loadTasks, logActivity, upsertStoredItems } from '@/lib/server/storage'
 import { enqueueTask, disableSessionHeartbeat } from '@/lib/server/queue'
 import { pushMainLoopEventToMainSessions } from '@/lib/server/main-agent-loop'
 import { notify } from '@/lib/server/ws-hub'
@@ -82,7 +82,7 @@ export async function POST(req: Request) {
     }
   }
 
-  saveTasks(tasks)
+  upsertStoredItems('tasks', results.map((id) => [id, tasks[id]] as [string, any]))
 
   if (updated > 0) {
     const action = body.status

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

@@ -1,6 +1,6 @@
 import { NextResponse } from 'next/server'
 import { genId } from '@/lib/id'
-import { loadTasks, saveTasks, loadSettings, loadAgents, logActivity } from '@/lib/server/storage'
+import { deleteTask, loadAgents, loadSettings, loadTasks, logActivity, upsertTask } from '@/lib/server/storage'
 import { TaskCreateSchema, formatZodError } from '@/lib/validation/schemas'
 import { z } from 'zod'
 import { enqueueTask, recoverStalledRunningTasks, validateCompletedTasksQueue } from '@/lib/server/queue'
@@ -13,6 +13,7 @@ import { resolveTaskAgentFromDescription } from '@/lib/server/task-mention'
 import { validateDag } from '@/lib/server/dag-validation'
 import { getPluginManager } from '@/lib/server/plugins'
 import { normalizeTaskQualityGate } from '@/lib/server/task-quality-gate'
+import '@/lib/server/builtin-plugins'
 
 export async function GET(req: Request) {
   // Keep completed queue integrity even if daemon is not running.
@@ -49,7 +50,6 @@ export async function DELETE(req: Request) {
     (filter === 'done' && (task.status === 'completed' || task.status === 'failed')) ||
     (!filter && task.status === 'archived')
 
-  const { deleteTask } = await import('@/lib/server/storage')
   for (const [id, task] of Object.entries(tasks)) {
     if (shouldRemove(task as { status: string; sourceType?: string })) {
       deleteTask(id)
@@ -169,7 +169,12 @@ export async function POST(req: Request) {
     if (validation.ok) {
       tasks[id].completedAt = Date.now()
       tasks[id].error = null
-      getPluginManager().runHook('onTaskComplete', { taskId: id, result: tasks[id].result })
+      const agentPlugins = resolvedAgentId ? (loadAgents()[resolvedAgentId]?.plugins || []) : []
+      getPluginManager().runHook(
+        'onTaskComplete',
+        { taskId: id, result: tasks[id].result },
+        { enabledIds: agentPlugins },
+      )
     } else {
       tasks[id].status = 'failed'
       tasks[id].completedAt = null
@@ -177,7 +182,7 @@ export async function POST(req: Request) {
     }
   }
 
-  saveTasks(tasks)
+  upsertTask(id, tasks[id])
   logActivity({ entityType: 'task', entityId: id, action: 'created', actor: 'user', summary: `Task created: "${tasks[id].title}"` })
   pushMainLoopEventToMainSessions({
     type: 'task_created',

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

@@ -8,6 +8,7 @@ import { enqueueSystemEvent } from '@/lib/server/system-events'
 import { requestHeartbeatNow } from '@/lib/server/heartbeat-wake'
 import { mutateItem, deleteItem, notFound, type CollectionOps } from '@/lib/server/collection-helpers'
 import type { WebhookRetryEntry } from '@/types'
+import { triggerWebhookWatchJobs } from '@/lib/server/watch-jobs'
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const ops: CollectionOps<any> = { load: loadWebhooks, save: saveWebhooks }
@@ -126,6 +127,12 @@ export async function POST(req: Request, { params }: { params: Promise<{ id: str
     })
   }
 
+  triggerWebhookWatchJobs({
+    webhookId: id,
+    event: incomingEvent,
+    payloadPreview: rawBody,
+  })
+
   const agents = loadAgents()
   const agent = webhook.agentId ? agents[webhook.agentId] : null
   if (!agent) {
@@ -165,7 +172,7 @@ export async function POST(req: Request, { params }: { params: Promise<{ id: str
       messages: [],
       createdAt: now,
       lastActiveAt: now,
-      sessionType: 'orchestrated',
+      sessionType: 'human',
       agentId: agent.id,
       parentSessionId: null,
       tools: agent.tools || [],

package/src/app/page.tsx

@@ -158,8 +158,15 @@ export default function Home() {
   const checkAuth = useCallback(async () => {
     const key = getStoredAccessKey()
     if (!key) {
-      setAuthChecked(true)
-      setAuthenticated(false)
+      try {
+        const res = await fetchWithTimeout('/api/auth', {}, AUTH_CHECK_TIMEOUT_MS)
+        const data = await res.json().catch(() => ({}))
+        setAuthenticated(data?.authenticated === true)
+      } catch {
+        setAuthenticated(false)
+      } finally {
+        setAuthChecked(true)
+      }
       return
     }
 

package/src/cli/index.js

@@ -120,6 +120,9 @@ const COMMAND_GROUPS = [
         defaultBody: { action: 'repair' },
       }),
       cmd('health', 'GET', '/connectors/:id/health', 'Get connector health status'),
+      cmd('doctor', 'GET', '/connectors/:id/doctor', 'Get connector doctor diagnostics'),
+      cmd('doctor-preview', 'POST', '/connectors/:id/doctor', 'Preview connector doctor diagnostics with temporary overrides', { expectsJsonBody: true }),
+      cmd('doctor-draft', 'POST', '/connectors/doctor', 'Preview connector doctor diagnostics before saving a connector', { expectsJsonBody: true }),
     ],
   },
   {
@@ -344,6 +347,7 @@ const COMMAND_GROUPS = [
       cmd('delete', 'DELETE', '/plugins', 'Delete an external plugin (use --query filename=plugin.js)'),
       cmd('update', 'PATCH', '/plugins', 'Update a plugin (use --query id=plugin.js or --query all=true)'),
       cmd('install', 'POST', '/plugins/install', 'Install plugin from URL', { expectsJsonBody: true }),
+      cmd('install-deps', 'POST', '/plugins/dependencies', 'Install or refresh plugin workspace dependencies', { expectsJsonBody: true }),
       cmd('marketplace', 'GET', '/plugins/marketplace', 'Get marketplace catalog'),
       cmd('settings-get', 'GET', '/plugins/settings', 'Get plugin settings (use --query pluginId=plugin_name)'),
       cmd('settings-set', 'PUT', '/plugins/settings', 'Set plugin settings (use --query pluginId=plugin_name and --data JSON)', { expectsJsonBody: true }),

package/src/cli/index.ts

@@ -17,7 +17,6 @@ interface CliContext {
 
 interface SetupAuthStatus {
   firstTime?: boolean
-  key?: string
 }
 
 interface SetupProviderCheckResponse {
@@ -208,19 +207,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 (or SWARMCLAW_ACCESS_KEY).')
   }
 
-  await apiRequestWithAccessKey(ctx, 'POST', '/auth', discoveredKey, { key: discoveredKey })
-  return {
-    accessKey: discoveredKey,
-    firstTime: true,
-    autoDiscovered: true,
-  }
+  throw new Error('No access key provided. Pass --key (or SWARMCLAW_ACCESS_KEY).')
 }
 
 function printResult(value: unknown, rawOutput: boolean): void {

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]

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

@@ -25,7 +25,7 @@ export function AgentList({ inSidebar }: Props) {
   const currentSessionId = useAppStore((s) => s.currentSessionId)
   const approvals = useApprovalStore((s) => s.approvals)
   const [search, setSearch] = useState('')
-  const [filter, setFilter] = useState<'all' | 'orchestrator' | 'agent'>('all')
+  const [filter, setFilter] = useState<'all' | 'delegating' | 'solo'>('all')
 
   // FLIP animation refs
   const flipPositions = useRef<Map<string, number>>(new Map())
@@ -88,12 +88,22 @@ export function AgentList({ inSidebar }: Props) {
     return counts
   }, [approvals])
 
+  const delegatingCount = useMemo(
+    () => Object.values(agents).filter((agent) => agent.platformAssignScope === 'all' && !agent.trashedAt).length,
+    [agents],
+  )
+  const soloCount = useMemo(
+    () => Object.values(agents).filter((agent) => agent.platformAssignScope !== 'all' && !agent.trashedAt).length,
+    [agents],
+  )
+
   const filtered = useMemo(() => {
     return Object.values(agents)
       .filter((p) => {
         if (search && !p.name.toLowerCase().includes(search.toLowerCase())) return false
-        if (filter === 'orchestrator' && !p.isOrchestrator) return false
-        if (filter === 'agent' && p.isOrchestrator) return false
+        const canDelegateToAgents = p.platformAssignScope === 'all'
+        if (filter === 'delegating' && !canDelegateToAgents) return false
+        if (filter === 'solo' && canDelegateToAgents) return false
         if (activeProjectFilter && p.projectId !== activeProjectFilter) return false
         // Fleet filter
         if (fleetFilter === 'running' && !runningAgentIds.has(p.id)) return false
@@ -171,7 +181,7 @@ export function AgentList({ inSidebar }: Props) {
           </svg>
         }
         title="No agents yet"
-        subtitle="Create AI agents and orchestrators"
+        subtitle="Create AI agents and enable delegation where needed"
         action={!inSidebar ? { label: '+ New Agent', onClick: () => setAgentSheetOpen(true) } : undefined}
       />
     )
@@ -212,15 +222,19 @@ export function AgentList({ inSidebar }: Props) {
         })}
       </div>
       <div className="flex gap-1 px-4 pb-2 items-center">
-        {(['all', 'orchestrator', 'agent'] as const).map((f) => (
+        {([
+          ['all', `all (${delegatingCount + soloCount})`],
+          ['delegating', `delegating (${delegatingCount})`],
+          ['solo', `solo (${soloCount})`],
+        ] as const).map(([value, label]) => (
           <button
-            key={f}
-            onClick={() => setFilter(f)}
+            key={value}
+            onClick={() => setFilter(value)}
             className={`px-3 py-1.5 rounded-[8px] text-[11px] font-600 capitalize cursor-pointer transition-all
-              ${filter === f ? 'bg-accent-soft text-accent-bright' : 'bg-transparent text-text-3 hover:text-text-2'}`}
+              ${filter === value ? 'bg-accent-soft text-accent-bright' : 'bg-transparent text-text-3 hover:text-text-2'}`}
             style={{ fontFamily: 'inherit' }}
           >
-            {f}
+            {label}
           </button>
         ))}
         <div className="flex-1" />
@@ -235,6 +249,29 @@ export function AgentList({ inSidebar }: Props) {
           </svg>
         </button>
       </div>
+      {!inSidebar && (
+        <div className="mx-4 mb-3 rounded-[14px] border border-white/[0.06] bg-white/[0.02] px-4 py-3">
+          <div className="flex flex-col gap-2 lg:flex-row lg:items-center lg:justify-between">
+            <div>
+              <h3 className="text-[12px] font-700 uppercase tracking-[0.08em] text-text-3/60">Fleet Roles</h3>
+              <p className="text-[12px] text-text-3/65 mt-1">
+                Delegating agents can hand work to other agents. Solo agents stay on their own thread and tools.
+              </p>
+            </div>
+            <div className="flex flex-wrap gap-2">
+              <span className="px-2.5 py-1 rounded-[8px] bg-white/[0.04] text-[11px] font-600 text-text-2">
+                Default: {agents[defaultAgentId]?.name || 'Unset'}
+              </span>
+              <span className="px-2.5 py-1 rounded-[8px] bg-sky-500/10 text-[11px] font-600 text-sky-400">
+                {delegatingCount} delegating
+              </span>
+              <span className="px-2.5 py-1 rounded-[8px] bg-white/[0.04] text-[11px] font-600 text-text-2">
+                {soloCount} solo
+              </span>
+            </div>
+          </div>
+        </div>
+      )}
       <div className="flex flex-col gap-1 px-2 pb-4">
         {filtered.map((p) => (
           <div key={p.id} ref={(el) => { if (el) cardRefs.current.set(p.id, el); else cardRefs.current.delete(p.id) }}>