@swarmclawai/swarmclaw 1.9.20 → 1.9.22

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

@@ -10,7 +10,7 @@ import { sleep } from '@/lib/shared-utils'
 import { BottomSheet } from '@/components/shared/bottom-sheet'
 import { toast } from 'sonner'
 import { ModelCombobox } from '@/components/shared/model-combobox'
-import type { ProviderType, ClaudeSkill, AgentPackManifest, AgentRoutingStrategy, AgentRoutingTarget } from '@/types'
+import type { ProviderType, ProviderDiagnosticStep, ClaudeSkill, AgentPackManifest, AgentRoutingStrategy, AgentRoutingTarget } from '@/types'
 import { AVAILABLE_TOOLS, PLATFORM_TOOLS } from '@/lib/tool-definitions'
 import { MCP_INJECTION_PROVIDER_IDS, NATIVE_CAPABILITY_PROVIDER_IDS, NON_LANGGRAPH_PROVIDER_IDS, WORKER_ONLY_PROVIDER_IDS } from '@/lib/provider-sets'
 import { isOrchestratorProviderEligible } from '@/lib/orchestrator-config'
@@ -33,6 +33,7 @@ import { buildAgentSelectableProviders, resolveAgentSelectableProviderCredential
 import { AgentSocialSettings } from '@/features/swarmfeed/agent-social-settings'
 import { AgentMarketplaceSettings } from '@/features/swarmdock/agent-marketplace-settings'
 import type { ConfigVersion } from '@/types/config-version'
+import { ProviderDiagnosticsList } from '@/components/providers/provider-diagnostics-list'
 
 const HB_PRESETS = [1800, 3600, 7200, 21600, 43200] as const
 const FALLBACK_ELEVENLABS_VOICE_ID = 'JBFqnCBsd6RMkjVDRZzb'
@@ -284,6 +285,7 @@ export function AgentSheet() {
   const [testStatus, setTestStatus] = useState<'idle' | 'testing' | 'pass' | 'fail'>('idle')
   const [testMessage, setTestMessage] = useState('')
   const [testErrorCode, setTestErrorCode] = useState<string | null>(null)
+  const [testDiagnostics, setTestDiagnostics] = useState<ProviderDiagnosticStep[]>([])
   const [testDeviceId, setTestDeviceId] = useState<string | null>(null)
   const [openclawDeviceId, setOpenclawDeviceId] = useState<string | null>(null)
   const [configCopied, setConfigCopied] = useState(false)
@@ -426,6 +428,7 @@ export function AgentSheet() {
         .catch(() => {})
       setTestStatus('idle')
       setTestMessage('')
+      setTestDiagnostics([])
       setShowAdvancedSettings(false)
       if (editing) {
         setName(editing.name)
@@ -690,6 +693,7 @@ export function AgentSheet() {
   useEffect(() => {
     setTestStatus('idle')
     setTestMessage('')
+    setTestDiagnostics([])
   }, [provider, credentialId, apiEndpoint])
 
   // Fetch MCP tools when selected servers change
@@ -758,6 +762,7 @@ export function AgentSheet() {
     setTestStatus('idle')
     setTestMessage('')
     setTestErrorCode(null)
+    setTestDiagnostics([])
     setAddingKey(false)
     setNewKeyName('')
     setNewKeyValue('')
@@ -1047,8 +1052,9 @@ export function AgentSheet() {
     setTestStatus('testing')
     setTestMessage('')
     setTestErrorCode(null)
+    setTestDiagnostics([])
     try {
-      const result = await api<{ ok: boolean; message: string; errorCode?: string; deviceId?: string }>('POST', '/setup/check-provider', {
+      const result = await api<{ ok: boolean; message: string; errorCode?: string; deviceId?: string; diagnostics?: ProviderDiagnosticStep[] }>('POST', '/setup/check-provider', {
         provider,
         credentialId,
         endpoint: apiEndpoint,
@@ -1057,6 +1063,7 @@ export function AgentSheet() {
       }, {
         timeoutMs: CONNECTION_TEST_TIMEOUT_MS,
       })
+      setTestDiagnostics(result.diagnostics ?? [])
       if (result.deviceId) setTestDeviceId(result.deviceId)
       if (result.ok) {
         let syncedModels: string[] = []
@@ -1084,6 +1091,7 @@ export function AgentSheet() {
       const msg = err instanceof Error ? err.message : 'Connection test failed'
       setTestStatus('fail')
       setTestMessage(msg)
+      setTestDiagnostics([])
       toast.error(msg)
       return false
     }
@@ -1317,6 +1325,10 @@ export function AgentSheet() {
             <button
               type="button"
               onClick={() => {
+                setTestStatus('idle')
+                setTestMessage('')
+                setTestErrorCode(null)
+                setTestDiagnostics([])
                 if (!openclawEnabled) {
                   setOpenclawEnabled(true)
                   setProvider('openclaw')
@@ -1330,9 +1342,6 @@ export function AgentSheet() {
                   setApiEndpoint(null)
                   setCredentialId(null)
                   setGatewayProfileId(null)
-                  setTestStatus('idle')
-                  setTestMessage('')
-                  setTestErrorCode(null)
                 }
               }}
               className={`relative h-6 w-11 rounded-full border-none transition-colors duration-200 ${openclawEnabled ? 'bg-accent-bright' : 'bg-white/[0.12]'}`}
@@ -1473,6 +1482,7 @@ export function AgentSheet() {
                 <p className="text-[14px] text-emerald-400 font-600">Connected</p>
               </div>
               <p className="text-[13px] text-text-2/80 leading-[1.6]">Gateway is reachable and this device is paired. Tools and models are managed by the OpenClaw instance.</p>
+              <ProviderDiagnosticsList diagnostics={testDiagnostics} />
             </div>
           )}
           {testStatus === 'fail' && (
@@ -1548,6 +1558,7 @@ export function AgentSheet() {
                   </p>
                 </div>
               )}
+              <ProviderDiagnosticsList diagnostics={testDiagnostics} />
             </div>
           )}
         </div>
@@ -2965,11 +2976,13 @@ export function AgentSheet() {
       {!openclawEnabled && testStatus === 'fail' && (
         <div className="mb-4 p-3 rounded-[12px] bg-red-500/[0.08] border border-red-500/20">
           <p className="text-[13px] text-red-400">{testMessage || 'Connection test failed'}</p>
+          <ProviderDiagnosticsList diagnostics={testDiagnostics} />
         </div>
       )}
       {!openclawEnabled && testStatus === 'pass' && (
         <div className="mb-4 p-3 rounded-[12px] bg-emerald-500/[0.08] border border-emerald-500/20">
           <p className="text-[13px] text-emerald-400">{testMessage || 'Connected successfully'}</p>
+          <ProviderDiagnosticsList diagnostics={testDiagnostics} />
         </div>
       )}
 

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

@@ -5,7 +5,8 @@ import { api } from '@/lib/app/api-client'
 import { dedup, errorMessage } from '@/lib/shared-utils'
 import { getDefaultModelForProvider } from '@/lib/setup-defaults'
 import { OpenClawDeployPanel } from '@/components/openclaw/openclaw-deploy-panel'
-import type { Credential, Credentials, GatewayProfile, ProviderId, ProviderConfig } from '@/types'
+import { ProviderDiagnosticsList } from '@/components/providers/provider-diagnostics-list'
+import type { Credential, Credentials, GatewayProfile, ProviderDiagnosticStep, ProviderId, ProviderConfig } from '@/types'
 import type { StepConnectProps, CheckState, ProviderCheckResponse, ConfiguredProvider } from './types'
 import {
   formatEndpointHost,
@@ -34,6 +35,7 @@ export function StepConnect({
   const [checkState, setCheckState] = useState<CheckState>(editingProvider?.verified ? 'ok' : 'idle')
   const [checkMessage, setCheckMessage] = useState('')
   const [checkErrorCode, setCheckErrorCode] = useState<string | null>(null)
+  const [checkDiagnostics, setCheckDiagnostics] = useState<ProviderDiagnosticStep[]>([])
   const [openclawDeviceId, setOpenclawDeviceId] = useState<string | null>(null)
   const [providerSuggestedModel, setProviderSuggestedModel] = useState(
     editingProvider?.defaultModel || (provider === 'custom' ? '' : getDefaultModelForProvider(provider)),
@@ -111,6 +113,7 @@ export function StepConnect({
     setCheckState('idle')
     setCheckMessage('')
     setCheckErrorCode(null)
+    setCheckDiagnostics([])
     setError('')
   }
 
@@ -118,12 +121,14 @@ export function StepConnect({
     if (requiresKey && !hasKeyOrCredential) {
       setCheckState('error')
       setCheckMessage('Please paste your API key or select a saved key first.')
+      setCheckDiagnostics([])
       return false
     }
 
     setCheckState('checking')
     setCheckMessage('')
     setCheckErrorCode(null)
+    setCheckDiagnostics([])
     setError('')
     try {
       const result = await api<ProviderCheckResponse>('POST', '/setup/check-provider', {
@@ -140,6 +145,7 @@ export function StepConnect({
         setProviderSuggestedModel(result.recommendedModel)
       }
       setCheckErrorCode(result.errorCode || null)
+      setCheckDiagnostics(result.diagnostics ?? [])
       setOpenclawDeviceId(result.deviceId || null)
       setCheckState(result.ok ? 'ok' : 'error')
       setCheckMessage(result.message || (result.ok ? 'Connected successfully.' : 'Connection failed.'))
@@ -148,6 +154,7 @@ export function StepConnect({
       setCheckState('error')
       setCheckMessage(errorMessage(err))
       setCheckErrorCode(null)
+      setCheckDiagnostics([])
       return false
     }
   }
@@ -280,7 +287,7 @@ export function StepConnect({
             <input
               type="text"
               value={endpoint}
-              onChange={(e) => { setEndpoint(e.target.value); setCheckState('idle'); setCheckMessage('') }}
+              onChange={(e) => { setEndpoint(e.target.value); setCheckState('idle'); setCheckMessage(''); setCheckDiagnostics([]) }}
               placeholder={selectedProvider.defaultEndpoint || ''}
               className="w-full px-4 py-3 rounded-[12px] border border-white/[0.08] bg-surface
                 text-text text-[14px] font-mono outline-none transition-all duration-200
@@ -295,6 +302,7 @@ export function StepConnect({
                     setEndpoint(isCloud ? (selectedProvider.defaultEndpoint || '') : selectedProvider.cloudEndpoint!)
                     setCheckState('idle')
                     setCheckMessage('')
+                    setCheckDiagnostics([])
                   }}
                   className="inline-flex items-center gap-1.5 px-3 py-1.5 rounded-[10px] border text-[12px] font-500 cursor-pointer transition-all duration-200 bg-transparent
                     border-white/[0.08] text-text-2 hover:bg-white/[0.04]"
@@ -440,6 +448,7 @@ export function StepConnect({
                       setApiKey('')
                       setCheckState('idle')
                       setCheckMessage('')
+                      setCheckDiagnostics([])
                     }
                   }}
                   className="w-full px-4 py-3 rounded-[12px] border border-white/[0.08] bg-surface
@@ -466,7 +475,7 @@ export function StepConnect({
                 <input
                   type="password"
                   value={apiKey}
-                  onChange={(e) => { setApiKey(e.target.value); setCredentialId(null); setCheckState('idle'); setCheckMessage(''); setError('') }}
+                  onChange={(e) => { setApiKey(e.target.value); setCredentialId(null); setCheckState('idle'); setCheckMessage(''); setCheckDiagnostics([]); setError('') }}
                   placeholder={selectedProvider.keyPlaceholder || (provider === 'openclaw' ? 'Paste OpenClaw bearer token' : 'sk-...')}
                   className="w-full px-4 py-3 rounded-[12px] border border-white/[0.08] bg-surface
                     text-text text-[14px] font-mono outline-none transition-all duration-200
@@ -530,6 +539,7 @@ export function StepConnect({
               Device paired as <code className="text-text-2">{openclawDeviceId.slice(0, 12)}...</code>.
             </p>
           )}
+          <ProviderDiagnosticsList diagnostics={checkDiagnostics} />
         </div>
       )}
 

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

@@ -1,17 +1,10 @@
-import type { GatewayProfile, ProviderId } from '@/types'
+import type { GatewayProfile, ProviderCheckResult, ProviderId } from '@/types'
 import type { SetupProvider } from '@/lib/setup-defaults'
 
 export type SetupStep = 'profile' | 'path' | 'providers' | 'connect' | 'agents' | 'next' | 'done'
 export type CheckState = 'idle' | 'checking' | 'ok' | 'error'
 
-export interface ProviderCheckResponse {
-  ok: boolean
-  message: string
-  normalizedEndpoint?: string
-  recommendedModel?: string
-  errorCode?: string
-  deviceId?: string
-}
+export type ProviderCheckResponse = ProviderCheckResult
 
 export interface SetupDoctorCheck {
   id: string

package/src/components/chat/activity-moment.tsx

@@ -19,6 +19,9 @@ const NOTABLE_TOOLS: Record<string, { label: string; color: string; icon: 'brain
   delegate_to_agent: { label: 'Delegating task', color: '#6366F1', icon: 'delegate' },
   check_delegation_status: { label: 'Checking delegation', color: '#6366F1', icon: 'delegate' },
   web_search: { label: 'Searched the web', color: '#22C55E', icon: 'search' },
+  web_fetch: { label: 'Read a web page', color: '#22C55E', icon: 'search' },
+  web_extract: { label: 'Extracted a web page', color: '#22C55E', icon: 'search' },
+  web_crawl: { label: 'Crawled a site', color: '#22C55E', icon: 'search' },
   connector_message_tool: { label: 'Sent a message', color: '#F97316', icon: 'message' },
 }
 
@@ -35,6 +38,7 @@ function extractSnippet(toolName: string, toolInput: string): string | null {
     if (toolName === 'check_delegation_status' && parsed.agentName) return parsed.agentName
     if (toolName.startsWith('delegate_to_') && parsed.task) return parsed.task
     if (toolName === 'web_search' && parsed.query) return parsed.query
+    if ((toolName === 'web_fetch' || toolName === 'web_extract' || toolName === 'web_crawl') && parsed.url) return parsed.url
     if (toolName === 'connector_message_tool' && parsed.to) return parsed.to
   } catch { /* ignore parse errors */ }
   return null

package/src/components/chat/tool-call-bubble.tsx

@@ -20,6 +20,8 @@ const TOOL_COLORS: Record<string, string> = {
   create_spreadsheet: '#10B981',
   web_search: '#3B82F6',
   web_fetch: '#3B82F6',
+  web_extract: '#3B82F6',
+  web_crawl: '#3B82F6',
   spawn_subagent: '#8B5CF6',
   delegate_to_agent: '#6366F1',
   check_delegation_status: '#6366F1',
@@ -77,6 +79,8 @@ export const TOOL_LABELS: Record<string, string> = {
   create_spreadsheet: 'Create Spreadsheet',
   web_search: 'Web Search',
   web_fetch: 'Web Fetch',
+  web_extract: 'Web Extract',
+  web_crawl: 'Web Crawl',
   claude_code: 'Claude Code',
   codex_cli: 'Codex CLI',
   opencode_cli: 'OpenCode CLI',
@@ -127,6 +131,8 @@ export const TOOL_DESCRIPTIONS: Record<string, string> = {
   create_spreadsheet: 'Create Excel or CSV files from structured data',
   web_search: 'Search the web for information',
   web_fetch: 'Fetch and read web page content',
+  web_extract: 'Extract readable content from a source URL',
+  web_crawl: 'Crawl a bounded set of pages from one site',
   claude_code: 'Enable delegation to Claude Code CLI',
   codex_cli: 'Enable delegation to OpenAI Codex CLI',
   opencode_cli: 'Enable delegation to OpenCode CLI',

package/src/components/providers/provider-diagnostics-list.tsx

@@ -0,0 +1,58 @@
+'use client'
+
+import type { ProviderDiagnosticStep } from '@/types'
+
+const STATUS_CLASSES: Record<ProviderDiagnosticStep['status'], string> = {
+  pass: 'border-emerald-500/25 bg-emerald-500/10 text-emerald-300',
+  warn: 'border-amber-500/25 bg-amber-500/10 text-amber-300',
+  fail: 'border-red-500/25 bg-red-500/10 text-red-300',
+}
+
+const STATUS_LABELS: Record<ProviderDiagnosticStep['status'], string> = {
+  pass: 'Pass',
+  warn: 'Warn',
+  fail: 'Fail',
+}
+
+export function ProviderDiagnosticsList({
+  diagnostics,
+  className = '',
+}: {
+  diagnostics?: ProviderDiagnosticStep[] | null
+  className?: string
+}) {
+  if (!diagnostics?.length) return null
+
+  return (
+    <div className={`mt-3 border-t border-white/[0.06] pt-3 ${className}`}>
+      <div className="mb-2 text-[11px] font-700 uppercase tracking-[0.1em] text-text-3/70">
+        Diagnostics
+      </div>
+      <ol className="space-y-2">
+        {diagnostics.map((step) => (
+          <li key={step.id} className="grid gap-1 text-left sm:grid-cols-[64px_minmax(0,1fr)] sm:gap-3">
+            <div>
+              <span className={`inline-flex min-w-[54px] items-center justify-center rounded-[999px] border px-2 py-0.5 text-[10px] font-700 uppercase tracking-[0.08em] ${STATUS_CLASSES[step.status]}`}>
+                {STATUS_LABELS[step.status]}
+              </span>
+            </div>
+            <div className="min-w-0">
+              <div className="flex min-w-0 flex-wrap items-center gap-x-2 gap-y-1">
+                <span className="text-[12px] font-650 text-text-2">{step.label}</span>
+                {typeof step.durationMs === 'number' && (
+                  <span className="text-[11px] text-text-3">{step.durationMs} ms</span>
+                )}
+              </div>
+              {step.target && (
+                <div className="mt-0.5 break-all font-mono text-[11px] text-text-3">{step.target}</div>
+              )}
+              {step.detail && (
+                <div className="mt-0.5 text-[11px] leading-relaxed text-text-3">{step.detail}</div>
+              )}
+            </div>
+          </li>
+        ))}
+      </ol>
+    </div>
+  )
+}

package/src/components/providers/provider-sheet.tsx

@@ -4,6 +4,7 @@ import { useEffect, useMemo, useState } from 'react'
 import { useAppStore } from '@/stores/use-app-store'
 import { BottomSheet } from '@/components/shared/bottom-sheet'
 import { ConfirmDialog } from '@/components/shared/confirm-dialog'
+import { ProviderDiagnosticsList } from '@/components/providers/provider-diagnostics-list'
 import { toast } from 'sonner'
 import { errorMessage } from '@/lib/shared-utils'
 import {
@@ -17,6 +18,7 @@ import {
   useSaveCustomProviderMutation,
 } from '@/features/providers/queries'
 import { useCreateCredentialMutation, useCredentialsQuery } from '@/features/credentials/queries'
+import type { ProviderDiagnosticStep } from '@/types'
 
 export function ProviderSheet() {
   const open = useAppStore((s) => s.providerSheetOpen)
@@ -54,6 +56,7 @@ export function ProviderSheet() {
   const [testStatus, setTestStatus] = useState<'idle' | 'testing' | 'pass' | 'fail'>('idle')
   const [testMessage, setTestMessage] = useState('')
   const [testModel, setTestModel] = useState('')
+  const [testDiagnostics, setTestDiagnostics] = useState<ProviderDiagnosticStep[]>([])
 
   const [liveModels, setLiveModels] = useState<string[]>([])
   const [liveLoading, setLiveLoading] = useState(false)
@@ -77,6 +80,7 @@ export function ProviderSheet() {
       setLiveCached(false)
       setTestStatus('idle')
       setTestMessage('')
+      setTestDiagnostics([])
       if (editingCustom) {
         setName(editingCustom.name)
         setBaseUrl(editingCustom.baseUrl || '')
@@ -108,6 +112,7 @@ export function ProviderSheet() {
   useEffect(() => {
     setTestStatus('idle')
     setTestMessage('')
+    setTestDiagnostics([])
   }, [credentialId, baseUrl])
 
   useEffect(() => {
@@ -121,6 +126,7 @@ export function ProviderSheet() {
     if (!isBuiltin) return
     setTestStatus('testing')
     setTestMessage('')
+    setTestDiagnostics([])
     try {
       const result = await checkProviderConnectionMutation.mutateAsync({
         provider: editingId || 'custom',
@@ -128,6 +134,7 @@ export function ProviderSheet() {
         endpoint: baseUrl,
         model: testModel || undefined,
       })
+      setTestDiagnostics(result.diagnostics ?? [])
       if (result.ok) {
         setTestStatus('pass')
         setTestMessage(result.message)
@@ -141,6 +148,7 @@ export function ProviderSheet() {
       const msg = err instanceof Error ? err.message : 'Connection test failed'
       setTestStatus('fail')
       setTestMessage(msg)
+      setTestDiagnostics([])
       toast.error(msg)
     }
   }
@@ -530,7 +538,7 @@ export function ProviderSheet() {
           </label>
           <select
             value={testModel}
-            onChange={(e) => { setTestModel(e.target.value); setTestStatus('idle'); setTestMessage('') }}
+            onChange={(e) => { setTestModel(e.target.value); setTestStatus('idle'); setTestMessage(''); setTestDiagnostics([]) }}
             className={`${inputClass} appearance-none cursor-pointer`}
             style={{ fontFamily: 'inherit' }}
           >
@@ -546,11 +554,13 @@ export function ProviderSheet() {
       {isBuiltin && testStatus === 'fail' && (
         <div className="mb-4 p-3 rounded-[12px] bg-red-500/[0.08] border border-red-500/20">
           <p className="text-[13px] text-red-400">{testMessage || 'Connection test failed'}</p>
+          <ProviderDiagnosticsList diagnostics={testDiagnostics} />
         </div>
       )}
       {isBuiltin && testStatus === 'pass' && (
         <div className="mb-4 p-3 rounded-[12px] bg-emerald-500/[0.08] border border-emerald-500/20">
           <p className="text-[13px] text-emerald-400">{testMessage || 'Connected successfully'}</p>
+          <ProviderDiagnosticsList diagnostics={testDiagnostics} />
         </div>
       )}
 

package/src/features/providers/queries.ts

@@ -13,6 +13,7 @@ import {
 import { fetchProviders } from '@/lib/chat/chats'
 import type {
   ProviderConfig,
+  ProviderCheckResult,
   ProviderInfo,
   ProviderModelDiscoveryResult,
 } from '@/types'
@@ -129,7 +130,7 @@ export function useResetProviderModelsMutation() {
 export function useCheckProviderConnectionMutation() {
   return useMutation({
     mutationFn: ({ provider, credentialId, endpoint, model }: CheckProviderConnectionInput) =>
-      api<{ ok: boolean; message: string }>('POST', '/setup/check-provider', {
+      api<ProviderCheckResult>('POST', '/setup/check-provider', {
         provider,
         credentialId,
         endpoint,

package/src/lib/server/capability-router.test.ts

@@ -26,7 +26,7 @@ test('routeTaskIntent keeps coding prompts prioritized over memory keywords', ()
 test('routeTaskIntent keeps hybrid research-plus-media prompts in research intent', () => {
   const decision = routeTaskIntent(
     'Can you tell me more if there is any news related to the US-Iran war, and can you send me some screenshots and give me a summary and maybe send me a voice note about it?',
-    ['web_search', 'web_fetch', 'browser', 'manage_connectors'],
+    ['web_search', 'web_fetch', 'web_crawl', 'browser', 'manage_connectors'],
     null,
     makeClassification({
       taskIntent: 'research',
@@ -39,7 +39,7 @@ test('routeTaskIntent keeps hybrid research-plus-media prompts in research inten
   )
 
   assert.equal(decision.intent, 'research')
-  assert.deepEqual(decision.preferredTools, ['web_search', 'web_fetch', 'browser', 'connector_message_tool'])
+  assert.deepEqual(decision.preferredTools, ['web_search', 'web_fetch', 'web_extract', 'web_crawl', 'browser', 'connector_message_tool'])
 })
 
 test('routeTaskIntent treats direct voice-note delivery as outreach', () => {
@@ -72,7 +72,7 @@ test('routeTaskIntent treats keep-watching update requests as research even with
   )
 
   assert.equal(decision.intent, 'research')
-  assert.deepEqual(decision.preferredTools, ['web_search', 'web_fetch'])
+  assert.deepEqual(decision.preferredTools, ['web_search', 'web_fetch', 'web_extract', 'web_crawl'])
 })
 
 test('routeTaskIntent uses structured classification when available', () => {
@@ -99,7 +99,7 @@ test('routeTaskIntent uses structured classification when available', () => {
   )
 
   assert.equal(decision.intent, 'browsing')
-  assert.deepEqual(decision.preferredTools, ['browser', 'web_fetch'])
+  assert.deepEqual(decision.preferredTools, ['browser', 'web_fetch', 'web_extract'])
 })
 
 function makeClassification(overrides: Partial<MessageClassification>): MessageClassification {

package/src/lib/server/capability-router.ts

@@ -144,6 +144,7 @@ export function routeTaskIntent(
       [
         TOOL_CAPABILITY.researchSearch,
         TOOL_CAPABILITY.researchFetch,
+        TOOL_CAPABILITY.researchCrawl,
         ...(wantsScreenshots ? [TOOL_CAPABILITY.browserCapture] : []),
         ...(wantsVoiceDelivery ? [TOOL_CAPABILITY.deliveryVoiceNote] : []),
         ...(wantsOutboundDelivery ? [TOOL_CAPABILITY.deliveryMedia, TOOL_CAPABILITY.deliveryMessage] : []),

package/src/lib/server/chat-execution/chat-execution-advanced.test.ts

@@ -407,6 +407,33 @@ describe('translateRequestedToolInvocation advanced', () => {
     assert.equal(args.action, 'search')
     assert.equal(args.query, 'test query')
   })
+
+  it('maps web_extract to web with action=extract', () => {
+    const { toolName, args } = translateRequestedToolInvocation(
+      'web_extract',
+      { url: 'https://example.com/source' },
+      '',
+      ['web'],
+    )
+    assert.equal(toolName, 'web')
+    assert.equal(args.action, 'extract')
+    assert.equal(args.url, 'https://example.com/source')
+  })
+
+  it('maps web_crawl to web with bounded crawl arguments', () => {
+    const { toolName, args } = translateRequestedToolInvocation(
+      'web_crawl',
+      { url: 'https://example.com/', maxPages: 4, maxDepth: 1, includeExternal: false },
+      '',
+      ['web'],
+    )
+    assert.equal(toolName, 'web')
+    assert.equal(args.action, 'crawl')
+    assert.equal(args.url, 'https://example.com/')
+    assert.equal(args.maxPages, 4)
+    assert.equal(args.maxDepth, 1)
+    assert.equal(args.includeExternal, false)
+  })
 })
 
 // ---------------------------------------------------------------------------

package/src/lib/server/chat-execution/chat-execution-utils.ts

@@ -127,6 +127,27 @@ export function translateRequestedToolInvocation(
       },
     }
   }
+  if (requestedName === 'web_extract') {
+    return {
+      toolName: 'web',
+      args: {
+        action: 'extract',
+        url: rawArgs.url,
+      },
+    }
+  }
+  if (requestedName === 'web_crawl') {
+    return {
+      toolName: 'web',
+      args: {
+        action: 'crawl',
+        url: rawArgs.url || rawArgs.query,
+        maxPages: rawArgs.maxPages ?? rawArgs.maxResults,
+        maxDepth: rawArgs.maxDepth,
+        includeExternal: rawArgs.includeExternal,
+      },
+    }
+  }
   if (requestedName === 'delegate_to_claude_code') {
     return { toolName: 'delegate', args: { ...rawArgs, backend: 'claude' } }
   }

package/src/lib/server/chat-execution/iteration-event-handler.ts

@@ -349,7 +349,7 @@ export async function processIterationEvents(opts: ProcessIterationEventsOpts):
       }
       if (
         boundedExternalExecutionTask
-        && ['http_request', 'web', 'web_search', 'web_fetch', 'browser'].includes(toolName)
+        && ['http_request', 'web', 'web_search', 'web_fetch', 'web_extract', 'web_crawl', 'browser'].includes(toolName)
         && countExternalExecutionResearchSteps(state.streamedToolEvents) >= 5
         && countDistinctExternalResearchHosts(state.streamedToolEvents) >= 3
       ) {

package/src/lib/server/chat-execution/stream-continuation.ts

@@ -196,7 +196,7 @@ function getRequestedArtifactStatus(params: {
 
 export function countExternalExecutionResearchSteps(toolEvents: MessageToolEvent[]): number {
   return toolEvents.filter((event) => {
-    return ['http_request', 'web', 'web_search', 'web_fetch', 'browser'].includes(event.name)
+    return ['http_request', 'web', 'web_search', 'web_fetch', 'web_extract', 'web_crawl', 'browser'].includes(event.name)
   }).length
 }
 
@@ -300,6 +300,8 @@ const RECOVERABLE_TOOL_ERROR_NAMES = new Set([
   'web',
   'web_search',
   'web_fetch',
+  'web_extract',
+  'web_crawl',
   'http_request',
 ])
 
@@ -390,6 +392,8 @@ export function getToolFrequencyHint(toolName: string, sessionExtensions: string
     case 'http_request':
     case 'web_search':
     case 'web_fetch':
+    case 'web_extract':
+    case 'web_crawl':
       return 'Hint: You have done extensive research. Stop gathering more sources and use the information you already have to complete the task.'
 
     case 'spawn_subagent':
@@ -490,7 +494,7 @@ function buildDeliverableFollowthroughPrompt(params: {
   }
 
   if (
-    params.toolEvents.some((event) => ['web', 'web_search', 'web_fetch', 'browser', 'http_request'].includes(event.name))
+    params.toolEvents.some((event) => ['web', 'web_search', 'web_fetch', 'web_extract', 'web_crawl', 'browser', 'http_request'].includes(event.name))
     && !params.toolEvents.some((event) => ['files', 'write_file', 'edit_file', 'shell', 'execute_command'].includes(event.name))
   ) {
     lines.push(

package/src/lib/server/plugins-advanced.test.ts

@@ -135,11 +135,13 @@ describe('expandExtensionIds', () => {
     }
   })
 
-  it('web expands to include web_search and web_fetch', () => {
+  it('web expands to include granular web tools', () => {
     const result = expandExtensionIds(['web'])
     assert.ok(result.includes('web'))
     assert.ok(result.includes('web_search'))
     assert.ok(result.includes('web_fetch'))
+    assert.ok(result.includes('web_extract'))
+    assert.ok(result.includes('web_crawl'))
   })
 
   it('removes duplicates after expansion', () => {
@@ -199,12 +201,14 @@ describe('expandExtensionIds', () => {
 // getExtensionAliases
 // ---------------------------------------------------------------------------
 describe('getExtensionAliases', () => {
-  it('web returns [web, web_search, web_fetch]', () => {
+  it('web returns the full web alias group', () => {
     const result = getExtensionAliases('web')
     assert.ok(result.includes('web'))
     assert.ok(result.includes('web_search'))
     assert.ok(result.includes('web_fetch'))
-    assert.equal(result.length, 5) // web, web_search, web_fetch, http_request, http
+    assert.ok(result.includes('web_extract'))
+    assert.ok(result.includes('web_crawl'))
+    assert.equal(result.length, 7) // web, web_search, web_fetch, web_extract, web_crawl, http_request, http
   })
 
   it('web_search returns the same group as web', () => {