feat: wire fetch_web_content into execution dispatcher

Author: p12tic

src/core/assistant-message/NativeToolCallParser.ts

@@ -637,6 +637,15 @@ export class NativeToolCallParser {
 				}
 				break
 
+			case "fetch_web_content":
+				if (partialArgs.url !== undefined) {
+					nativeArgs = {
+						url: partialArgs.url,
+						prompt: partialArgs.prompt,
+					}
+				}
+				break
+
 			default:
 				break
 		}
@@ -992,6 +1001,15 @@ export class NativeToolCallParser {
 					}
 					break
 
+				case "fetch_web_content":
+					if (args.url !== undefined) {
+						nativeArgs = {
+							url: args.url,
+							prompt: args.prompt,
+						} as NativeArgsFor<TName>
+					}
+					break
+
 				default:
 					if (customToolRegistry.has(resolvedName)) {
 						nativeArgs = args as NativeArgsFor<TName>

src/core/assistant-message/__tests__/NativeToolCallParser.spec.ts

@@ -291,6 +291,67 @@ describe("NativeToolCallParser", () => {
 				})
 			})
 		})
+
+		describe("fetch_web_content tool", () => {
+			it("should parse fetch_web_content with url and prompt", () => {
+				const toolCall = {
+					id: "toolu_fetch_1",
+					name: "fetch_web_content" as const,
+					arguments: JSON.stringify({
+						url: "https://example.com",
+						prompt: "Find the main heading",
+					}),
+				}
+
+				const result = NativeToolCallParser.parseToolCall(toolCall)
+
+				expect(result).not.toBeNull()
+				expect(result?.type).toBe("tool_use")
+				if (result?.type === "tool_use") {
+					expect(result.nativeArgs).toBeDefined()
+					const nativeArgs = result.nativeArgs as { url: string; prompt?: string }
+					expect(nativeArgs.url).toBe("https://example.com")
+					expect(nativeArgs.prompt).toBe("Find the main heading")
+				}
+			})
+
+			it("should parse fetch_web_content with url only (no prompt)", () => {
+				const toolCall = {
+					id: "toolu_fetch_2",
+					name: "fetch_web_content" as const,
+					arguments: JSON.stringify({
+						url: "https://api.example.com/status",
+						prompt: null,
+					}),
+				}
+
+				const result = NativeToolCallParser.parseToolCall(toolCall)
+
+				expect(result).not.toBeNull()
+				expect(result?.type).toBe("tool_use")
+				if (result?.type === "tool_use") {
+					expect(result.nativeArgs).toBeDefined()
+					const nativeArgs = result.nativeArgs as { url: string; prompt?: string | null }
+					expect(nativeArgs.url).toBe("https://api.example.com/status")
+					expect(nativeArgs.prompt).toBeNull()
+				}
+			})
+
+			it("should return null when url is missing", () => {
+				const toolCall = {
+					id: "toolu_fetch_3",
+					name: "fetch_web_content" as const,
+					arguments: JSON.stringify({
+						prompt: "some prompt",
+					}),
+				}
+
+				const result = NativeToolCallParser.parseToolCall(toolCall)
+
+				// Should return null because nativeArgs can't be constructed without url
+				expect(result).toBeNull()
+			})
+		})
 	})
 
 	describe("processStreamingChunk", () => {
@@ -311,6 +372,22 @@ describe("NativeToolCallParser", () => {
 				expect(nativeArgs.path).toBe("src/test.ts")
 			})
 		})
