@openclaw/firecrawl-plugin 2026.10.10 → 2026.11.5-beta.1

package/dist/.setup/{firecrawl-client-Dk_bi5M_.mjs → firecrawl-client-CDyLQvtN.mjs}

@@ -1,12 +1,15 @@
-import { resolveSiteName } from "openclaw/plugin-sdk/provider-web-search";
+import { externalContentStamp, readCachedSearchPayload, resolveSearchCacheTtlMs, resolveSiteName, writeCachedSearchPayload } from "openclaw/plugin-sdk/provider-web-search";
+import { sha256Hex } from "openclaw/plugin-sdk/node-crypto-runtime";
 import { asNonNegativeFiniteNumber, asPositiveFiniteNumber, parseDateStringTimestampMs, parseFiniteNumber, resolveIntegerOption } from "openclaw/plugin-sdk/number-runtime";
+import { resolvePluginConfigObject } from "openclaw/plugin-sdk/plugin-config-runtime";
 import { ProviderHttpError, readProviderJsonObjectResponse } from "openclaw/plugin-sdk/provider-http";
-import { DEFAULT_CACHE_TTL_MINUTES, markdownToText, normalizeCacheKey, readCache, readResponseText, resolveCacheTtlMs, resolvePositiveTimeoutSeconds, withSelfHostedWebToolsEndpoint, withStrictWebToolsEndpoint, writeCache } from "openclaw/plugin-sdk/provider-web-fetch";
+import { markdownToText, readResponseText, resolvePositiveTimeoutSeconds, withSelfHostedWebToolsEndpoint, withStrictWebToolsEndpoint } from "openclaw/plugin-sdk/provider-web-fetch";
+import { resolveProviderWebSearchPluginConfig } from "openclaw/plugin-sdk/provider-web-search-config-contract";
 import { normalizeSecretInput } from "openclaw/plugin-sdk/secret-input";
+import { resolveReadOnlyEnvSecretRef } from "openclaw/plugin-sdk/secret-ref-readonly";
 import { truncateSanitizedExternalContent, wrapExternalContent, wrapWebContent } from "openclaw/plugin-sdk/security-runtime";
 import { SsrFBlockedError, isBlockedHostnameOrIp, isPrivateIpAddress, resolvePinnedHostnameWithPolicy } from "openclaw/plugin-sdk/ssrf-runtime";
 import { asBoolean, asOptionalObjectRecord, asOptionalRecord, asRecord, normalizeOptionalString, readStringField } from "openclaw/plugin-sdk/string-coerce-runtime";
