@swarmclawai/swarmclaw 0.7.2 → 0.7.4

package/src/lib/server/session-tools/crawl.ts

@@ -0,0 +1,447 @@
+import crypto from 'crypto'
+import { URL } from 'url'
+import { z } from 'zod'
+import { tool, type StructuredToolInterface } from '@langchain/core/tools'
+import * as cheerio from 'cheerio'
+import type { Plugin, PluginHooks } from '@/types'
+import { getPluginManager } from '../plugins'
+import { runStructuredExtraction } from '../structured-extract'
+import type { ToolBuildContext } from './context'
+import { normalizeToolInputArgs } from './normalize-tool-args'
+
+interface CrawledPage {
+  url: string
+  status: number
+  title: string | null
+  depth: number
+  textPreview: string
+  headings: string[]
+  links: string[]
+  hash: string
+}
+
+function cleanText(value: string, max = 1200): string {
+  const normalized = value.replace(/\s+/g, ' ').trim()
+  return normalized.length <= max ? normalized : `${normalized.slice(0, max)}...`
+}
+
+function normalizeUrl(input: string, base?: string): string {
+  const resolved = base ? new URL(input, base) : new URL(input)
+  resolved.hash = ''
+  if (resolved.pathname.endsWith('/') && resolved.pathname !== '/') {
+    resolved.pathname = resolved.pathname.replace(/\/+$/, '')
+  }
+  return resolved.toString()
+}
+
+function shouldIncludeUrl(url: string, params: { includePattern?: string | null; excludePattern?: string | null }) {
+  if (params.includePattern) {
+    try {
+      if (!new RegExp(params.includePattern, 'i').test(url)) return false
+    } catch {
+      return false
+    }
+  }
+  if (params.excludePattern) {
+    try {
+      if (new RegExp(params.excludePattern, 'i').test(url)) return false
+    } catch {
+      return false
+    }
+  }
+  return true
+}
+
+function pageHash(text: string): string {
+  return crypto.createHash('sha1').update(text).digest('hex')
+}
+
+async function fetchCrawlPage(url: string, depth: number): Promise<CrawledPage> {
+  const res = await fetch(url, {
+    headers: { 'User-Agent': 'Mozilla/5.0 (compatible; SwarmClaw/1.0)' },
+    signal: AbortSignal.timeout(15_000),
+  })
+  const html = await res.text()
+  const $ = cheerio.load(html)
+  $('script, style, noscript').remove()
+
+  const title = cleanText($('title').first().text(), 200) || null
+  const headings = $('h1, h2, h3')
+    .toArray()
+    .map((node) => cleanText($(node).text(), 200))
+    .filter(Boolean)
+    .slice(0, 12)
+  const textPreview = cleanText($('body').text() || $.text(), 1600)
+  const links = $('a[href]')
+    .toArray()
+    .map((node) => $(node).attr('href') || '')
+    .filter(Boolean)
+    .map((href) => {
+      try {
+        return normalizeUrl(href, url)
+      } catch {
+        return null
+      }
+    })
+    .filter((href): href is string => !!href)
+    .slice(0, 200)
+
+  return {
+    url,
+    status: res.status,
+    title,
+    depth,
+    textPreview,
+    headings,
+    links: Array.from(new Set(links)),
+    hash: pageHash(`${title || ''}\n${textPreview}`),
+  }
+}
+
+async function crawlSite(params: {
+  startUrl: string
+  limit: number
+  maxDepth: number
+  sameOrigin: boolean
+  includePattern?: string | null
+  excludePattern?: string | null
+}): Promise<CrawledPage[]> {
+  const startUrl = normalizeUrl(params.startUrl)
+  const startOrigin = new URL(startUrl).origin
+  const queue: Array<{ url: string; depth: number }> = [{ url: startUrl, depth: 0 }]
+  const visited = new Set<string>()
+  const pages: CrawledPage[] = []
+
+  while (queue.length > 0 && pages.length < params.limit) {
+    const current = queue.shift()!
+    if (visited.has(current.url)) continue
+    visited.add(current.url)
+    if (!shouldIncludeUrl(current.url, params)) continue
+    if (params.sameOrigin && new URL(current.url).origin !== startOrigin) continue
+
+    try {
+      const page = await fetchCrawlPage(current.url, current.depth)
+      pages.push(page)
+      if (current.depth >= params.maxDepth) continue
+      for (const link of page.links) {
+        if (visited.has(link)) continue
+        if (params.sameOrigin && new URL(link).origin !== startOrigin) continue
+        queue.push({ url: link, depth: current.depth + 1 })
+      }
+    } catch {
+      // skip failed pages and continue crawling
+    }
+  }
+
+  return pages
+}
+
+async function followPagination(params: {
+  startUrl: string
+  limit: number
+}): Promise<CrawledPage[]> {
+  const pages: CrawledPage[] = []
+  const visited = new Set<string>()
+  let currentUrl = normalizeUrl(params.startUrl)
+  let depth = 0
+
+  while (currentUrl && pages.length < params.limit && !visited.has(currentUrl)) {
+    visited.add(currentUrl)
+    const page = await fetchCrawlPage(currentUrl, depth)
+    pages.push(page)
+
+    const res = await fetch(currentUrl, {
+      headers: { 'User-Agent': 'Mozilla/5.0 (compatible; SwarmClaw/1.0)' },
+      signal: AbortSignal.timeout(15_000),
+    })
+    const html = await res.text()
+    const $ = cheerio.load(html)
+    const nextHref = $('link[rel="next"]').attr('href')
+      || $('a[rel="next"]').attr('href')
+      || $('a').toArray().map((node) => ({
+        href: $(node).attr('href') || '',
+        text: cleanText($(node).text(), 80).toLowerCase(),
+      })).find((candidate) => /^(next|next page|older|more|continue)/i.test(candidate.text))?.href
+
+    if (!nextHref) break
+    try {
+      currentUrl = normalizeUrl(nextHref, currentUrl)
+    } catch {
+      break
+    }
+    depth += 1
+  }
+
+  return pages
+}
+
+function dedupePages(input: CrawledPage[]): CrawledPage[] {
+  const seen = new Set<string>()
+  const out: CrawledPage[] = []
+  for (const page of input) {
+    const key = `${page.url}|${page.hash}`
+    if (seen.has(key)) continue
+    seen.add(key)
+    out.push(page)
+  }
+  return out
+}
+
+async function fetchSitemapUrls(sitemapUrl: string): Promise<string[]> {
+  const res = await fetch(sitemapUrl, {
+    headers: { 'User-Agent': 'Mozilla/5.0 (compatible; SwarmClaw/1.0)' },
+    signal: AbortSignal.timeout(15_000),
+  })
+  const xml = await res.text()
+  const matches = Array.from(xml.matchAll(/<loc>\s*([^<]+)\s*<\/loc>/gi))
+  return Array.from(new Set(matches.map((match) => match[1]?.trim()).filter((value): value is string => !!value)))
+}
+
+function normalizeSelectorMap(value: unknown): Record<string, string> {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) return {}
+  const entries: Array<readonly [string, string]> = []
+  for (const [key, selector] of Object.entries(value as Record<string, unknown>)) {
+    if (typeof selector !== 'string') continue
+    const trimmed = selector.trim()
+    if (!trimmed) continue
+    entries.push([key, trimmed] as const)
+  }
+  return Object.fromEntries(entries)
+}
+
+async function extractSelectorRows(urls: string[], selectors: Record<string, string>) {
+  const rows: Array<Record<string, unknown>> = []
+  for (const url of urls) {
+    const res = await fetch(url, {
+      headers: { 'User-Agent': 'Mozilla/5.0 (compatible; SwarmClaw/1.0)' },
+      signal: AbortSignal.timeout(15_000),
+    })
+    const html = await res.text()
+    const $ = cheerio.load(html)
+    $('script, style, noscript').remove()
+    const row: Record<string, unknown> = { url }
+    for (const [key, selector] of Object.entries(selectors)) {
+      row[key] = cleanText($(selector).first().text(), 800)
+    }
+    rows.push(row)
+  }
+  return rows
+}
+
+function normalizePagesInput(value: unknown): CrawledPage[] {
+  if (typeof value === 'string' && value.trim()) {
+    try {
+      return JSON.parse(value) as CrawledPage[]
+    } catch {
+      return []
+    }
+  }
+  if (Array.isArray(value)) return value as CrawledPage[]
+  return []
+}
+
+function resolveExtractionSession(bctx: ToolBuildContext) {
+  const session = bctx.resolveCurrentSession?.()
+  if (!session) throw new Error('crawl batch_extract requires an active session context.')
+  return session
+}
+
+async function executeCrawlAction(args: Record<string, unknown>, bctx: ToolBuildContext) {
+  const normalized = normalizeToolInputArgs(args)
+  const action = String(normalized.action || 'crawl_site').trim().toLowerCase()
+
+  try {
+    if (action === 'status') {
+      return JSON.stringify({
+        supports: ['crawl_site', 'follow_pagination', 'extract_sitemap', 'dedupe_pages', 'batch_extract'],
+      })
+    }
+
+    if (action === 'dedupe_pages') {
+      const pages = dedupePages(normalizePagesInput(normalized.pages))
+      return JSON.stringify({ count: pages.length, pages })
+    }
+
+    const startUrl = typeof normalized.url === 'string'
+      ? normalized.url
+      : typeof normalized.startUrl === 'string'
+        ? normalized.startUrl
+        : ''
+
+    const limit = typeof normalized.limit === 'number' ? Math.max(1, Math.min(normalized.limit, 100)) : 20
+    const maxDepth = typeof normalized.maxDepth === 'number' ? Math.max(0, Math.min(normalized.maxDepth, 5)) : 2
+    const sameOrigin = normalized.sameOrigin !== false
+
+    if (action === 'crawl_site' || action === 'extract_sitemap') {
+      const sitemapUrl = typeof normalized.sitemapUrl === 'string' && normalized.sitemapUrl.trim()
+        ? normalized.sitemapUrl.trim()
+        : null
+      const pages = action === 'extract_sitemap' && sitemapUrl
+        ? dedupePages(await Promise.all(
+            (await fetchSitemapUrls(sitemapUrl))
+              .slice(0, limit)
+              .map((url) => fetchCrawlPage(normalizeUrl(url), 0)),
+          ))
+        : dedupePages(await crawlSite({
+            startUrl,
+            limit,
+            maxDepth,
+            sameOrigin,
+            includePattern: typeof normalized.includePattern === 'string' ? normalized.includePattern : null,
+            excludePattern: typeof normalized.excludePattern === 'string' ? normalized.excludePattern : null,
+          }))
+      if (action === 'extract_sitemap') {
+        return JSON.stringify({
+          startUrl: normalizeUrl(startUrl),
+          count: pages.length,
+          urlCount: pages.length,
+          urls: pages.map((page) => page.url),
+        })
+      }
+      return JSON.stringify({
+        startUrl: normalizeUrl(startUrl),
+        count: pages.length,
+        pageCount: pages.length,
+        pages,
+      })
+    }
+
+    if (action === 'follow_pagination') {
+      const pages = dedupePages(await followPagination({ startUrl, limit }))
+      return JSON.stringify({
+        startUrl: normalizeUrl(startUrl),
+        count: pages.length,
+        pageCount: pages.length,
+        pages,
+      })
+    }
+
+    if (action === 'batch_extract') {
+      const seededPages = normalizePagesInput(normalized.pages)
+      if (seededPages.length === 0 && !startUrl) return 'Error: url/startUrl or pages is required.'
+      const pages = seededPages.length > 0
+        ? dedupePages(seededPages)
+        : dedupePages(await crawlSite({
+            startUrl,
+            limit,
+            maxDepth,
+            sameOrigin,
+            includePattern: typeof normalized.includePattern === 'string' ? normalized.includePattern : null,
+            excludePattern: typeof normalized.excludePattern === 'string' ? normalized.excludePattern : null,
+          }))
+      const selectors = normalizeSelectorMap(normalized.selectors)
+      if (Object.keys(selectors).length > 0) {
+        const rows = await extractSelectorRows(pages.map((page) => page.url), selectors)
+        return JSON.stringify({
+          count: pages.length,
+          pageCount: pages.length,
+          rowCount: rows.length,
+          urls: pages.map((page) => page.url),
+          rows,
+        })
+      }
+      const session = resolveExtractionSession(bctx)
+      const sourceText = pages
+        .map((page) => `URL: ${page.url}\nTitle: ${page.title || ''}\nHeadings: ${page.headings.join(' | ')}\nText: ${page.textPreview}`)
+        .join('\n\n---\n\n')
+      const extracted = await runStructuredExtraction({
+        session,
+        text: sourceText,
+        schema: normalized.schema,
+        instruction: typeof normalized.instruction === 'string'
+          ? normalized.instruction
+          : 'Aggregate the crawled pages and extract the requested structured information.',
+        maxChars: typeof normalized.maxChars === 'number' ? Math.max(10_000, normalized.maxChars) : 120_000,
+      })
+      return JSON.stringify({
+        count: pages.length,
+        pageCount: pages.length,
+        urls: pages.map((page) => page.url),
+        object: extracted.object,
+        validationErrors: extracted.validationErrors,
+        provider: extracted.provider,
+        model: extracted.model,
+        raw: normalized.includeRaw === true ? extracted.raw : undefined,
+      })
+    }
+
+    if (!startUrl) return 'Error: url or startUrl is required.'
+
+    return `Error: Unknown action "${action}".`
+  } catch (err: unknown) {
+    return `Error: ${err instanceof Error ? err.message : String(err)}`
+  }
+}
+
+const CrawlPlugin: Plugin = {
+  name: 'Crawl',
+  enabledByDefault: false,
+  description: 'Research whole sites by crawling pages, following pagination, deduping results, and batch-extracting structure.',
+  hooks: {
+    getCapabilityDescription: () =>
+      'I can crawl websites with `crawl`, including sitemap extraction, pagination following, page deduping, and batch structured extraction over many pages.',
+  } as PluginHooks,
+  tools: [
+    {
+      name: 'crawl',
+      description: 'Site crawler. Actions: crawl_site, follow_pagination, extract_sitemap, dedupe_pages, batch_extract, status.',
+      parameters: {
+        type: 'object',
+        properties: {
+          action: {
+            type: 'string',
+            enum: ['crawl_site', 'follow_pagination', 'extract_sitemap', 'dedupe_pages', 'batch_extract', 'status'],
+          },
+          url: { type: 'string' },
+          startUrl: { type: 'string' },
+          sitemapUrl: { type: 'string' },
+          pages: {},
+          limit: { type: 'number' },
+          maxDepth: { type: 'number' },
+          sameOrigin: { type: 'boolean' },
+          includePattern: { type: 'string' },
+          excludePattern: { type: 'string' },
+          selectors: {},
+          schema: {},
+          instruction: { type: 'string' },
+          maxChars: { type: 'number' },
+          includeRaw: { type: 'boolean' },
+        },
+        required: ['action'],
+      },
+      execute: async (args, context) => {
+        const syntheticBuildContext = {
+          cwd: context.session.cwd || process.cwd(),
+          ctx: { sessionId: context.session.id, agentId: context.session.agentId || null },
+          hasPlugin: () => true,
+          hasTool: () => true,
+          cleanupFns: [],
+          commandTimeoutMs: 0,
+          claudeTimeoutMs: 0,
+          cliProcessTimeoutMs: 0,
+          persistDelegateResumeId: () => undefined,
+          readStoredDelegateResumeId: () => null,
+          resolveCurrentSession: () => context.session,
+          activePlugins: context.session.plugins || [],
+        } as ToolBuildContext
+        return executeCrawlAction(args, syntheticBuildContext)
+      },
+    },
+  ],
+}
+
+getPluginManager().registerBuiltin('crawl', CrawlPlugin)
+
+export function buildCrawlTools(bctx: ToolBuildContext): StructuredToolInterface[] {
+  if (!bctx.hasPlugin('crawl')) return []
+  return [
+    tool(
+      async (args) => executeCrawlAction(args, bctx),
+      {
+        name: 'crawl',
+        description: CrawlPlugin.tools![0].description,
+        schema: z.object({}).passthrough(),
+      },
+    ),
+  ]
+}

