fix(web): resolve explicit global search providers

vincentkoc · vincentkoc · commit 0668f1e003ed · 2026-05-14T16:29:55.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -38,6 +38,7 @@ Docs: https://docs.openclaw.ai
 - CLI tables: preserve muted/color styling on wrapped continuation lines after multiline cells, keeping `openclaw plugins list` descriptions readable.
 - Process execution: collapse case-insensitive duplicate child environment keys on Windows so caller-provided overrides such as `PATH` cannot be shadowed by host `Path`.
 - Browser CLI: request the existing `operator.admin` gateway scope explicitly for browser control commands, avoiding unnecessary scope-upgrade approval loops. Fixes #81555. (#81716) Thanks @joshavant.
+- Web: honor explicitly configured global `web_search` providers during provider ownership resolution while keeping sandboxed `web_fetch` limited to bundled providers.
 - iOS: restore first-use Contacts, Calendar, and Reminders permission prompts and add Privacy & Access status/actions in Settings. Thanks @BunsDev.
 - Canvas: return not found for malformed percent-encoded Canvas/A2UI/document asset paths and keep decoded parent traversal blocked before path normalization.
 - Telegram: allow trusted local Bot API media files whose filenames start with dots instead of falling back to remote download.
diff --git a/src/agents/tools/web-tool-runtime-context.test.ts b/src/agents/tools/web-tool-runtime-context.test.ts
@@ -77,7 +77,7 @@ describe("web tool runtime context", () => {
     const ownerLookup = latestOwnerLookupParams();
     expect(ownerLookup.contract).toBe("webSearchProviders");
     expect(ownerLookup.value).toBe("perplexity");
-    expect(ownerLookup.origin).toBe("bundled");
+    expect(ownerLookup).not.toHaveProperty("origin");
     expect(ownerLookup.config).toBe(runtimeConfig);
   });
 
@@ -103,7 +103,7 @@ describe("web tool runtime context", () => {
     const ownerLookup = latestOwnerLookupParams();
     expect(ownerLookup.contract).toBe("webSearchProviders");
     expect(ownerLookup.value).toBe("brave");
-    expect(ownerLookup.origin).toBe("bundled");
+    expect(ownerLookup).not.toHaveProperty("origin");
     expect(ownerLookup.config).toBe(capturedConfig);
   });
 
@@ -115,12 +115,26 @@ describe("web tool runtime context", () => {
     const ownerLookup = latestOwnerLookupParams();
     expect(ownerLookup.contract).toBe("webSearchProviders");
     expect(ownerLookup.value).toBe("brave");
-    expect(ownerLookup.origin).toBe("bundled");
+    expect(ownerLookup).not.toHaveProperty("origin");
     expect(ownerLookup.config).toEqual({
       tools: { web: { search: { provider: "Brave" } } },
     });
   });
 
