denchclaw 2.0.6 → 2.0.8

package/dist/{program-CVEqiDmd.js → program-BYwTE_Ot.js}

@@ -1,11 +1,11 @@
-import { a as readTelemetryConfig, i as markNoticeShown, o as writeTelemetryConfig, r as track, t as isTelemetryEnabled } from "./telemetry-UyOfXAoS.js";
-import { a as defaultRuntime, c as getPrimaryCommand, d as hasRootVersionAlias, f as applyCliProfileEnv, l as hasFlag, m as resolveRequiredHomeDir, p as expandHomePrefix, t as isTruthyEnvValue } from "./entry.js";
-import { a as hasEmittedCliBanner, c as theme, i as formatCliBannerLine, n as resolveCliName, o as VERSION, s as isRich, t as replaceCliName } from "./cli-name-yhDyCrts.js";
+import { a as readTelemetryConfig, i as markNoticeShown, o as writeTelemetryConfig, r as track, t as isTelemetryEnabled } from "./telemetry-CwRnbZ2F.js";
+import { f as hasRootVersionAlias, h as resolveRequiredHomeDir, l as getPrimaryCommand, m as expandHomePrefix, o as defaultRuntime, p as applyCliProfileEnv, r as DENCHCLAW_DEFAULT_GATEWAY_PORT, t as isTruthyEnvValue, u as hasFlag } from "./entry.js";
+import { a as hasEmittedCliBanner, c as theme, i as formatCliBannerLine, n as resolveCliName, o as VERSION, s as isRich, t as replaceCliName } from "./cli-name-YmLsNGR6.js";
 import { execFileSync, spawn } from "node:child_process";
 import process$1 from "node:process";
 import os from "node:os";
 import path from "node:path";
-import fs, { copyFileSync, cpSync, existsSync, mkdirSync, openSync, readFileSync, readdirSync, rmSync, writeFileSync } from "node:fs";
+import fs, { copyFileSync, cpSync, existsSync, lstatSync, mkdirSync, openSync, readFileSync, readdirSync, readlinkSync, rmSync, writeFileSync } from "node:fs";
 import { Command } from "commander";
 import { confirm, isCancel, spinner } from "@clack/prompts";
 import { fileURLToPath } from "node:url";