package/src/lib/server/session-tools/crud.ts

@@ -22,8 +22,15 @@ import {
 import { resolveScheduleName } from '@/lib/schedule-name'
 import { findDuplicateSchedule, type ScheduleLike } from '@/lib/schedule-dedupe'
 import { computeTaskFingerprint, findDuplicateTask } from '@/lib/task-dedupe'
-import { resolveTaskAgentFromDescription } from '@/lib/server/task-mention'
+import {
+  hasManagedAgentAssignmentInput,
+  isDelegationTaskPayload,
+  resolveDelegatorAgentId,
+  resolveManagedAgentAssignment,
+  validateManagedAgentAssignment,
+} from '@/lib/server/agent-assignment'
 import { normalizeTaskQualityGate } from '@/lib/server/task-quality-gate'
+import { normalizeSchedulePayload } from '@/lib/server/schedule-normalization'
 import type { ToolBuildContext } from './context'
 import { safePath, findBinaryOnPath } from './context'
 import { normalizeToolInputArgs } from './normalize-tool-args'
@@ -137,7 +144,8 @@ const RESOURCE_DEFAULTS: Record<string, (parsed: any) => any> = {
     soul: p.soul || '',
     provider: p.provider || 'claude-cli',
     model: p.model || '',
-    isOrchestrator: p.isOrchestrator || false,
+    platformAssignScope: p.platformAssignScope === 'all' ? 'all' : 'self',
+    isOrchestrator: p.platformAssignScope === 'all',
     tools: p.tools || [],
     skills: p.skills || [],
     skillIds: p.skillIds || [],
@@ -254,19 +262,22 @@ export function buildCrudTools(bctx: ToolBuildContext): StructuredToolInterface[
     if (!hasPlugin(toolKey)) continue
 
     let description = `Manage SwarmClaw ${res.label}. ${res.readOnly ? 'List and get only.' : 'List, get, create, update, or delete.'} Returns JSON.`
+    if (toolKey.startsWith('manage_') && toolKey !== 'manage_platform') {
+      description += `\n\nUse this direct tool name exactly as shown (\`${toolKey}\`). Do not swap it for \`manage_platform\` unless that umbrella tool is separately enabled in the current session.`
+    }
     if (toolKey === 'manage_tasks') {
       if (assignScope === 'self') {
-        description += `\n\nDo NOT create tasks for yourself — just do the work directly. Tasks are for delegating work to other agents or for user-created work items. You can only list, get, update status, or complete tasks assigned to you ("${ctx?.agentId || 'unknown'}"). Valid manual statuses: backlog, queued, completed, failed, archived. "running" is runtime-only and set automatically when execution starts.`
+        description += `\n\nYou may create tasks for yourself ("${ctx?.agentId || 'unknown'}") or leave them unassigned to track multi-step work. You cannot assign tasks to other agents unless a user enables "Assign to Other Agents" in your agent settings. Valid manual statuses: backlog, queued, completed, failed, archived. "running" is runtime-only and set automatically when execution starts.`
       } else {
-        description += `\n\nDo NOT create tasks for yourself — just do the work directly. Only create tasks to delegate work to OTHER agents. Your agent ID is "${ctx?.agentId || 'unknown'}". Valid manual statuses: backlog, queued, completed, failed, archived. "running" is runtime-only and set automatically when execution starts.` + agentSummary
+        description += `\n\nYou may create tasks for yourself, leave them unassigned, or delegate them to other agents. Your agent ID is "${ctx?.agentId || 'unknown'}". When delegating, set a target agent using "agentId", "assignee", "agent", "assignedAgentId", or "assigned_agent_id". Use the target agent's exact ID when possible. Valid manual statuses: backlog, queued, completed, failed, archived. "running" is runtime-only and set automatically when execution starts.` + agentSummary
       }
     } else if (toolKey === 'manage_agents') {
-      description += `\n\nAgents may self-edit their own soul. To update your soul, use action="update", id="${ctx?.agentId || 'your-agent-id'}", and include data with the "soul" field.`
+      description += `\n\nAgents may self-edit their own soul. To update your soul, use action="update", id="${ctx?.agentId || 'your-agent-id'}", and include data with the "soul" field. Set "platformAssignScope":"all" to let an agent delegate work across the fleet; use "self" for solo execution.`
     } else if (toolKey === 'manage_schedules') {
       if (assignScope === 'self') {
-        description += `\n\nSet "agentId" to assign a schedule to yourself ("${ctx?.agentId || 'unknown'}") or leave it null. You can only assign schedules to yourself. Schedule types: interval (set intervalMs), cron (set cron), once (set runAt). Set taskPrompt for what the agent should do. Before create, call list/get to avoid duplicate schedules. If an equivalent active/paused schedule already exists, create returns that existing schedule (deduplicated=true).`
+        description += `\n\nOmit "agentId" to assign a schedule to yourself ("${ctx?.agentId || 'unknown'}"), or set it explicitly to yourself. You can only assign schedules to yourself. Schedule types: interval (set intervalMs), cron (set cron), once (set runAt). Provide either taskPrompt, command, or action+path. Before create, call list/get to avoid duplicate schedules. If an equivalent active/paused schedule already exists, create returns that existing schedule (deduplicated=true).`
       } else {
-        description += `\n\nSet "agentId" to assign a schedule to an agent (including yourself: "${ctx?.agentId || 'unknown'}"). Schedule types: interval (set intervalMs), cron (set cron), once (set runAt). Set taskPrompt for what the agent should do. Before create, call list/get to avoid duplicate schedules. If an equivalent active/paused schedule already exists, create returns that existing schedule (deduplicated=true).` + agentSummary
+        description += `\n\nOmit "agentId" to assign a schedule to yourself ("${ctx?.agentId || 'unknown'}"), or set "agentId" to another agent when needed. Schedule types: interval (set intervalMs), cron (set cron), once (set runAt). Provide either taskPrompt, command, or action+path. Before create, call list/get to avoid duplicate schedules. If an equivalent active/paused schedule already exists, create returns that existing schedule (deduplicated=true).` + agentSummary
       }
     } else if (toolKey === 'manage_webhooks') {
       description += '\n\nUse `source`, `events`, `agentId`, and `secret` when creating webhooks. Inbound calls should POST to `/api/webhooks/{id}` with header `x-webhook-secret` when a secret is configured.'
@@ -337,14 +348,39 @@ export function buildCrudTools(bctx: ToolBuildContext): StructuredToolInterface[
               if (parsed && typeof parsed === 'object' && 'id' in parsed) {
                 delete (parsed as Record<string, unknown>).id
               }
-              // Enforce assignment scope for tasks and schedules
-              if (assignScope === 'self' && (toolKey === 'manage_tasks' || toolKey === 'manage_schedules')) {
-                if (parsed.agentId && parsed.agentId !== ctx?.agentId) {
-                  return `Error: You can only assign ${res.label} to yourself ("${ctx?.agentId}"). To assign to other agents, ask a user to enable "Assign to Other Agents" in your agent settings.`
-                }
-              }
               const now = Date.now()
+              if (toolKey === 'manage_tasks' || toolKey === 'manage_schedules') {
+                const agents = loadAgents()
+                const resolution = resolveManagedAgentAssignment(
+                  parsed as Record<string, unknown>,
+                  agents,
+                  toolKey === 'manage_tasks' || toolKey === 'manage_schedules'
+                    ? (parsed.agentId || ctx?.agentId || null)
+                    : null,
+                  { allowDescription: toolKey === 'manage_tasks' },
+                )
+                const assignmentError = validateManagedAgentAssignment({
+                  resourceLabel: res.label,
+                  agents,
+                  assignScope,
+                  currentAgentId: ctx?.agentId || null,
+                  targetAgentId: resolution.agentId,
+                  unresolvedReference: resolution.unresolvedReference,
+                  isDelegation: toolKey === 'manage_tasks' ? isDelegationTaskPayload(parsed as Record<string, unknown>) : false,
+                  delegatorAgentId: toolKey === 'manage_tasks'
+                    ? resolveDelegatorAgentId(parsed as Record<string, unknown>, agents, ctx?.agentId || null)
+                    : null,
+                })
+                if (assignmentError) return assignmentError
+                parsed.agentId = resolution.agentId
+              }
               if (toolKey === 'manage_schedules') {
+                const normalizedSchedule = normalizeSchedulePayload(parsed as Record<string, unknown>, {
+                  cwd,
+                  now,
+                })
+                if (!normalizedSchedule.ok) return normalizedSchedule.error
+                Object.assign(parsed, normalizedSchedule.value)
                 const duplicate = findDuplicateSchedule(all as Record<string, ScheduleLike>, {
                   agentId: parsed.agentId || null,
                   taskPrompt: parsed.taskPrompt || '',
@@ -387,23 +423,6 @@ export function buildCrudTools(bctx: ToolBuildContext): StructuredToolInterface[
                   })
                 }
               }
-              // @mention agent resolution for tasks
-              if (toolKey === 'manage_tasks' && parsed.description) {
-                const agents = loadAgents()
-                parsed.agentId = resolveTaskAgentFromDescription(
-                  parsed.description,
-                  parsed.agentId || ctx?.agentId || '',
-                  agents,
-                )
-              }
-              // Agents cannot create tasks for themselves — just do the work directly.
-              // Tasks are for delegating to other agents or user-created work items.
-              if (toolKey === 'manage_tasks' && ctx?.agentId) {
-                const resolvedAgentId = parsed.agentId || ctx.agentId
-                if (resolvedAgentId === ctx.agentId) {
-                  return 'Error: You cannot create tasks for yourself — just do the work directly. Tasks are for delegating work to other agents. If you need to track progress, use memory instead.'
-                }
-              }
               if (toolKey === 'manage_tasks') {
                 parsed.title = deriveTaskTitle(parsed)
                 if (!parsed.title || /^untitled task$/i.test(parsed.title)) {
@@ -507,13 +526,56 @@ export function buildCrudTools(bctx: ToolBuildContext): StructuredToolInterface[
                   ? normalizeTaskQualityGate(parsed.qualityGate, settings)
                   : null
               }
-              // Enforce assignment scope for tasks and schedules
-              if (assignScope === 'self' && (toolKey === 'manage_tasks' || toolKey === 'manage_schedules')) {
-                if (parsed.agentId && parsed.agentId !== ctx?.agentId) {
-                  return `Error: You can only assign ${res.label} to yourself ("${ctx?.agentId}"). To assign to other agents, ask a user to enable "Assign to Other Agents" in your agent settings.`
+              if (toolKey === 'manage_tasks' || toolKey === 'manage_schedules') {
+                const agents = loadAgents()
+                const requestedClear = Object.prototype.hasOwnProperty.call(parsed, 'agentId') && parsed.agentId == null
+                const shouldResolveAssignment = requestedClear
+                  || hasManagedAgentAssignmentInput(parsed as Record<string, unknown>)
+                if (shouldResolveAssignment) {
+                  const resolution = resolveManagedAgentAssignment(
+                    parsed as Record<string, unknown>,
+                    agents,
+                    null,
+                    { allowDescription: false },
+                  )
+                  const assignmentError = validateManagedAgentAssignment({
+                    resourceLabel: res.label,
+                    agents,
+                    assignScope,
+                    currentAgentId: ctx?.agentId || null,
+                    targetAgentId: requestedClear ? null : resolution.agentId,
+                    unresolvedReference: requestedClear ? null : resolution.unresolvedReference,
+                    isDelegation: toolKey === 'manage_tasks'
+                      ? isDelegationTaskPayload({
+                          ...all[id],
+                          ...parsed,
+                          agentId: requestedClear ? null : resolution.agentId,
+                        } as Record<string, unknown>)
+                      : false,
+                    delegatorAgentId: toolKey === 'manage_tasks'
+                      ? resolveDelegatorAgentId({
+                          ...all[id],
+                          ...parsed,
+                        } as Record<string, unknown>, agents, ctx?.agentId || null)
+                      : null,
+                  })
+                  if (assignmentError) return assignmentError
+                  if (!requestedClear) parsed.agentId = resolution.agentId
                 }
               }
               all[id] = { ...all[id], ...parsed, updatedAt: Date.now() }
+              if (toolKey === 'manage_schedules') {
+                const normalizedSchedule = normalizeSchedulePayload(all[id] as Record<string, unknown>, {
+                  cwd,
+                  now: Date.now(),
+                })
+                if (!normalizedSchedule.ok) return normalizedSchedule.error
+                all[id] = {
+                  ...all[id],
+                  ...normalizedSchedule.value,
+                  updatedAt: Date.now(),
+                }
+              }
               if (toolKey === 'manage_secrets') {
                 if (!canAccessSecret(all[id])) return 'Error: you do not have access to this secret.'
                 const nextScope = parsed.scope === 'agent'