Remove switch from tools (#2091)

* HandleError returns a promise

* Remove unnecessary switch from tools

Author: mrubens

src/core/tools/fetchInstructionsTool.ts

@@ -12,58 +12,53 @@ export async function fetchInstructionsTool(
 	handleError: HandleError,
 	pushToolResult: PushToolResult,
 ) {
-	switch (true) {
-		default:
-			const task: string | undefined = block.params.task
-			const sharedMessageProps: ClineSayTool = {
-				tool: "fetchInstructions",
-				content: task,
+	const task: string | undefined = block.params.task
+	const sharedMessageProps: ClineSayTool = {
+		tool: "fetchInstructions",
+		content: task,
+	}
+	try {
+		if (block.partial) {
+			const partialMessage = JSON.stringify({
+				...sharedMessageProps,
+				content: undefined,
+			} satisfies ClineSayTool)
+			await cline.ask("tool", partialMessage, block.partial).catch(() => {})
+			return
+		} else {
+			if (!task) {
+				cline.consecutiveMistakeCount++
+				pushToolResult(await cline.sayAndCreateMissingParamError("fetch_instructions", "task"))
+				return
 			}
-			try {
-				if (block.partial) {
-					const partialMessage = JSON.stringify({
-						...sharedMessageProps,
-						content: undefined,
-					} satisfies ClineSayTool)
-					await cline.ask("tool", partialMessage, block.partial).catch(() => {})
-					break
-				} else {
-					if (!task) {
-						cline.consecutiveMistakeCount++
-						pushToolResult(await cline.sayAndCreateMissingParamError("fetch_instructions", "task"))
-						break
-					}
 
-					cline.consecutiveMistakeCount = 0
-					const completeMessage = JSON.stringify({
-						...sharedMessageProps,
-						content: task,
-					} satisfies ClineSayTool)
+			cline.consecutiveMistakeCount = 0
+			const completeMessage = JSON.stringify({
+				...sharedMessageProps,
+				content: task,
+			} satisfies ClineSayTool)
 
-					const didApprove = await askApproval("tool", completeMessage)
-					if (!didApprove) {
-						break
-					}
+			const didApprove = await askApproval("tool", completeMessage)
+			if (!didApprove) {
+				return
+			}
 
-					// now fetch the content and provide it to the agent.
-					const provider = cline.providerRef.deref()
-					const mcpHub = provider?.getMcpHub()
-					if (!mcpHub) {
-						throw new Error("MCP hub not available")
-					}
-					const diffStrategy = cline.diffStrategy
-					const context = provider?.context
-					const content = await fetchInstructions(task, { mcpHub, diffStrategy, context })
-					if (!content) {
-						pushToolResult(formatResponse.toolError(`Invalid instructions request: ${task}`))
-						break
-					}
-					pushToolResult(content)
-					break
-				}
-			} catch (error) {
-				await handleError("fetch instructions", error)
-				break
+			// now fetch the content and provide it to the agent.
+			const provider = cline.providerRef.deref()
+			const mcpHub = provider?.getMcpHub()
+			if (!mcpHub) {
+				throw new Error("MCP hub not available")
+			}
+			const diffStrategy = cline.diffStrategy
+			const context = provider?.context
+			const content = await fetchInstructions(task, { mcpHub, diffStrategy, context })
+			if (!content) {
+				pushToolResult(formatResponse.toolError(`Invalid instructions request: ${task}`))
+				return
 			}
+			pushToolResult(content)
+		}
+	} catch (error) {
+		await handleError("fetch instructions", error)
 	}
 }

src/core/tools/listFilesTool.ts

@@ -69,10 +69,8 @@ export async function listFilesTool(
 				return
 			}
 			pushToolResult(result)
-			return
 		}
 	} catch (error) {
 		await handleError("listing files", error)
-		return
 	}
 }