@@ -108,6 +108,90 @@ function formatDocsLink(path, label, opts) {
 //#region src/terminal/prompt-style.ts
 const stylePromptMessage = (message) => isRich() ? theme.accent(message) : message;
 
+//#endregion
+//#region src/cli/flatten-standalone-deps.ts
+/**
+* Flatten pnpm virtual-store symlinks in a Next.js standalone output
+* into a standard flat node_modules layout.
+*
+* Why: pnpm's standalone output uses symlinks inside node_modules/ that
+* npm pack silently drops. Without this step the published package ships
+* with an empty node_modules/ and `require('next')` fails on user machines.
+*/
+/**
+* Walk the pnpm `.pnpm/` virtual store inside `standaloneDir/node_modules/`
+* and copy every traced package (dereferenced) into a flat
+* `standaloneDir/apps/web/node_modules/` layout. Removes the root
+* `node_modules/` afterwards so only the self-contained app dir remains.
+*/
+function flattenPnpmStandaloneDeps(standaloneDir) {
+	const pnpmStore = path.join(standaloneDir, "node_modules", ".pnpm");
+	const target = path.join(standaloneDir, "apps", "web", "node_modules");
+	if (!existsSync(pnpmStore)) return {
+		skipped: true,
+		copied: 0
+	};
+	rmSync(target, {
+		recursive: true,
+		force: true
+	});
+	mkdirSync(target, { recursive: true });
+	let copied = 0;
+	for (const storeEntry of readdirSync(pnpmStore)) {
+		const nmDir = path.join(pnpmStore, storeEntry, "node_modules");
+		if (!existsSync(nmDir)) continue;
+		const stat = lstatSync(nmDir);
+		if (!stat.isDirectory() && !stat.isSymbolicLink()) continue;
+		let deps;
+		try {
+			deps = readdirSync(nmDir);
+		} catch {
+			continue;
+		}
+		for (const dep of deps) {
+			if (dep === ".pnpm" || dep === "node_modules") continue;
+			const depPath = path.join(nmDir, dep);
+			if (dep.startsWith("@")) {
+				let scopedPkgs;
+				try {
+					scopedPkgs = readdirSync(depPath);
+				} catch {
+					continue;
+				}
+				for (const pkg of scopedPkgs) {
+					const src = path.join(depPath, pkg);
+					const dst = path.join(target, dep, pkg);
+					if (existsSync(dst)) continue;
+					mkdirSync(path.join(target, dep), { recursive: true });
+					cpSync(src, dst, {
+						recursive: true,
+						dereference: true,
+						force: true
+					});
+					copied++;
+				}
+			} else {
+				const dst = path.join(target, dep);
+				if (existsSync(dst)) continue;
+				cpSync(depPath, dst, {
+					recursive: true,
+					dereference: true,
+					force: true
+				});
+				copied++;
+			}
+		}
+	}
+	rmSync(path.join(standaloneDir, "node_modules"), {
+		recursive: true,
+		force: true
+	});
+	return {
+		skipped: false,
+		copied
+	};
+}
+
 //#endregion
 //#region src/cli/web-runtime.ts
 const DEFAULT_WEB_APP_PORT = 3100;
@@ -147,6 +231,13 @@ function writeJsonFile(filePath, value) {
 	ensureParentDir(filePath);
 	writeFileSync(filePath, `${JSON.stringify(value, null, 2)}\n`, "utf-8");
 }
+function resolveCommandForPlatform$1(command) {
+	if (process$1.platform !== "win32") return command;
+	if (path.extname(command)) return command;
+	const normalized = path.basename(command).toLowerCase();
+	if (normalized === "npm" || normalized === "pnpm" || normalized === "npx" || normalized === "yarn") return `${command}.cmd`;
+	return command;
+}
 function isProcessAlive(pid) {
 	try {
 		process$1.kill(pid, 0);
@@ -364,6 +455,162 @@ function readLastKnownWebPort(stateDir) {
 	if (manifestPort) return manifestPort;
 	return DEFAULT_WEB_APP_PORT;
 }
+/**
+* Node.js cpSync with dereference:true does NOT dereference symlinks nested
+* inside a recursively-copied directory.  After copying the app dir:
+*
+* 1. Merge all packages from the standalone root node_modules/ into the
+*    runtime's node_modules/ (provides transitive deps like styled-jsx).
+* 2. Replace any remaining symlinks with real copies of their targets,
+*    falling back to the standalone root node_modules/ when the original
+*    target is missing (e.g. .pnpm/ was removed by a prior flatten).
+*/
+function dereferenceRuntimeNodeModules(runtimeAppDir, standaloneDir) {
+	const nmDir = path.join(runtimeAppDir, "node_modules");
+	mkdirSync(nmDir, { recursive: true });
+	const rootNm = path.join(standaloneDir, "node_modules");
+	mergeRootNodeModules(nmDir, rootNm);
+	resolveRemainingSymlinks(nmDir, rootNm);
+}
+function mergeRootNodeModules(targetNm, rootNm) {
+	if (!existsSync(rootNm)) return;
+	let entries;
+	try {
+		entries = readdirSync(rootNm);
+	} catch {
+		return;
+	}
+	for (const entry of entries) {
+		if (entry === ".pnpm" || entry === "node_modules") continue;
+		const src = path.join(rootNm, entry);
+		if (entry.startsWith("@")) {
+			let scopeEntries;
+			try {
+				scopeEntries = readdirSync(src);
+			} catch {
+				continue;
+			}
+			for (const pkg of scopeEntries) {
+				const dst = path.join(targetNm, entry, pkg);
+				if (existsSync(dst) && !lstatSync(dst).isSymbolicLink()) continue;
+				const scopeSrc = path.join(src, pkg);
+				try {
+					rmSync(dst, {
+						recursive: true,
+						force: true
+					});
+					mkdirSync(path.join(targetNm, entry), { recursive: true });
+					cpSync(scopeSrc, dst, {
+						recursive: true,
+						dereference: true,
+						force: true
+					});
+				} catch {}
+			}
+			continue;
+		}
+		const dst = path.join(targetNm, entry);
+		if (existsSync(dst) && !lstatSync(dst).isSymbolicLink()) continue;
+		try {
+			rmSync(dst, {
+				recursive: true,
+				force: true
+			});
+			cpSync(src, dst, {
+				recursive: true,
+				dereference: true,
+				force: true
+			});
+		} catch {}
+	}
+}
+function resolveRemainingSymlinks(nmDir, rootNm) {
+	let entries;
+	try {
+		entries = readdirSync(nmDir);
+	} catch {
+		return;
+	}
+	for (const entry of entries) {
+		const entryPath = path.join(nmDir, entry);
+		try {
+			if (!lstatSync(entryPath).isSymbolicLink()) {
+				if (entry.startsWith("@")) resolveScopeSymlinks(entryPath, entry, rootNm);
+				continue;
+			}
+		} catch {
+			continue;
+		}
+		resolveSymlinkedPackage(entryPath, entry, rootNm);
+	}
+}
+function resolveScopeSymlinks(scopeDir, scopeName, rootNm) {
+	let scopeEntries;
+	try {
+		scopeEntries = readdirSync(scopeDir);
+	} catch {
+		return;
+	}
+	for (const pkg of scopeEntries) {
+		const pkgPath = path.join(scopeDir, pkg);
+		try {
+			if (!lstatSync(pkgPath).isSymbolicLink()) continue;
+		} catch {
+			continue;
+		}
+		resolveSymlinkedPackage(pkgPath, `${scopeName}/${pkg}`, rootNm);
+	}
+}
+function resolveSymlinkedPackage(linkPath, packageName, rootNm) {
+	try {
+		const target = readlinkSync(linkPath);
+		const resolved = path.isAbsolute(target) ? target : path.resolve(path.dirname(linkPath), target);
+		if (existsSync(resolved)) {
+			rmSync(linkPath, { force: true });
+			cpSync(resolved, linkPath, {
+				recursive: true,
+				dereference: true,
+				force: true
+			});
+			return;
+		}
+	} catch {}
+	const fallback = path.join(rootNm, packageName);
+	if (existsSync(fallback)) {
+		try {
+			rmSync(linkPath, { force: true });
+			cpSync(fallback, linkPath, {
+				recursive: true,
+				dereference: true,
+				force: true
+			});
+		} catch {}
+		return;
+	}
+	try {
+		rmSync(linkPath, { force: true });
+	} catch {}
+}
+/**
+* Copy .next/static/ and public/ into the runtime app dir if they aren't
+* already present.  In production the prepack script copies these into the
+* standalone app dir before publish, so cpSync already picks them up.
+* In dev the prepack hasn't run, so we pull them from the source tree.
+*/
+function ensureStaticAssets(runtimeAppDir, packageRoot) {
+	const pairs = [[path.join(packageRoot, "apps", "web", ".next", "static"), path.join(runtimeAppDir, ".next", "static")], [path.join(packageRoot, "apps", "web", "public"), path.join(runtimeAppDir, "public")]];
+	for (const [src, dst] of pairs) {
+		if (existsSync(dst) || !existsSync(src)) continue;
+		try {
+			mkdirSync(path.dirname(dst), { recursive: true });
+			cpSync(src, dst, {
+				recursive: true,
+				dereference: true,
+				force: true
+			});
+		} catch {}
+	}
+}
 function installManagedWebRuntime(params) {
 	const runtimeDir = resolveManagedWebRuntimeDir(params.stateDir);
 	const runtimeAppDir = resolveManagedWebRuntimeAppDir(params.stateDir);
@@ -377,6 +624,8 @@ function installManagedWebRuntime(params) {
 		runtimeServerPath,
 		reason: "standalone-missing"
 	};
+	const standaloneDir = path.join(params.packageRoot, "apps", "web", ".next", "standalone");
+	flattenPnpmStandaloneDeps(standaloneDir);
 	mkdirSync(runtimeDir, { recursive: true });
 	rmSync(runtimeAppDir, {
 		recursive: true,
@@ -387,6 +636,8 @@ function installManagedWebRuntime(params) {
 		force: true,
 		dereference: true
 	});
+	dereferenceRuntimeNodeModules(runtimeAppDir, standaloneDir);
+	ensureStaticAssets(runtimeAppDir, params.packageRoot);
 	const manifest = {
 		schemaVersion: 1,
 		deployedDenchVersion: params.denchVersion,
@@ -513,6 +764,50 @@ function resolveOpenClawCommandOrThrow() {
 		throw new Error("Global `openclaw` CLI was not found on PATH. Install it with: npm install -g openclaw");
 	}
 }
+async function runOpenClawCommand(params) {
+	return await new Promise((resolve, reject) => {
+		const child = spawn(resolveCommandForPlatform$1(params.openclawCommand), params.args, {
+			stdio: [
+				"ignore",
+				"pipe",
+				"pipe"
+			],
+			env: params.env ? {
+				...process$1.env,
+				...params.env
+			} : process$1.env
+		});
+		let stdout = "";
+		let stderr = "";
+		let settled = false;
+		const timer = setTimeout(() => {
+			if (settled) return;
+			child.kill("SIGKILL");
+		}, params.timeoutMs);
+		child.stdout?.on("data", (chunk) => {
+			stdout += String(chunk);
+		});
+		child.stderr?.on("data", (chunk) => {
+			stderr += String(chunk);
+		});
+		child.once("error", (error) => {
+			if (settled) return;
+			settled = true;
+			clearTimeout(timer);
+			reject(error);
+		});
+		child.once("close", (code) => {
+			if (settled) return;
+			settled = true;
+			clearTimeout(timer);
+			resolve({
+				code: typeof code === "number" ? code : 1,
+				stdout,
+				stderr
+			});
+		});
+	});
+}
 
 //#endregion
 //#region src/cli/workspace-seed.ts
@@ -829,7 +1124,6 @@ function seedWorkspaceFromAssets(params) {
 //#endregion
 //#region src/cli/bootstrap-external.ts
 const DEFAULT_DENCHCLAW_PROFILE = "dench";
-const DEFAULT_GATEWAY_PORT = 18789;
 const DENCHCLAW_GATEWAY_PORT_START = 19001;
 const MAX_PORT_SCAN_ATTEMPTS = 100;
 const DEFAULT_BOOTSTRAP_ROLLOUT_STAGE = "default";
@@ -943,6 +1237,21 @@ async function findAvailablePort(startPort, maxAttempts) {
 		if (await isPortAvailable(port)) return port;
 	}
 }
+/**
+* Port 18789 belongs to the host OpenClaw installation.  A persisted config
+* that drifted to that value (e.g. bootstrap ran while OpenClaw was down)
+* must be rejected to prevent service hijack on launchd restart.
+*/
+function isPersistedPortAcceptable(port) {
+	return typeof port === "number" && port > 0 && port !== 18789;
+}
+function readExistingGatewayPort(stateDir) {
+	for (const name of ["openclaw.json", "config.json"]) try {
+		const raw = JSON.parse(readFileSync(path.join(stateDir, name), "utf-8"));
+		const port = typeof raw.gateway?.port === "number" ? raw.gateway.port : typeof raw.gateway?.port === "string" ? Number.parseInt(raw.gateway.port, 10) : void 0;
+		if (typeof port === "number" && Number.isFinite(port) && port > 0) return port;
+	} catch {}
+}
 function normalizeBootstrapRolloutStage(raw) {
 	const normalized = raw?.trim().toLowerCase();
 	if (normalized === "internal" || normalized === "beta" || normalized === "default") return normalized;
@@ -969,6 +1278,88 @@ function resolveGatewayLaunchAgentLabel(profile) {
 	if (!normalized || normalized === "default") return DEFAULT_GATEWAY_LAUNCH_AGENT_LABEL;
 	return `ai.openclaw.${normalized}`;
 }
+async function installBundledPlugins(params) {
+	try {
+		const pluginSrc = path.join(resolveCliPackageRoot(), "extensions", "posthog-analytics");
+		if (!existsSync(pluginSrc)) return false;
+		const pluginDest = path.join(params.stateDir, "extensions", "posthog-analytics");
+		mkdirSync(path.dirname(pluginDest), { recursive: true });
+		cpSync(pluginSrc, pluginDest, {
+			recursive: true,
+			force: true
+		});
+		await runOpenClawOrThrow({
+			openclawCommand: params.openclawCommand,
+			args: [
+				"--profile",
+				params.profile,
+				"config",
+				"set",
+				"plugins.allow",
+				"[\"posthog-analytics\"]"
+			],
+			timeoutMs: 3e4,
+			errorMessage: "Failed to set plugins.allow for posthog-analytics."
+		});
+		await runOpenClawOrThrow({
+			openclawCommand: params.openclawCommand,
+			args: [
+				"--profile",
+				params.profile,
+				"config",
+				"set",
+				"plugins.load.paths",
+				JSON.stringify([pluginDest])
+			],
+			timeoutMs: 3e4,
+			errorMessage: "Failed to set plugins.load.paths for posthog-analytics."
+		});
+		if (params.posthogKey) {
+			await runOpenClawOrThrow({
+				openclawCommand: params.openclawCommand,
+				args: [
+					"--profile",
+					params.profile,
+					"config",
+					"set",
+					"plugins.entries.posthog-analytics.enabled",
+					"true"
+				],
+				timeoutMs: 3e4,
+				errorMessage: "Failed to enable posthog-analytics plugin."
+			});
+			await runOpenClawOrThrow({
+				openclawCommand: params.openclawCommand,
+				args: [
+					"--profile",
+					params.profile,
+					"config",
+					"set",
+					"plugins.entries.posthog-analytics.config.apiKey",
+					params.posthogKey
+				],
+				timeoutMs: 3e4,
+				errorMessage: "Failed to set posthog-analytics API key."
+			});
+		}
+		try {
+			await runOpenClawOrThrow({
+				openclawCommand: params.openclawCommand,
+				args: [
+					"--profile",
+					params.profile,
+					"gateway",
+					"restart"
+				],
+				timeoutMs: 6e4,
+				errorMessage: "Failed to restart gateway after plugin install."
+			});
+		} catch {}
+		return true;
+	} catch {
+		return false;
+	}
+}
 async function ensureGatewayModeLocal(openclawCommand, profile) {
 	if ((await runOpenClaw(openclawCommand, [
 		"--profile",
@@ -1536,7 +1927,7 @@ async function attemptGatewayAutoFix(params) {
 		logExcerpts
 	};
 }
-async function openUrl(url) {
+async function openUrl$1(url) {
 	const result = await runCommandWithTimeout(process$1.platform === "darwin" ? ["open", url] : process$1.platform === "win32" ? [
 		"cmd",
 		"/c",
@@ -1668,6 +2059,7 @@ function buildBootstrapDiagnostics(params) {
 	const enforceCutoverGates = isTruthyEnvValue(env.DENCHCLAW_BOOTSTRAP_ENFORCE_SAFETY_GATES);
 	const cutoverGatePassed = migrationSuiteOk && onboardingE2EOk;
 	checks.push(createCheck("cutover-gates", cutoverGatePassed ? "pass" : enforceCutoverGates ? "fail" : "warn", `Cutover gate: migrationSuite=${migrationSuiteOk ? "pass" : "missing"}, onboardingE2E=${onboardingE2EOk ? "pass" : "missing"}.`, cutoverGatePassed ? void 0 : "Run migration contracts + onboarding E2E and set DENCHCLAW_BOOTSTRAP_MIGRATION_SUITE_OK=1 and DENCHCLAW_BOOTSTRAP_ONBOARDING_E2E_OK=1 before full cutover."));
+	if (params.posthogPluginInstalled != null) checks.push(createCheck("posthog-analytics", params.posthogPluginInstalled ? "pass" : "warn", params.posthogPluginInstalled ? "PostHog analytics plugin installed." : "PostHog analytics plugin not installed (POSTHOG_KEY missing or extension not bundled)."));
 	return {
 		rolloutStage: params.rolloutStage,
 		legacyFallbackEnabled: params.legacyFallbackEnabled,
@@ -1748,15 +2140,26 @@ async function bootstrapCommand(opts, runtime = defaultRuntime) {
 	let gatewayPort;
 	let portAutoAssigned = false;
 	if (explicitPort) gatewayPort = explicitPort;
-	else if (await isPortAvailable(DEFAULT_GATEWAY_PORT)) gatewayPort = DEFAULT_GATEWAY_PORT;
 	else {
-		const availablePort = await findAvailablePort(DENCHCLAW_GATEWAY_PORT_START, MAX_PORT_SCAN_ATTEMPTS);
-		if (!availablePort) throw new Error(`Could not find an available gateway port between ${DENCHCLAW_GATEWAY_PORT_START} and ${DENCHCLAW_GATEWAY_PORT_START + MAX_PORT_SCAN_ATTEMPTS}. Please specify a port explicitly with --gateway-port.`);
-		gatewayPort = availablePort;
-		portAutoAssigned = true;
+		const existingPort = readExistingGatewayPort(stateDir);
+		if (isPersistedPortAcceptable(existingPort) && await isPortAvailable(existingPort)) gatewayPort = existingPort;
+		else if (await isPortAvailable(DENCHCLAW_GATEWAY_PORT_START)) gatewayPort = DENCHCLAW_GATEWAY_PORT_START;
+		else {
+			const availablePort = await findAvailablePort(DENCHCLAW_GATEWAY_PORT_START + 1, MAX_PORT_SCAN_ATTEMPTS);
+			if (!availablePort) throw new Error(`Could not find an available gateway port between ${DENCHCLAW_GATEWAY_PORT_START} and ${DENCHCLAW_GATEWAY_PORT_START + MAX_PORT_SCAN_ATTEMPTS}. Please specify a port explicitly with --gateway-port.`);
+			gatewayPort = availablePort;
+			portAutoAssigned = true;
+		}
 	}
-	if (portAutoAssigned && !opts.json) runtime.log(theme.muted(`Default gateway port ${DEFAULT_GATEWAY_PORT} is in use. Using auto-assigned port ${gatewayPort}.`));
+	if (portAutoAssigned && !opts.json) runtime.log(theme.muted(`Default gateway port ${DENCHCLAW_GATEWAY_PORT_START} is in use. Using auto-assigned port ${gatewayPort}.`));
 	await ensureDefaultWorkspacePath(openclawCommand, profile, workspaceDir);
+	const packageRoot = resolveCliPackageRoot();
+	const posthogPluginInstalled = await installBundledPlugins({
+		openclawCommand,
+		profile,
+		stateDir,
+		posthogKey: process$1.env.POSTHOG_KEY || ""
+	});
 	const onboardArgv = [
 		"--profile",
 		profile,
@@ -1782,7 +2185,6 @@ async function bootstrapCommand(opts, runtime = defaultRuntime) {
 		timeoutMs: 12 * 6e4,
 		errorMessage: "OpenClaw onboarding failed."
 	});
-	const packageRoot = resolveCliPackageRoot();
 	const workspaceSeed = seedWorkspaceFromAssets({
 		workspaceDir,
 		packageRoot
@@ -1837,10 +2239,24 @@ async function bootstrapCommand(opts, runtime = defaultRuntime) {
 		webReachable,
 		rolloutStage,
 		legacyFallbackEnabled,
-		stateDir
+		stateDir,
+		posthogPluginInstalled
 	});
-	const shouldOpen = !opts.noOpen && !opts.json;
-	const opened = shouldOpen ? await openUrl(webUrl) : false;
+	let opened = false;
+	let openAttempted = false;
+	if (!opts.noOpen && !opts.json && webReachable) if (nonInteractive) {
+		openAttempted = true;
+		opened = await openUrl$1(webUrl);
+	} else {
+		const wantOpen = await confirm({
+			message: stylePromptMessage(`Open ${webUrl} in your browser?`),
+			initialValue: true
+		});
+		if (!isCancel(wantOpen) && wantOpen) {
+			openAttempted = true;
+			opened = await openUrl$1(webUrl);
+		}
+	}
 	if (!opts.json) {
 		if (!webRuntimeStatus.ready) runtime.log(theme.warn(`Managed web runtime check failed: ${webRuntimeStatus.reason}`));
 		if (installResult.installed) runtime.log(theme.muted("Installed global OpenClaw CLI via npm."));
@@ -1872,7 +2288,7 @@ async function bootstrapCommand(opts, runtime = defaultRuntime) {
 		runtime.log(`Gateway: ${gatewayProbe.ok ? "reachable" : "check failed"}`);
 		runtime.log(`Web UI: ${webUrl}`);
 		runtime.log(`Rollout stage: ${rolloutStage}${legacyFallbackEnabled ? " (legacy fallback enabled)" : ""}`);
-		if (!opened && shouldOpen) runtime.log(theme.muted("Browser open failed; copy/paste the URL above."));
+		if (!opened && openAttempted) runtime.log(theme.muted("Browser open failed; copy/paste the URL above."));
 		if (diagnostics.hasFailures) runtime.log(theme.warn("Bootstrap completed with failing checks. Address remediation items above before full cutover."));
 	}
 	const summary = {
@@ -1958,7 +2374,7 @@ async function runCommandWithRuntime(runtime, action, onError) {
 //#endregion
 //#region src/cli/program/register.bootstrap.ts
 function registerBootstrapCommand(program) {
-	program.command("bootstrap").description("Bootstrap DenchClaw on top of OpenClaw and open the web UI").option("--profile <name>", "Compatibility flag; non-dench values are ignored with a warning").option("--force-onboard", "Run onboarding even if config already exists", false).option("--non-interactive", "Skip prompts where possible", false).option("--yes", "Auto-approve install prompts", false).option("--skip-update", "Skip update prompt/check", false).option("--update-now", "Run OpenClaw update before onboarding", false).option("--gateway-port <port>", "Gateway port override for first-run onboarding").option("--web-port <port>", "Preferred web UI port (default: 3100)").option("--no-open", "Do not open the browser automatically", false).option("--json", "Output summary as JSON", false).addHelpText("after", () => `\n${theme.muted("Docs:")} ${formatDocsLink("/cli/onboard", "docs.openclaw.ai/cli/onboard")}\n`).action(async (opts) => {
+	program.command("bootstrap").description("Bootstrap DenchClaw on top of OpenClaw and open the web UI").option("--profile <name>", "Compatibility flag; non-dench values are ignored with a warning").option("--force-onboard", "Run onboarding even if config already exists", false).option("--non-interactive", "Skip prompts where possible", false).option("--yes", "Auto-approve install prompts", false).option("--skip-update", "Skip update prompt/check", false).option("--update-now", "Run OpenClaw update before onboarding", false).option("--gateway-port <port>", "Gateway port override for first-run onboarding").option("--web-port <port>", "Preferred web UI port (default: 3100)").option("--no-open", "Do not open the browser automatically").option("--json", "Output summary as JSON", false).addHelpText("after", () => `\n${theme.muted("Docs:")} ${formatDocsLink("/cli/onboard", "docs.openclaw.ai/cli/onboard")}\n`).action(async (opts) => {
 		await runCommandWithRuntime(defaultRuntime, async () => {
 			await bootstrapCommand({
 				profile: opts.profile,
@@ -1990,6 +2406,41 @@ function firstNonEmptyLine(...values) {
 		if (first) return first;
 	}
 }
+async function openUrl(url) {
+	const [cmd, ...args] = process$1.platform === "darwin" ? ["open", url] : process$1.platform === "win32" ? [
+		"cmd",
+		"/c",
+		"start",
+		"",
+		url
+	] : ["xdg-open", url];
+	if (!cmd) return false;
+	return new Promise((resolve) => {
+		const child = spawn(cmd, args, { stdio: "ignore" });
+		const timer = setTimeout(() => {
+			child.kill();
+			resolve(false);
+		}, 5e3);
+		child.once("close", (code) => {
+			clearTimeout(timer);
+			resolve(code === 0);
+		});
+		child.once("error", () => {
+			clearTimeout(timer);
+			resolve(false);
+		});
+	});
+}
+async function promptAndOpenWebUi(params) {
+	if (params.noOpen || params.json || !process$1.stdin.isTTY) return;
+	const webUrl = `http://localhost:${params.webPort}`;
+	const wantOpen = await confirm({
+		message: stylePromptMessage(`Open ${webUrl} in your browser?`),
+		initialValue: true
+	});
+	if (isCancel(wantOpen) || !wantOpen) return;
+	if (!await openUrl(webUrl)) params.runtime.log(theme.muted("Browser open failed; copy/paste the URL above."));
+}
 async function runOpenClawUpdateWithProgress(openclawCommand) {
 	const s = spinner();
 	s.start("Updating OpenClaw (required for this major Dench upgrade)...");
@@ -2070,7 +2521,7 @@ function resolveGatewayPort(stateDir) {
 		const port = readConfigGatewayPort(path.join(stateDir, name));
 		if (typeof port === "number") return port;
 	}
-	return 18789;
+	return DENCHCLAW_DEFAULT_GATEWAY_PORT;
 }
 function readConfigGatewayPort(configPath) {
 	try {
@@ -2082,6 +2533,78 @@ function readConfigGatewayPort(configPath) {
 		return;
 	}
 }
+async function restartGatewayDaemon(params) {
+	let openclawCommand;
+	try {
+		openclawCommand = resolveOpenClawCommandOrThrow();
+	} catch {
+		return {
+			restarted: false,
+			error: "openclaw CLI not found on PATH"
+		};
+	}
+	const s = !params.json ? spinner() : null;
+	s?.start("Stopping gateway daemon…");
+	await runOpenClawCommand({
+		openclawCommand,
+		args: [
+			"--profile",
+			params.profile,
+			"gateway",
+			"stop"
+		],
+		timeoutMs: 9e4
+	}).catch(() => ({
+		code: 1,
+		stdout: "",
+		stderr: "stop timed out"
+	}));
+	s?.message("Installing gateway daemon…");
+	await runOpenClawCommand({
+		openclawCommand,
+		args: [
+			"--profile",
+			params.profile,
+			"gateway",
+			"install",
+			"--force",
+			"--port",
+			String(params.gatewayPort)
+		],
+		timeoutMs: 2 * 6e4
+	}).catch(() => ({
+		code: 1,
+		stdout: "",
+		stderr: "install failed"
+	}));
+	s?.message("Starting gateway daemon…");
+	const startResult = await runOpenClawCommand({
+		openclawCommand,
+		args: [
+			"--profile",
+			params.profile,
+			"gateway",
+			"start",
+			"--port",
+			String(params.gatewayPort)
+		],
+		timeoutMs: 2 * 6e4
+	}).catch(() => ({
+		code: 1,
+		stdout: "",
+		stderr: "start failed"
+	}));
+	if (startResult.code !== 0) {
+		const detail = firstNonEmptyLine(startResult.stderr, startResult.stdout);
+		s?.stop(detail ? `Gateway restart failed: ${detail}` : "Gateway restart failed.");
+		return {
+			restarted: false,
+			error: detail ?? "gateway start failed"
+		};
+	}
+	s?.stop("Gateway daemon restarted.");
+	return { restarted: true };
+}
 async function updateWebRuntimeCommand(opts, runtime = defaultRuntime) {
 	const appliedProfile = applyCliProfileEnv({ profile: opts.profile });
 	const profile = appliedProfile.effectiveProfile;
@@ -2110,6 +2633,11 @@ async function updateWebRuntimeCommand(opts, runtime = defaultRuntime) {
 		port: selectedPort,
 		includeLegacyStandalone: true
 	});
+	const gatewayResult = await restartGatewayDaemon({
+		profile,
+		gatewayPort,
+		json: Boolean(opts.json)
+	});
 	const ensureResult = await ensureManagedWebRuntime({
 		stateDir,
 		packageRoot,
@@ -2129,7 +2657,9 @@ async function updateWebRuntimeCommand(opts, runtime = defaultRuntime) {
 		stoppedPids: stopResult.stoppedPids,
 		skippedForeignPids: stopResult.skippedForeignPids,
 		ready: ensureResult.ready,
-		reason: ensureResult.reason
+		reason: ensureResult.reason,
+		gatewayRestarted: gatewayResult.restarted,
+		gatewayError: gatewayResult.error
 	};
 	if (!opts.json) {
 		runtime.log("");
@@ -2137,12 +2667,20 @@ async function updateWebRuntimeCommand(opts, runtime = defaultRuntime) {
 		runtime.log(`Profile: ${profile}`);
 		runtime.log(`Version: ${VERSION}`);
 		runtime.log(`Web port: ${selectedPort}`);
+		runtime.log(`Gateway: ${summary.gatewayRestarted ? "restarted" : "restart failed"}`);
+		if (summary.gatewayError) runtime.log(theme.warn(`Gateway error: ${summary.gatewayError}`));
 		runtime.log(`Stopped web processes: ${summary.stoppedPids.length}`);
 		if (summary.skippedForeignPids.length > 0) runtime.log(theme.warn(`Skipped non-Dench listeners on ${selectedPort}: ${summary.skippedForeignPids.join(", ")}`));
 		runtime.log(`Web runtime: ${summary.ready ? "ready" : "not ready"}`);
 		if (!summary.ready) runtime.log(theme.warn(summary.reason));
 	}
 	if (!summary.ready) throw new Error(`Web runtime update failed: ${summary.reason}`);
+	await promptAndOpenWebUi({
+		webPort: selectedPort,
+		json: opts.json,
+		noOpen: opts.noOpen,
+		runtime
+	});
 	if (opts.json) runtime.log(JSON.stringify(summary, null, 2));
 	return summary;
 }
@@ -2191,6 +2729,11 @@ async function startWebRuntimeCommand(opts, runtime = defaultRuntime, label = "s
 		includeLegacyStandalone: true
 	});
 	if (stopResult.skippedForeignPids.length > 0) throw new Error(`Cannot start on ${selectedPort}; non-Dench listener(s) still own the port: ${stopResult.skippedForeignPids.join(", ")}`);
+	const gatewayResult = await restartGatewayDaemon({
+		profile,
+		gatewayPort,
+		json: Boolean(opts.json)
+	});
 	if (!startManagedWebRuntime({
 		stateDir,
 		port: selectedPort,
@@ -2206,7 +2749,9 @@ async function startWebRuntimeCommand(opts, runtime = defaultRuntime, label = "s
 		stoppedPids: stopResult.stoppedPids,
 		skippedForeignPids: stopResult.skippedForeignPids,
 		started: probe.ok,
-		reason: probe.reason
+		reason: probe.reason,
+		gatewayRestarted: gatewayResult.restarted,
+		gatewayError: gatewayResult.error
 	};
 	if (opts.json) {
 		runtime.log(JSON.stringify(summary, null, 2));
@@ -2216,20 +2761,29 @@ async function startWebRuntimeCommand(opts, runtime = defaultRuntime, label = "s
 	runtime.log(theme.heading(`Dench web ${label}`));
 	runtime.log(`Profile: ${profile}`);
 	runtime.log(`Web port: ${selectedPort}`);
+	runtime.log(`Gateway: ${summary.gatewayRestarted ? "restarted" : "restart failed"}`);
+	if (summary.gatewayError) runtime.log(theme.warn(`Gateway error: ${summary.gatewayError}`));
 	runtime.log(`Restarted managed web runtime: ${summary.started ? "yes" : "no"}`);
 	if (!summary.started) runtime.log(theme.warn(summary.reason));
 	if (!summary.started) throw new Error(`Web runtime failed readiness probe: ${summary.reason}`);
+	await promptAndOpenWebUi({
+		webPort: selectedPort,
+		json: opts.json,
+		noOpen: opts.noOpen,
+		runtime
+	});
 	return summary;
 }
 
 //#endregion
 //#region src/cli/program/register.restart.ts
 function registerRestartCommand(program) {
-	program.command("restart").description("Restart Dench managed web runtime (stop then start)").option("--profile <name>", "Compatibility flag; non-dench values are ignored with a warning").option("--web-port <port>", "Web runtime port override").option("--json", "Output summary as JSON", false).action(async (opts) => {
+	program.command("restart").description("Restart Dench managed web runtime (stop then start)").option("--profile <name>", "Compatibility flag; non-dench values are ignored with a warning").option("--web-port <port>", "Web runtime port override").option("--no-open", "Do not open the browser automatically").option("--json", "Output summary as JSON", false).action(async (opts) => {
 		await runCommandWithRuntime(defaultRuntime, async () => {
 			await restartWebRuntimeCommand({
 				profile: opts.profile,
 				webPort: opts.webPort,
+				noOpen: Boolean(opts.open === false),
 				json: Boolean(opts.json)
 			});
 		});
@@ -2239,11 +2793,12 @@ function registerRestartCommand(program) {
 //#endregion
 //#region src/cli/program/register.start.ts
 function registerStartCommand(program) {
-	program.command("start").description("Start Dench managed web runtime without updating assets").option("--profile <name>", "Compatibility flag; non-dench values are ignored with a warning").option("--web-port <port>", "Web runtime port override").option("--json", "Output summary as JSON", false).action(async (opts) => {
+	program.command("start").description("Start Dench managed web runtime without updating assets").option("--profile <name>", "Compatibility flag; non-dench values are ignored with a warning").option("--web-port <port>", "Web runtime port override").option("--no-open", "Do not open the browser automatically").option("--json", "Output summary as JSON", false).action(async (opts) => {
 		await runCommandWithRuntime(defaultRuntime, async () => {
 			await startWebRuntimeCommand({
 				profile: opts.profile,
 				webPort: opts.webPort,
+				noOpen: Boolean(opts.open === false),
 				json: Boolean(opts.json)
 			});
 		});
@@ -2272,32 +2827,53 @@ function registerTelemetryCommand(program) {
 		const config = readTelemetryConfig();
 		const envDisabled = process.env.DO_NOT_TRACK === "1" || process.env.DENCHCLAW_TELEMETRY_DISABLED === "1" || Boolean(process.env.CI);
 		const effective = isTelemetryEnabled();
+		const privacyOn = config.privacyMode !== false;
 		console.log(`Telemetry config:  ${config.enabled ? "enabled" : "disabled"}`);
 		if (envDisabled) console.log("Environment override: disabled (DO_NOT_TRACK, DENCHCLAW_TELEMETRY_DISABLED, or CI)");
 		console.log(`Effective status:  ${effective ? "enabled" : "disabled"}`);
+		console.log(`Privacy mode:      ${privacyOn ? "on (message content is redacted)" : "off (full content is captured)"}`);
 		console.log("\nLearn more: https://github.com/openclaw/openclaw/blob/main/TELEMETRY.md");
 	});
 	cmd.command("disable").description("Disable anonymous telemetry").action(() => {
 		writeTelemetryConfig({ enabled: false });
 		console.log("Telemetry has been disabled.");
-		console.log("You can re-enable it anytime with: denchclaw telemetry enable");
+		console.log("You can re-enable it anytime with: npx denchclaw telemetry enable");
 	});
 	cmd.command("enable").description("Enable anonymous telemetry").action(() => {
 		writeTelemetryConfig({ enabled: true });
 		console.log("Telemetry has been enabled. Thank you for helping improve DenchClaw!");
 	});
+	const privacyCmd = cmd.command("privacy").description("Control whether message content is included in telemetry");
+	privacyCmd.command("on").description("Enable privacy mode (redacts message content, default)").action(() => {
+		if (!isTelemetryEnabled()) {
+			console.log("Telemetry is currently disabled. Enable it first with: npx denchclaw telemetry enable");
+			return;
+		}
+		writeTelemetryConfig({ privacyMode: true });
+		console.log("Privacy mode enabled. Message content and tool results will be redacted.");
+	});
+	privacyCmd.command("off").description("Disable privacy mode (sends full message content)").action(() => {
+		if (!isTelemetryEnabled()) {
+			console.log("Telemetry is currently disabled. Enable it first with: npx denchclaw telemetry enable");
+			return;
+		}
+		writeTelemetryConfig({ privacyMode: false });
+		console.log("Privacy mode disabled. Full message content and tool results will be captured.");
+		console.log("Re-enable anytime with: npx denchclaw telemetry privacy on");
+	});
 }
 
 //#endregion
 //#region src/cli/program/register.update.ts
 function registerUpdateCommand(program) {
-	program.command("update").description("Update Dench managed web runtime without onboarding").option("--profile <name>", "Compatibility flag; non-dench values are ignored with a warning").option("--web-port <port>", "Web runtime port override").option("--non-interactive", "Fail instead of prompting for major-gate approval", false).option("--yes", "Approve mandatory major-gate OpenClaw update", false).option("--json", "Output summary as JSON", false).action(async (opts) => {
+	program.command("update").description("Update Dench managed web runtime without onboarding").option("--profile <name>", "Compatibility flag; non-dench values are ignored with a warning").option("--web-port <port>", "Web runtime port override").option("--non-interactive", "Fail instead of prompting for major-gate approval", false).option("--yes", "Approve mandatory major-gate OpenClaw update", false).option("--no-open", "Do not open the browser automatically").option("--json", "Output summary as JSON", false).action(async (opts) => {
 		await runCommandWithRuntime(defaultRuntime, async () => {
 			await updateWebRuntimeCommand({
 				profile: opts.profile,
 				webPort: opts.webPort,
 				nonInteractive: Boolean(opts.nonInteractive),
 				yes: Boolean(opts.yes),
+				noOpen: Boolean(opts.open === false),
 				json: Boolean(opts.json)
 			});
 		});
@@ -2352,7 +2928,7 @@ const CORE_CLI_ENTRIES = [
 ];
 const CORE_CLI_ENTRY_BY_NAME = new Map(CORE_CLI_ENTRIES.map((entry) => [entry.name, entry]));
 function getCoreCliCommandsWithSubcommands() {
-	return [];
+	return ["telemetry"];
 }
 function registerCoreCliCommands(program, ctx, argv) {
 	const primary = getPrimaryCommand(argv);