refactor(websearch): rename search domain

packages/core/src/plugin/host.ts

@@ -345,11 +345,11 @@ function registerIntegration(draft: Integration.Draft, definition: IntegrationDe
       }),
     )
   }
-  if (!definition.search) return
-  draft.search.update({
+  if (!definition.websearch) return
+  draft.websearch.update({
     integrationID,
-    connection: definition.search.connection,
-    execute: definition.search.execute,
+    connection: definition.websearch.connection,
+    execute: definition.websearch.execute,
   })
 }
 

packages/core/src/plugin/internal.ts

@@ -26,7 +26,7 @@ import { ModelsDev } from "../models-dev"
 import { Npm } from "../npm"
 import { PermissionV2 } from "../permission"
 import { Reference } from "../reference"
-import { Search } from "../search"
+import { WebSearch } from "../websearch"
 import { Ripgrep } from "../ripgrep"
 import { SessionInstructions } from "../session/instructions"
 import { SessionTodo } from "../session/todo"
@@ -51,7 +51,7 @@ import { AgentPlugin } from "./agent"
 import { CommandPlugin } from "./command"
 import { ModelsDevPlugin } from "./models-dev"
 import { ProviderPlugins } from "./provider"
-import { SearchPlugins } from "./search"
+import { WebSearchPlugins } from "./websearch"
 import { PluginRuntime } from "./runtime"
 import { SkillPlugin } from "./skill"
 import { VariantPlugin } from "./variant"
@@ -78,7 +78,7 @@ const services = Effect.fn("PluginInternal.services")(function* () {
   const form = yield* Form.Service
   const read = yield* ReadToolFileSystem.Service
   const reference = yield* Reference.Service
-  const search = yield* Search.Service
+  const websearch = yield* WebSearch.Service
   const ripgrep = yield* Ripgrep.Service
   const instructions = yield* SessionInstructions.Service
   const todo = yield* SessionTodo.Service
@@ -107,7 +107,7 @@ const services = Effect.fn("PluginInternal.services")(function* () {
     Context.make(Form.Service, form),
     Context.make(ReadToolFileSystem.Service, read),
     Context.make(Reference.Service, reference),
-    Context.make(Search.Service, search),
+    Context.make(WebSearch.Service, websearch),
     Context.make(Ripgrep.Service, ripgrep),
     Context.make(SessionInstructions.Service, instructions),
     Context.make(SessionTodo.Service, todo),
@@ -129,7 +129,7 @@ const pre = [
   SkillPlugin.Plugin,
   ModelsDevPlugin,
   ...ProviderPlugins,
-  ...SearchPlugins,
+  ...WebSearchPlugins,
   PatchTool.Plugin,
   EditTool.Plugin,
   GlobTool.Plugin,

packages/core/src/plugin/promise.ts

@@ -131,7 +131,7 @@ export function fromPromise(plugin: PromisePlugin) {
 }
 
 function adaptIntegration(definition: IntegrationDefinition) {
-  const { methods, search, ...definitionInfo } = definition
+  const { methods, websearch, ...definitionInfo } = definition
   return {
     ...definitionInfo,
     methods: methods?.map((method) => {
@@ -163,16 +163,16 @@ function adaptIntegration(definition: IntegrationDefinition) {
           : {}),
       }
     }),
-    ...(search
+    ...(websearch
       ? {
-          search: {
-            connection: search.connection,
+          websearch: {
+            connection: websearch.connection,
             execute: (
-              input: Parameters<typeof search.execute>[0],
-              execution: Omit<Parameters<typeof search.execute>[1], "signal">,
+              input: Parameters<typeof websearch.execute>[0],
+              execution: Omit<Parameters<typeof websearch.execute>[1], "signal">,
             ) =>
               Effect.tryPromise({
-                try: (signal) => search.execute(input, { ...execution, signal }),
+                try: (signal) => websearch.execute(input, { ...execution, signal }),
                 catch: (cause) => cause,
               }),
           },

packages/core/src/plugin/search/index.ts

@@ -1,4 +0,0 @@
-import { SearchExa } from "./exa"
-import { SearchParallel } from "./parallel"
-
-export const SearchPlugins = [SearchExa.Plugin, SearchParallel.Plugin] as const

packages/core/src/plugin/websearch/exa.ts

@@ -1,9 +1,9 @@
-export * as SearchExa from "./exa"
+export * as WebSearchExa from "./exa"
 
 import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 import { Effect, Schema, Scope } from "effect"
 import { HttpClient } from "effect/unstable/http"
-import { SearchMcp } from "./mcp"
+import { WebSearchMcp } from "./mcp"
 
 export const endpoint = "https://mcp.exa.ai/mcp"
 
@@ -23,8 +23,8 @@ const Output = Schema.Struct({
 })
 
 export const Plugin = define<HttpClient.HttpClient | Scope.Scope>({
-  id: "opencode.search.exa",
-  effect: Effect.fn("SearchExa.Plugin")(function* (ctx) {
+  id: "opencode.websearch.exa",
+  effect: Effect.fn("WebSearchExa.Plugin")(function* (ctx) {
     const http = yield* HttpClient.HttpClient
     yield* ctx.integration.register({
       id: "exa",
@@ -33,17 +33,17 @@ export const Plugin = define<HttpClient.HttpClient | Scope.Scope>({
         { type: "key", label: "API key (optional)" },
         { type: "env", names: ["EXA_API_KEY"] },
       ],
-      search: {
+      websearch: {
         connection: "optional",
         execute: (input, context) => {
           const url = new URL(endpoint)
           if (context.credential?.type === "key") url.searchParams.set("exaApiKey", context.credential.key)
-          return SearchMcp.call(
+          return WebSearchMcp.call(
             http,
             url.toString(),
             "web_search_exa",
             { input: Input, output: Output },
-            { query: input.query },
+            { query: input.query, numResults: 8 },
           ).pipe(
             Effect.map((result) => {
               const content = result?.content.find((item) => item.text)

packages/core/src/plugin/websearch/index.ts

@@ -0,0 +1,4 @@
+import { WebSearchExa } from "./exa"
+import { WebSearchParallel } from "./parallel"
+
+export const WebSearchPlugins = [WebSearchExa.Plugin, WebSearchParallel.Plugin] as const

packages/core/src/plugin/websearch/mcp.ts

@@ -1,4 +1,4 @@
-export * as SearchMcp from "./mcp"
+export * as WebSearchMcp from "./mcp"
 
 import { Duration, Effect, Schema } from "effect"
 import { HttpClient, HttpClientRequest } from "effect/unstable/http"

packages/core/src/plugin/websearch/parallel.ts

@@ -1,10 +1,10 @@
-export * as SearchParallel from "./parallel"
+export * as WebSearchParallel from "./parallel"
 
 import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 import { Effect, Schema, Scope } from "effect"
 import { HttpClient } from "effect/unstable/http"
 import { InstallationVersion } from "../../installation/version"
-import { SearchMcp } from "./mcp"
+import { WebSearchMcp } from "./mcp"
 
 export const endpoint = "https://search.parallel.ai/mcp"
 
@@ -50,8 +50,8 @@ const Output = Schema.Struct({
 })
 
 export const Plugin = define<HttpClient.HttpClient | Scope.Scope>({
-  id: "opencode.search.parallel",
-  effect: Effect.fn("SearchParallel.Plugin")(function* (ctx) {
+  id: "opencode.websearch.parallel",
+  effect: Effect.fn("WebSearchParallel.Plugin")(function* (ctx) {
     const http = yield* HttpClient.HttpClient
     yield* ctx.integration.register({
       id: "parallel",
@@ -60,10 +60,10 @@ export const Plugin = define<HttpClient.HttpClient | Scope.Scope>({
         { type: "key", label: "API key (optional)" },
         { type: "env", names: ["PARALLEL_API_KEY"] },
       ],
-      search: {
+      websearch: {
         connection: "optional",
         execute: (input, context) =>
-          SearchMcp.call(
+          WebSearchMcp.call(
             http,
             endpoint,
             "web_search",