From 2a83911c7ef98ca416d95e1a26ccb4cd3d97a6c7 Mon Sep 17 00:00:00 2001
From: Kit Langton <kit.langton@gmail.com>
Date: Fri, 21 Aug 2026 14:23:10 -0400
Subject: [PATCH] refactor(plugin): simplify websearch effects (#43943)

---
 packages/core/src/plugin/websearch/mcp.ts    |  6 +++---
 packages/core/src/plugin/websearch/tavily.ts | 18 +++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/core/src/plugin/websearch/mcp.ts b/packages/core/src/plugin/websearch/mcp.ts
index 05aaa68b9e..d733ca23f3 100644
--- a/packages/core/src/plugin/websearch/mcp.ts
+++ b/packages/core/src/plugin/websearch/mcp.ts
@@ -45,9 +45,9 @@ export const call = <F extends Schema.Struct.Fields, R extends Schema.Struct.Fie
           params: Schema.Struct({ name: Schema.String, arguments: schema.input }),
         }),
       )({
-        jsonrpc: "2.0" as const,
-        id: 1 as const,
-        method: "tools/call" as const,
+        jsonrpc: "2.0",
+        id: 1,
+        method: "tools/call",
         params: { name: tool, arguments: value },
       }),
     )
diff --git a/packages/core/src/plugin/websearch/tavily.ts b/packages/core/src/plugin/websearch/tavily.ts
index ca239bebc1..e833c7af49 100644
--- a/packages/core/src/plugin/websearch/tavily.ts
+++ b/packages/core/src/plugin/websearch/tavily.ts
@@ -63,15 +63,15 @@ export const Plugin = define<HttpClient.HttpClient | Scope.Scope>({
                 max_results: 8,
               }),
             )
-            const response = yield* Effect.gen(function* () {
-              const httpResponse = yield* HttpClient.filterStatusOk(http).execute(request)
-              return yield* HttpClientResponse.schemaBodyJson(SearchResponse)(httpResponse)
-            }).pipe(
-              Effect.timeoutOrElse({
-                duration: Duration.seconds(25),
-                orElse: () => Effect.fail(new Error("Tavily web search request timed out")),
-              }),
-            )
+            const response = yield* HttpClient.filterStatusOk(http)
+              .execute(request)
+              .pipe(
+                Effect.flatMap(HttpClientResponse.schemaBodyJson(SearchResponse)),
+                Effect.timeoutOrElse({
+                  duration: Duration.seconds(25),
+                  orElse: () => Effect.fail(new Error("Tavily web search request timed out")),
+                }),
+              )
             return response.results.map((item) => ({
               url: item.url,
               title: item.title,