@openclaw/brave-plugin 2026.8.1-beta.2 → 2026.8.1

package/dist/{brave-web-search-provider-BFrhKp8F.js → brave-web-search-provider-B1n-hEjq.js}

@@ -1,5 +1,5 @@
 import { buildBraveWebSearchProviderBase } from "./web-search-shared.js";
-import { isDiagnosticFlagEnabled } from "openclaw/plugin-sdk/diagnostic-runtime";
+import { isDiagnosticFlagEnabled } from "openclaw/plugin-sdk/diagnostic-flags";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { mergeScopedSearchConfig, resolveProviderWebSearchPluginConfig } from "openclaw/plugin-sdk/provider-web-search-config-contract";
 import { isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
@@ -8,7 +8,7 @@ import { isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 * Brave web-search provider factory. It builds the agent tool definition and
 * lazy-loads HTTP execution only when a search is run.
 */
-const loadBraveWebSearchRuntime = createLazyRuntimeModule(() => import("./brave-web-search-provider.runtime-DqLOemiz.js"));
+const loadBraveWebSearchRuntime = createLazyRuntimeModule(() => import("./brave-web-search-provider.runtime-Bal1W8k7.js"));
 const BraveSearchSchema = {
 	type: "object",
 	properties: {

package/dist/{brave-web-search-provider.runtime-DqLOemiz.js → brave-web-search-provider.runtime-Bal1W8k7.js}

@@ -1,6 +1,7 @@
 import { normalizeLowercaseStringOrEmpty, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { buildTimeoutAbortSignal } from "openclaw/plugin-sdk/extension-shared";
 import { assertOkOrThrowProviderError, readProviderJsonResponse } from "openclaw/plugin-sdk/provider-http";
-import { DEFAULT_SEARCH_COUNT, MAX_SEARCH_COUNT, buildSearchCacheKey, formatCliCommand, parseWebSearchTimeFilters, readCachedSearchPayload, readConfiguredSecretString, readPositiveIntegerParam, readProviderEnvValue, readStringParam, resolveSearchCacheTtlMs, resolveSearchCount, resolveSearchTimeoutSeconds, resolveSiteName, withSelfHostedWebSearchEndpoint, withTrustedWebSearchEndpoint, wrapWebContent, writeCachedSearchPayload } from "openclaw/plugin-sdk/provider-web-search";
+import { DEFAULT_SEARCH_COUNT, MAX_SEARCH_COUNT, buildSearchCacheKey, formatCliCommand, parseWebSearchTimeFilters, readCachedSearchPayload, readConfiguredSecretString, readPositiveIntegerParam, readProviderEnvValue, readStringParam, resolveSearchCacheTtlMs, resolveSearchCount, resolveSearchTimeoutSeconds, resolveSiteName, withSelfHostedWebToolsEndpoint, withTrustedWebToolsEndpoint, wrapWebContent, writeCachedSearchPayload } from "openclaw/plugin-sdk/provider-web-search";
 import { createSubsystemLogger } from "openclaw/plugin-sdk/runtime-env";
 import { assertHttpUrlTargetsPrivateNetwork, isBlockedHostnameOrIp, isPrivateIpAddress, resolvePinnedHostnameWithPolicy } from "openclaw/plugin-sdk/ssrf-runtime";
 //#region extensions/brave/src/brave-web-search-provider.shared.ts
@@ -165,21 +166,13 @@ function normalizeBraveLanguageParams(params) {
 		ui_lang
 	};
 }
-function resolveSiteName$1(url) {
-	if (!url) return;
-	try {
-		return new URL(url).hostname;
-	} catch {
-		return;
-	}
-}
 /** Map Brave LLM Context API grounding results into web-search result rows. */
 function mapBraveLlmContextResults(data) {
 	return (Array.isArray(data.grounding?.generic) ? data.grounding.generic : []).map((entry) => ({
 		url: entry.url ?? "",
 		title: entry.title ?? "",
 		snippets: (entry.snippets ?? []).filter((snippet) => typeof snippet === "string" && snippet.length > 0),
-		siteName: resolveSiteName$1(entry.url) || void 0
+		siteName: resolveSiteName(entry.url) || void 0
 	}));
 }
 //#endregion
@@ -196,13 +189,6 @@ function logBraveHttp(diagnostics, event, meta) {
 	if (!diagnostics?.enabled) return;
 	braveHttpLogger.info(`brave http ${event}`, meta);
 }
-function describeBraveRequestUrl(url) {
-	return {
-		url: url.toString(),
-		query: url.searchParams.get("q") ?? "",
-		params: Object.fromEntries(url.searchParams.entries())
-	};
-}
 function resolveBraveApiKey(searchConfig) {
 	return readConfiguredSecretString(searchConfig?.apiKey, "plugins.entries.brave.config.webSearch.apiKey") ?? readProviderEnvValue(["BRAVE_API_KEY"]);
 }
@@ -215,18 +201,22 @@ function buildBraveEndpointUrl(params) {
 	url.search = "";
 	return url;
 }
-async function braveEndpointTargetsPrivateNetwork(url) {
+async function braveEndpointTargetsPrivateNetwork(url, signal) {
 	if (isBlockedHostnameOrIp(url.hostname)) return true;
 	try {
-		return (await resolvePinnedHostnameWithPolicy(url.hostname, { policy: {
-			allowPrivateNetwork: true,
-			allowRfc2544BenchmarkRange: true
-		} })).addresses.every((address) => isPrivateIpAddress(address));
+		return (await resolvePinnedHostnameWithPolicy(url.hostname, {
+			signal,
+			policy: {
+				allowPrivateNetwork: true,
+				allowRfc2544BenchmarkRange: true
+			}
+		})).addresses.every((address) => isPrivateIpAddress(address));
 	} catch {
+		signal?.throwIfAborted();
 		return false;
 	}
 }
-async function validateBraveBaseUrl(baseUrl) {
+async function validateBraveBaseUrl(baseUrl, signal) {
 	let parsed;
 	try {
 		parsed = new URL(baseUrl);
@@ -236,12 +226,13 @@ async function validateBraveBaseUrl(baseUrl) {
 	if (parsed.protocol !== "http:" && parsed.protocol !== "https:") throw new Error("Brave Search base URL must use http:// or https://.");
 	if (parsed.protocol === "http:") {
 		await assertHttpUrlTargetsPrivateNetwork(parsed.toString(), {
+			signal,
 			dangerouslyAllowPrivateNetwork: true,
 			errorMessage: "Brave Search HTTP base URL must target a trusted private or loopback host. Use https:// for public hosts."
 		});
 		return "selfHosted";
 	}
-	return await braveEndpointTargetsPrivateNetwork(parsed) ? "selfHosted" : "strict";
+	return await braveEndpointTargetsPrivateNetwork(parsed, signal) ? "selfHosted" : "strict";
 }
 function missingBraveKeyPayload() {
 	return {
@@ -267,12 +258,13 @@ async function runBraveJsonRequest(params, errorLabel) {
 	params.configureUrl(url);
 	logBraveHttp(params.diagnostics, "request", {
 		mode: params.mode,
-		...describeBraveRequestUrl(url)
+		url: url.toString(),
+		query: url.searchParams.get("q") ?? "",
+		params: Object.fromEntries(url.searchParams.entries())
 	});
 	const startedAt = Date.now();
-	return (params.endpointMode === "selfHosted" ? withSelfHostedWebSearchEndpoint : withTrustedWebSearchEndpoint)({
+	return (params.endpointMode === "selfHosted" ? withSelfHostedWebToolsEndpoint : withTrustedWebToolsEndpoint)({
 		url: url.toString(),
-		timeoutSeconds: params.timeoutSeconds,
 		signal: params.signal,
 		init: {
 			method: "GET",
@@ -281,7 +273,7 @@ async function runBraveJsonRequest(params, errorLabel) {
 				"X-Subscription-Token": params.apiKey
 			}
 		}
-	}, async (response) => {
+	}, async ({ response }) => {
 		logBraveHttp(params.diagnostics, "response", {
 			mode: params.mode,
 			status: response.status,
@@ -294,14 +286,9 @@ async function runBraveJsonRequest(params, errorLabel) {
 }
 async function runBraveLlmContextSearch(params) {
 	const data = await runBraveJsonRequest({
-		baseUrl: params.baseUrl,
+		...params,
 		endpointPath: BRAVE_LLM_CONTEXT_ENDPOINT_PATH,
 		mode: "llm-context",
-		endpointMode: params.endpointMode,
-		apiKey: params.apiKey,
-		timeoutSeconds: params.timeoutSeconds,
-		diagnostics: params.diagnostics,
-		signal: params.signal,
 		configureUrl: (url) => {
 			setBraveSearchUrlParams(url, params);
 		}
@@ -313,14 +300,9 @@ async function runBraveLlmContextSearch(params) {
 }
 async function runBraveWebSearch(params) {
 	const data = await runBraveJsonRequest({
-		baseUrl: params.baseUrl,
+		...params,
 		endpointPath: BRAVE_SEARCH_ENDPOINT_PATH,
 		mode: "web",
-		endpointMode: params.endpointMode,
-		apiKey: params.apiKey,
-		timeoutSeconds: params.timeoutSeconds,
-		diagnostics: params.diagnostics,
-		signal: params.signal,
 		configureUrl: (url) => {
 			setBraveSearchUrlParams(url, {
 				...params,
@@ -350,123 +332,146 @@ async function executeBraveSearch(args, searchConfig, options) {
 	const braveConfig = resolveBraveConfig(searchConfig);
 	const braveMode = resolveBraveMode(braveConfig);
 	const braveBaseUrl = resolveBraveBaseUrl(braveConfig);
-	const braveEndpointMode = await validateBraveBaseUrl(braveBaseUrl);
-	const query = readStringParam(args, "query", { required: true });
-	const count = readPositiveIntegerParam(args, "count", {
-		max: MAX_SEARCH_COUNT,
-		message: `count must be an integer from 1 to ${MAX_SEARCH_COUNT}.`
-	}) ?? searchConfig?.maxResults ?? void 0;
-	const country = normalizeBraveCountry(readStringParam(args, "country"));
-	const language = readStringParam(args, "language");
-	const search_lang = readStringParam(args, "search_lang");
-	const ui_lang = readStringParam(args, "ui_lang");
-	const normalizedLanguage = normalizeBraveLanguageParams({
-		search_lang: search_lang || language,
-		ui_lang
-	});
-	if (normalizedLanguage.invalidField === "search_lang") return {
-		error: "invalid_search_lang",
-		message: "search_lang must be a Brave-supported language code like 'en', 'en-gb', 'zh-hans', or 'zh-hant'.",
-		docs: "https://docs.openclaw.ai/tools/web"
-	};
-	if (normalizedLanguage.invalidField === "ui_lang") return {
-		error: "invalid_ui_lang",
-		message: "ui_lang must be a language-region locale like 'en-US'.",
-		docs: "https://docs.openclaw.ai/tools/web"
-	};
-	if (normalizedLanguage.ui_lang && braveMode === "llm-context") return {
-		error: "unsupported_ui_lang",
-		message: "ui_lang is not supported by Brave llm-context mode. Remove ui_lang or use Brave web mode for locale-based UI hints.",
-		docs: "https://docs.openclaw.ai/tools/web"
-	};
-	const rawFreshness = readStringParam(args, "freshness");
-	const parsedTimeFilters = parseWebSearchTimeFilters({
-		rawDateAfter: readStringParam(args, "date_after"),
-		rawDateBefore: readStringParam(args, "date_before"),
-		rawFreshness,
-		freshnessProvider: "brave",
-		invalidFreshnessMessage: "freshness must be day, week, month, or year.",
-		invalidDateAfterMessage: "date_after must be YYYY-MM-DD format.",
-		invalidDateBeforeMessage: "date_before must be YYYY-MM-DD format.",
-		invalidDateRangeMessage: "date_after must be before date_before."
+	const { signal, cleanup } = buildTimeoutAbortSignal({
+		timeoutMs: resolveSearchTimeoutSeconds(searchConfig) * 1e3,
+		signal: options?.signal,
+		operation: "brave.web_search",
+		url: braveBaseUrl
 	});
-	if ("error" in parsedTimeFilters) return parsedTimeFilters;
-	const { freshness, dateAfter, dateBefore } = parsedTimeFilters;
-	if (braveMode === "llm-context") {
-		const today = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
-		if (dateAfter && !dateBefore && dateAfter > today) return {
-			error: "invalid_date_range",
-			message: "date_after cannot be in the future for Brave llm-context mode.",
+	try {
+		signal?.throwIfAborted();
+		const braveEndpointMode = await validateBraveBaseUrl(braveBaseUrl, signal);
+		signal?.throwIfAborted();
+		const query = readStringParam(args, "query", { required: true });
+		const count = readPositiveIntegerParam(args, "count", {
+			max: MAX_SEARCH_COUNT,
+			message: `count must be an integer from 1 to ${MAX_SEARCH_COUNT}.`
+		}) ?? searchConfig?.maxResults ?? void 0;
+		const country = normalizeBraveCountry(readStringParam(args, "country"));
+		const language = readStringParam(args, "language");
+		const search_lang = readStringParam(args, "search_lang");
+		const ui_lang = readStringParam(args, "ui_lang");
+		const normalizedLanguage = normalizeBraveLanguageParams({
+			search_lang: search_lang || language,
+			ui_lang
+		});
+		if (normalizedLanguage.invalidField === "search_lang") return {
+			error: "invalid_search_lang",
+			message: "search_lang must be a Brave-supported language code like 'en', 'en-gb', 'zh-hans', or 'zh-hant'.",
 			docs: "https://docs.openclaw.ai/tools/web"
 		};
-		if (dateBefore && !dateAfter) return {
-			error: "unsupported_date_filter",
-			message: "Brave llm-context mode requires date_after when date_before is set. Use a bounded date range or freshness.",
+		if (normalizedLanguage.invalidField === "ui_lang") return {
+			error: "invalid_ui_lang",
+			message: "ui_lang must be a language-region locale like 'en-US'.",
 			docs: "https://docs.openclaw.ai/tools/web"
 		};
-	}
-	const llmContextDateEnd = braveMode === "llm-context" && dateAfter ? dateBefore ?? (/* @__PURE__ */ new Date()).toISOString().slice(0, 10) : dateBefore;
-	const cacheKey = buildSearchCacheKey(braveMode === "llm-context" ? [
-		"brave",
-		braveMode,
-		braveBaseUrl,
-		query,
-		country,
-		normalizedLanguage.search_lang,
-		freshness,
-		dateAfter,
-		llmContextDateEnd
-	] : [
-		"brave",
-		braveMode,
-		braveBaseUrl,
-		query,
-		resolveSearchCount(count, DEFAULT_SEARCH_COUNT),
-		country,
-		normalizedLanguage.search_lang,
-		normalizedLanguage.ui_lang,
-		freshness,
-		dateAfter,
-		dateBefore
-	]);
-	const diagnostics = { enabled: options?.diagnosticsEnabled === true };
-	const cached = readCachedSearchPayload(cacheKey);
-	if (cached) {
-		logBraveHttp(diagnostics, "cache hit", {
+		if (normalizedLanguage.ui_lang && braveMode === "llm-context") return {
+			error: "unsupported_ui_lang",
+			message: "ui_lang is not supported by Brave llm-context mode. Remove ui_lang or use Brave web mode for locale-based UI hints.",
+			docs: "https://docs.openclaw.ai/tools/web"
+		};
+		const rawFreshness = readStringParam(args, "freshness");
+		const parsedTimeFilters = parseWebSearchTimeFilters({
+			rawDateAfter: readStringParam(args, "date_after"),
+			rawDateBefore: readStringParam(args, "date_before"),
+			rawFreshness,
+			freshnessProvider: "brave",
+			invalidFreshnessMessage: "freshness must be day, week, month, or year.",
+			invalidDateAfterMessage: "date_after must be YYYY-MM-DD format.",
+			invalidDateBeforeMessage: "date_before must be YYYY-MM-DD format.",
+			invalidDateRangeMessage: "date_after must be before date_before."
+		});
+		if ("error" in parsedTimeFilters) return parsedTimeFilters;
+		const { freshness, dateAfter, dateBefore } = parsedTimeFilters;
+		if (braveMode === "llm-context") {
+			const today = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
+			if (dateAfter && !dateBefore && dateAfter > today) return {
+				error: "invalid_date_range",
+				message: "date_after cannot be in the future for Brave llm-context mode.",
+				docs: "https://docs.openclaw.ai/tools/web"
+			};
+			if (dateBefore && !dateAfter) return {
+				error: "unsupported_date_filter",
+				message: "Brave llm-context mode requires date_after when date_before is set. Use a bounded date range or freshness.",
+				docs: "https://docs.openclaw.ai/tools/web"
+			};
+		}
+		const llmContextDateEnd = braveMode === "llm-context" && dateAfter ? dateBefore ?? (/* @__PURE__ */ new Date()).toISOString().slice(0, 10) : dateBefore;
+		const cacheKey = buildSearchCacheKey(braveMode === "llm-context" ? [
+			"brave",
+			braveMode,
+			braveBaseUrl,
+			query,
+			country,
+			normalizedLanguage.search_lang,
+			freshness,
+			dateAfter,
+			llmContextDateEnd
+		] : [
+			"brave",
+			braveMode,
+			braveBaseUrl,
+			query,
+			resolveSearchCount(count, DEFAULT_SEARCH_COUNT),
+			country,
+			normalizedLanguage.search_lang,
+			normalizedLanguage.ui_lang,
+			freshness,
+			dateAfter,
+			dateBefore
+		]);
+		const diagnostics = { enabled: options?.diagnosticsEnabled === true };
+		const cacheTtlMs = resolveSearchCacheTtlMs(searchConfig);
+		const cached = readCachedSearchPayload(cacheKey, cacheTtlMs);
+		if (cached) {
+			logBraveHttp(diagnostics, "cache hit", {
+				mode: braveMode,
+				query,
+				cacheKey
+			});
+			return cached;
+		}
+		logBraveHttp(diagnostics, "cache miss", {
 			mode: braveMode,
 			query,
 			cacheKey
 		});
-		return cached;
-	}
-	logBraveHttp(diagnostics, "cache miss", {
-		mode: braveMode,
-		query,
-		cacheKey
-	});
-	const start = Date.now();
-	const timeoutSeconds = resolveSearchTimeoutSeconds(searchConfig);
-	const cacheTtlMs = resolveSearchCacheTtlMs(searchConfig);
-	if (braveMode === "llm-context") {
-		const { results, sources } = await runBraveLlmContextSearch({
+		const start = Date.now();
+		const request = {
 			baseUrl: braveBaseUrl,
 			endpointMode: braveEndpointMode,
 			query,
 			apiKey,
-			timeoutSeconds,
 			diagnostics,
-			signal: options?.signal,
+			signal,
 			country: country ?? void 0,
 			search_lang: normalizedLanguage.search_lang,
 			freshness,
 			dateAfter,
 			dateBefore
-		});
-		options?.signal?.throwIfAborted();
+		};
+		const response = braveMode === "llm-context" ? {
+			...await runBraveLlmContextSearch(request),
+			mode: "llm-context"
+		} : {
+			results: await runBraveWebSearch({
+				...request,
+				count: resolveSearchCount(count, DEFAULT_SEARCH_COUNT),
+				ui_lang: normalizedLanguage.ui_lang
+			}),
+			mode: "web"
+		};
+		signal?.throwIfAborted();
+		const results = response.mode === "llm-context" ? response.results.map((entry) => ({
+			title: entry.title ? wrapWebContent(entry.title, "web_search") : "",
+			url: entry.url,
+			snippets: entry.snippets.map((snippet) => wrapWebContent(snippet, "web_search")),
+			siteName: entry.siteName
+		})) : response.results;
 		const payload = {
 			query,
 			provider: "brave",
-			mode: "llm-context",
+			...response.mode === "llm-context" ? { mode: response.mode } : {},
 			count: results.length,
 			tookMs: Date.now() - start,
 			externalContent: {
@@ -475,63 +480,24 @@ async function executeBraveSearch(args, searchConfig, options) {
 				provider: "brave",
 				wrapped: true
 			},
-			results: results.map((entry) => ({
-				title: entry.title ? wrapWebContent(entry.title, "web_search") : "",
-				url: entry.url,
-				snippets: entry.snippets.map((snippet) => wrapWebContent(snippet, "web_search")),
-				siteName: entry.siteName
-			})),
-			sources
+			results,
+			...response.mode === "llm-context" ? { sources: response.sources } : {}
 		};
 		writeCachedSearchPayload(cacheKey, payload, cacheTtlMs);
 		logBraveHttp(diagnostics, "cache write", {
-			mode: "llm-context",
+			mode: response.mode,
 			query,
 			cacheKey,
 			ttlMs: cacheTtlMs,
 			count: results.length
 		});
 		return payload;
+	} catch (error) {
+		signal?.throwIfAborted();
+		throw error;
+	} finally {
+		cleanup();
 	}
-	const results = await runBraveWebSearch({
-		baseUrl: braveBaseUrl,
-		endpointMode: braveEndpointMode,
-		query,
-		count: resolveSearchCount(count, DEFAULT_SEARCH_COUNT),
-		apiKey,
-		timeoutSeconds,
-		diagnostics,
-		signal: options?.signal,
-		country: country ?? void 0,
-		search_lang: normalizedLanguage.search_lang,
-		ui_lang: normalizedLanguage.ui_lang,
-		freshness,
-		dateAfter,
-		dateBefore
-	});
-	options?.signal?.throwIfAborted();
-	const payload = {
-		query,
-		provider: "brave",
-		count: results.length,
-		tookMs: Date.now() - start,
-		externalContent: {
-			untrusted: true,
-			source: "web_search",
-			provider: "brave",
-			wrapped: true
-		},
-		results
-	};
-	writeCachedSearchPayload(cacheKey, payload, cacheTtlMs);
-	logBraveHttp(diagnostics, "cache write", {
-		mode: "web",
-		query,
-		cacheKey,
-		ttlMs: cacheTtlMs,
-		count: results.length
-	});
-	return payload;
 }
 //#endregion
 export { executeBraveSearch };

package/dist/index.js

@@ -1,4 +1,4 @@
-import { t as createBraveWebSearchProvider } from "./brave-web-search-provider-BFrhKp8F.js";
+import { t as createBraveWebSearchProvider } from "./brave-web-search-provider-B1n-hEjq.js";
 import { definePluginEntry } from "openclaw/plugin-sdk/plugin-entry";
 //#region extensions/brave/index.ts
 /**

package/dist/web-search-contract-api.js

@@ -1,11 +1,3 @@
-import { buildBraveWebSearchProviderBase } from "./web-search-shared.js";
-//#region extensions/brave/web-search-contract-api.ts
-/** Create the Brave provider descriptor for contract checks. */
-function createBraveWebSearchProvider() {
-	return {
-		...buildBraveWebSearchProviderBase(),
-		createTool: () => null
-	};
-}
-//#endregion
+import { t as createBraveWebSearchProvider } from "./brave-web-search-provider-B1n-hEjq.js";
+import "./web-search-provider.js";
 export { createBraveWebSearchProvider };

package/dist/web-search-provider.js

@@ -1,2 +1,2 @@
-import { t as createBraveWebSearchProvider } from "./brave-web-search-provider-BFrhKp8F.js";
+import { t as createBraveWebSearchProvider } from "./brave-web-search-provider-B1n-hEjq.js";
 export { createBraveWebSearchProvider };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclaw/brave-plugin",
-  "version": "2026.8.1-beta.2",
+  "version": "2026.8.1",
   "description": "OpenClaw Brave Search provider plugin for web search.",
   "repository": {
     "type": "git",
@@ -18,10 +18,10 @@
       "allowInvalidConfigRecovery": true
     },
     "compat": {
-      "pluginApi": ">=2026.8.1-beta.2"
+      "pluginApi": ">=2026.8.1"
     },
     "build": {
-      "openclawVersion": "2026.8.1-beta.2"
+      "openclawVersion": "2026.8.1"
     },
     "release": {
       "publishToClawHub": true,
@@ -37,7 +37,7 @@
     "README.md"
   ],
   "peerDependencies": {
-    "openclaw": ">=2026.8.1-beta.2"
+    "openclaw": ">=2026.8.1"
   },
   "peerDependenciesMeta": {
     "openclaw": {