+  it("treats resolved global provider owners as explicit selections", async () => {
+    mocks.resolveManifestContractOwnerPluginId.mockReturnValue("brave");
+    const { resolveWebSearchToolRuntimeContext } = await import("./web-tool-runtime-context.js");
+
+    const resolved = resolveWebSearchToolRuntimeContext({
+      config: { tools: { web: { search: { provider: "brave" } } } },
+    });
+
+    expect(resolved.preferRuntimeProviders).toBe(false);
+    expect(mocks.resolveManifestContractOwnerPluginId.mock.calls.at(-1)?.[0]).not.toHaveProperty(
+      "origin",
+    );
+  });
+
   it("keeps runtime providers disabled for bundled fetch owners", async () => {
     mocks.resolveManifestContractOwnerPluginId.mockReturnValue("firecrawl");
 
diff --git a/src/agents/tools/web-tool-runtime-context.ts b/src/agents/tools/web-tool-runtime-context.ts
@@ -46,7 +46,7 @@ function shouldPreferRuntimeProviders(params: {
   return !resolveManifestContractOwnerPluginId({
     contract: resolveWebProviderContract(params.kind),
     value: params.providerSelectionId,
-    origin: "bundled",
+    ...(params.kind === "fetch" ? { origin: "bundled" as const } : {}),
     config: params.config,
   });
 }
diff --git a/src/web-search/runtime.test.ts b/src/web-search/runtime.test.ts
@@ -595,8 +595,8 @@ describe("web search runtime", () => {
 
     const ownerCall = mockCallParam(resolveManifestContractOwnerPluginIdMock);
     expect(ownerCall.contract).toBe("webSearchProviders");
-    expect(ownerCall.origin).toBe("bundled");
     expect(ownerCall.value).toBe("duckduckgo");
+    expect(ownerCall).not.toHaveProperty("origin");
     expect(mockCallParam(resolveRuntimeWebSearchProvidersMock).onlyPluginIds).toEqual([
       "duckduckgo",
     ]);
@@ -628,6 +628,38 @@ describe("web search runtime", () => {
     expect(mockCallParam(resolveRuntimeWebSearchProvidersMock).onlyPluginIds).toEqual(["google"]);
   });
 
+  it("scopes configured global web_search providers when runtime providers are not preferred", async () => {
+    resolveManifestContractOwnerPluginIdMock.mockImplementation(({ value }) =>
+      value === "custom" ? "custom-search" : undefined,
+    );
+    resolvePluginWebSearchProvidersMock.mockReturnValue([createCustomSearchProvider()]);
+
+    await expect(
+      runWebSearch({
+        config: {
+          tools: {
+            web: {
+              search: {
+                provider: "custom",
+              },
+            },
+          },
+          ...createCustomSearchConfig("custom-key"),
+        },
+        preferRuntimeProviders: false,
+        args: { query: "configured-custom" },
+      }),
+    ).resolves.toMatchObject({
+      provider: "custom",
+    });
+
+    expect(resolvePluginWebSearchProvidersMock).toHaveBeenCalledWith(
+      expect.objectContaining({
+        onlyPluginIds: ["custom-search"],
+      }),
+    );
+  });
+
   it("keeps runtime provider loading unscoped when configured provider ownership is unknown", async () => {
     resolveManifestContractOwnerPluginIdMock.mockReturnValue(undefined);
     resolveRuntimeWebSearchProvidersMock.mockReturnValue([
diff --git a/src/web-search/runtime.ts b/src/web-search/runtime.ts
@@ -147,7 +147,6 @@ export function resolveWebSearchProviderId(params: {
       resolvePluginWebSearchProviders({
         config,
         bundledAllowlistCompat: true,
-        origin: "bundled",
       }),
   );
   const raw =
@@ -231,7 +230,6 @@ function resolveExplicitWebSearchProviderPluginIds(params: {
     config: params.config,
     contract: "webSearchProviders",
     value: providerId,
-    origin: "bundled",
   });
   return ownerPluginId ? [ownerPluginId] : undefined;
 }
@@ -270,7 +268,6 @@ export function resolveWebSearchDefinition(
       : resolvePluginWebSearchProviders({
           config,
           bundledAllowlistCompat: true,
-          origin: "bundled",
           ...loadScope,
         }),
   );
@@ -334,7 +331,6 @@ function resolveWebSearchCandidates(
       : resolvePluginWebSearchProviders({
           config,
           bundledAllowlistCompat: true,
-          origin: "bundled",
           ...loadScope,
         }),
   ).filter(Boolean);

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ function shouldPreferRuntimeProviders(params: {`
`46`	`46`	`return !resolveManifestContractOwnerPluginId({`
`47`	`47`	`contract: resolveWebProviderContract(params.kind),`
`48`	`48`	`value: params.providerSelectionId,`
`49`		`- origin: "bundled",`
	`49`	`+ ...(params.kind === "fetch" ? { origin: "bundled" as const } : {}),`
`50`	`50`	`config: params.config,`
`51`	`51`	`});`
`52`	`52`	`}`