denchclaw 2.5.2 → 2.5.4

package/dist/{program-C4ijUMvC.js → program-CtW4fcfa.js}

@@ -1,12 +1,12 @@
-import { a as markNoticeShown, i as getOrCreateAnonymousId, o as readTelemetryConfig, r as track, s as writeTelemetryConfig, t as isTelemetryEnabled } from "./telemetry-DguRjCZq.js";
+import { a as markNoticeShown, i as getOrCreateAnonymousId, o as readTelemetryConfig, r as track, s as writeTelemetryConfig, t as isTelemetryEnabled } from "./telemetry-C_b18hhq.js";
 import { d as hasFlag, g as resolveRequiredHomeDir, h as expandHomePrefix, i as isDaemonlessMode, m as applyCliProfileEnv, o as visibleWidth, p as hasRootVersionAlias, r as DENCHCLAW_DEFAULT_GATEWAY_PORT, s as defaultRuntime, t as isTruthyEnvValue, u as getPrimaryCommand } from "./entry.js";
-import { a as hasEmittedCliBanner, i as formatCliBannerLine, n as resolveCliName, o as isRich, s as theme, t as replaceCliName } from "./cli-name-CoW7mNz-.js";
+import { a as hasEmittedCliBanner, i as formatCliBannerLine, n as resolveCliName, o as isRich, s as theme, t as replaceCliName } from "./cli-name-Sz-5E3q2.js";
 import { t as VERSION } from "./version-DfFmvCFM.js";
 import { execFileSync, spawn } from "node:child_process";
 import process$1 from "node:process";
