@swarmclawai/swarmclaw 0.3.1 → 0.4.5

package/src/app/page.tsx

@@ -4,10 +4,13 @@ import { useEffect, useState, useCallback } from 'react'
 import { useAppStore } from '@/stores/use-app-store'
 import { initAudioContext } from '@/lib/tts'
 import { getStoredAccessKey, clearStoredAccessKey, api } from '@/lib/api-client'
+import { connectWs, disconnectWs } from '@/lib/ws-client'
+import { useWs } from '@/hooks/use-ws'
 import { AccessKeyGate } from '@/components/auth/access-key-gate'
 import { UserPicker } from '@/components/auth/user-picker'
 import { SetupWizard } from '@/components/auth/setup-wizard'
 import { AppLayout } from '@/components/layout/app-layout'
+import { useViewRouter } from '@/hooks/use-view-router'
 
 export default function Home() {
   const currentUser = useAppStore((s) => s.currentUser)
@@ -15,7 +18,6 @@ export default function Home() {
   const hydrated = useAppStore((s) => s._hydrated)
   const hydrate = useAppStore((s) => s.hydrate)
   const loadNetworkInfo = useAppStore((s) => s.loadNetworkInfo)
-  const sessions = useAppStore((s) => s.sessions)
   const loadSessions = useAppStore((s) => s.loadSessions)
   const loadSettings = useAppStore((s) => s.loadSettings)
 
@@ -70,14 +72,17 @@ export default function Home() {
 
   useEffect(() => {
     if (!authenticated) return
+    const key = getStoredAccessKey()
+    if (key) connectWs(key)
     syncUserFromServer()
     loadNetworkInfo()
     loadSettings()
     loadSessions()
-    const interval = setInterval(loadSessions, 5000)
-    return () => clearInterval(interval)
+    return () => { disconnectWs() }
   }, [authenticated])
 
+  useWs('sessions', loadSessions, 5000)
+
   // Auto-select default agent's thread on load
   useEffect(() => {
     if (!authenticated || !currentUser) return
@@ -102,29 +107,6 @@ export default function Home() {
     return () => { cancelled = true }
   }, [authenticated, currentUser])
 
-  // Keep __main__ session for backward compat — create if missing
-  useEffect(() => {
-    if (!authenticated || !currentUser) return
-    const sessionList = Object.values(sessions)
-    const mainSession = sessionList.find((s: any) => s.name === '__main__' && s.user === currentUser)
-    if (mainSession) return
-    let cancelled = false
-    ;(async () => {
-      try {
-        const mainId = `main-${currentUser}`
-        await api<any>('POST', '/sessions', {
-          id: mainId,
-          name: '__main__',
-          user: currentUser,
-          agentId: 'default',
-          heartbeatEnabled: true,
-        })
-        if (!cancelled) await loadSessions()
-      } catch { /* ignore */ }
-    })()
-    return () => { cancelled = true }
-  }, [authenticated, currentUser, sessions, loadSessions])
-
   // Check if first-run setup is needed
   useEffect(() => {
     if (!authenticated || !currentUser) return
@@ -156,6 +138,7 @@ export default function Home() {
 
   useEffect(() => {
     const handler = () => {
+      disconnectWs()
       setAuthenticated(false)
       setAuthChecked(true)
     }
@@ -163,6 +146,8 @@ export default function Home() {
     return () => window.removeEventListener('sc_auth_required', handler)
   }, [])
 
+  useViewRouter()
+
   if (!hydrated || !authChecked) return null
   if (!authenticated) return <AccessKeyGate onAuthenticated={() => setAuthenticated(true)} />
   if (!currentUser) return <UserPicker />

package/src/cli/index.js

@@ -17,7 +17,6 @@ const COMMAND_GROUPS = [
       cmd('create', 'POST', '/agents', 'Create an agent', { expectsJsonBody: true }),
       cmd('update', 'PUT', '/agents/:id', 'Update an agent', { expectsJsonBody: true }),
       cmd('delete', 'DELETE', '/agents/:id', 'Delete an agent'),
-      cmd('generate', 'POST', '/agents/generate', 'Generate agent definition from prompt', { expectsJsonBody: true }),
       cmd('thread', 'POST', '/agents/:id/thread', 'Get or create agent thread session'),
     ],
   },
@@ -56,6 +55,7 @@ const COMMAND_GROUPS = [
       cmd('create', 'POST', '/connectors', 'Create connector', { expectsJsonBody: true }),
       cmd('update', 'PUT', '/connectors/:id', 'Update connector', { expectsJsonBody: true }),
       cmd('delete', 'DELETE', '/connectors/:id', 'Delete connector'),
+      cmd('webhook', 'POST', '/connectors/:id/webhook', 'Trigger connector webhook ingress', { expectsJsonBody: true }),
       cmd('start', 'PUT', '/connectors/:id', 'Start connector', {
         expectsJsonBody: true,
         defaultBody: { action: 'start' },
@@ -123,14 +123,6 @@ const COMMAND_GROUPS = [
       cmd('serve', 'GET', '/files/serve', 'Serve a local file (use --query path=/abs/path)'),
     ],
   },
-  {
-    name: 'generate',
-    description: 'AI generation endpoints',
-    commands: [
-      cmd('run', 'POST', '/generate', 'Generate schedule/task/skill/provider payload', { expectsJsonBody: true }),
-      cmd('info', 'GET', '/generate/info', 'Get generation provider/model info'),
-    ],
-  },
   {
     name: 'ip',
     description: 'Get local IP/port metadata',
@@ -208,6 +200,16 @@ const COMMAND_GROUPS = [
         expectsJsonBody: true,
         waitEntityFrom: 'taskId',
       }),
+      cmd('graph', 'GET', '/orchestrator/graph', 'Get orchestrator graph structure'),
+    ],
+  },
+  {
+    name: 'openclaw',
+    description: 'OpenClaw discovery and sync',
+    commands: [
+      cmd('discover', 'GET', '/openclaw/discover', 'Discover OpenClaw gateways'),
+      cmd('directory', 'GET', '/openclaw/directory', 'List directory entries from running OpenClaw connectors'),
+      cmd('sync', 'POST', '/openclaw/sync', 'Run OpenClaw sync action', { expectsJsonBody: true }),
     ],
   },
   {
@@ -217,6 +219,17 @@ const COMMAND_GROUPS = [
       cmd('manage', 'POST', '/preview-server', 'Start/stop/status/detect preview server', { expectsJsonBody: true }),
     ],
   },
+  {
+    name: 'projects',
+    description: 'Manage projects',
+    commands: [
+      cmd('list', 'GET', '/projects', 'List projects'),
+      cmd('get', 'GET', '/projects/:id', 'Get project by id'),
+      cmd('create', 'POST', '/projects', 'Create project', { expectsJsonBody: true }),
+      cmd('update', 'PUT', '/projects/:id', 'Update project', { expectsJsonBody: true }),
+      cmd('delete', 'DELETE', '/projects/:id', 'Delete project'),
+    ],
+  },
   {
     name: 'plugins',
     description: 'Manage plugins and marketplace',
@@ -360,6 +373,7 @@ const COMMAND_GROUPS = [
       cmd('update', 'PUT', '/tasks/:id', 'Update task', { expectsJsonBody: true }),
       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 }),
     ],
   },
   {
@@ -371,6 +385,11 @@ const COMMAND_GROUPS = [
         responseType: 'binary',
         bodyFlagMap: { text: 'text' },
       }),
+      cmd('stream', 'POST', '/tts/stream', 'Generate streaming TTS audio', {
+        expectsJsonBody: true,
+        responseType: 'binary',
+        bodyFlagMap: { text: 'text' },
+      }),
     ],
   },
   {

package/src/cli/index.ts

@@ -928,7 +928,7 @@ export function buildProgram(): Command {
   connectors
     .command('create')
     .description('Create connector')
-    .requiredOption('--platform <platform>', 'Connector platform (discord|telegram|slack|whatsapp|openclaw)')
+    .requiredOption('--platform <platform>', 'Connector platform (discord|telegram|slack|whatsapp|openclaw|bluebubbles|signal|teams|googlechat|matrix)')
     .requiredOption('--agent-id <agentId>', 'Agent id')
     .option('--name <name>', 'Connector name')
     .option('--credential-id <credentialId>', 'Credential id')
@@ -1140,14 +1140,57 @@ export function buildProgram(): Command {
       console.log('Run: swarmclaw server --help')
     })
 
+  program
+    .command('update')
+    .description('Pull the latest SwarmClaw release via git')
+    .action(() => {
+      console.log('The update command is handled directly by the swarmclaw binary.')
+      console.log('Run: swarmclaw update --help')
+    })
+
   return program
 }
 
+async function checkForUpdate(baseUrl: string, accessKey: string): Promise<void> {
+  try {
+    const url = `${baseUrl}/api/version`
+    const headers: Record<string, string> = {}
+    if (accessKey) headers['X-Access-Key'] = accessKey
+    const controller = new AbortController()
+    const timeout = setTimeout(() => controller.abort(), 2000)
+    const res = await fetch(url, { headers, signal: controller.signal })
+    clearTimeout(timeout)
+    if (!res.ok) return
+    const data = (await res.json()) as { updateAvailable?: boolean; behindBy?: number }
+    if (data.updateAvailable && data.behindBy) {
+      process.stderr.write(`\n  Update available (${data.behindBy} behind). Run: swarmclaw update\n`)
+    }
+  } catch {
+    // Server unreachable or timed out — silently skip
+  }
+}
+
 export async function runCli(argv: string[] = process.argv.slice(2)): Promise<number> {
   const program = buildProgram()
   try {
+    // Skip update hint for commands that don't talk to the server
+    const skipHint = !argv.length || ['update', 'server', '--help', '-h'].includes(argv[0])
+    const hintPromise = skipHint
+      ? null
+      : checkForUpdate(
+          normalizeBaseUrl(process.env.SWARMCLAW_URL || process.env.SWARMCLAW_BASE_URL || 'http://localhost:3456'),
+          (process.env.SWARMCLAW_ACCESS_KEY || '').trim(),
+        )
+
     await program.parseAsync(['node', 'swarmclaw', ...argv])
-    return (process.exitCode as number | undefined) ?? 0
+    const code = (process.exitCode as number | undefined) ?? 0
+
+    // Wait briefly for the hint if the command succeeded
+    if (hintPromise && code === 0) {
+      await Promise.race([hintPromise, new Promise((r) => setTimeout(r, 2000))])
+    }
+
+    return code
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err)
     console.error(msg)

package/src/cli/spec.js

@@ -7,7 +7,6 @@ const COMMAND_GROUPS = {
       create: { description: 'Create an agent', method: 'POST', path: '/agents' },
       update: { description: 'Update an agent', method: 'PUT', path: '/agents/:id', params: ['id'] },
       delete: { description: 'Delete an agent', method: 'DELETE', path: '/agents/:id', params: ['id'] },
-      generate: { description: 'Generate an agent definition', method: 'POST', path: '/agents/generate' },
     },
   },
   auth: {
@@ -97,13 +96,6 @@ const COMMAND_GROUPS = {
       },
     },
   },
-  generate: {
-    description: 'Structured AI generation helpers',
-    commands: {
-      create: { description: 'Generate object from prompt/type', method: 'POST', path: '/generate' },
-      info: { description: 'Get active generator provider/model', method: 'GET', path: '/generate/info' },
-    },
-  },
   logs: {
     description: 'Application logs',
     commands: {
@@ -135,6 +127,7 @@ const COMMAND_GROUPS = {
       run: { description: 'Run orchestrator task now', method: 'POST', path: '/orchestrator/run', waitable: true },
       runs: { description: 'List queued/running/completed runs', method: 'GET', path: '/runs' },
       'run-get': { description: 'Get run by id', method: 'GET', path: '/runs/:id', params: ['id'] },
+      graph: { description: 'Get orchestrator graph structure', method: 'GET', path: '/orchestrator/graph' },
     },
   },
   plugins: {
@@ -251,6 +244,7 @@ const COMMAND_GROUPS = {
       update: { description: 'Update task', method: 'PUT', path: '/tasks/:id', params: ['id'] },
       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'] },
     },
   },
   webhooks: {

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

@@ -56,7 +56,7 @@ export function AgentCard({ agent, isDefault, onSetDefault }: Props) {
         await loadSessions()
         setMessages([])
         setCurrentSession(result.sessionId)
-        setActiveView('sessions')
+        setActiveView('agents')
       }
     } catch (err) {
       console.error('Orchestrator run failed:', err)

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

@@ -16,6 +16,7 @@ export function AgentList({ inSidebar }: Props) {
   const currentUser = useAppStore((s) => s.currentUser)
   const loadSessions = useAppStore((s) => s.loadSessions)
   const setAgentSheetOpen = useAppStore((s) => s.setAgentSheetOpen)
+  const activeProjectFilter = useAppStore((s) => s.activeProjectFilter)
   const [search, setSearch] = useState('')
   const [filter, setFilter] = useState<'all' | 'orchestrator' | 'agent'>('all')
 
@@ -41,10 +42,11 @@ export function AgentList({ inSidebar }: Props) {
         if (search && !p.name.toLowerCase().includes(search.toLowerCase())) return false
         if (filter === 'orchestrator' && !p.isOrchestrator) return false
         if (filter === 'agent' && p.isOrchestrator) return false
+        if (activeProjectFilter && p.projectId !== activeProjectFilter) return false
         return true
       })
       .sort((a, b) => b.updatedAt - a.updatedAt)
-  }, [agents, search, filter])
+  }, [agents, search, filter, activeProjectFilter])
 
   if (!filtered.length && !search) {
     return (

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

@@ -5,40 +5,46 @@ import { useAppStore } from '@/stores/use-app-store'
 import { createAgent, updateAgent, deleteAgent } from '@/lib/agents'
 import { api } from '@/lib/api-client'
 import { BottomSheet } from '@/components/shared/bottom-sheet'
-import { AiGenBlock } from '@/components/shared/ai-gen-block'
 import { toast } from 'sonner'
+import { ModelCombobox } from '@/components/shared/model-combobox'
 import type { ProviderType, ClaudeSkill } from '@/types'
+import { AVAILABLE_TOOLS, PLATFORM_TOOLS } from '@/lib/tool-definitions'
+import { NATIVE_CAPABILITY_PROVIDER_IDS, NON_LANGGRAPH_PROVIDER_IDS } from '@/lib/provider-sets'
 
-const AVAILABLE_TOOLS: { id: string; label: string; description: string }[] = [
-  { id: 'shell', label: 'Shell', description: 'Execute commands in the working directory' },
-  { id: 'files', label: 'Files', description: 'Read, write, list, move, copy, and send files' },
-  { id: 'copy_file', label: 'Copy File', description: 'Copy files within the working directory' },
-  { id: 'move_file', label: 'Move File', description: 'Move/rename files within the working directory' },
-  { id: 'delete_file', label: 'Delete File', description: 'Delete files/directories (disabled by default)' },
-  { id: 'edit_file', label: 'Edit File', description: 'Search-and-replace editing within files' },
-  { id: 'process', label: 'Process', description: 'Monitor and control long-running shell commands' },
-  { id: 'web_search', label: 'Web Search', description: 'Search the web via DuckDuckGo' },
-  { id: 'web_fetch', label: 'Web Fetch', description: 'Fetch and extract text from URLs' },
-  { id: 'claude_code', label: 'Claude Code', description: 'Delegate complex tasks to Claude Code CLI' },
-  { id: 'codex_cli', label: 'Codex CLI', description: 'Delegate complex tasks to OpenAI Codex CLI' },
-  { id: 'opencode_cli', label: 'OpenCode CLI', description: 'Delegate complex tasks to OpenCode CLI' },
-  { id: 'browser', label: 'Browser', description: 'Playwright — browse, scrape, interact with web pages' },
-  { id: 'memory', label: 'Memory', description: 'Store and retrieve long-term memories across sessions' },
-]
+const HB_PRESETS = [30, 60, 120, 300, 600, 1800, 3600] as const
 
-const PLATFORM_TOOLS: { id: string; label: string; description: string }[] = [
-  { id: 'manage_agents', label: 'Agents', description: 'Create, edit, and delete agents' },
-  { id: 'manage_tasks', label: 'Tasks', description: 'Create, edit, and delete tasks' },
-  { id: 'manage_schedules', label: 'Schedules', description: 'Create, edit, and delete schedules' },
-  { id: 'manage_skills', label: 'Skills', description: 'Create, edit, and delete skills' },
-  { id: 'manage_documents', label: 'Documents', description: 'Upload, search, and delete indexed documents' },
-  { id: 'manage_webhooks', label: 'Webhooks', description: 'Register webhooks that trigger agent sessions' },
-  { id: 'manage_connectors', label: 'Connectors', description: 'Create, edit, and delete connectors' },
-  { id: 'manage_sessions', label: 'Sessions', description: 'List sessions, send messages, and spawn session work' },
-  { id: 'manage_secrets', label: 'Secrets', description: 'Store and retrieve encrypted service secrets' },
-]
+function formatHbDuration(sec: number): string {
+  if (sec >= 3600) {
+    const h = Math.floor(sec / 3600)
+    const m = Math.floor((sec % 3600) / 60)
+    return m > 0 ? `${h}h${m}m` : `${h}h`
+  }
+  if (sec >= 60) return `${Math.floor(sec / 60)}m`
+  return `${sec}s`
+}
 
-const NATIVE_CAPABILITY_PROVIDER_IDS = new Set<ProviderType>(['claude-cli', 'codex-cli', 'opencode-cli', 'openclaw'])
+/** Parse a stored heartbeatInterval string or heartbeatIntervalSec number to a select-friendly string of seconds */
+function parseDurationToSec(interval: string | number | null | undefined, intervalSec: number | null | undefined): string {
+  if (intervalSec != null && Number.isFinite(intervalSec) && intervalSec > 0) {
+    // Snap to nearest preset if close, otherwise use raw value
+    const closest = HB_PRESETS.find((p) => p === Math.round(intervalSec))
+    if (closest) return String(closest)
+  }
+  if (typeof interval === 'number' && Number.isFinite(interval) && interval > 0) {
+    return String(Math.round(interval))
+  }
+  if (interval != null && typeof interval === 'string' && interval.trim()) {
+    const t = interval.trim().toLowerCase()
+    const n = Number(t)
+    if (Number.isFinite(n) && n > 0) return String(Math.round(n))
+    const m = t.match(/^(?:(\d+)h)?(?:(\d+)m)?(?:(\d+)s?)?$/)
+    if (m && (m[1] || m[2] || m[3])) {
+      const total = (m[1] ? parseInt(m[1]) * 3600 : 0) + (m[2] ? parseInt(m[2]) * 60 : 0) + (m[3] ? parseInt(m[3]) : 0)
+      if (total > 0) return String(total)
+    }
+  }
+  return '' // default
+}
 
 export function AgentSheet() {
   const open = useAppStore((s) => s.agentSheetOpen)
@@ -47,6 +53,8 @@ export function AgentSheet() {
   const setEditingId = useAppStore((s) => s.setEditingAgentId)
   const agents = useAppStore((s) => s.agents)
   const loadAgents = useAppStore((s) => s.loadAgents)
+  const projects = useAppStore((s) => s.projects)
+  const loadProjects = useAppStore((s) => s.loadProjects)
   const providers = useAppStore((s) => s.providers)
   const loadProviders = useAppStore((s) => s.loadProviders)
   const credentials = useAppStore((s) => s.credentials)
@@ -54,9 +62,6 @@ export function AgentSheet() {
   const dynamicSkills = useAppStore((s) => s.skills)
   const mcpServers = useAppStore((s) => s.mcpServers)
   const loadSkills = useAppStore((s) => s.loadSkills)
-  const appSettings = useAppStore((s) => s.appSettings)
-  const loadSettings = useAppStore((s) => s.loadSettings)
-
   const [claudeSkills, setClaudeSkills] = useState<ClaudeSkill[]>([])
   const [claudeSkillsLoading, setClaudeSkillsLoading] = useState(false)
   const loadClaudeSkills = async () => {
@@ -91,6 +96,12 @@ export function AgentSheet() {
   const [capInput, setCapInput] = useState('')
   const [ollamaMode, setOllamaMode] = useState<'local' | 'cloud'>('local')
   const [openclawEnabled, setOpenclawEnabled] = useState(false)
+  const [projectId, setProjectId] = useState<string | undefined>(undefined)
+  const [thinkingLevel, setThinkingLevel] = useState<'' | 'minimal' | 'low' | 'medium' | 'high'>('')
+  const [heartbeatEnabled, setHeartbeatEnabled] = useState(false)
+  const [heartbeatIntervalSec, setHeartbeatIntervalSec] = useState('')  // '' = default (30m)
+  const [heartbeatModel, setHeartbeatModel] = useState('')
+  const [heartbeatPrompt, setHeartbeatPrompt] = useState('')
   const [addingKey, setAddingKey] = useState(false)
   const [newKeyName, setNewKeyName] = useState('')
   const [newKeyValue, setNewKeyValue] = useState('')
@@ -117,12 +128,6 @@ export function AgentSheet() {
     e.target.value = ''
   }
 
-  // AI generation state
-  const [aiPrompt, setAiPrompt] = useState('')
-  const [generating, setGenerating] = useState(false)
-  const [generated, setGenerated] = useState(false)
-  const [genError, setGenError] = useState('')
-
   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')
@@ -139,12 +144,8 @@ export function AgentSheet() {
       loadProviders()
       loadCredentials()
       loadSkills()
+      loadProjects()
       loadClaudeSkills()
-      loadSettings()
-      setAiPrompt('')
-      setGenerating(false)
-      setGenerated(false)
-      setGenError('')
       setTestStatus('idle')
       setTestMessage('')
       if (editing) {
@@ -169,6 +170,12 @@ export function AgentSheet() {
         setCapInput('')
         setOllamaMode(editing.credentialId && editing.provider === 'ollama' ? 'cloud' : 'local')
         setOpenclawEnabled(editing.provider === 'openclaw')
+        setProjectId(editing.projectId)
+        setThinkingLevel(editing.thinkingLevel || '')
+        setHeartbeatEnabled(editing.heartbeatEnabled || false)
+        setHeartbeatIntervalSec(parseDurationToSec(editing.heartbeatInterval, editing.heartbeatIntervalSec))
+        setHeartbeatModel(editing.heartbeatModel || '')
+        setHeartbeatPrompt(editing.heartbeatPrompt || '')
       } else {
         setName('')
         setDescription('')
@@ -190,6 +197,12 @@ export function AgentSheet() {
         setCapInput('')
         setOllamaMode('local')
         setOpenclawEnabled(false)
+        setProjectId(undefined)
+        setThinkingLevel('')
+        setHeartbeatEnabled(false)
+        setHeartbeatIntervalSec('')
+        setHeartbeatModel('')
+        setHeartbeatPrompt('')
       }
     }
   // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -246,29 +259,6 @@ export function AgentSheet() {
     return () => { cancelled = true }
   }, [openclawEnabled])
 
-  const handleGenerate = async () => {
-    if (!aiPrompt.trim()) return
-    setGenerating(true)
-    setGenError('')
-    try {
-      const result = await api<{ name?: string; description?: string; systemPrompt?: string; isOrchestrator?: boolean; error?: string }>('POST', '/agents/generate', { prompt: aiPrompt })
-      if (result.error) {
-        setGenError(result.error)
-      } else if (result.name || result.systemPrompt) {
-        if (result.name) setName(result.name)
-        if (result.description) setDescription(result.description)
-        if (result.systemPrompt) setSystemPrompt(result.systemPrompt)
-        if (result.isOrchestrator !== undefined) setIsOrchestrator(result.isOrchestrator)
-        setGenerated(true)
-      } else {
-        setGenError('AI returned empty response — try again')
-      }
-    } catch (err: unknown) {
-      setGenError(err instanceof Error ? err.message : 'Generation failed')
-    }
-    setGenerating(false)
-  }
-
   const onClose = () => {
     setOpen(false)
     setEditingId(null)
@@ -300,6 +290,13 @@ export function AgentSheet() {
       fallbackCredentialIds,
       platformAssignScope,
       capabilities,
+      projectId: projectId || undefined,
+      thinkingLevel: thinkingLevel || undefined,
+      heartbeatEnabled,
+      heartbeatInterval: heartbeatIntervalSec ? formatHbDuration(Number(heartbeatIntervalSec)) : null,
+      heartbeatIntervalSec: heartbeatIntervalSec ? Number(heartbeatIntervalSec) : null,
+      heartbeatModel: heartbeatModel.trim() || null,
+      heartbeatPrompt: heartbeatPrompt.trim() || null,
     }
     if (editing) {
       await updateAgent(editing.id, data)
@@ -383,8 +380,7 @@ export function AgentSheet() {
 
   // Whether this provider needs a connection test before saving.
   // Only CLI providers (no remote connection) skip the test.
-  const CLI_ONLY_PROVIDERS: Set<ProviderType> = new Set(['claude-cli', 'codex-cli', 'opencode-cli'])
-  const needsTest = !providerNeedsKey && !CLI_ONLY_PROVIDERS.has(provider)
+  const needsTest = !providerNeedsKey && !NON_LANGGRAPH_PROVIDER_IDS.has(provider)
 
   const [saving, setSaving] = useState(false)
 
@@ -450,14 +446,6 @@ export function AgentSheet() {
         </div>
       </div>
 
-      {/* AI Generation */}
-      {!editing && !openclawEnabled && <AiGenBlock
-        aiPrompt={aiPrompt} setAiPrompt={setAiPrompt}
-        generating={generating} generated={generated} genError={genError}
-        onGenerate={handleGenerate} appSettings={appSettings}
-        placeholder='Describe the agent you want, e.g. "An SEO keyword researcher that finds low-competition long-tail keywords"'
-      />}
-
       <div className="mb-8">
         <label className="block font-display text-[12px] font-600 text-text-2 uppercase tracking-[0.08em] mb-3">Name</label>
         <input type="text" value={name} onChange={(e) => setName(e.target.value)} placeholder="e.g. SEO Researcher" className={inputClass} style={{ fontFamily: 'inherit' }} />
@@ -512,6 +500,100 @@ export function AgentSheet() {
         <p className="text-[11px] text-text-3/70 mt-1.5">Press Enter or comma to add. Other agents see these when deciding delegation.</p>
       </div>}
 
+      {/* Project */}
+      {Object.keys(projects).length > 0 && (
+        <div className="mb-8">
+          <label className="block font-display text-[12px] font-600 text-text-2 uppercase tracking-[0.08em] mb-2">
+            Project <span className="normal-case tracking-normal font-normal text-text-3">(optional)</span>
+          </label>
+          <select
+            value={projectId || ''}
+            onChange={(e) => setProjectId(e.target.value || undefined)}
+            className={inputClass}
+            style={{ fontFamily: 'inherit' }}
+          >
+            <option value="">None</option>
+            {Object.values(projects).map((p) => (
+              <option key={p.id} value={p.id}>{p.name}</option>
+            ))}
+          </select>
+        </div>
+      )}
+
+      {/* Thinking Level */}
+      <div className="mb-8">
+        <label className="block font-display text-[12px] font-600 text-text-2 uppercase tracking-[0.08em] mb-2">
+          Thinking Level <span className="normal-case tracking-normal font-normal text-text-3">(optional)</span>
+        </label>
+        <select
+          value={thinkingLevel}
+          onChange={(e) => setThinkingLevel(e.target.value as typeof thinkingLevel)}
+          className={inputClass}
+          style={{ fontFamily: 'inherit' }}
+        >
+          <option value="">None (default)</option>
+          <option value="minimal">Minimal — Direct and concise</option>
+          <option value="low">Low — Brief reasoning</option>
+          <option value="medium">Medium — Moderate analysis</option>
+          <option value="high">High — Deep, thorough reasoning</option>
+        </select>
+        <p className="text-[11px] text-text-3/70 mt-1.5">Controls reasoning depth. Anthropic models use extended thinking; OpenAI o-series uses reasoning_effort. Others get system prompt guidance.</p>
+      </div>
+
+      {/* Heartbeat Configuration */}
+      <div className="mb-8">
+        <div className="flex items-center justify-between mb-3">
+          <label className="block font-display text-[12px] font-600 text-text-2 uppercase tracking-[0.08em]">Heartbeat</label>
+          <button
+            type="button"
+            onClick={() => setHeartbeatEnabled(!heartbeatEnabled)}
+            className={`relative w-10 h-[22px] rounded-full transition-colors duration-200 cursor-pointer ${heartbeatEnabled ? 'bg-accent' : 'bg-white/[0.12]'}`}
+          >
+            <span className={`absolute top-[3px] left-[3px] w-4 h-4 rounded-full bg-white transition-transform duration-200 ${heartbeatEnabled ? 'translate-x-[18px]' : ''}`} />
+          </button>
+        </div>
+        {heartbeatEnabled && (
+          <div className="space-y-4 mt-3">
+            <div>
+              <label className="block text-[12px] text-text-3/70 mb-1.5">Interval</label>
+              <select
+                value={heartbeatIntervalSec}
+                onChange={(e) => setHeartbeatIntervalSec(e.target.value)}
+                className={inputClass}
+              >
+                <option value="">Default (30m)</option>
+                {HB_PRESETS.map((sec) => (
+                  <option key={sec} value={String(sec)}>{formatHbDuration(sec)}</option>
+                ))}
+              </select>
+            </div>
+            <div>
+              <label className="block text-[12px] text-text-3/70 mb-1.5">Model override <span className="text-text-3/50">(optional, cheaper model)</span></label>
+              <input
+                type="text"
+                value={heartbeatModel}
+                onChange={(e) => setHeartbeatModel(e.target.value)}
+                placeholder="e.g. gpt-4o-mini"
+                className={inputClass}
+                style={{ fontFamily: 'inherit' }}
+              />
+            </div>
+            <div>
+              <label className="block text-[12px] text-text-3/70 mb-1.5">Instructions <span className="text-text-3/50">(what to do each tick)</span></label>
+              <textarea
+                value={heartbeatPrompt}
+                onChange={(e) => setHeartbeatPrompt(e.target.value)}
+                placeholder="Describe what this agent should do during heartbeat ticks..."
+                rows={4}
+                className={`${inputClass} resize-y min-h-[100px]`}
+                style={{ fontFamily: 'inherit' }}
+              />
+            </div>
+          </div>
+        )}
+        <p className="text-[11px] text-text-3/70 mt-1.5">Periodic check-in runs on idle sessions using this agent. Processes pending events and monitors status.</p>
+      </div>
+
       {provider !== 'openclaw' && (
         <div className="mb-8">
           <label className="block font-display text-[12px] font-600 text-text-2 uppercase tracking-[0.08em] mb-2">
@@ -774,11 +856,14 @@ export function AgentSheet() {
       {!openclawEnabled && currentProvider && currentProvider.models.length > 0 && (
         <div className="mb-8">
           <label className="block font-display text-[12px] font-600 text-text-2 uppercase tracking-[0.08em] mb-3">Model</label>
-          <select value={model} onChange={(e) => setModel(e.target.value)} className={`${inputClass} appearance-none cursor-pointer`} style={{ fontFamily: 'inherit' }}>
-            {currentProvider.models.map((m) => (
-              <option key={m} value={m}>{m}</option>
-            ))}
-          </select>
+          <ModelCombobox
+            providerId={currentProvider.id}
+            value={model}
+            onChange={setModel}
+            models={currentProvider.models}
+            defaultModels={currentProvider.defaultModels}
+            className={`${inputClass} cursor-pointer`}
+          />
         </div>
       )}