@swarmclawai/swarmclaw 1.2.4 → 1.2.6

package/src/app/tasks/page.tsx

@@ -2,8 +2,15 @@
 
 import { useEffect, useCallback, useState, useRef, useMemo } from 'react'
 import { useAppStore } from '@/stores/use-app-store'
-import { useWs } from '@/hooks/use-ws'
-import { updateTask, bulkUpdateTasks, importGitHubIssues, type GitHubIssueImportResult } from '@/lib/tasks'
+import { useAgentsQuery } from '@/features/agents/queries'
+import { useProjectsQuery } from '@/features/projects/queries'
+import {
+  useBulkUpdateTasksMutation,
+  useImportGitHubIssuesMutation,
+  useTasksQuery,
+  useUpdateTaskMutation,
+  type GitHubIssueImportResult,
+} from '@/features/tasks/queries'
 import { TaskColumn } from '@/components/tasks/task-column'
 import { TaskCard } from '@/components/tasks/task-card'
 import { Skeleton } from '@/components/shared/skeleton'
@@ -63,18 +70,18 @@ function attentionRank(task: BoardTask, now: number | null): number {
 
 export default function TasksPage() {
   const now = useNow()
-  const tasks = useAppStore((s) => s.tasks)
-  const loadTasks = useAppStore((s) => s.loadTasks)
-  const loadAgents = useAppStore((s) => s.loadAgents)
   const setTaskSheetOpen = useAppStore((s) => s.setTaskSheetOpen)
   const setEditingTaskId = useAppStore((s) => s.setEditingTaskId)
-  const agents = useAppStore((s) => s.agents)
-  const projects = useAppStore((s) => s.projects)
-  const loadProjects = useAppStore((s) => s.loadProjects)
   const activeProjectFilter = useAppStore((s) => s.activeProjectFilter)
   const setActiveProjectFilter = useAppStore((s) => s.setActiveProjectFilter)
   const showArchived = useAppStore((s) => s.showArchivedTasks)
   const setShowArchived = useAppStore((s) => s.setShowArchivedTasks)
+  const { data: tasks = {}, isLoading: tasksLoading } = useTasksQuery({ includeArchived: true })
+  const { data: agents = {}, isLoading: agentsLoading } = useAgentsQuery()
+  const { data: projects = {}, isLoading: projectsLoading } = useProjectsQuery()
+  const bulkUpdateTasksMutation = useBulkUpdateTasksMutation()
+  const updateTaskMutation = useUpdateTaskMutation()
+  const importGitHubIssuesMutation = useImportGitHubIssuesMutation()
 
   // Bulk selection
   const [selectedIds, setSelectedIds] = useState<Set<string>>(new Set())
@@ -97,8 +104,7 @@ export default function TasksPage() {
     if (selectedIds.size === 0) return
     setBulkActing(true)
     try {
-      await bulkUpdateTasks([...selectedIds], { status })
-      await loadTasks()
+      await bulkUpdateTasksMutation.mutateAsync({ ids: [...selectedIds], patch: { status } })
       toast.success(`Moved ${selectedIds.size} task(s) to ${status}`)
       clearSelection()
     } catch {
@@ -106,15 +112,13 @@ export default function TasksPage() {
     } finally {
       setBulkActing(false)
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [selectedIds])
+  }, [bulkUpdateTasksMutation, clearSelection, selectedIds])
 
   const handleBulkAgent = useCallback(async (agentId: string) => {
     if (selectedIds.size === 0) return
     setBulkActing(true)
     try {
-      await bulkUpdateTasks([...selectedIds], { agentId })
-      await loadTasks()
+      await bulkUpdateTasksMutation.mutateAsync({ ids: [...selectedIds], patch: { agentId } })
       const name = agents[agentId]?.name || 'agent'
       toast.success(`Assigned ${selectedIds.size} task(s) to ${name}`)
       clearSelection()
@@ -123,15 +127,13 @@ export default function TasksPage() {
     } finally {
       setBulkActing(false)
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [selectedIds, agents])
+  }, [agents, bulkUpdateTasksMutation, clearSelection, selectedIds])
 
   const handleBulkProject = useCallback(async (projectId: string | null) => {
     if (selectedIds.size === 0) return
     setBulkActing(true)
     try {
-      await bulkUpdateTasks([...selectedIds], { projectId })
-      await loadTasks()
+      await bulkUpdateTasksMutation.mutateAsync({ ids: [...selectedIds], patch: { projectId } })
       toast.success(projectId ? `Assigned ${selectedIds.size} task(s) to project` : `Cleared project from ${selectedIds.size} task(s)`)
       clearSelection()
     } catch {
@@ -139,8 +141,7 @@ export default function TasksPage() {
     } finally {
       setBulkActing(false)
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [selectedIds])
+  }, [bulkUpdateTasksMutation, clearSelection, selectedIds])
 
   // Bulk action bar dropdowns
   const [bulkAgentOpen, setBulkAgentOpen] = useState(false)
@@ -196,11 +197,7 @@ export default function TasksPage() {
     window.history.replaceState(null, '', newUrl)
   }, [activeProjectFilter, filterAgentId, filterTag, filtersHydrated, taskScopeFilter])
 
-  const [loaded, setLoaded] = useState(Object.keys(tasks).length > 0)
-  useEffect(() => {
-    Promise.all([loadTasks(), loadAgents(), loadProjects()]).then(() => setLoaded(true))
-  }, [loadAgents, loadProjects, loadTasks])
-  useWs('tasks', loadTasks, 5000)
+  const loaded = !tasksLoading && !agentsLoading && !projectsLoading
 
   // Collect all unique tags across tasks
   const allTags = dedup(Object.values(tasks).flatMap((t) => t.tags || [])).sort()
@@ -259,10 +256,8 @@ export default function TasksPage() {
   const handleDrop = useCallback(async (taskId: string, newStatus: BoardTaskStatus) => {
     const task = tasks[taskId]
     if (!task || task.status === newStatus) return
-    await updateTask(taskId, { status: newStatus })
-    await loadTasks()
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [tasks])
+    await updateTaskMutation.mutateAsync({ id: taskId, patch: { status: newStatus } })
+  }, [tasks, updateTaskMutation])
 
   const archivedCount = Object.values(tasks).filter((t) => t.status === 'archived').length
 
@@ -284,7 +279,7 @@ export default function TasksPage() {
     try {
       const rawLimit = Number.parseInt(githubLimit, 10)
       const limit = Number.isFinite(rawLimit) ? Math.max(1, Math.min(rawLimit, 200)) : 25
-      const result = await importGitHubIssues({
+      const result = await importGitHubIssuesMutation.mutateAsync({
         repo: githubRepo.trim(),
         token: githubToken.trim() || undefined,
         state: githubState,
@@ -296,7 +291,6 @@ export default function TasksPage() {
         projectId: activeProjectFilter,
       })
       setGitHubImportResult(result)
-      await loadTasks()
       const summary = result.created.length > 0
         ? `Imported ${result.created.length} issue(s) from ${result.repo}`
         : `No new issues imported from ${result.repo}`
@@ -316,7 +310,7 @@ export default function TasksPage() {
     githubRepo,
     githubState,
     githubToken,
-    loadTasks,
+    importGitHubIssuesMutation,
   ])
 
   // Task counts per project (non-archived)
@@ -759,6 +753,9 @@ export default function TasksPage() {
                 <TaskColumn
                   status={status}
                   tasks={tasksByStatus(status)}
+                  agents={agents}
+                  projects={projects}
+                  tasksById={tasks}
                   onDrop={handleDrop}
                   selectionMode={selectionMode}
                   selectedIds={selectedIds}
@@ -804,6 +801,9 @@ export default function TasksPage() {
                   <TaskCard
                     key={task.id}
                     task={task}
+                    agents={agents}
+                    projects={projects}
+                    tasksById={tasks}
                     index={idx}
                     selectionMode={selectionMode}
                     selected={selectedIds.has(task.id)}

package/src/cli/index.js

@@ -596,6 +596,7 @@ const COMMAND_GROUPS = [
         defaultBody: { action: 'status' },
       }),
       cmd('checkpoints', 'GET', '/chats/:id/checkpoints', 'List checkpoint history for a chat'),
+      cmd('migrate-messages', 'POST', '/chats/migrate-messages', 'Migrate messages from session blobs to relational table'),
     ],
   },
   {

package/src/cli/spec.js

@@ -428,6 +428,7 @@ const COMMAND_GROUPS = {
       delete: { description: 'Delete one chat', method: 'DELETE', path: '/chats/:id', params: ['id'] },
       'delete-many': { description: 'Delete multiple chats (body: {"ids":[...]})', method: 'DELETE', path: '/chats' },
       'heartbeat-disable-all': { description: 'Disable all chat heartbeats and cancel queued heartbeat runs', method: 'POST', path: '/chats/heartbeat' },
+      'migrate-messages': { description: 'Migrate messages from session blobs to relational table', method: 'POST', path: '/chats/migrate-messages' },
       messages: { description: 'Get chat message history', method: 'GET', path: '/chats/:id/messages', params: ['id'] },
       'messages-update': { description: 'Update chat message metadata (e.g. bookmark)', method: 'PUT', path: '/chats/:id/messages', params: ['id'] },
       'messages-send': { description: 'Append a user/system message to a chat', method: 'POST', path: '/chats/:id/messages', params: ['id'] },

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

@@ -447,7 +447,7 @@ export function AgentSheet() {
         }))
         setOpenclawEnabled(editing.provider === 'openclaw')
         setProjectId(editing.projectId)
-        setAvatarSeed(editing.avatarSeed || crypto.randomUUID().slice(0, 8))
+        setAvatarSeed(editing.avatarSeed || Math.random().toString(36).slice(2, 10))
         setAvatarUrl(editing.avatarUrl || null)
         setThinkingLevel(editing.thinkingLevel || '')
         setMemoryScopeMode(editing.memoryScopeMode || 'auto')
@@ -527,7 +527,7 @@ export function AgentSheet() {
         }))
         setOpenclawEnabled(src.provider === 'openclaw')
         setProjectId(src.projectId)
-        setAvatarSeed(crypto.randomUUID().slice(0, 8))
+        setAvatarSeed(Math.random().toString(36).slice(2, 10))
         setAvatarUrl(null)
         setThinkingLevel(src.thinkingLevel || '')
         setMemoryScopeMode(src.memoryScopeMode || 'auto')
@@ -725,7 +725,7 @@ export function AgentSheet() {
 
   const addRoutingTargetFromCurrent = () => {
     const nextTarget: AgentRoutingTarget = {
-      id: crypto.randomUUID(),
+      id: Math.random().toString(16).slice(2, 10),
       label: routingTargets.length === 0 ? 'Primary route' : `Route ${routingTargets.length + 1}`,
       role: routingTargets.length === 0 ? 'primary' : 'backup',
       provider,
@@ -1165,7 +1165,7 @@ export function AgentSheet() {
                   type="button"
                   onClick={() => {
                     setAvatarUrl(null)
-                    if (!avatarSeed) setAvatarSeed(crypto.randomUUID().slice(0, 8))
+                    if (!avatarSeed) setAvatarSeed(Math.random().toString(36).slice(2, 10))
                   }}
                   className="text-[11px] text-text-3 hover:text-red-400 transition-colors self-start cursor-pointer"
                 >
@@ -1186,7 +1186,7 @@ export function AgentSheet() {
             />
             <button
               type="button"
-              onClick={() => { setAvatarSeed(crypto.randomUUID().slice(0, 8)); setAvatarUrl(null) }}
+              onClick={() => { setAvatarSeed(Math.random().toString(36).slice(2, 10)); setAvatarUrl(null) }}
               className="inline-flex items-center gap-1.5 px-3 py-2 rounded-[10px] border border-white/[0.08] bg-transparent text-text-3 text-[12px] font-600 cursor-pointer transition-all hover:bg-white/[0.04] hover:text-text-2 active:scale-95 shrink-0"
               style={{ fontFamily: 'inherit' }}
               title="Shuffle avatar"

package/src/components/auth/setup-wizard/index.tsx

@@ -119,7 +119,7 @@ export function SetupWizard({ onComplete }: SetupWizardProps) {
     if (!editingProviderId && draftAgents.length === 0) {
       const cp = configured
       setDraftAgents([{
-        id: `auto:${crypto.randomUUID().slice(0, 8)}`,
+        id: `auto:${Math.random().toString(36).slice(2, 10)}`,
         templateId: 'auto',
         name: 'Assistant',
         description: 'A helpful assistant.',
@@ -140,7 +140,7 @@ export function SetupWizard({ onComplete }: SetupWizardProps) {
         autoDraftSkillSuggestions: true,
         orchestratorEnabled: false,
         orchestratorMission: '',
-        avatarSeed: crypto.randomUUID().slice(0, 8),
+        avatarSeed: Math.random().toString(36).slice(2, 10),
         avatarUrl: null,
         enabled: true,
       }])
@@ -182,7 +182,7 @@ export function SetupWizard({ onComplete }: SetupWizardProps) {
   const addBlankAgent = () => {
     const defaultProvider = configuredProviders[0] || null
     const newAgent: StarterDraftAgent = {
-      id: `custom:${crypto.randomUUID().slice(0, 8)}`,
+      id: `custom:${Math.random().toString(36).slice(2, 10)}`,
       templateId: 'custom',
       name: `Agent ${draftAgents.length + 1}`,
       description: '',
@@ -203,7 +203,7 @@ export function SetupWizard({ onComplete }: SetupWizardProps) {
       autoDraftSkillSuggestions: true,
       orchestratorEnabled: false,
       orchestratorMission: '',
-      avatarSeed: crypto.randomUUID().slice(0, 8),
+      avatarSeed: Math.random().toString(36).slice(2, 10),
       avatarUrl: null,
       enabled: true,
     }

package/src/components/auth/setup-wizard/step-agents.tsx

@@ -361,7 +361,7 @@ export function StepAgents({
                     />
                     <button
                       type="button"
-                      onClick={() => onUpdateDraft(draft.id, { avatarSeed: crypto.randomUUID().slice(0, 8), avatarUrl: null })}
+                      onClick={() => onUpdateDraft(draft.id, { avatarSeed: Math.random().toString(36).slice(2, 10), avatarUrl: null })}
                       className="inline-flex items-center gap-1.5 px-3 py-2 rounded-[10px] border border-white/[0.08] bg-transparent text-text-3 text-[12px] font-600 cursor-pointer transition-all hover:bg-white/[0.04] hover:text-text-2 active:scale-95 shrink-0"
                       title="Shuffle avatar"
                     >

package/src/components/auth/setup-wizard/step-connect.tsx

@@ -216,7 +216,7 @@ export function StepConnect({
       }
 
       const configured: ConfiguredProvider = {
-        id: crypto.randomUUID(),
+        id: Math.random().toString(16).slice(2, 10),
         setupProvider: provider,
         provider: resolvedProvider,
         name: providerLabel.trim() || selectedProvider.name,

package/src/components/auth/setup-wizard/utils.ts

@@ -170,7 +170,7 @@ export function buildStarterDrafts(args: {
       autoDraftSkillSuggestions: previous?.autoDraftSkillSuggestions ?? true,
       orchestratorEnabled: previous?.orchestratorEnabled ?? false,
       orchestratorMission: previous?.orchestratorMission || '',
-      avatarSeed: previous?.avatarSeed || crypto.randomUUID().slice(0, 8),
+      avatarSeed: previous?.avatarSeed || Math.random().toString(36).slice(2, 10),
       avatarUrl: previous?.avatarUrl || null,
       enabled: previous?.enabled ?? true,
     }

package/src/components/chatrooms/chatroom-sheet.tsx

@@ -7,146 +7,10 @@ import { BottomSheet } from '@/components/shared/bottom-sheet'
 import { ConfirmDialog } from '@/components/shared/confirm-dialog'
 import { toast } from 'sonner'
 import { AgentAvatar } from '@/components/agents/agent-avatar'
-import type { Agent, ChatroomRoutingRule } from '@/types'
+import type { Agent } from '@/types'
 import { CheckIcon } from '@/components/shared/check-icon'
 import { WORKER_ONLY_PROVIDER_IDS } from '@/lib/provider-sets'
 
-function genRuleId(): string {
-  return `rule-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`
-}
-
-interface RuleFormState {
-  type: 'keyword' | 'capability'
-  pattern: string
-  keywords: string
-  agentId: string
-  priority: number
-}
-
-const emptyRuleForm: RuleFormState = {
-  type: 'keyword',
-  pattern: '',
-  keywords: '',
-  agentId: '',
-  priority: 10,
-}
-
-function RoutingRuleForm({
-  rule,
-  memberAgents,
-  onSave,
-  onCancel,
-}: {
-  rule: RuleFormState
-  memberAgents: Agent[]
-  onSave: (form: RuleFormState) => void
-  onCancel: () => void
-}) {
-  const [form, setForm] = useState<RuleFormState>(rule)
-
-  return (
-    <div className="p-3 rounded-[8px] bg-white/[0.04] border border-white/[0.08] space-y-3">
-      <div className="flex gap-2">
-        {(['keyword', 'capability'] as const).map((t) => (
-          <button
-            key={t}
-            type="button"
-            onClick={() => setForm((f) => ({ ...f, type: t }))}
-            className={`flex-1 py-1.5 text-[11px] font-600 capitalize rounded-[6px] cursor-pointer transition-all ${
-              form.type === t
-                ? 'bg-accent-soft text-accent-bright'
-                : 'bg-white/[0.04] text-text-3 hover:text-text-2'
-            }`}
-          >
-            {t}
-          </button>
-        ))}
-      </div>
-
-      {form.type === 'keyword' && (
-        <>
-          <div>
-            <label className="block text-[11px] font-600 text-text-3 mb-1">Keywords (comma-separated)</label>
-            <input
-              type="text"
-              value={form.keywords}
-              onChange={(e) => setForm((f) => ({ ...f, keywords: e.target.value }))}
-              placeholder="e.g. deploy, devops, infrastructure"
-              className="w-full px-2.5 py-1.5 rounded-[6px] bg-white/[0.06] border border-white/[0.08] text-[12px] text-text placeholder:text-text-3 focus:outline-none focus:border-accent-bright/40"
-            />
-          </div>
-          <div>
-            <label className="block text-[11px] font-600 text-text-3 mb-1">Regex pattern (optional)</label>
-            <input
-              type="text"
-              value={form.pattern}
-              onChange={(e) => setForm((f) => ({ ...f, pattern: e.target.value }))}
-              placeholder="e.g. deploy|release|ship"
-              className="w-full px-2.5 py-1.5 rounded-[6px] bg-white/[0.06] border border-white/[0.08] text-[12px] text-text placeholder:text-text-3 focus:outline-none focus:border-accent-bright/40"
-            />
-          </div>
-        </>
-      )}
-
-      {form.type === 'capability' && (
-        <div>
-          <label className="block text-[11px] font-600 text-text-3 mb-1">Capability pattern</label>
-          <input
-            type="text"
-            value={form.pattern}
-            onChange={(e) => setForm((f) => ({ ...f, pattern: e.target.value }))}
-            placeholder="e.g. frontend, research, devops"
-            className="w-full px-2.5 py-1.5 rounded-[6px] bg-white/[0.06] border border-white/[0.08] text-[12px] text-text placeholder:text-text-3 focus:outline-none focus:border-accent-bright/40"
-          />
-        </div>
-      )}
-
-      <div className="flex gap-2">
-        <div className="flex-1">
-          <label className="block text-[11px] font-600 text-text-3 mb-1">Route to agent</label>
-          <select
-            value={form.agentId}
-            onChange={(e) => setForm((f) => ({ ...f, agentId: e.target.value }))}
-            className="w-full px-2.5 py-1.5 rounded-[6px] bg-white/[0.06] border border-white/[0.08] text-[12px] text-text focus:outline-none focus:border-accent-bright/40"
-          >
-            <option value="">Select agent...</option>
-            {memberAgents.map((a) => (
-              <option key={a.id} value={a.id}>{a.name}</option>
-            ))}
-          </select>
-        </div>
-        <div className="w-20">
-          <label className="block text-[11px] font-600 text-text-3 mb-1">Priority</label>
-          <input
-            type="number"
-            value={form.priority}
-            onChange={(e) => setForm((f) => ({ ...f, priority: parseInt(e.target.value, 10) || 0 }))}
-            className="w-full px-2.5 py-1.5 rounded-[6px] bg-white/[0.06] border border-white/[0.08] text-[12px] text-text focus:outline-none focus:border-accent-bright/40"
-          />
-        </div>
-      </div>
-
-      <div className="flex gap-2 justify-end">
-        <button
-          type="button"
-          onClick={onCancel}
-          className="px-3 py-1.5 text-[11px] font-600 text-text-3 hover:text-text-2 cursor-pointer"
-        >
-          Cancel
-        </button>
-        <button
-          type="button"
-          onClick={() => onSave(form)}
-          disabled={!form.agentId || (form.type === 'keyword' && !form.keywords.trim() && !form.pattern.trim()) || (form.type === 'capability' && !form.pattern.trim())}
-          className="px-3 py-1.5 text-[11px] font-600 bg-accent-bright text-white rounded-[6px] hover:bg-accent-bright/90 disabled:opacity-50 cursor-pointer"
-        >
-          Save Rule
-        </button>
-      </div>
-    </div>
-  )
-}
-
 export function ChatroomSheet() {
   const open = useChatroomStore((s) => s.chatroomSheetOpen)
   const editingId = useChatroomStore((s) => s.editingChatroomId)
@@ -163,10 +27,8 @@ export function ChatroomSheet() {
   const [selectedAgentIds, setSelectedAgentIds] = useState<string[]>([])
   const [chatMode, setChatMode] = useState<'sequential' | 'parallel'>('sequential')
   const [autoAddress, setAutoAddress] = useState(false)
-  const [routingRules, setRoutingRules] = useState<ChatroomRoutingRule[]>([])
+  const [routingGuidance, setRoutingGuidance] = useState('')
   const [saving, setSaving] = useState(false)
-  const [addingRule, setAddingRule] = useState(false)
-  const [editingRuleId, setEditingRuleId] = useState<string | null>(null)
   const [confirmDelete, setConfirmDelete] = useState(false)
 
   const editing = editingId ? chatrooms[editingId] : null
@@ -178,17 +40,15 @@ export function ChatroomSheet() {
       setSelectedAgentIds([...editing.agentIds])
       setChatMode(editing.chatMode || 'sequential')
       setAutoAddress(editing.autoAddress || false)
-      setRoutingRules([...(editing.routingRules || [])])
+      setRoutingGuidance(editing.routingGuidance || '')
     } else {
       setName('')
       setDescription('')
       setSelectedAgentIds([])
       setChatMode('sequential')
       setAutoAddress(false)
-      setRoutingRules([])
+      setRoutingGuidance('')
     }
-    setAddingRule(false)
-    setEditingRuleId(null)
     setConfirmDelete(false)
   }, [editing, open])
 
@@ -206,7 +66,7 @@ export function ChatroomSheet() {
         agentIds: selectedAgentIds,
         chatMode,
         autoAddress,
-        routingRules: routingRules.length > 0 ? routingRules : undefined,
+        routingGuidance: routingGuidance.trim() || null,
       }
       if (editing) {
         await updateChatroom(editing.id, payload)
@@ -245,53 +105,10 @@ export function ChatroomSheet() {
     )
   }
 
-  const handleAddRule = (form: RuleFormState) => {
-    const rule: ChatroomRoutingRule = {
-      id: genRuleId(),
-      type: form.type,
-      agentId: form.agentId,
-      priority: form.priority,
-      ...(form.pattern.trim() ? { pattern: form.pattern.trim() } : {}),
-      ...(form.type === 'keyword' && form.keywords.trim()
-        ? { keywords: form.keywords.split(',').map((k) => k.trim()).filter(Boolean) }
-        : {}),
-    }
-    setRoutingRules((prev) => [...prev, rule].sort((a, b) => a.priority - b.priority))
-    setAddingRule(false)
-  }
-
-  const handleEditRule = (form: RuleFormState) => {
-    setRoutingRules((prev) =>
-      prev.map((r) =>
-        r.id === editingRuleId
-          ? {
-              ...r,
-              type: form.type,
-              agentId: form.agentId,
-              priority: form.priority,
-              pattern: form.pattern.trim() || undefined,
-              keywords:
-                form.type === 'keyword' && form.keywords.trim()
-                  ? form.keywords.split(',').map((k) => k.trim()).filter(Boolean)
-                  : undefined,
-            }
-          : r,
-      ).sort((a, b) => a.priority - b.priority),
-    )
-    setEditingRuleId(null)
-  }
-
-  const removeRule = (ruleId: string) => {
-    setRoutingRules((prev) => prev.filter((r) => r.id !== ruleId))
-  }
-
   const agentList = Object.values(agents).filter(
     (a: Agent) => !a.trashedAt && !WORKER_ONLY_PROVIDER_IDS.has(a.provider)
   ) as Agent[]
 
-  const memberAgents = agentList.filter((a) => selectedAgentIds.includes(a.id))
-  const sortedRules = [...routingRules].sort((a, b) => a.priority - b.priority)
-
   return (
     <BottomSheet open={open} onClose={() => setChatroomSheetOpen(false)}>
       <div className="p-6 max-w-[560px] mx-auto">
@@ -350,7 +167,7 @@ export function ChatroomSheet() {
           <div>
             <button
               type="button"
-              onClick={() => setAutoAddress((v) => !v)}
+              onClick={() => setAutoAddress((value) => !value)}
               className="w-full flex items-center gap-2.5 px-3 py-2.5 rounded-[8px] border border-white/[0.08] bg-white/[0.03] cursor-pointer transition-all hover:bg-white/[0.05]"
             >
               <div className={`w-8 h-[18px] rounded-full transition-all relative ${autoAddress ? 'bg-accent-bright' : 'bg-white/[0.12]'}`}>
@@ -361,7 +178,7 @@ export function ChatroomSheet() {
                 <p className="text-[11px] text-text-3 mt-0.5">
                   {autoAddress
                     ? 'Every message is sent to all agents, no @mention needed'
-                    : 'Only agents you @mention will respond'}
+                    : 'Only agents you @mention respond unless routing guidance selects someone'}
                 </p>
               </div>
             </button>
@@ -405,95 +222,18 @@ export function ChatroomSheet() {
             )}
           </div>
 
-          {/* Routing Rules */}
           <div>
-            <label className="block text-[12px] font-600 text-text-2 mb-1.5">
-              Routing Rules ({sortedRules.length})
-            </label>
+            <label className="block text-[12px] font-600 text-text-2 mb-1.5">Routing Guidance</label>
             <p className="text-[11px] text-text-3 mb-2">
-              Route messages to specific agents based on keywords or capabilities. Evaluated before auto-address.
+              Optional. Used only when there is no explicit @mention and auto-address is off. Describe which kinds of messages should go to which members.
             </p>
-
-            {sortedRules.length > 0 && (
-              <div className="space-y-2 mb-2">
-                {sortedRules.map((rule) => {
-                  const agent = agents[rule.agentId]
-                  if (editingRuleId === rule.id) {
-                    return (
-                      <RoutingRuleForm
-                        key={rule.id}
-                        rule={{
-                          type: rule.type,
-                          pattern: rule.pattern || '',
-                          keywords: rule.keywords?.join(', ') || '',
-                          agentId: rule.agentId,
-                          priority: rule.priority,
-                        }}
-                        memberAgents={memberAgents}
-                        onSave={handleEditRule}
-                        onCancel={() => setEditingRuleId(null)}
-                      />
-                    )
-                  }
-                  return (
-                    <div
-                      key={rule.id}
-                      className="flex items-center gap-2 px-3 py-2 rounded-[8px] bg-white/[0.04] border border-white/[0.08]"
-                    >
-                      <span className="text-[10px] font-700 text-text-3 bg-white/[0.06] px-1.5 py-0.5 rounded">
-                        P{rule.priority}
-                      </span>
-                      <span className="text-[10px] font-600 text-accent-bright/70 uppercase">
-                        {rule.type}
-                      </span>
-                      <span className="text-[12px] text-text-2 flex-1 truncate">
-                        {rule.type === 'keyword'
-                          ? (rule.keywords?.join(', ') || rule.pattern || '(no match)')
-                          : (rule.pattern || '(no pattern)')}
-                      </span>
-                      <span className="text-[11px] text-text-3 truncate max-w-[100px]">
-                        {agent?.name || 'Unknown'}
-                      </span>
-                      <button
-                        type="button"
-                        onClick={() => setEditingRuleId(rule.id)}
-                        className="text-[11px] text-text-3 hover:text-text-2 cursor-pointer px-1"
-                      >
-                        Edit
-                      </button>
-                      <button
-                        type="button"
-                        onClick={() => removeRule(rule.id)}
-                        className="text-[11px] text-red-400 hover:text-red-300 cursor-pointer px-1"
-                      >
-                        Remove
-                      </button>
-                    </div>
-                  )
-                })}
-              </div>
-            )}
-
-            {addingRule ? (
-              <RoutingRuleForm
-                rule={emptyRuleForm}
-                memberAgents={memberAgents}
-                onSave={handleAddRule}
-                onCancel={() => setAddingRule(false)}
-              />
-            ) : (
-              <button
-                type="button"
-                onClick={() => setAddingRule(true)}
-                disabled={memberAgents.length === 0}
-                className="w-full py-2 rounded-[8px] border border-dashed border-white/[0.12] text-[12px] font-600 text-text-3 hover:text-text-2 hover:border-white/[0.2] cursor-pointer transition-all disabled:opacity-40 disabled:cursor-not-allowed"
-              >
-                + Add Rule
-              </button>
-            )}
-            {memberAgents.length === 0 && (
-              <p className="text-[11px] text-text-3 mt-1">Add members first to create routing rules.</p>
-            )}
+            <textarea
+              value={routingGuidance}
+              onChange={(e) => setRoutingGuidance(e.target.value)}
+              placeholder={'Examples:\nRoute deployment issues to Ops.\nPrefer Maya for design reviews and UI polish.\nSend pricing or market-analysis requests to Research.'}
+              rows={6}
+              className="w-full px-3 py-2 rounded-[8px] bg-white/[0.06] border border-white/[0.08] text-[13px] text-text placeholder:text-text-3 focus:outline-none focus:border-accent-bright/40 resize-y min-h-[132px]"
+            />
           </div>
         </div>