+import fs, { copyFileSync, cpSync, existsSync, lstatSync, mkdirSync, openSync, readFileSync, readdirSync, readlinkSync, realpathSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import os from "node:os";
 import path from "node:path";
-import fs, { copyFileSync, cpSync, existsSync, lstatSync, mkdirSync, openSync, readFileSync, readdirSync, readlinkSync, realpathSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import json5 from "json5";
 import { Command } from "commander";
 import { confirm, isCancel, select, spinner, text } from "@clack/prompts";
@@ -168,6 +168,7 @@ function buildDenchGatewayCatalogUrl(gatewayUrl) {
 	return `${normalizeDenchGatewayUrl(gatewayUrl)}/v1/public/models`;
 }
 const RECOMMENDED_DENCH_CLOUD_MODEL_ID = "claude-opus-4.6";
+const DENCH_COMPOSIO_WRAPPER_TOOLS = ["dench_search_integrations", "dench_execute_integrations"];
 const FALLBACK_DENCH_CLOUD_MODELS = [
 	{
 		id: "claude-opus-4.6",
@@ -348,13 +349,6 @@ function buildDenchCloudProviderModels(models) {
 function buildDenchCloudAgentModelEntries(models) {
 	return Object.fromEntries(models.map((model) => [`dench-cloud/${model.stableId}`, { alias: `${model.displayName} (Dench Cloud)` }]));
 }
-function buildComposioMcpServerConfig(gatewayUrl, apiKey) {
-	return {
-		url: `${gatewayUrl}/v1/composio/mcp`,
-		transport: "streamable-http",
-		headers: { Authorization: `Bearer ${apiKey}` }
-	};
-}
 function buildDenchCloudProviderConfig(params) {
 	return {
 		baseUrl: buildDenchGatewayApiBaseUrl(params.gatewayUrl),
@@ -377,7 +371,7 @@ function buildDenchCloudConfigPatch(params) {
 				apiKey: params.apiKey
 			} }
 		} },
-		mcp: { servers: { composio: buildComposioMcpServerConfig(params.gatewayUrl, params.apiKey) } }
+		tools: { alsoAllow: [...DENCH_COMPOSIO_WRAPPER_TOOLS] }
 	};
 }
 function resolveDenchCloudModel(models, requestedId) {
@@ -398,7 +392,8 @@ function readConfiguredDenchCloudSettings(rawConfig) {
 	const modelPrimary = typeof modelValue === "string" ? modelValue : typeof modelSetting?.primary === "string" ? modelSetting.primary : void 0;
 	const selectedModel = typeof modelPrimary === "string" && modelPrimary.startsWith("dench-cloud/") ? modelPrimary.slice(12) : void 0;
 	const baseUrl = readString(provider ?? {}, "baseUrl", "base_url");
-	const ttsElevenlabs = asRecord$1(asRecord$1(asRecord$1(asRecord$1(rawConfig?.messages)?.tts)?.providers)?.elevenlabs);
+	const tts = asRecord$1(asRecord$1(rawConfig?.messages)?.tts);
+	const ttsElevenlabs = asRecord$1(tts?.elevenlabs) ?? asRecord$1(asRecord$1(tts?.providers)?.elevenlabs);
 	return {
 		gatewayUrl: baseUrl ? normalizeDenchGatewayUrl(baseUrl) : void 0,
 		apiKey: readString(provider ?? {}, "apiKey", "api_key"),
@@ -1423,7 +1418,7 @@ const MANAGED_SKILLS = [
 		templatePaths: true
 	},
 	{ name: "gstack" },
-	{ name: "composio-apps" }
+	{ name: "dench-integrations" }
 ];
 function seedSkill(params, skill) {
 	const sourceDir = path.join(params.packageRoot, "skills", skill.name);
@@ -1706,6 +1701,31 @@ function normalizeVersionOutput(raw) {
 	const first = raw?.split(/\r?\n/).map((line) => line.trim()).find(Boolean);
 	return first && first.length > 0 ? first : void 0;
 }
+function parseOpenClawCalendarVersion(raw) {
+	const match = raw?.match(/\b(\d{4})\.(\d+)\.(\d+)\b/u);
+	if (!match) return;
+	return [
+		Number(match[1]),
+		Number(match[2]),
+		Number(match[3])
+	];
+}
+function compareOpenClawCalendarVersions(left, right) {
+	for (let index = 0; index < left.length; index += 1) {
+		const diff = left[index] - right[index];
+		if (diff !== 0) return diff;
+	}
+	return 0;
+}
+function preferredTtsConfigShapeForOpenClaw(openClawVersion) {
+	const parsed = parseOpenClawCalendarVersion(openClawVersion);
+	if (!parsed) return "providers";
+	return compareOpenClawCalendarVersions(parsed, [
+		2026,
+		3,
+		28
+	]) >= 0 ? "providers" : "flat";
+}
 function firstNonEmptyLine$1(...values) {
 	for (const value of values) {
 		const first = value?.split(/\r?\n/).map((line) => line.trim()).find(Boolean);
@@ -1726,6 +1746,15 @@ function toStringArray(value) {
 function asRecord(value) {
 	return value && typeof value === "object" && !Array.isArray(value) ? value : void 0;
 }
+function mergeAllowedTools(existingTools, patchTools) {
+	const existing = asRecord(existingTools);
+	const patch = asRecord(patchTools);
+	return [...new Set([
+		...toStringArray(existing?.alsoAllow),
+		...toStringArray(existing?.allow),
+		...toStringArray(patch?.alsoAllow)
+	])].sort((left, right) => left.localeCompare(right));
+}
 function toFiniteNumber(value) {
 	return typeof value === "number" && Number.isFinite(value) ? value : void 0;
 }
@@ -1782,16 +1811,50 @@ function readDenchIntegrationsMetadata(stateDir) {
 		return;
 	}
 }
-function disableDenchElevenLabsOverride(tts, gatewayUrl, apiKey) {
+function readTtsElevenLabsConfig(tts) {
+	return asRecord(tts.elevenlabs) ?? asRecord(asRecord(tts.providers)?.elevenlabs);
+}
+function ensureTtsElevenLabsConfig(tts, shape) {
+	const direct = asRecord(tts.elevenlabs);
 	const providers = asRecord(tts.providers);
-	const elevenlabs = asRecord(providers?.elevenlabs);
+	const next = {
+		...asRecord(providers?.elevenlabs) ?? {},
+		...direct ?? {}
+	};
+	if (shape === "providers") {
+		const nextProviders = providers ?? {};
+		nextProviders.elevenlabs = next;
+		tts.providers = nextProviders;
+		delete tts.elevenlabs;
+		return next;
+	}
+	tts.elevenlabs = next;
+	if (providers) {
+		delete providers.elevenlabs;
+		if (Object.keys(providers).length === 0) delete tts.providers;
+		else tts.providers = providers;
+	}
+	return next;
+}
+function removeTtsElevenLabsConfig(tts, shape) {
+	if (shape === "providers") {
+		const providers = asRecord(tts.providers);
+		if (providers) {
+			delete providers.elevenlabs;
+			if (Object.keys(providers).length === 0) delete tts.providers;
+		}
+		return;
+	}
+	delete tts.elevenlabs;
+}
+function disableDenchElevenLabsOverride(tts, shape, gatewayUrl, apiKey) {
+	const elevenlabs = readTtsElevenLabsConfig(tts) ? ensureTtsElevenLabsConfig(tts, shape) : void 0;
 	if (elevenlabs) {
 		if (typeof elevenlabs.baseUrl === "string" && (!gatewayUrl || elevenlabs.baseUrl === gatewayUrl)) delete elevenlabs.baseUrl;
 		if (typeof elevenlabs.apiKey === "string" && (!apiKey || elevenlabs.apiKey === apiKey)) delete elevenlabs.apiKey;
-		if (Object.keys(elevenlabs).length === 0 && providers) delete providers.elevenlabs;
+		if (Object.keys(elevenlabs).length === 0) removeTtsElevenLabsConfig(tts, shape);
 	}
 	if (tts.provider === "elevenlabs") delete tts.provider;
-	if (providers && Object.keys(providers).length === 0) delete tts.providers;
 }
 function applyDenchManagedIntegrationDefaults(params) {
 	const nextConfig = { ...readBootstrapConfig(params.stateDir) ?? {} };
@@ -1818,18 +1881,12 @@ function applyDenchManagedIntegrationDefaults(params) {
 	nextConfig.tools = tools;
 	const messages = { ...asRecord(nextConfig.messages) ?? {} };
 	const tts = { ...asRecord(messages.tts) ?? {} };
-	const providers = { ...asRecord(tts.providers) ?? {} };
-	const elevenlabs = { ...asRecord(providers.elevenlabs) ?? {} };
 	if (params.denchEnabled && params.gatewayUrl && params.apiKey) {
+		const elevenlabs = ensureTtsElevenLabsConfig(tts, params.ttsConfigShape);
 		tts.provider = "elevenlabs";
 		elevenlabs.baseUrl = params.gatewayUrl;
 		elevenlabs.apiKey = params.apiKey;
-		providers.elevenlabs = elevenlabs;
-		tts.providers = providers;
-	} else {
-		tts.providers = providers;
-		disableDenchElevenLabsOverride(tts, params.gatewayUrl, params.apiKey);
-	}
+	} else disableDenchElevenLabsOverride(tts, params.ttsConfigShape, params.gatewayUrl, params.apiKey);
 	messages.tts = tts;
 	nextConfig.messages = messages;
 	writeFileSync(path.join(params.stateDir, "openclaw.json"), `${JSON.stringify(nextConfig, null, 2)}\n`);
@@ -1884,6 +1941,13 @@ async function syncBundledPlugins(params) {
 				...asRecord(existingEntry.config),
 				...plugin.config
 			};
+			if (plugin.pluginId === "apollo-enrichment" || plugin.pluginId === "exa-search") {
+				const cfg = asRecord(existingEntry.config);
+				if (cfg && "apiKey" in cfg) {
+					delete cfg.apiKey;
+					existingEntry.config = cfg;
+				}
+			}
 			if (Object.keys(existingEntry).length > 0) entries[plugin.pluginId] = existingEntry;
 			const installRecord = {
 				source: "path",
@@ -1895,6 +1959,11 @@ async function syncBundledPlugins(params) {
 			if (version) installRecord.version = version;
 			installs[plugin.pluginId] = installRecord;
 		}
+		const sharedSrc = path.join(packageRoot, "extensions", "shared");
+		if (existsSync(sharedSrc)) cpSync(sharedSrc, path.join(params.stateDir, "extensions", "shared"), {
+			recursive: true,
+			force: true
+		});
 		pluginsConfig.allow = uniqueStrings(nextAllow);
 		loadConfig.paths = uniqueStrings(nextLoadPaths);
 		pluginsConfig.load = loadConfig;
@@ -2765,9 +2834,8 @@ function readBootstrapConfig(stateDir) {
 		} catch {}
 	}
 }
-function hasConfiguredComposioServer(stateDir) {
-	const composio = asRecord(asRecord(asRecord(readBootstrapConfig(stateDir)?.mcp)?.servers)?.composio);
-	return typeof composio?.url === "string" && composio.url.trim().length > 0;
+function hasConfiguredComposioServer(_stateDir) {
+	return true;
 }
 function resolveBootstrapWorkspaceDir(stateDir) {
 	return path.join(stateDir, "workspace");
@@ -2781,6 +2849,38 @@ function resolveModelProvider(stateDir) {
 	const modelName = typeof model === "string" ? model : model?.primary;
 	if (typeof modelName === "string" && modelName.includes("/")) return modelName.split("/")[0];
 }
+function authProfilesPath(stateDir) {
+	return path.join(stateDir, "agents", "main", "agent", "auth-profiles.json");
+}
+function readAuthProfileKey(stateDir) {
+	const authPath = authProfilesPath(stateDir);
+	try {
+		if (!existsSync(authPath)) return void 0;
+		const key = json5.parse(readFileSync(authPath, "utf-8"))?.profiles?.["dench-cloud:default"]?.key;
+		return typeof key === "string" && key.trim() ? key.trim() : void 0;
+	} catch {
+		return;
+	}
+}
+function writeAuthProfileKey(stateDir, apiKey) {
+	const authPath = authProfilesPath(stateDir);
+	let raw = {
+		version: 1,
+		profiles: {}
+	};
+	try {
+		if (existsSync(authPath)) raw = json5.parse(readFileSync(authPath, "utf-8"));
+	} catch {}
+	const profiles = raw.profiles ?? {};
+	profiles["dench-cloud:default"] = {
+		type: "api_key",
+		provider: "dench-cloud",
+		key: apiKey
+	};
+	raw.profiles = profiles;
+	mkdirSync(path.dirname(authPath), { recursive: true });
+	writeFileSync(authPath, `${JSON.stringify(raw, null, 2)}\n`);
+}
 /**
 * Check if the agent auth store has at least one key for the given provider.
 */
@@ -2838,7 +2938,7 @@ function buildBootstrapDiagnostics(params) {
 	else checks.push(createCheck("profile", "fail", `DenchClaw profile drift detected (${params.profile}).`, `DenchClaw requires \`--profile ${DEFAULT_DENCHCLAW_PROFILE}\`. Re-run bootstrap to repair environment defaults.`));
 	if (params.gatewayProbe.ok) checks.push(createCheck("gateway", "pass", `Gateway reachable at ${params.gatewayUrl}.`));
 	else checks.push(createCheck("gateway", "fail", `Gateway probe failed at ${params.gatewayUrl}${params.gatewayProbe.detail ? ` (${params.gatewayProbe.detail})` : ""}.`, remediationForGatewayFailure(params.gatewayProbe.detail, params.gatewayPort, params.profile)));
-	if (params.denchCloudEnabled) checks.push(createCheck("composio", params.composioConfigured ? "pass" : "warn", params.composioConfigured ? "Composio MCP configured via Dench Cloud gateway." : "Composio MCP not configured. Check mcp.servers.composio in openclaw.json.", params.composioConfigured ? void 0 : `Open Settings > Integrations and repair the Composio MCP setup, or run \`openclaw --profile ${DEFAULT_DENCHCLAW_PROFILE} gateway restart\` after restoring the Dench Cloud config.`));
+	if (params.denchCloudEnabled) checks.push(createCheck("composio", params.composioConfigured ? "pass" : "warn", params.composioConfigured ? "Dench Integrations configured via Dench Cloud gateway." : "Dench Integrations not configured. Check Dench Cloud gateway connectivity.", params.composioConfigured ? void 0 : `Open Settings > Integrations or run \`openclaw --profile ${DEFAULT_DENCHCLAW_PROFILE} gateway restart\` to repair the Dench Cloud config.`));
 	const stateDir = params.stateDir ?? resolveProfileStateDir(params.profile, env);
 	const authCheck = checkAgentAuth(stateDir, resolveModelProvider(stateDir));
 	if (authCheck.ok) checks.push(createCheck("agent-auth", "pass", authCheck.detail));
@@ -2883,7 +2983,7 @@ function isExplicitDenchCloudRequest(opts) {
 	return Boolean(opts.denchCloud || opts.denchCloudApiKey?.trim() || opts.denchCloudModel?.trim() || opts.denchGatewayUrl?.trim());
 }
 function resolveDenchCloudApiKeyCandidate(params) {
-	return params.opts.denchCloudApiKey?.trim() || process$1.env.DENCH_CLOUD_API_KEY?.trim() || process$1.env.DENCH_API_KEY?.trim() || params.existingApiKey?.trim();
+	return params.opts.denchCloudApiKey?.trim() || process$1.env.DENCH_CLOUD_API_KEY?.trim() || process$1.env.DENCH_API_KEY?.trim() || readAuthProfileKey(params.stateDir) || params.existingApiKey?.trim();
 }
 async function promptForDenchCloudApiKey(initialValue) {
 	const value = await text({
@@ -2985,6 +3085,109 @@ function renderDenchCloudRecommendationBanner() {
 		""
 	].join("\n");
 }
+function preStageDenchCloudConfig(params) {
+	try {
+		const nextConfig = { ...readBootstrapConfig(params.stateDir) ?? {} };
+		const models = { ...asRecord(nextConfig.models) };
+		models.mode = models.mode ?? "merge";
+		const providers = { ...asRecord(models.providers) };
+		const configPatch = buildDenchCloudConfigPatch({
+			gatewayUrl: params.gatewayUrl,
+			apiKey: params.apiKey,
+			models: params.catalog?.models ?? []
+		});
+		providers["dench-cloud"] = configPatch.models.providers["dench-cloud"];
+		models.providers = providers;
+		nextConfig.models = models;
+		const tools = { ...asRecord(nextConfig.tools) };
+		tools.alsoAllow = mergeAllowedTools(nextConfig.tools, configPatch.tools);
+		delete tools.allow;
+		nextConfig.tools = tools;
+		if (params.selectedModel) {
+			const agents = { ...asRecord(nextConfig.agents) };
+			const defaults = { ...asRecord(agents.defaults) };
+			defaults.model = {
+				...asRecord(defaults.model),
+				primary: `dench-cloud/${params.selectedModel}`
+			};
+			agents.defaults = defaults;
+			nextConfig.agents = agents;
+		}
+		writeFileSync(path.join(params.stateDir, "openclaw.json"), `${JSON.stringify(nextConfig, null, 2)}\n`);
+		writeAuthProfileKey(params.stateDir, params.apiKey);
+	} catch {}
+}
+function buildDenchCloudElevenLabsTtsConfig(params) {
+	if (params.shape === "providers") return {
+		provider: "elevenlabs",
+		providers: { elevenlabs: {
+			baseUrl: params.gatewayUrl,
+			apiKey: params.apiKey
+		} }
+	};
+	return {
+		provider: "elevenlabs",
+		elevenlabs: {
+			baseUrl: params.gatewayUrl,
+			apiKey: params.apiKey
+		}
+	};
+}
+function rewriteDenchCloudTtsConfigFile(params) {
+	const nextConfig = { ...readBootstrapConfig(params.stateDir) ?? {} };
+	const messages = { ...asRecord(nextConfig.messages) ?? {} };
+	const tts = { ...asRecord(messages.tts) ?? {} };
+	const elevenlabs = ensureTtsElevenLabsConfig(tts, params.shape);
+	tts.provider = "elevenlabs";
+	elevenlabs.baseUrl = params.gatewayUrl;
+	elevenlabs.apiKey = params.apiKey;
+	messages.tts = tts;
+	nextConfig.messages = messages;
+	writeFileSync(path.join(params.stateDir, "openclaw.json"), `${JSON.stringify(nextConfig, null, 2)}\n`);
+}
+function isExpectedTtsShapeValidationError(error, attemptedShape) {
+	const message = error instanceof Error ? error.message : String(error);
+	if (attemptedShape === "flat") return /messages\.tts.*legacy; use messages\.tts\.providers/i.test(message);
+	return /messages\.tts.*unrecognized key:\s*"providers"/iu.test(message);
+}
+async function applyDenchCloudTtsConfig(params) {
+	const attempt = async (shape) => {
+		const ttsConfig = buildDenchCloudElevenLabsTtsConfig({
+			gatewayUrl: params.gatewayUrl,
+			apiKey: params.apiKey,
+			shape
+		});
+		rewriteDenchCloudTtsConfigFile({
+			stateDir: params.stateDir,
+			gatewayUrl: params.gatewayUrl,
+			apiKey: params.apiKey,
+			shape
+		});
+		await setOpenClawConfigJson({
+			openclawCommand: params.openclawCommand,
+			profile: params.profile,
+			key: "messages.tts.provider",
+			value: ttsConfig.provider,
+			errorMessage: "Failed to set ElevenLabs as TTS provider."
+		});
+		await setOpenClawConfigJson({
+			openclawCommand: params.openclawCommand,
+			profile: params.profile,
+			key: shape === "providers" ? "messages.tts.providers.elevenlabs" : "messages.tts.elevenlabs",
+			value: shape === "providers" ? asRecord(asRecord(ttsConfig.providers)?.elevenlabs) : asRecord(ttsConfig.elevenlabs),
+			errorMessage: "Failed to configure ElevenLabs TTS via Dench Cloud gateway."
+		});
+	};
+	try {
+		await attempt(params.preferredShape);
+		return params.preferredShape;
+	} catch (error) {
+		if (!isExpectedTtsShapeValidationError(error, params.preferredShape)) throw error;
+		const fallbackShape = params.preferredShape === "providers" ? "flat" : "providers";
+		await attempt(fallbackShape);
+		return fallbackShape;
+	}
+}
 async function applyDenchCloudBootstrapConfig(params) {
 	const raw = readBootstrapConfig(params.stateDir);
 	const existingAgentModels = raw?.agents?.defaults?.models && typeof raw.agents.defaults.models === "object" ? raw.agents.defaults.models : {};
@@ -2997,6 +3200,7 @@ async function applyDenchCloudBootstrapConfig(params) {
 		...existingAgentModels,
 		...configPatch.agents?.defaults?.models ?? {}
 	};
+	const preferredTtsShape = preferredTtsConfigShapeForOpenClaw(params.openClawVersion);
 	await runOpenClawOrThrow({
 		openclawCommand: params.openclawCommand,
 		args: [
@@ -3037,47 +3241,24 @@ async function applyDenchCloudBootstrapConfig(params) {
 		value: nextAgentModels,
 		errorMessage: "Failed to update agents.defaults.models for Dench Cloud."
 	});
-	await setOpenClawConfigJson({
+	const appliedTtsShape = await applyDenchCloudTtsConfig({
 		openclawCommand: params.openclawCommand,
 		profile: params.profile,
-		key: "messages.tts.provider",
-		value: configPatch.messages.tts.provider,
-		errorMessage: "Failed to set ElevenLabs as TTS provider."
+		stateDir: params.stateDir,
+		gatewayUrl: params.gatewayUrl,
+		apiKey: params.apiKey,
+		preferredShape: preferredTtsShape
 	});
-	await setOpenClawConfigJson({
+	const nextAlsoAllow = mergeAllowedTools(raw?.tools, configPatch.tools);
+	if (nextAlsoAllow.length > 0) await setOpenClawConfigJson({
 		openclawCommand: params.openclawCommand,
 		profile: params.profile,
-		key: "messages.tts.providers.elevenlabs",
-		value: configPatch.messages.tts.providers.elevenlabs,
-		errorMessage: "Failed to configure ElevenLabs TTS via Dench Cloud gateway."
-	});
-	if (configPatch.mcp) {
-		const servers = configPatch.mcp.servers;
-		if (servers?.composio) try {
-			await setOpenClawConfigJson({
-				openclawCommand: params.openclawCommand,
-				profile: params.profile,
-				key: "mcp.servers.composio",
-				value: servers.composio,
-				errorMessage: "Failed to configure Composio MCP server via Dench Cloud gateway."
-			});
-		} catch {
-			console.warn(theme.warn("Could not configure the Composio MCP server during bootstrap. You can repair it later in Settings > Integrations."));
-		}
-	}
-	await runOpenClawOrThrow({
-		openclawCommand: params.openclawCommand,
-		args: [
-			"--profile",
-			params.profile,
-			"config",
-			"set",
-			"agents.defaults.reasoningDefault",
-			"on"
-		],
-		timeoutMs: 3e4,
-		errorMessage: "Failed to enable reasoning visibility for Dench Cloud."
+		key: "tools.alsoAllow",
+		value: nextAlsoAllow,
+		errorMessage: "Failed to enable Dench Integrations wrapper tools."
 	});
+	writeAuthProfileKey(params.stateDir, params.apiKey);
+	return appliedTtsShape;
 }
 async function resolveDenchCloudBootstrapSelection(params) {
 	const existing = readConfiguredDenchCloudSettings(readBootstrapConfig(params.stateDir));
@@ -3089,6 +3270,7 @@ async function resolveDenchCloudBootstrapSelection(params) {
 		if (!explicitRequest && !existingDenchConfigured) return { enabled: false };
 		const apiKey = resolveDenchCloudApiKeyCandidate({
 			opts: params.opts,
+			stateDir: params.stateDir,
 			existingApiKey: existing.apiKey
 		});
 		if (!apiKey) throw new Error("Dench Cloud bootstrap requires --dench-cloud-api-key or DENCH_CLOUD_API_KEY in non-interactive mode.");
@@ -3113,6 +3295,7 @@ async function resolveDenchCloudBootstrapSelection(params) {
 	if (!params.nonInteractive) await openUrl$1("https://dench.com/api").catch(() => {});
 	let apiKey = resolveDenchCloudApiKeyCandidate({
 		opts: params.opts,
+		stateDir: params.stateDir,
 		existingApiKey: existing.apiKey
 	});
 	const showSpinners = !params.opts.json;
@@ -3290,12 +3473,14 @@ async function bootstrapCommand(opts, runtime = defaultRuntime) {
 		{
 			pluginId: "apollo-enrichment",
 			sourceDirName: "apollo-enrichment",
-			enabled: denchCloudSelection.enabled
+			enabled: denchCloudSelection.enabled,
+			...denchCloudSelection.enabled ? { config: { enabled: true } } : {}
 		},
 		{
 			pluginId: "exa-search",
 			sourceDirName: "exa-search",
-			enabled: denchCloudSelection.enabled
+			enabled: denchCloudSelection.enabled,
+			...denchCloudSelection.enabled ? { config: { enabled: true } } : {}
 		}
 	];
 	const preOnboardSpinner = !opts.json ? spinner() : null;
@@ -3306,6 +3491,13 @@ async function bootstrapCommand(opts, runtime = defaultRuntime) {
 		stateDir,
 		plugins: managedBundledPlugins
 	})).installedPluginIds.includes("posthog-analytics");
+	if (denchCloudSelection.enabled && denchCloudSelection.apiKey) preStageDenchCloudConfig({
+		stateDir,
+		gatewayUrl: denchCloudSelection.gatewayUrl ?? DEFAULT_DENCH_CLOUD_GATEWAY_URL,
+		apiKey: denchCloudSelection.apiKey,
+		catalog: denchCloudSelection.catalog,
+		selectedModel: denchCloudSelection.selectedModel
+	});
 	preOnboardSpinner?.stop("Ready to onboard.");
 	const onboardArgv = [
 		"--profile",
@@ -3351,16 +3543,18 @@ async function bootstrapCommand(opts, runtime = defaultRuntime) {
 	await ensureGatewayPort(openclawCommand, profile, gatewayPort);
 	postOnboardSpinner?.message("Setting tools profile…");
 	await ensureToolsProfile(openclawCommand, profile);
+	let appliedTtsConfigShape = preferredTtsConfigShapeForOpenClaw(installResult.version);
 	if (denchCloudSelection.enabled && denchCloudSelection.apiKey && denchCloudSelection.gatewayUrl && denchCloudSelection.selectedModel && denchCloudSelection.catalog) {
 		postOnboardSpinner?.message("Applying Dench Cloud model config…");
-		await applyDenchCloudBootstrapConfig({
+		appliedTtsConfigShape = await applyDenchCloudBootstrapConfig({
 			openclawCommand,
 			profile,
 			stateDir,
 			gatewayUrl: denchCloudSelection.gatewayUrl,
 			apiKey: denchCloudSelection.apiKey,
 			catalog: denchCloudSelection.catalog,
-			selectedModel: denchCloudSelection.selectedModel
+			selectedModel: denchCloudSelection.selectedModel,
+			openClawVersion: installResult.version
 		});
 	}
 	postOnboardSpinner?.message("Refreshing managed plugin config…");
@@ -3377,7 +3571,8 @@ async function bootstrapCommand(opts, runtime = defaultRuntime) {
 		stateDir,
 		denchEnabled: denchCloudSelection.enabled,
 		gatewayUrl: denchCloudSelection.gatewayUrl,
-		apiKey: denchCloudSelection.apiKey
+		apiKey: denchCloudSelection.apiKey,
+		ttsConfigShape: appliedTtsConfigShape
 	});
 	let gatewayProbe;
 	let gatewayAutoFix;

package/dist/{run-main-tu5KGaV-.js → run-main-CPnN1zoG.js}

@@ -1,11 +1,11 @@
 import { c as normalizeWindowsArgv, f as hasHelpOrVersion, l as getCommandPath, n as normalizeEnv, t as isTruthyEnvValue, u as getPrimaryCommand } from "./entry.js";
-import { n as resolveCliName, r as emitCliBanner } from "./cli-name-CoW7mNz-.js";
+import { n as resolveCliName, r as emitCliBanner } from "./cli-name-Sz-5E3q2.js";
 import { t as VERSION } from "./version-DfFmvCFM.js";
 import { spawn } from "node:child_process";
 import process$1 from "node:process";
+import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
-import fs from "node:fs";
 import { fileURLToPath } from "node:url";
 
 //#region src/infra/brew.ts
@@ -220,7 +220,7 @@ async function runCli(argv = process$1.argv) {
 		process$1.exitCode = await delegateToGlobalOpenClaw(parseArgv);
 		return;
 	}
-	const { buildProgram } = await import("./program-C4ijUMvC.js");
+	const { buildProgram } = await import("./program-CtW4fcfa.js");
 	await buildProgram().parseAsync(parseArgv);
 }
 

package/dist/{telemetry-DguRjCZq.js → telemetry-C_b18hhq.js}

@@ -1,8 +1,8 @@
 import { a as resolveStateDir } from "./entry.js";
 import { n as resolveOpenClawVersion, t as VERSION } from "./version-DfFmvCFM.js";
 import { createRequire } from "node:module";
-import { dirname, join } from "node:path";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { dirname, join } from "node:path";
 import { randomUUID } from "node:crypto";
 import { PostHog } from "posthog-node";
 

package/extensions/apollo-enrichment/index.ts

@@ -1,8 +1,8 @@
 import type { AnyAgentTool, OpenClawPluginApi } from "openclaw/plugin-sdk";
+import { readDenchAuthProfileKey, resolveDenchGatewayUrl } from "../shared/dench-auth.js";
 
 export const id = "apollo-enrichment";
 
-const DEFAULT_GATEWAY_URL = "https://gateway.merseoriginals.com";
 const ENRICHMENT_BASE_PATH = "/v1/enrichment";
 const APOLLO_ACTIONS = ["people", "company", "people_search"] as const;
 
@@ -26,29 +26,6 @@ function readStringList(value: unknown): string[] | undefined {
   return items.length > 0 ? items : undefined;
 }
 
-function resolveGatewayUrl(config: unknown): string {
-  const root = asRecord(config);
-  const pluginEntries = asRecord(asRecord(root?.plugins)?.entries);
-  const gatewayConfig = asRecord(asRecord(pluginEntries?.["dench-ai-gateway"])?.config);
-  return (
-    readTrimmedString(gatewayConfig?.gatewayUrl) ||
-    process.env.DENCH_GATEWAY_URL?.trim() ||
-    DEFAULT_GATEWAY_URL
-  );
-}
-
-function resolveApiKey(config: unknown): string | undefined {
-  const root = asRecord(config);
-  const providers = asRecord(asRecord(asRecord(root?.models)?.providers));
-  const provider = asRecord(providers?.["dench-cloud"]);
-  return (
-    readTrimmedString(provider?.apiKey) ||
-    process.env.DENCH_CLOUD_API_KEY?.trim() ||
-    process.env.DENCH_API_KEY?.trim() ||
-    undefined
-  );
-}
-
 function jsonResult(payload: unknown) {
   return {
     content: [{ type: "text" as const, text: JSON.stringify(payload, null, 2) }],
@@ -244,8 +221,9 @@ export default function register(api: OpenClawPluginApi) {
     return;
   }
 
-  const gatewayUrl = resolveGatewayUrl(api.config);
-  const apiKey = resolveApiKey(api.config);
+  const gwPluginConfig = asRecord(asRecord(pluginEntries?.["dench-ai-gateway"])?.config);
+  const gatewayUrl = resolveDenchGatewayUrl(gwPluginConfig as Record<string, unknown> | undefined);
+  const apiKey = readDenchAuthProfileKey();
 
   if (!apiKey) {
     api.logger?.info?.(