feat: better collapsing fetch result

src/components/messages/CollapsedReadSearchContent.tsx

@@ -159,6 +159,7 @@ export function CollapsedReadSearchContent({
     memoryWriteCount,
     messages: groupMessages
   } = message;
+  const rawWebFetchCount = message.webFetchCount ?? 0;
   const [theme] = useTheme();
   const toolUseIds = getToolUseIdsFromCollapsedGroup(message);
   const anyError = toolUseIds.some(id => lookups.erroredToolUseIDs.has(id));
@@ -173,21 +174,24 @@ export function CollapsedReadSearchContent({
   const maxListCountRef = useRef(0);
   const maxMcpCountRef = useRef(0);
   const maxBashCountRef = useRef(0);
+  const maxWebFetchCountRef = useRef(0);
   maxReadCountRef.current = Math.max(maxReadCountRef.current, rawReadCount);
   maxSearchCountRef.current = Math.max(maxSearchCountRef.current, rawSearchCount);
   maxListCountRef.current = Math.max(maxListCountRef.current, rawListCount);
   maxMcpCountRef.current = Math.max(maxMcpCountRef.current, message.mcpCallCount ?? 0);
   maxBashCountRef.current = Math.max(maxBashCountRef.current, message.bashCount ?? 0);
+  maxWebFetchCountRef.current = Math.max(maxWebFetchCountRef.current, rawWebFetchCount);
   const readCount = maxReadCountRef.current;
   const searchCount = maxSearchCountRef.current;
   const listCount = maxListCountRef.current;
   const mcpCallCount = maxMcpCountRef.current;
+  const webFetchCount = maxWebFetchCountRef.current;
   // Subtract commands surfaced as "Committed …" / "Created PR …" so the
   // same command isn't counted twice. gitOpBashCount is read live (no max-ref
   // needed — it's 0 until results arrive, then only grows).
   const gitOpBashCount = message.gitOpBashCount ?? 0;
   const bashCount = isFullscreenEnvEnabled() ? Math.max(0, maxBashCountRef.current - gitOpBashCount) : 0;
-  const hasNonMemoryOps = searchCount > 0 || readCount > 0 || listCount > 0 || replCount > 0 || mcpCallCount > 0 || bashCount > 0 || gitOpBashCount > 0;
+  const hasNonMemoryOps = searchCount > 0 || readCount > 0 || listCount > 0 || replCount > 0 || mcpCallCount > 0 || bashCount > 0 || gitOpBashCount > 0 || webFetchCount > 0;
   const readPaths = message.readFilePaths;
   const searchArgs = message.searchArgs;
   let incomingHint = message.latestDisplayHint;
@@ -411,37 +415,48 @@ export function CollapsedReadSearchContent({
         {bashCount === 1 ? 'command' : 'commands'}
       </Text>);
   }
+  if (webFetchCount > 0) {
+    const isFirst_5 = nonMemParts.length === 0;
+    const verb_2 = isActiveGroup ? isFirst_5 ? 'Fetching' : 'fetching' : isFirst_5 ? 'Fetched' : 'fetched';
+    if (!isFirst_5) {
+      nonMemParts.push(<Text key="comma-webfetch">, </Text>);
+    }
+    nonMemParts.push(<Text key="webfetch">
+        {verb_2} <Text bold>{webFetchCount}</Text> URL{' '}
+        {webFetchCount === 1 ? '' : 's'}
+      </Text>);
+  }
 
   // Build memory parts (auto-memory) — rendered after nonMemParts
   const hasPrecedingNonMem = nonMemParts.length > 0;
   const memParts: React.ReactNode[] = [];
   if (memoryReadCount > 0) {
-    const isFirst_5 = !hasPrecedingNonMem && memParts.length === 0;
-    const verb_2 = isActiveGroup ? isFirst_5 ? 'Recalling' : 'recalling' : isFirst_5 ? 'Recalled' : 'recalled';
-    if (!isFirst_5) {
+    const isFirst_6 = !hasPrecedingNonMem && memParts.length === 0;
+    const verb_3 = isActiveGroup ? isFirst_6 ? 'Recalling' : 'recalling' : isFirst_6 ? 'Recalled' : 'recalled';
+    if (!isFirst_6) {
       memParts.push(<Text key="comma-mr">, </Text>);
     }
     memParts.push(<Text key="mem-read">
-        {verb_2} <Text bold>{memoryReadCount}</Text>{' '}
+        {verb_3} <Text bold>{memoryReadCount}</Text>{' '}
         {memoryReadCount === 1 ? 'memory' : 'memories'}
       </Text>);
   }
   if (memorySearchCount > 0) {
-    const isFirst_6 = !hasPrecedingNonMem && memParts.length === 0;
-    const verb_3 = isActiveGroup ? isFirst_6 ? 'Searching' : 'searching' : isFirst_6 ? 'Searched' : 'searched';
-    if (!isFirst_6) {
+    const isFirst_7 = !hasPrecedingNonMem && memParts.length === 0;
+    const verb_4 = isActiveGroup ? isFirst_7 ? 'Searching' : 'searching' : isFirst_7 ? 'Searched' : 'searched';
+    if (!isFirst_7) {
       memParts.push(<Text key="comma-ms">, </Text>);
     }
-    memParts.push(<Text key="mem-search">{`${verb_3} memories`}</Text>);
+    memParts.push(<Text key="mem-search">{`${verb_4} memories`}</Text>);
   }
   if (memoryWriteCount > 0) {
-    const isFirst_7 = !hasPrecedingNonMem && memParts.length === 0;
-    const verb_4 = isActiveGroup ? isFirst_7 ? 'Writing' : 'writing' : isFirst_7 ? 'Wrote' : 'wrote';
-    if (!isFirst_7) {
+    const isFirst_8 = !hasPrecedingNonMem && memParts.length === 0;
+    const verb_5 = isActiveGroup ? isFirst_8 ? 'Writing' : 'writing' : isFirst_8 ? 'Wrote' : 'wrote';
+    if (!isFirst_8) {
       memParts.push(<Text key="comma-mw">, </Text>);
     }
     memParts.push(<Text key="mem-write">
-        {verb_4} <Text bold>{memoryWriteCount}</Text>{' '}
+        {verb_5} <Text bold>{memoryWriteCount}</Text>{' '}
         {memoryWriteCount === 1 ? 'memory' : 'memories'}
       </Text>);
   }

src/types/message.ts

@@ -0,0 +1,246 @@
+import type { UUID } from 'crypto'
+import type {
+  ContentBlockParam,
+  MessageParam,
+} from '@anthropic-ai/sdk/resources/messages.mjs'
+
+export type MessageOrigin = 'user' | 'assistant' | 'system'
+
+export type Message = {
+  role: 'user' | 'assistant' | 'system'
+  content: ContentBlockParam[]
+  uuid: string
+  timestamp: number
+  origin?: MessageOrigin
+}
+
+export type UserMessage = {
+  role: 'user'
+  content: ContentBlockParam[]
+  uuid: string
+  timestamp: number
+  origin?: MessageOrigin
+}
+
+export type AssistantMessage = {
+  role: 'assistant'
+  content: ContentBlockParam[]
+  uuid: string
+  timestamp: number
+  origin?: MessageOrigin
+  model?: string
+}
+
+export type NormalizedMessage =
+  | NormalizedUserMessage
+  | NormalizedAssistantMessage
+
+export type NormalizedUserMessage = {
+  type: 'user'
+  message: UserMessage
+  uuid: string
+  timestamp: number
+  origin?: MessageOrigin
+  toolUseResult?: { stdout?: string; stderr?: string }
+}
+
+export type NormalizedAssistantMessage = {
+  type: 'assistant'
+  message: AssistantMessage
+  uuid: string
+  timestamp: number
+  origin?: MessageOrigin
+  model?: string
+}
+
+export type SystemMessage = {
+  type: 'system'
+  subtype: string
+  uuid: string
+  timestamp: number
+  level?: string
+  text?: string
+}
+
+export type SystemInformationalMessage = SystemMessage & {
+  subtype: 'informational'
+  text: string
+}
+
+export type SystemAPIErrorMessage = SystemMessage & {
+  subtype: 'api_error'
+  error: string
+}
+
+export type StopHookInfo = {
+  command: string
+  durationMs?: number
+  hookName?: string
+}
+
+export type SystemStopHookSummaryMessage = SystemMessage & {
+  subtype: 'stop_hook_summary'
+  hookLabel: string
+  hookCount: number
+  totalDurationMs?: number
+  hookInfos: StopHookInfo[]
+}
+
+export type SystemAgentsKilledMessage = SystemMessage & {
+  subtype: 'agents_killed'
+}
+
+export type SystemApiMetricsMessage = SystemMessage & {
+  subtype: 'api_metrics'
+}
+
+export type SystemAwaySummaryMessage = SystemMessage & {
+  subtype: 'away_summary'
+}
+
+export type SystemBridgeStatusMessage = SystemMessage & {
+  subtype: 'bridge_status'
+}
+
+export type SystemCompactBoundaryMessage = SystemMessage & {
+  subtype: 'compact_boundary'
+}
+
+export type SystemLocalCommandMessage = SystemMessage & {
+  subtype: 'local_command'
+}
+
+export type SystemMemorySavedMessage = SystemMessage & {
+  subtype: 'memory_saved'
+}
+
+export type SystemMicrocompactBoundaryMessage = SystemMessage & {
+  subtype: 'microcompact_boundary'
+}
+
+export type SystemPermissionRetryMessage = SystemMessage & {
+  subtype: 'permission_retry'
+}
+
+export type SystemScheduledTaskFireMessage = SystemMessage & {
+  subtype: 'scheduled_task_fire'
+}
+
+export type SystemTurnDurationMessage = SystemMessage & {
+  subtype: 'turn_duration'
+}
+
+export type ProgressMessage = {
+  type: 'progress'
+  uuid: string
+  timestamp: number
+  data?: {
+    type: string
+    phase?: string
+    toolName?: string
+    toolInput?: unknown
+    elapsedTimeSeconds?: number
+    totalLines?: number
+  }
+}
+
+export type HookResultMessage = {
+  type: 'hook_result'
+  uuid: string
+  timestamp: number
+  hookName: string
+}
+
+export type Attachment = {
+  type: string
+  memories?: { path: string; content: string; mtimeMs: number }[]
+}
+
+export type AttachmentMessage = {
+  type: 'attachment'
+  attachment: Attachment
+  uuid: string
+  timestamp: number
+}
+
+export type GroupedToolUseMessage = {
+  type: 'grouped_tool_use'
+  toolName: string
+  messages: NormalizedAssistantMessage[]
+  uuid: string
+  timestamp: number
+  displayMessage: NormalizedAssistantMessage
+}
+
+export type CollapsibleMessage =
+  | NormalizedAssistantMessage
+  | GroupedToolUseMessage
+  | NormalizedUserMessage
+
+export type RenderableMessage =
+  | NormalizedUserMessage
+  | NormalizedAssistantMessage
+  | SystemMessage
+  | AttachmentMessage
+  | GroupedToolUseMessage
+  | ProgressMessage
+
+export type TombstoneMessage = SystemMessage & {
+  subtype: 'tombstone'
+}
+
+export type ToolUseSummaryMessage = {
+  type: 'tool_use_summary'
+  uuid: string
+  timestamp: number
+}
+
+export type CollapsedReadSearchGroup = {
+  type: 'collapsed_read_search'
+  searchCount: number
+  readCount: number
+  listCount: number
+  replCount: number
+  memorySearchCount: number
+  memoryReadCount: number
+  memoryWriteCount: number
+  readFilePaths: string[]
+  searchArgs: string[]
+  latestDisplayHint?: string
+  messages: CollapsibleMessage[]
+  displayMessage: CollapsibleMessage
+  uuid: string
+  timestamp: number
+  mcpCallCount?: number
+  mcpServerNames?: string[]
+  bashCount?: number
+  gitOpBashCount?: number
+  commits?: { sha: string; kind: string }[]
+  pushes?: { branch: string }[]
+  branches?: { ref: string; action: string }[]
+  prs?: { number: number; url?: string; action: string }[]
+  hookTotalMs?: number
+  hookCount?: number
+  hookInfos?: StopHookInfo[]
+  relevantMemories?: { path: string; content: string; mtimeMs: number }[]
+  teamMemorySearchCount?: number
+  teamMemoryReadCount?: number
+  teamMemoryWriteCount?: number
+  webFetchCount?: number
+  webFetchURLs?: string[]
+}
+
+export type PartialCompactDirection = 'forward' | 'backward'
+
+export type RequestStartEvent = {
+  type: 'request_start'
+  timestamp: number
+}
+
+export type StreamEvent =
+  | { type: 'message_start'; message: MessageParam }
+  | { type: 'content_block_start'; content_block: ContentBlockParam }
+  | { type: 'content_block_delta'; delta: unknown }
+  | { type: 'content_block_stop' }
+  | { type: 'message_delta'; usage: unknown }
+  | { type: 'message_stop' }

src/utils/collapseReadSearch.ts

@@ -14,6 +14,7 @@ import {
   type PrAction,
 } from '../tools/shared/gitOperationTracking.js'
 import { TOOL_SEARCH_TOOL_NAME } from '../tools/ToolSearchTool/prompt.js'
+import { WEB_FETCH_TOOL_NAME } from '../tools/WebFetchTool/prompt.js'
 import type {
   CollapsedReadSearchGroup,
   CollapsibleMessage,
@@ -161,6 +162,21 @@ export function getToolSearchOrReadInfo(
     }
   }
 
+  // WebFetch is absorbed silently — counted separately so display says
+  // "Fetched N URLs" instead of "Read N files". Remains visible in verbose
+  // mode via the groupMessages iteration.
+  if (toolName === WEB_FETCH_TOOL_NAME) {
+    return {
+      isCollapsible: true,
+      isSearch: false,
+      isRead: false,
+      isList: false,
+      isREPL: false,
+      isMemoryWrite: false,
+      isAbsorbedSilently: false,
+    }
+  }
+
   // Memory file writes/edits are collapsible
   if (isMemoryWriteOrEdit(toolName, toolInput)) {
     return {
@@ -620,6 +636,9 @@ type GroupAccumulator = {
   // memories, not explicit Read calls). Paths mirrored into readFilePaths +
   // memoryReadFilePaths so the inline "recalled N memories" text is accurate.
   relevantMemories?: { path: string; content: string; mtimeMs: number }[]
+  // WebFetch operations (tracked separately for "Fetched N URLs")
+  webFetchCount?: number
+  webFetchURLs?: string[]
 }
 
 function createEmptyGroup(): GroupAccumulator {
@@ -638,6 +657,8 @@ function createEmptyGroup(): GroupAccumulator {
     hookTotalMs: 0,
     hookCount: 0,
     hookInfos: [],
+    webFetchCount: 0,
+    webFetchURLs: [],
   }
   if (feature('TEAMMEM')) {
     group.teamMemorySearchCount = 0
@@ -748,6 +769,10 @@ function createCollapsedGroup(
   if (group.relevantMemories && group.relevantMemories.length > 0) {
     result.relevantMemories = group.relevantMemories
   }
+  if ((group.webFetchCount ?? 0) > 0) {
+    result.webFetchCount = group.webFetchCount
+    result.webFetchURLs = group.webFetchURLs
+  }
   return result
 }
 
@@ -800,6 +825,16 @@ export function collapseReadSearchGroups(
         // Snip/ToolSearch absorbed silently — no count, no summary text.
         // Hidden from the default view but still shown in verbose mode
         // (Ctrl+O) via the groupMessages iteration in CollapsedReadSearchContent.
+      } else if (toolInfo.name === WEB_FETCH_TOOL_NAME) {
+        // WebFetch — counted separately so the summary says
+        // "Fetched N URLs" instead of "Read N files".
+        const count = countToolUses(msg)
+        currentGroup.webFetchCount = (currentGroup.webFetchCount ?? 0) + count
+        const input = toolInfo.input as { url?: string } | undefined
+        if (input?.url) {
+          currentGroup.webFetchURLs?.push(input.url)
+          currentGroup.latestDisplayHint = input.url
+        }
       } else if (toolInfo.mcpServerName) {
         // MCP search/read — counted separately so the summary says
         // "Queried slack N times" instead of "Read N files".