+
+		describe("fetch_web_content tool", () => {
+			it("should emit a partial ToolUse with nativeArgs.url during streaming", () => {
+				const id = "toolu_streaming_fetch_1"
+				NativeToolCallParser.startStreamingToolCall(id, "fetch_web_content")
+
+				const fullArgs = JSON.stringify({ url: "https://example.com", prompt: "Find info" })
+				const result = NativeToolCallParser.processStreamingChunk(id, fullArgs)
+
+				expect(result).not.toBeNull()
+				expect(result?.nativeArgs).toBeDefined()
+				const nativeArgs = result?.nativeArgs as { url: string; prompt?: string }
+				expect(nativeArgs.url).toBe("https://example.com")
+				expect(nativeArgs.prompt).toBe("Find info")
+			})
+		})
 	})
 
 	describe("finalizeStreamingToolCall", () => {
@@ -342,5 +419,53 @@ describe("NativeToolCallParser", () => {
 				}
 			})
 		})
+
+		describe("fetch_web_content tool", () => {
+			it("should parse fetch_web_content args on finalize", () => {
+				const id = "toolu_finalize_fetch_1"
+				NativeToolCallParser.startStreamingToolCall(id, "fetch_web_content")
+
+				NativeToolCallParser.processStreamingChunk(
+					id,
+					JSON.stringify({
+						url: "https://docs.example.com/api",
+						prompt: "Find authentication methods",
+					}),
+				)
+
+				const result = NativeToolCallParser.finalizeStreamingToolCall(id)
+
+				expect(result).not.toBeNull()
+				expect(result?.type).toBe("tool_use")
+				if (result?.type === "tool_use") {
+					const nativeArgs = result.nativeArgs as { url: string; prompt?: string }
+					expect(nativeArgs.url).toBe("https://docs.example.com/api")
+					expect(nativeArgs.prompt).toBe("Find authentication methods")
+				}
+			})
+
+			it("should parse fetch_web_content with null prompt on finalize", () => {
+				const id = "toolu_finalize_fetch_2"
+				NativeToolCallParser.startStreamingToolCall(id, "fetch_web_content")
+
+				NativeToolCallParser.processStreamingChunk(
+					id,
+					JSON.stringify({
+						url: "https://api.example.com/status",
+						prompt: null,
+					}),
+				)
+
+				const result = NativeToolCallParser.finalizeStreamingToolCall(id)
+
+				expect(result).not.toBeNull()
+				expect(result?.type).toBe("tool_use")
+				if (result?.type === "tool_use") {
+					const nativeArgs = result.nativeArgs as { url: string; prompt?: string | null }
+					expect(nativeArgs.url).toBe("https://api.example.com/status")
+					expect(nativeArgs.prompt).toBeNull()
+				}
+			})
+		})
 	})
 })

src/core/assistant-message/presentAssistantMessage.ts

@@ -37,6 +37,7 @@ import { generateImageTool } from "../tools/GenerateImageTool"
 import { applyDiffTool as applyDiffToolClass } from "../tools/ApplyDiffTool"
 import { isValidToolName, validateToolUse } from "../tools/validateToolUse"
 import { codebaseSearchTool } from "../tools/CodebaseSearchTool"
+import { fetchWebContentTool } from "../tools/FetchWebContentTool"
 
 import { formatResponse } from "../prompts/responses"
 import { sanitizeToolUseId } from "../../utils/tool-id"
@@ -383,6 +384,8 @@ export async function presentAssistantMessage(cline: Task) {
 						return `[${block.name} for '${block.params.skill}'${block.params.args ? ` with args: ${block.params.args}` : ""}]`
 					case "generate_image":
 						return `[${block.name} for '${block.params.path}']`
+					case "fetch_web_content":
+						return `[${block.name} for '${block.params.url}']`
 					default:
 						return `[${block.name}]`
 				}
@@ -849,6 +852,13 @@ export async function presentAssistantMessage(cline: Task) {
 						pushToolResult,
 					})
 					break
+				case "fetch_web_content":
+					await fetchWebContentTool.handle(cline, block as ToolUse<"fetch_web_content">, {
+						askApproval,
+						handleError,
+						pushToolResult,
+					})
+					break
 				default: {
 					// Handle unknown/invalid tool names OR custom tools
 					// This is critical for native tool calling where every tool_use MUST have a tool_result