vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-06 05:50:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: resolve web search secrets by target path

Browse Source
This commit is contained in:
Peter Steinberger
2026-04-22 05:48:06 +01:00
parent 89741c7a23
commit a6dce7cf19
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/secrets/runtime-web-tools.shared.ts
View File

@@ -72,6 +72,7 @@ export type RuntimeWebProviderSelectionParams<
setResolvedCredential: (params: {
resolvedConfig: OpenClawConfig;
provider: TProvider;
path: string;
value: string;
}) => void;
inactivePathsForProvider: (provider: TProvider) => string[];
@@ -372,6 +373,7 @@ export async function resolveRuntimeWebProviderSelection<
params.setResolvedCredential({
resolvedConfig: params.resolvedConfig,
provider,
path,
value: resolution.value,
});
}
@@ -384,6 +386,7 @@ export async function resolveRuntimeWebProviderSelection<
params.setResolvedCredential({
resolvedConfig: params.resolvedConfig,
provider,
path,
value: resolution.value,
});
break;

24
src/secrets/runtime-web-tools.ts
View File

@@ -301,17 +301,17 @@ async function resolveSecretInputWithEnvFallback(params: {
function setResolvedWebSearchApiKey(params: {
resolvedConfig: OpenClawConfig;
provider: PluginWebSearchProviderEntry;
path: string;
value: string;
}): void {
const useLegacySearchConfig = params.path === "tools.web.search.apiKey";
if (params.provider.setConfiguredCredentialValue && !useLegacySearchConfig) {
params.provider.setConfiguredCredentialValue(params.resolvedConfig, params.value);
return;
}
const tools = ensureObject(params.resolvedConfig as Record<string, unknown>, "tools");
const web = ensureObject(tools, "web");
const search = ensureObject(web, "search");
if (params.provider.setConfiguredCredentialValue) {
params.provider.setConfiguredCredentialValue(params.resolvedConfig, params.value);
if (params.provider.id !== "brave") {
return;
}
}
params.provider.setCredentialValue(search, params.value);
}
@@ -432,6 +432,7 @@ function inactivePathsForProvider(provider: PluginWebSearchProviderEntry): strin
function setResolvedWebFetchApiKey(params: {
resolvedConfig: OpenClawConfig;
provider: PluginWebFetchProviderEntry;
path: string;
value: string;
}): void {
const tools = ensureObject(params.resolvedConfig as Record<string, unknown>, "tools");
@@ -646,10 +647,16 @@ export async function resolveRuntimeWebTools(params: {
path,
envVars,
}),
setResolvedCredential: ({ resolvedConfig, provider, value }) =>
setResolvedCredential: ({ resolvedConfig, provider, path, value }) =>
setResolvedWebSearchApiKey({
resolvedConfig,
provider,
path:
search &&
Object.prototype.hasOwnProperty.call(search, "apiKey") &&
provider.getConfiguredCredentialValue?.(params.sourceConfig) == null
? "tools.web.search.apiKey"
: path,
value,
}),
inactivePathsForProvider,
@@ -740,10 +747,11 @@ export async function resolveRuntimeWebTools(params: {
envVars,
restrictEnvRefsToEnvVars: true,
}),
setResolvedCredential: ({ resolvedConfig, provider, value }) =>
setResolvedCredential: ({ resolvedConfig, provider, path, value }) =>
setResolvedWebFetchApiKey({
resolvedConfig,
provider,
path,
value,
}),
inactivePathsForProvider: inactivePathsForFetchProvider,