-import { resolveReadOnlyEnvSecretRef } from "openclaw/plugin-sdk/secret-ref-readonly";
 // \0rolldown/runtime.js
 var __defProp = Object.defineProperty;
 var __exportAll = (all, no_symbols) => {
@@ -18,32 +21,35 @@ var __exportAll = (all, no_symbols) => {
 	if (!no_symbols) __defProp(target, Symbol.toStringTag, { value: "Module" });
 	return target;
 };
+// extensions/firecrawl/src/firecrawl-client.ts
+var firecrawl_client_exports = /* @__PURE__ */ __exportAll({
+	runFirecrawlScrape: () => runFirecrawlScrape,
+	runFirecrawlSearch: () => runFirecrawlSearch
+});
+const DEFAULT_FIRECRAWL_BASE_URL = "https://api.firecrawl.dev";
 const DEFAULT_FIRECRAWL_SEARCH_TIMEOUT_SECONDS = 30;
 const DEFAULT_FIRECRAWL_SCRAPE_TIMEOUT_SECONDS = 60;
 const DEFAULT_FIRECRAWL_MAX_AGE_MS = 1728e5;
 const FIRECRAWL_API_KEY_ENV_VAR = "FIRECRAWL_API_KEY";
-function resolveFirecrawlSearchConfig(cfg) {
-	const pluginConfig = cfg?.plugins?.entries?.firecrawl?.config;
-	return asOptionalRecord(pluginConfig?.webSearch);
-}
+const DEFAULT_SEARCH_COUNT = 5;
+const FIRECRAWL_SEARCH_MAX_RESULTS = 100;
+const FIRECRAWL_SEARCH_MAX_CONTENT_CHARS = 2e4;
+const DEFAULT_SCRAPE_MAX_CHARS = 5e4;
+const FIRECRAWL_SCRAPE_METADATA_MAX_CHARS = 4e3;
+const FIRECRAWL_RESULT_URL_MAX_CHARS = 2048;
+const FIRECRAWL_SCRAPE_RESPONSE_MAX_BYTES = 67108864;
+const ALLOWED_FIRECRAWL_HOSTS = /* @__PURE__ */ new Set(["api.firecrawl.dev"]);
+const FIRECRAWL_PUBLISHED_DATE_RE = /^\d{4}-\d{2}-\d{2}(?:[T ][\d:.+Z-]{0,20})?$/u;
+const FIRECRAWL_SELF_HOSTED_PRIVATE_ERROR = "Firecrawl custom baseUrl must target a private or internal self-hosted endpoint.";
+const FIRECRAWL_HTTP_PRIVATE_ERROR = "Firecrawl HTTP baseUrl must target a private or internal self-hosted endpoint. Use https:// for public hosts.";
 function resolveFirecrawlFetchConfig(cfg) {
-	const pluginConfig = cfg?.plugins?.entries?.firecrawl?.config;
-	return asOptionalRecord(pluginConfig?.webFetch);
-}
-function resolveConfiguredSecret(value, path, cfg) {
-	return resolveReadOnlyEnvSecretRef({
-		value,
-		path,
-		cfg,
-		expectedEnvId: FIRECRAWL_API_KEY_ENV_VAR,
-		normalizeValue: normalizeSecretInput
-	});
+	return asOptionalRecord(resolvePluginConfigObject(cfg, "firecrawl")?.webFetch);
 }
 function resolveFirecrawlApiKey(cfg) {
-	const pluginConfig = cfg?.plugins?.entries?.firecrawl?.config;
-	const search = resolveFirecrawlSearchConfig(cfg);
+	const fetch = resolveFirecrawlFetchConfig(cfg);
+	const search = resolveProviderWebSearchPluginConfig(cfg, "firecrawl");
 	const configuredCandidates = [{
-		value: pluginConfig?.webFetch?.apiKey,
+		value: fetch?.apiKey,
 		path: "plugins.entries.firecrawl.config.webFetch.apiKey"
 	}, {
 		value: search?.apiKey,
@@ -51,7 +57,13 @@ function resolveFirecrawlApiKey(cfg) {
 	}];
 	let blockedConfiguredSecret = false;
 	for (const candidate of configuredCandidates) {
-		const resolved = resolveConfiguredSecret(candidate.value, candidate.path, cfg);
+		const resolved = resolveReadOnlyEnvSecretRef({
+			value: candidate.value,
+			path: candidate.path,
+			cfg,
+			expectedEnvId: FIRECRAWL_API_KEY_ENV_VAR,
+			normalizeValue: normalizeSecretInput
+		});
 		if (resolved.status === "available") return resolved.value;
 		if (resolved.status === "blocked") blockedConfiguredSecret = true;
 	}
@@ -59,43 +71,10 @@ function resolveFirecrawlApiKey(cfg) {
 	return normalizeSecretInput(process.env[FIRECRAWL_API_KEY_ENV_VAR]) || void 0;
 }
 function resolveFirecrawlBaseUrl(cfg) {
-	const search = resolveFirecrawlSearchConfig(cfg);
-	const fetch = resolveFirecrawlFetchConfig(cfg);
-	return normalizeOptionalString(search?.baseUrl) || normalizeOptionalString(fetch?.baseUrl) || normalizeSecretInput(process.env.FIRECRAWL_BASE_URL) || "https://api.firecrawl.dev";
-}
-function resolveFirecrawlOnlyMainContent(cfg, override) {
-	return asBoolean(override) ?? asBoolean(resolveFirecrawlFetchConfig(cfg)?.onlyMainContent) ?? true;
-}
-function resolveFirecrawlMaxAgeMs(cfg, override) {
-	return Math.floor(asNonNegativeFiniteNumber(override) ?? asNonNegativeFiniteNumber(resolveFirecrawlFetchConfig(cfg)?.maxAgeMs) ?? DEFAULT_FIRECRAWL_MAX_AGE_MS);
-}
-function resolveFirecrawlScrapeTimeoutSeconds(cfg, override) {
+	const search = resolveProviderWebSearchPluginConfig(cfg, "firecrawl");
 	const fetch = resolveFirecrawlFetchConfig(cfg);
-	return resolvePositiveTimeoutSeconds(override, resolvePositiveTimeoutSeconds(fetch?.timeoutSeconds, DEFAULT_FIRECRAWL_SCRAPE_TIMEOUT_SECONDS));
-}
-function resolveFirecrawlSearchTimeoutSeconds(override) {
-	return resolvePositiveTimeoutSeconds(override, DEFAULT_FIRECRAWL_SEARCH_TIMEOUT_SECONDS);
+	return normalizeOptionalString(search?.baseUrl) || normalizeOptionalString(fetch?.baseUrl) || normalizeSecretInput(process.env.FIRECRAWL_BASE_URL) || DEFAULT_FIRECRAWL_BASE_URL;
 }
-// extensions/firecrawl/src/firecrawl-client.ts
-var firecrawl_client_exports = /* @__PURE__ */ __exportAll({
-	assertFirecrawlScrapeTargetAllowed: () => assertFirecrawlScrapeTargetAllowed,
-	parseFirecrawlScrapePayload: () => parseFirecrawlScrapePayload,
-	runFirecrawlScrape: () => runFirecrawlScrape,
-	runFirecrawlSearch: () => runFirecrawlSearch,
-	testing: () => testing
-});
-const SEARCH_CACHE = /* @__PURE__ */ new Map();
-const DEFAULT_SEARCH_COUNT = 5;
-const FIRECRAWL_SEARCH_MAX_RESULTS = 100;
-const FIRECRAWL_SEARCH_MAX_CONTENT_CHARS = 2e4;
-const DEFAULT_SCRAPE_MAX_CHARS = 5e4;
-const FIRECRAWL_SCRAPE_METADATA_MAX_CHARS = 4e3;
-const FIRECRAWL_RESULT_URL_MAX_CHARS = 2048;
-const FIRECRAWL_SCRAPE_RESPONSE_MAX_BYTES = 67108864;
-const ALLOWED_FIRECRAWL_HOSTS = /* @__PURE__ */ new Set(["api.firecrawl.dev"]);
-const FIRECRAWL_PUBLISHED_DATE_RE = /^\d{4}-\d{2}-\d{2}(?:[T ][\d:.+Z-]{0,20})?$/u;
-const FIRECRAWL_SELF_HOSTED_PRIVATE_ERROR = "Firecrawl custom baseUrl must target a private or internal self-hosted endpoint.";
-const FIRECRAWL_HTTP_PRIVATE_ERROR = "Firecrawl HTTP baseUrl must target a private or internal self-hosted endpoint. Use https:// for public hosts.";
 function assertFirecrawlScrapeTargetAllowed(url) {
 	let parsed;
 	try {
@@ -109,27 +88,24 @@ function assertFirecrawlScrapeTargetAllowed(url) {
 function isOfficialFirecrawlEndpoint(url) {
 	return url.protocol === "https:" && ALLOWED_FIRECRAWL_HOSTS.has(url.hostname);
 }
-async function firecrawlEndpointTargetsPrivateNetwork(url, lookupFn) {
+async function firecrawlEndpointTargetsPrivateNetwork(url) {
 	if (isBlockedHostnameOrIp(url.hostname)) return true;
 	try {
-		return (await resolvePinnedHostnameWithPolicy(url.hostname, {
-			lookupFn,
-			policy: { allowPrivateNetwork: true }
-		})).addresses.every((address) => isPrivateIpAddress(address));
+		return (await resolvePinnedHostnameWithPolicy(url.hostname, { policy: { allowPrivateNetwork: true } })).addresses.every((address) => isPrivateIpAddress(address));
 	} catch {
 		return false;
 	}
 }
-async function validateFirecrawlBaseUrl(url, lookupFn) {
+async function validateFirecrawlBaseUrl(url) {
 	if (url.protocol !== "http:" && url.protocol !== "https:") throw new Error("Firecrawl baseUrl must use http:// or https://.");
 	if (isOfficialFirecrawlEndpoint(url)) return "strict";
-	if (await firecrawlEndpointTargetsPrivateNetwork(url, lookupFn)) return "selfHosted";
+	if (await firecrawlEndpointTargetsPrivateNetwork(url)) return "selfHosted";
 	if (url.protocol === "http:") throw new Error(FIRECRAWL_HTTP_PRIVATE_ERROR);
 	throw new Error(`${FIRECRAWL_SELF_HOSTED_PRIVATE_ERROR} Host: ${url.hostname}`);
 }
-async function resolveEndpoint(baseUrl, pathname, lookupFn) {
-	const url = new URL(baseUrl.trim() || "https://api.firecrawl.dev");
-	const mode = await validateFirecrawlBaseUrl(url, lookupFn);
+async function resolveEndpoint(baseUrl, pathname) {
+	const url = new URL(baseUrl.trim() || DEFAULT_FIRECRAWL_BASE_URL);
+	const mode = await validateFirecrawlBaseUrl(url);
 	url.username = "";
 	url.password = "";
 	url.search = "";
@@ -245,20 +221,21 @@ async function runFirecrawlSearch(params) {
 		min: 1,
 		max: 100
 	});
-	const timeoutSeconds = resolveFirecrawlSearchTimeoutSeconds(params.timeoutSeconds);
+	const timeoutSeconds = resolvePositiveTimeoutSeconds(params.timeoutSeconds, DEFAULT_FIRECRAWL_SEARCH_TIMEOUT_SECONDS);
 	const scrapeResults = params.scrapeResults === true;
-	const sources = Array.isArray(params.sources) ? params.sources.filter(Boolean) : [];
-	const categories = Array.isArray(params.categories) ? params.categories.filter(Boolean) : [];
-	const includeDomains = Array.isArray(params.includeDomains) ? params.includeDomains.filter(Boolean) : [];
-	const excludeDomains = Array.isArray(params.excludeDomains) ? params.excludeDomains.filter(Boolean) : [];
+	const sources = params.sources?.filter(Boolean) ?? [];
+	const categories = params.categories?.filter(Boolean) ?? [];
+	const includeDomains = params.includeDomains?.filter(Boolean) ?? [];
+	const excludeDomains = params.excludeDomains?.filter(Boolean) ?? [];
 	if (includeDomains.length > 0 && excludeDomains.length > 0) throw new Error("Firecrawl search accepts includeDomains or excludeDomains, not both.");
 	const tbs = normalizeOptionalString(params.tbs);
 	const location = normalizeOptionalString(params.location);
 	const country = normalizeOptionalString(params.country);
 	const baseUrl = resolveFirecrawlBaseUrl(params.cfg);
-	const cacheKey = normalizeCacheKey(JSON.stringify({
+	const cacheKey = JSON.stringify({
 		type: "firecrawl-search",
 		provider: providerId,
+		credential: apiKey ? sha256Hex(apiKey) : void 0,
 		q: params.query,
 		count,
 		baseUrl,
@@ -270,13 +247,10 @@ async function runFirecrawlSearch(params) {
 		location,
 		country,
 		scrapeResults
-	}));
-	const cacheTtlMs = resolveCacheTtlMs(params.cfg?.tools?.web?.search?.cacheTtlMinutes, DEFAULT_CACHE_TTL_MINUTES);
-	const cached = readCache(SEARCH_CACHE, cacheKey, cacheTtlMs);
-	if (cached) return {
-		...cached.value,
-		cached: true
-	};
+	});
+	const cacheTtlMs = resolveSearchCacheTtlMs(params.cfg?.tools?.web?.search);
+	const cached = readCachedSearchPayload(cacheKey, cacheTtlMs);
+	if (cached) return cached;
 	const body = {
 		query: params.query,
 		limit: count,
@@ -330,20 +304,52 @@ async function runFirecrawlSearch(params) {
 		provider: providerId,
 		count: items.length,
 		tookMs,
-		externalContent: {
-			untrusted: true,
-			source: "web_search",
-			provider: providerId,
-			wrapped: true
-		},
+		externalContent: externalContentStamp(providerId),
 		results,
 		...truncated ? { truncated: true } : {}
 	};
-	writeCache(SEARCH_CACHE, cacheKey, result, cacheTtlMs);
+	writeCachedSearchPayload(cacheKey, result, cacheTtlMs);
 	return result;
 }
-function parseFirecrawlScrapePayload(params) {
-	const data = asRecord(params.payload.data);
+async function runFirecrawlScrape(params) {
+	params.signal?.throwIfAborted();
+	assertFirecrawlScrapeTargetAllowed(params.url);
+	const apiKey = resolveFirecrawlApiKey(params.cfg);
+	if (!apiKey && params.access !== "keyless") throw new Error("firecrawl_scrape needs a Firecrawl API key. Set FIRECRAWL_API_KEY in the Gateway environment, or configure plugins.entries.firecrawl.config.webFetch.apiKey.");
+	const baseUrl = resolveFirecrawlBaseUrl(params.cfg);
+	const fetch = resolveFirecrawlFetchConfig(params.cfg);
+	const timeoutSeconds = resolvePositiveTimeoutSeconds(params.timeoutSeconds, resolvePositiveTimeoutSeconds(fetch?.timeoutSeconds, DEFAULT_FIRECRAWL_SCRAPE_TIMEOUT_SECONDS));
+	const onlyMainContent = asBoolean(params.onlyMainContent) ?? asBoolean(resolveFirecrawlFetchConfig(params.cfg)?.onlyMainContent) ?? true;
+	const maxAgeMs = Math.floor(asNonNegativeFiniteNumber(params.maxAgeMs) ?? asNonNegativeFiniteNumber(resolveFirecrawlFetchConfig(params.cfg)?.maxAgeMs) ?? DEFAULT_FIRECRAWL_MAX_AGE_MS);
+	const proxy = params.proxy ?? "auto";
+	const storeInCache = params.storeInCache ?? true;
+	const maxChars = Math.floor(Math.min(asPositiveFiniteNumber(params.maxChars) ?? DEFAULT_SCRAPE_MAX_CHARS, asPositiveFiniteNumber(params.cfg?.tools?.web?.fetch?.maxCharsCap) ?? DEFAULT_SCRAPE_MAX_CHARS));
+	const endpoint = await resolveEndpoint(baseUrl, "/v2/scrape");
+	const payload = await postFirecrawlJson({
+		url: endpoint.url,
+		mode: endpoint.mode,
+		timeoutSeconds,
+		apiKey,
+		errorLabel: "Firecrawl",
+		...params.signal ? { signal: params.signal } : {},
+		body: {
+			url: params.url,
+			formats: ["markdown"],
+			onlyMainContent,
+			timeout: timeoutSeconds * 1e3,
+			maxAge: maxAgeMs,
+			proxy,
+			storeInCache
+		}
+	}, async (response) => {
+		const data = await readProviderJsonObjectResponse(response, "Firecrawl fetch failed", { maxBytes: FIRECRAWL_SCRAPE_RESPONSE_MAX_BYTES });
+		if (data.success === false) {
+			const detail = readFirecrawlErrorDetail(data, response.statusText);
+			throw new Error(`Firecrawl fetch failed (${response.status}): ${wrapWebContent(truncateSanitizedExternalContent(detail, FIRECRAWL_SCRAPE_METADATA_MAX_CHARS).text, "web_fetch")}`.trim());
+		}
+		return data;
+	});
+	const data = asRecord(payload.data);
 	const metadata = asOptionalObjectRecord(data.metadata);
 	const rawStatus = parseFiniteNumber(metadata?.statusCode) ?? parseFiniteNumber(data.statusCode);
 	const status = rawStatus === void 0 ? void 0 : Math.floor(rawStatus);
@@ -351,7 +357,7 @@ function parseFirecrawlScrapePayload(params) {
 	const markdown = typeof data.markdown === "string" && data.markdown || typeof data.content === "string" && data.content || "";
 	if (!markdown) throw new Error("Firecrawl scrape returned no content.");
 	const rawText = params.extractMode === "text" ? markdownToText(markdown) : markdown;
-	const boundedText = truncateSanitizedExternalContent(rawText, params.maxChars);
+	const boundedText = truncateSanitizedExternalContent(rawText, maxChars);
 	let truncated = boundedText.truncated;
 	let remainingMetadataChars = FIRECRAWL_SCRAPE_METADATA_MAX_CHARS;
 	const wrapBoundedMetadata = (value) => {
@@ -368,7 +374,7 @@ function parseFirecrawlScrapePayload(params) {
 		includeWarning: false
 	});
 	const title = typeof metadata?.title === "string" && metadata.title ? wrapBoundedMetadata(metadata.title) : void 0;
-	const warning = typeof params.payload.warning === "string" && params.payload.warning ? wrapBoundedMetadata(params.payload.warning) : void 0;
+	const warning = typeof payload.warning === "string" && payload.warning ? wrapBoundedMetadata(payload.warning) : void 0;
 	return {
 		url: params.url,
 		finalUrl: normalizeFirecrawlResultUrl(metadata?.sourceURL) ?? normalizeFirecrawlResultUrl(data.url) ?? params.url,
@@ -388,53 +394,4 @@ function parseFirecrawlScrapePayload(params) {
 		...warning ? { warning } : {}
 	};
 }
-async function runFirecrawlScrape(params) {
-	params.signal?.throwIfAborted();
-	assertFirecrawlScrapeTargetAllowed(params.url);
-	const apiKey = resolveFirecrawlApiKey(params.cfg);
-	if (!apiKey && params.access !== "keyless") throw new Error("firecrawl_scrape needs a Firecrawl API key. Set FIRECRAWL_API_KEY in the Gateway environment, or configure plugins.entries.firecrawl.config.webFetch.apiKey.");
-	const baseUrl = resolveFirecrawlBaseUrl(params.cfg);
-	const timeoutSeconds = resolveFirecrawlScrapeTimeoutSeconds(params.cfg, params.timeoutSeconds);
-	const onlyMainContent = resolveFirecrawlOnlyMainContent(params.cfg, params.onlyMainContent);
-	const maxAgeMs = resolveFirecrawlMaxAgeMs(params.cfg, params.maxAgeMs);
-	const proxy = params.proxy ?? "auto";
-	const storeInCache = params.storeInCache ?? true;
-	const maxChars = Math.floor(Math.min(asPositiveFiniteNumber(params.maxChars) ?? DEFAULT_SCRAPE_MAX_CHARS, asPositiveFiniteNumber(params.cfg?.tools?.web?.fetch?.maxCharsCap) ?? DEFAULT_SCRAPE_MAX_CHARS));
-	const endpoint = await resolveEndpoint(baseUrl, "/v2/scrape");
-	return parseFirecrawlScrapePayload({
-		payload: await postFirecrawlJson({
-			url: endpoint.url,
-			mode: endpoint.mode,
-			timeoutSeconds,
-			apiKey,
-			errorLabel: "Firecrawl",
-			...params.signal ? { signal: params.signal } : {},
-			body: {
-				url: params.url,
-				formats: ["markdown"],
-				onlyMainContent,
-				timeout: timeoutSeconds * 1e3,
-				maxAge: maxAgeMs,
-				proxy,
-				storeInCache
-			}
-		}, async (response) => {
-			const data = await readProviderJsonObjectResponse(response, "Firecrawl fetch failed", { maxBytes: FIRECRAWL_SCRAPE_RESPONSE_MAX_BYTES });
-			if (data.success === false) {
-				const detail = readFirecrawlErrorDetail(data, response.statusText);
-				throw new Error(`Firecrawl fetch failed (${response.status}): ${wrapWebContent(truncateSanitizedExternalContent(detail, FIRECRAWL_SCRAPE_METADATA_MAX_CHARS).text, "web_fetch")}`.trim());
-			}
-			return data;
-		}),
-		url: params.url,
-		extractMode: params.extractMode,
-		maxChars
-	});
-}
-const testing = {
-	assertFirecrawlScrapeTargetAllowed,
-	parseFirecrawlScrapePayload,
-	resolveEndpoint,
-	resolveSearchItems
-};
 export { runFirecrawlScrape as n, runFirecrawlSearch as r, firecrawl_client_exports as t };

package/dist/.setup/{firecrawl-fetch-provider-EP1XFhDE.mjs → firecrawl-fetch-provider-QmPccHZS.mjs}

@@ -1,14 +1,8 @@
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { readPositiveIntegerParam } from "openclaw/plugin-sdk/param-readers";
 import { enablePluginInConfig } from "openclaw/plugin-sdk/provider-web-fetch-contract";
+import { ensureRecord } from "openclaw/plugin-sdk/collection-input-runtime";
 // extensions/firecrawl/src/firecrawl-fetch-provider-shared.ts
-function ensureRecord(target, key) {
-	const current = target[key];
-	if (current && typeof current === "object" && !Array.isArray(current)) return current;
-	const next = {};
-	target[key] = next;
-	return next;
-}
 const FIRECRAWL_WEB_FETCH_PROVIDER_SHARED = {
 	id: "firecrawl",
 	label: "Firecrawl",
@@ -45,12 +39,13 @@ const FIRECRAWL_WEB_FETCH_PROVIDER_SHARED = {
 		const plugins = configTarget.plugins ??= {};
 		const entries = plugins.entries ??= {};
 		const firecrawlEntry = entries.firecrawl ??= {};
-		const webFetch = ensureRecord(firecrawlEntry.config ??= {}, "webFetch");
+		const pluginConfig = firecrawlEntry.config ??= {};
+		const webFetch = ensureRecord(pluginConfig, "webFetch");
 		webFetch.apiKey = value;
 	}
 };
 // extensions/firecrawl/src/firecrawl-fetch-provider.ts
-const loadFirecrawlClientModule = createLazyRuntimeModule(() => import("./firecrawl-client-Dk_bi5M_.mjs").then((n) => n.t));
+const loadFirecrawlClientModule = createLazyRuntimeModule(() => import("./firecrawl-client-CDyLQvtN.mjs").then((n) => n.t));
 function createFirecrawlWebFetchProvider() {
 	return {
 		...FIRECRAWL_WEB_FETCH_PROVIDER_SHARED,

package/dist/.setup/{firecrawl-search-provider-Dg-_xx_m.mjs → firecrawl-search-provider-wsRgx6kl.mjs}

@@ -1,29 +1,18 @@
+import { resolvePluginConfigObject } from "openclaw/plugin-sdk/plugin-config-runtime";
+import { asOptionalRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { readPositiveIntegerParam } from "openclaw/plugin-sdk/param-readers";
-import { asOptionalRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
-import { createWebSearchProviderContractFields, enablePluginInConfig } from "openclaw/plugin-sdk/provider-web-search-contract";
+import { WEB_SEARCH_QUERY_COUNT_PROPERTIES, createWebSearchProviderContractFields, enablePluginInConfig } from "openclaw/plugin-sdk/provider-web-search-contract";
 // extensions/firecrawl/src/firecrawl-search-provider.ts
 const FIRECRAWL_CREDENTIAL_PATH = "plugins.entries.firecrawl.config.webSearch.apiKey";
-const loadFirecrawlClientModule = createLazyRuntimeModule(() => import("./firecrawl-client-Dk_bi5M_.mjs").then((n) => n.t));
+const loadFirecrawlClientModule = createLazyRuntimeModule(() => import("./firecrawl-client-CDyLQvtN.mjs").then((n) => n.t));
 const GenericFirecrawlSearchSchema = {
 	type: "object",
-	properties: {
-		query: {
-			type: "string",
-			description: "Search query string."
-		},
-		count: {
-			type: "integer",
-			description: "Number of results to return (1-10).",
-			minimum: 1,
-			maximum: 10
-		}
-	},
+	properties: { ...WEB_SEARCH_QUERY_COUNT_PROPERTIES },
 	additionalProperties: false
 };
 function getConfiguredFirecrawlFetchCredentialFallback(config) {
-	const pluginConfig = asOptionalRecord(config?.plugins?.entries?.firecrawl?.config);
-	const value = asOptionalRecord(pluginConfig?.webFetch)?.apiKey;
+	const value = asOptionalRecord(resolvePluginConfigObject(config, "firecrawl")?.webFetch)?.apiKey;
 	return value === void 0 ? void 0 : {
 		path: "plugins.entries.firecrawl.config.webFetch.apiKey",
 		value

package/dist/.source-module-urls/ad8205c790d921269d4ea28d22ab658579b9674fd00e025664fcf0b8ea32155c.json

@@ -1 +1 @@
-{"version":3,"entries":[{"output":"api.js","source":"extensions/firecrawl/api.ts"},{"output":"index.js","source":"extensions/firecrawl/index.ts"},{"output":"web-fetch-contract-api.js","source":"extensions/firecrawl/web-fetch-contract-api.ts"},{"output":"web-fetch-provider.js","source":"extensions/firecrawl/web-fetch-provider.ts"},{"output":"web-search-contract-api.js","source":"extensions/firecrawl/web-search-contract-api.ts"},{"output":"web-search-provider.js","source":"extensions/firecrawl/web-search-provider.ts"}],"chunks":[{"output":".setup/firecrawl-client-Dk_bi5M_.mjs","sha256":"774b38239e4f578c2149ec27ef91f46ebf99354db4e16243e6f83209aaaed717","facadeSource":null,"sources":["extensions/firecrawl/src/config.ts","extensions/firecrawl/src/firecrawl-client.ts"]},{"output":".setup/firecrawl-fetch-provider-EP1XFhDE.mjs","sha256":"81a0a868cda6386f992e84287f96e973374877e9299337698d5f1db4a23ea537","facadeSource":null,"sources":["extensions/firecrawl/src/firecrawl-fetch-provider-shared.ts","extensions/firecrawl/src/firecrawl-fetch-provider.ts"]},{"output":".setup/firecrawl-search-provider-Dg-_xx_m.mjs","sha256":"13f6a7f2b72fa874d55f7afdb6378b76f36710c5bb52674a8b770456d2c1f4dd","facadeSource":null,"sources":["extensions/firecrawl/src/firecrawl-search-provider.ts"]},{"output":"api.js","sha256":"e28d050266697b2e5c369142ced5af70472bd93fec74a8e69897eac82f961dcc","facadeSource":"extensions/firecrawl/api.ts","sources":["extensions/firecrawl/api.ts"]},{"output":"index.js","sha256":"7391b6054e3a1882899054dac3303ff5d66cdcdf0242f0ca29949c280d6dcd31","facadeSource":"extensions/firecrawl/index.ts","sources":["extensions/firecrawl/index.ts","extensions/firecrawl/src/firecrawl-scrape-tool.ts","extensions/firecrawl/src/firecrawl-search-tool.ts"]},{"output":"web-fetch-contract-api.js","sha256":"6dd17949a8c79a884ebb5bb2003a1f970df8388242fd0f09734fd83fd577a864","facadeSource":"extensions/firecrawl/web-fetch-contract-api.ts","sources":[]},{"output":"web-fetch-provider.js","sha256":"283c5b3182c3a3f605ede1a44accdcb85f8a5409ab0356127bf7d2223d955ecf","facadeSource":"extensions/firecrawl/web-fetch-provider.ts","sources":[]},{"output":"web-search-contract-api.js","sha256":"f54c73b6596a5f879bfeb9d06f969652d4943e30d1ad7b94ec5568f6495e3e83","facadeSource":"extensions/firecrawl/web-search-contract-api.ts","sources":[]},{"output":"web-search-provider.js","sha256":"c3ad8cd2e10fe23a708f81b1b5e5b5257d17f8e59cf40e407be3812016986ce4","facadeSource":"extensions/firecrawl/web-search-provider.ts","sources":[]}],"unrenderedSources":["extensions/firecrawl/web-fetch-contract-api.ts","extensions/firecrawl/web-fetch-provider.ts","extensions/firecrawl/web-search-contract-api.ts","extensions/firecrawl/web-search-provider.ts"]}
+{"version":3,"entries":[{"output":"api.js","source":"extensions/firecrawl/api.ts"},{"output":"index.js","source":"extensions/firecrawl/index.ts"},{"output":"web-fetch-contract-api.js","source":"extensions/firecrawl/web-fetch-contract-api.ts"},{"output":"web-fetch-provider.js","source":"extensions/firecrawl/web-fetch-provider.ts"},{"output":"web-search-contract-api.js","source":"extensions/firecrawl/web-search-contract-api.ts"},{"output":"web-search-provider.js","source":"extensions/firecrawl/web-search-provider.ts"}],"chunks":[{"output":".setup/firecrawl-client-CDyLQvtN.mjs","sha256":"46c98acf8d71a8310851b8a6bfeb3d7e1176edb3d040c8e7d1de958e62cd4028","facadeSource":null,"sources":["extensions/firecrawl/src/firecrawl-client.ts"]},{"output":".setup/firecrawl-fetch-provider-QmPccHZS.mjs","sha256":"d32ea4f6248fc6c0c388257809db11ac0107a9a7c473ac75a0f665f71dae723c","facadeSource":null,"sources":["extensions/firecrawl/src/firecrawl-fetch-provider-shared.ts","extensions/firecrawl/src/firecrawl-fetch-provider.ts"]},{"output":".setup/firecrawl-search-provider-wsRgx6kl.mjs","sha256":"45416f284d535281a900a1ea20307652ca911769a3f36e9cbc5916a29a2ceafd","facadeSource":null,"sources":["extensions/firecrawl/src/firecrawl-search-provider.ts"]},{"output":"api.js","sha256":"ba89572c128911e1fb033a07004fa1c36861338a6704705ea14c6d6a1ea1cea3","facadeSource":"extensions/firecrawl/api.ts","sources":["extensions/firecrawl/api.ts"]},{"output":"index.js","sha256":"1b6689bdf7d803a983f86a4371e153139d127a259720af5d6412d102ecb1a3e5","facadeSource":"extensions/firecrawl/index.ts","sources":["extensions/firecrawl/index.ts"]},{"output":"web-fetch-contract-api.js","sha256":"e9f57ffa95524a8f5d9ac59cd879f41ec5c43e6e3ffd236a3bcfc6f55e2c439d","facadeSource":"extensions/firecrawl/web-fetch-contract-api.ts","sources":[]},{"output":"web-fetch-provider.js","sha256":"55e667f670164dd167c874b72e48fcba2b7ed2624d0d26f66d1fa78067f5b0b5","facadeSource":"extensions/firecrawl/web-fetch-provider.ts","sources":[]},{"output":"web-search-contract-api.js","sha256":"eb2a1d89385a524e030bc88d18d86398e5d9baf5bdeb57f9f4608017692541e4","facadeSource":"extensions/firecrawl/web-search-contract-api.ts","sources":[]},{"output":"web-search-provider.js","sha256":"54d793c602424e24a8e6f17c2f8eb832c5635c77e9094a1ca97c9b1249b17cb0","facadeSource":"extensions/firecrawl/web-search-provider.ts","sources":[]}],"unrenderedSources":["extensions/firecrawl/web-fetch-contract-api.ts","extensions/firecrawl/web-fetch-provider.ts","extensions/firecrawl/web-search-contract-api.ts","extensions/firecrawl/web-search-provider.ts"]}

package/dist/api.js

@@ -1,4 +1,4 @@
-import { n as runFirecrawlScrape } from "./.setup/firecrawl-client-Dk_bi5M_.mjs";
+import { n as runFirecrawlScrape } from "./.setup/firecrawl-client-CDyLQvtN.mjs";
 // extensions/firecrawl/api.ts
 async function fetchFirecrawlContent(params) {
 	const cfg = { plugins: { entries: { firecrawl: {

package/dist/index.js

@@ -1,11 +1,11 @@
-import { n as runFirecrawlScrape, r as runFirecrawlSearch } from "./.setup/firecrawl-client-Dk_bi5M_.mjs";
-import { t as createFirecrawlWebFetchProvider } from "./.setup/firecrawl-fetch-provider-EP1XFhDE.mjs";
-import { n as createFirecrawlWebSearchProvider, t as createFirecrawlFreeWebSearchProvider } from "./.setup/firecrawl-search-provider-Dg-_xx_m.mjs";
+import { n as runFirecrawlScrape, r as runFirecrawlSearch } from "./.setup/firecrawl-client-CDyLQvtN.mjs";
+import { t as createFirecrawlWebFetchProvider } from "./.setup/firecrawl-fetch-provider-QmPccHZS.mjs";
+import { n as createFirecrawlWebSearchProvider, t as createFirecrawlFreeWebSearchProvider } from "./.setup/firecrawl-search-provider-wsRgx6kl.mjs";
+import { optionalNonNegativeIntegerSchema, optionalPositiveIntegerSchema, optionalStringEnum } from "openclaw/plugin-sdk/channel-actions";
 import { definePluginEntry } from "openclaw/plugin-sdk/plugin-entry";
-import { optionalStringEnum } from "openclaw/plugin-sdk/channel-actions";
 import { jsonResult, readNonNegativeIntegerParam, readPositiveIntegerParam, readStringArrayParam, readStringParam } from "openclaw/plugin-sdk/provider-web-search";
 import { Type } from "typebox";
-// extensions/firecrawl/src/firecrawl-scrape-tool.ts
+// extensions/firecrawl/index.ts
 const FirecrawlScrapeToolSchema = Type.Object({
 	url: Type.String({ description: "HTTP or HTTPS URL to scrape via Firecrawl." }),
 	extractMode: optionalStringEnum(["markdown", "text"], { description: "Extraction mode (\"markdown\" or \"text\"). Default: markdown." }),
@@ -14,62 +14,21 @@ const FirecrawlScrapeToolSchema = Type.Object({
 		minimum: 100
 	})),
 	onlyMainContent: Type.Optional(Type.Boolean({ description: "Keep only main content when Firecrawl supports it." })),
-	maxAgeMs: Type.Optional(Type.Integer({
-		description: "Maximum Firecrawl cache age in milliseconds.",
-		minimum: 0
-	})),
+	maxAgeMs: optionalNonNegativeIntegerSchema({ description: "Maximum Firecrawl cache age in milliseconds." }),
 	proxy: optionalStringEnum([
 		"auto",
 		"basic",
 		"stealth"
 	], { description: "Firecrawl proxy mode (\"auto\", \"basic\", or \"stealth\")." }),
 	storeInCache: Type.Optional(Type.Boolean({ description: "Whether Firecrawl should store the scrape in its cache." })),
-	timeoutSeconds: Type.Optional(Type.Integer({
-		description: "Timeout in seconds for the Firecrawl scrape request.",
-		minimum: 1
-	}))
+	timeoutSeconds: optionalPositiveIntegerSchema({ description: "Timeout in seconds for the Firecrawl scrape request." })
 }, { additionalProperties: false });
-function createFirecrawlScrapeTool(api) {
-	return {
-		name: "firecrawl_scrape",
-		label: "Firecrawl Scrape",
-		resultContentSource: "network",
-		description: "Scrape a page using Firecrawl v2/scrape. Useful for JS-heavy or bot-protected pages where a plain URL fetch is weak.",
-		parameters: FirecrawlScrapeToolSchema,
-		execute: async (_toolCallId, rawParams, signal) => {
-			signal?.throwIfAborted();
-			const url = readStringParam(rawParams, "url", { required: true });
-			const extractMode = readStringParam(rawParams, "extractMode") === "text" ? "text" : "markdown";
-			const maxChars = readPositiveIntegerParam(rawParams, "maxChars");
-			const maxAgeMs = readNonNegativeIntegerParam(rawParams, "maxAgeMs");
-			const timeoutSeconds = readPositiveIntegerParam(rawParams, "timeoutSeconds");
-			const proxyRaw = readStringParam(rawParams, "proxy");
-			const proxy = proxyRaw === "basic" || proxyRaw === "stealth" || proxyRaw === "auto" ? proxyRaw : void 0;
-			const onlyMainContent = typeof rawParams.onlyMainContent === "boolean" ? rawParams.onlyMainContent : void 0;
-			const storeInCache = typeof rawParams.storeInCache === "boolean" ? rawParams.storeInCache : void 0;
-			return jsonResult(await runFirecrawlScrape({
-				cfg: api.config,
-				url,
-				extractMode,
-				maxChars,
-				onlyMainContent,
-				maxAgeMs,
-				proxy,
-				storeInCache,
-				timeoutSeconds,
-				...signal ? { signal } : {}
-			}));
-		}
-	};
-}
-// extensions/firecrawl/src/firecrawl-search-tool.ts
 const FirecrawlSearchToolSchema = Type.Object({
 	query: Type.String({ description: "Search query string." }),
-	count: Type.Optional(Type.Integer({
+	count: optionalPositiveIntegerSchema({
 		description: "Number of results to return (1-100).",
-		minimum: 1,
 		maximum: 100
-	})),
+	}),
 	sources: Type.Optional(Type.Array(Type.String(), { description: "Optional sources list, for example [\"web\"], [\"news\"], or [\"images\"]." })),
 	categories: Type.Optional(Type.Array(Type.String(), { description: "Optional Firecrawl categories, for example [\"github\"] or [\"research\"]." })),
 	includeDomains: Type.Optional(Type.Array(Type.String(), { description: "Restrict results to these hostnames (no protocol or path). Cannot be combined with excludeDomains." })),
@@ -78,42 +37,8 @@ const FirecrawlSearchToolSchema = Type.Object({
 	location: Type.Optional(Type.String({ description: "Geo-target location, for example \"Germany\" or \"San Francisco,California,United States\"." })),
 	country: Type.Optional(Type.String({ description: "ISO country code for geo-targeting, for example \"US\", \"DE\", or \"JP\"." })),
 	scrapeResults: Type.Optional(Type.Boolean({ description: "Include scraped result content when Firecrawl returns it." })),
-	timeoutSeconds: Type.Optional(Type.Integer({
-		description: "Timeout in seconds for the Firecrawl Search request.",
-		minimum: 1
-	}))
+	timeoutSeconds: optionalPositiveIntegerSchema({ description: "Timeout in seconds for the Firecrawl Search request." })
 }, { additionalProperties: false });
-function createFirecrawlSearchTool(api) {
-	return {
-		name: "firecrawl_search",
-		label: "Firecrawl Search",
-		resultContentSource: "network",
-		description: "Search the web using Firecrawl v2/search. Supports includeDomains/excludeDomains filtering and tbs time filters (day/week/month/year). Can optionally include scraped content from result pages.",
-		parameters: FirecrawlSearchToolSchema,
-		execute: async (_toolCallId, rawParams, signal) => {
-			signal?.throwIfAborted();
-			return jsonResult(await runFirecrawlSearch({
-				query: readStringParam(rawParams, "query", { required: true }),
-				count: readPositiveIntegerParam(rawParams, "count", {
-					max: 100,
-					message: "count must be an integer from 1 to 100"
-				}),
-				timeoutSeconds: readPositiveIntegerParam(rawParams, "timeoutSeconds"),
-				sources: readStringArrayParam(rawParams, "sources"),
-				categories: readStringArrayParam(rawParams, "categories"),
-				includeDomains: readStringArrayParam(rawParams, "includeDomains"),
-				excludeDomains: readStringArrayParam(rawParams, "excludeDomains"),
-				tbs: readStringParam(rawParams, "tbs"),
-				location: readStringParam(rawParams, "location"),
-				country: readStringParam(rawParams, "country"),
-				scrapeResults: rawParams.scrapeResults === true,
-				cfg: api.config,
-				...signal ? { signal } : {}
-			}));
-		}
-	};
-}
-// extensions/firecrawl/index.ts
 var firecrawl_default = definePluginEntry({
 	id: "firecrawl",
 	name: "Firecrawl Plugin",
@@ -122,8 +47,65 @@ var firecrawl_default = definePluginEntry({
 		api.registerWebFetchProvider(createFirecrawlWebFetchProvider());
 		api.registerWebSearchProvider(createFirecrawlWebSearchProvider());
 		api.registerWebSearchProvider(createFirecrawlFreeWebSearchProvider());
-		api.registerTool(createFirecrawlSearchTool(api));
-		api.registerTool(createFirecrawlScrapeTool(api));
+		api.registerTool({
+			name: "firecrawl_search",
+			label: "Firecrawl Search",
+			resultContentSource: "network",
+			description: "Search the web using Firecrawl v2/search. Supports includeDomains/excludeDomains filtering and tbs time filters (day/week/month/year). Can optionally include scraped content from result pages.",
+			parameters: FirecrawlSearchToolSchema,
+			execute: async (_toolCallId, rawParams, signal) => {
+				signal?.throwIfAborted();
+				return jsonResult(await runFirecrawlSearch({
+					query: readStringParam(rawParams, "query", { required: true }),
+					count: readPositiveIntegerParam(rawParams, "count", {
+						max: 100,
+						message: "count must be an integer from 1 to 100"
+					}),
+					timeoutSeconds: readPositiveIntegerParam(rawParams, "timeoutSeconds"),
+					sources: readStringArrayParam(rawParams, "sources"),
+					categories: readStringArrayParam(rawParams, "categories"),
+					includeDomains: readStringArrayParam(rawParams, "includeDomains"),
+					excludeDomains: readStringArrayParam(rawParams, "excludeDomains"),
+					tbs: readStringParam(rawParams, "tbs"),
+					location: readStringParam(rawParams, "location"),
+					country: readStringParam(rawParams, "country"),
+					scrapeResults: rawParams.scrapeResults === true,
+					cfg: api.config,
+					...signal ? { signal } : {}
+				}));
+			}
+		});
+		api.registerTool({
+			name: "firecrawl_scrape",
+			label: "Firecrawl Scrape",
+			resultContentSource: "network",
+			description: "Scrape a page using Firecrawl v2/scrape. Useful for JS-heavy or bot-protected pages where a plain URL fetch is weak.",
+			parameters: FirecrawlScrapeToolSchema,
+			execute: async (_toolCallId, rawParams, signal) => {
+				signal?.throwIfAborted();
+				const url = readStringParam(rawParams, "url", { required: true });
+				const extractMode = readStringParam(rawParams, "extractMode") === "text" ? "text" : "markdown";
+				const maxChars = readPositiveIntegerParam(rawParams, "maxChars");
+				const maxAgeMs = readNonNegativeIntegerParam(rawParams, "maxAgeMs");
+				const timeoutSeconds = readPositiveIntegerParam(rawParams, "timeoutSeconds");
+				const proxyRaw = readStringParam(rawParams, "proxy");
+				const proxy = proxyRaw === "basic" || proxyRaw === "stealth" || proxyRaw === "auto" ? proxyRaw : void 0;
+				const onlyMainContent = typeof rawParams.onlyMainContent === "boolean" ? rawParams.onlyMainContent : void 0;
+				const storeInCache = typeof rawParams.storeInCache === "boolean" ? rawParams.storeInCache : void 0;
+				return jsonResult(await runFirecrawlScrape({
+					cfg: api.config,
+					url,
+					extractMode,
+					maxChars,
+					onlyMainContent,
+					maxAgeMs,
+					proxy,
+					storeInCache,
+					timeoutSeconds,
+					...signal ? { signal } : {}
+				}));
+			}
+		});
 	}
 });
 export { firecrawl_default as default };

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

@@ -1,2 +1,2 @@
-export { t as createFirecrawlWebFetchProvider } from "./.setup/firecrawl-fetch-provider-EP1XFhDE.mjs";
+export { t as createFirecrawlWebFetchProvider } from "./.setup/firecrawl-fetch-provider-QmPccHZS.mjs";
 import "./web-fetch-provider.js";

package/dist/web-fetch-provider.js

@@ -1 +1 @@
-export { t as createFirecrawlWebFetchProvider } from "./.setup/firecrawl-fetch-provider-EP1XFhDE.mjs";
+export { t as createFirecrawlWebFetchProvider } from "./.setup/firecrawl-fetch-provider-QmPccHZS.mjs";