Secrets: avoid broad web search discovery for single plug...

Recent Commits to openclaw:main

gumadeiras · 2026-04-18 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import { describe, expect, it } from "vitest";`
	`2`	`+import { createExaWebSearchProvider as createContractExaWebSearchProvider } from "../web-search-contract-api.js";`
`2`	`3`	`import { __testing, createExaWebSearchProvider } from "./exa-web-search-provider.js";`
`3`	`4`
`4`	`5`	`describe("exa web search provider", () => {`
`@@ -15,6 +16,31 @@ describe("exa web search provider", () => {`
`15`	`16`	`expect(applied.plugins?.entries?.exa?.enabled).toBe(true);`
`16`	`17`	`});`
`17`	`18`
	`19`	`+it("keeps the lightweight contract surface aligned with provider metadata", () => {`
	`20`	`+const provider = createExaWebSearchProvider();`
	`21`	`+const contractProvider = createContractExaWebSearchProvider();`
	`22`	`+if (!contractProvider.applySelectionConfig) {`
	`23`	`+throw new Error("Expected contract applySelectionConfig to be defined");`
	`24`	`+}`
	`25`	`+const applied = contractProvider.applySelectionConfig({});`
	`26`	`+`
	`27`	`+expect(contractProvider).toMatchObject({`
	`28`	`+id: provider.id,`
	`29`	`+label: provider.label,`
	`30`	`+hint: provider.hint,`
	`31`	`+onboardingScopes: provider.onboardingScopes,`
	`32`	`+credentialLabel: provider.credentialLabel,`
	`33`	`+envVars: provider.envVars,`
	`34`	`+placeholder: provider.placeholder,`
	`35`	`+signupUrl: provider.signupUrl,`
	`36`	`+docsUrl: provider.docsUrl,`
	`37`	`+autoDetectOrder: provider.autoDetectOrder,`
	`38`	`+credentialPath: provider.credentialPath,`
	`39`	`+});`
	`40`	`+expect(contractProvider.createTool({ config: {}, searchConfig: {} })).toBeNull();`
	`41`	`+expect(applied.plugins?.entries?.exa?.enabled).toBe(true);`
	`42`	`+});`
	`43`	`+`
`18`	`44`	`it("prefers scoped configured api keys over environment fallbacks", () => {`
`19`	`45`	`expect(__testing.resolveExaApiKey({ apiKey: "exa-secret" })).toBe("exa-secret");`
`20`	`46`	`});`

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,29 @@`
	`1`	`+import {`
	`2`	`+createWebSearchProviderContractFields,`
	`3`	`+type WebSearchProviderPlugin,`
	`4`	`+} from "openclaw/plugin-sdk/provider-web-search-contract";`
	`5`	`+`
	`6`	`+export function createExaWebSearchProvider(): WebSearchProviderPlugin {`
	`7`	`+const credentialPath = "plugins.entries.exa.config.webSearch.apiKey";`
	`8`	`+`
	`9`	`+return {`
	`10`	`+id: "exa",`
	`11`	`+label: "Exa Search",`
	`12`	`+hint: "Neural + keyword search with date filters and content extraction",`
	`13`	`+onboardingScopes: ["text-inference"],`
	`14`	`+credentialLabel: "Exa API key",`
	`15`	`+envVars: ["EXA_API_KEY"],`
	`16`	`+placeholder: "exa-...",`
	`17`	`+signupUrl: "https://exa.ai/",`
	`18`	`+docsUrl: "https://docs.openclaw.ai/tools/web",`
	`19`	`+autoDetectOrder: 65,`
	`20`	`+ credentialPath,`
	`21`	`+ ...createWebSearchProviderContractFields({`
	`22`	`+ credentialPath,`
	`23`	`+searchCredential: { type: "scoped", scopeId: "exa" },`
	`24`	`+configuredCredential: { pluginId: "exa" },`
	`25`	`+selectionPluginId: "exa",`
	`26`	`+}),`
	`27`	`+createTool: () => null,`
	`28`	`+};`
	`29`	`+}`

Original file line number	Diff line number	Diff line change
`@@ -871,6 +871,36 @@ describe("runtime web tools resolution", () => {`
`871`	`871`	`expect(resolvePluginWebSearchProvidersMock).not.toHaveBeenCalled();`
`872`	`872`	`});`
`873`	`873`
	`874`	`+it("uses single plugin-scoped web search config as a bundled provider hint", async () => {`
	`875`	`+const { metadata } = await runRuntimeWebTools({`
	`876`	`+config: asConfig({`
	`877`	`+plugins: {`
	`878`	`+entries: {`
	`879`	`+google: {`
	`880`	`+enabled: true,`
	`881`	`+config: {`
	`882`	`+webSearch: {`
	`883`	`+apiKey: { source: "env", provider: "default", id: "GOOGLE_PROVIDER_REF" },`
	`884`	`+},`
	`885`	`+},`
	`886`	`+},`
	`887`	`+},`
	`888`	`+},`
	`889`	`+}),`
	`890`	`+env: {`
	`891`	`+GOOGLE_PROVIDER_REF: "google-provider-key",`
	`892`	`+},`
	`893`	`+});`
	`894`	`+`
	`895`	`+expect(metadata.search.selectedProvider).toBe("gemini");`
	`896`	`+expect(resolveBundledExplicitWebSearchProvidersFromPublicArtifactsMock).toHaveBeenCalledWith({`
	`897`	`+onlyPluginIds: ["google"],`
	`898`	`+});`
	`899`	`+expect(resolveManifestContractOwnerPluginIdMock).not.toHaveBeenCalled();`
	`900`	`+expect(resolveBundledWebSearchProvidersFromPublicArtifactsMock).not.toHaveBeenCalled();`
	`901`	`+expect(resolvePluginWebSearchProvidersMock).not.toHaveBeenCalled();`
	`902`	`+});`
	`903`	`+`
`874`	`904`	`it("limits legacy top-level web search apiKey auto-detect to compatibility owners", async () => {`
`875`	`905`	`const { metadata } = await runRuntimeWebTools({`
`876`	`906`	`config: asConfig({`

Original file line number	Diff line number	Diff line change
`@@ -542,18 +542,18 @@ export async function resolveRuntimeWebTools(params: {`
`542`	`542`	`}`
`543`	`543`	`const rawProvider = normalizeLowercaseStringOrEmpty(search?.provider);`
`544`	`544`	`let configuredBundledWebSearchPluginIdHint: string \| undefined;`
`545`		`-if (rawProvider && hasPluginWebSearchConfig) {`
`546`		`-configuredBundledWebSearchPluginIdHint = inferExactBundledPluginScopedWebToolConfigOwner({`
`547`		`-config: params.sourceConfig,`
`548`		`-key: "webSearch",`
`549`		`-pluginId: rawProvider,`
`550`		`-});`
`551`		`-if (!configuredBundledWebSearchPluginIdHint && !(await getHasCustomWebSearchRisk())) {`
`552`		`-configuredBundledWebSearchPluginIdHint = inferSingleBundledPluginScopedWebToolConfigOwner(`
`553`		`-params.sourceConfig,`
`554`		`-"webSearch",`
`555`		`-);`
	`545`	`+if (hasPluginWebSearchConfig && !(await getHasCustomWebSearchRisk())) {`
	`546`	`+if (rawProvider) {`
	`547`	`+configuredBundledWebSearchPluginIdHint = inferExactBundledPluginScopedWebToolConfigOwner({`
	`548`	`+config: params.sourceConfig,`
	`549`	`+key: "webSearch",`
	`550`	`+pluginId: rawProvider,`
	`551`	`+});`
`556`	`552`	`}`
	`553`	`+configuredBundledWebSearchPluginIdHint ??= inferSingleBundledPluginScopedWebToolConfigOwner(`
	`554`	`+params.sourceConfig,`
	`555`	`+"webSearch",`
	`556`	`+);`
`557`	`557`	`}`
`558`	`558`	`const searchMetadata: RuntimeWebSearchMetadata = {`
`559`	`559`	`providerSource: "none",`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main