@amirtechai/xclaude 2026.3.26 → 2026.3.27

package/dist/acp-cli-BJyvrvZg.js

@@ -392,7 +392,7 @@ async function runAcpClientInteractive(opts = {}) {
 		input: process.stdin,
 		output: process.stdout
 	});
-	console.log("XClaude ACP client");
+	console.log("XClaw ACP client");
 	console.log(`Session: ${sessionId}`);
 	console.log("Type a prompt, or \"exit\" to quit.\n");
 	const prompt = () => {
@@ -1938,7 +1938,7 @@ function parseArgs(args) {
 	return opts;
 }
 function printHelp() {
-	console.log(`Usage: xclaude acp [options]
+	console.log(`Usage: xclaw acp [options]
 
 Gateway-backed ACP server for IDE integration.
 

package/dist/active-listener-CU_ylekC.js

@@ -15,7 +15,7 @@ function resolveWebAccountId(accountId) {
 function requireActiveWebListener(accountId) {
 	const id = resolveWebAccountId(accountId);
 	const listener = state.listeners.get(id) ?? null;
-	if (!listener) throw new Error(`No active WhatsApp Web listener (account: ${id}). Start the gateway, then link WhatsApp with: ${formatCliCommand(`xclaude channels login --channel whatsapp --account ${id}`)}.`);
+	if (!listener) throw new Error(`No active WhatsApp Web listener (account: ${id}). Start the gateway, then link WhatsApp with: ${formatCliCommand(`xclaw channels login --channel whatsapp --account ${id}`)}.`);
 	return {
 		accountId: id,
 		listener

package/dist/audit-extra.async-B4rRNZiG.js

@@ -416,7 +416,7 @@ async function collectPluginsTrustFindings(params) {
 			severity: "warn",
 			title: "Plugin install records drift from installed package versions",
 			detail: `Detected plugin install metadata drift:\n${pluginVersionDrift.map((entry) => `- ${entry}`).join("\n")}`,
-			remediation: "Run `xclaude plugins update --all` (or reinstall affected plugins) to refresh install metadata."
+			remediation: "Run `xclaw plugins update --all` (or reinstall affected plugins) to refresh install metadata."
 		});
 	}
 	const hookInstalls = params.cfg.hooks?.internal?.installs ?? {};
@@ -451,7 +451,7 @@ async function collectPluginsTrustFindings(params) {
 			severity: "warn",
 			title: "Hook install records drift from installed package versions",
 			detail: `Detected hook install metadata drift:\n${hookVersionDrift.map((entry) => `- ${entry}`).join("\n")}`,
-			remediation: "Run `xclaude hooks update --all` (or reinstall affected hooks) to refresh install metadata."
+			remediation: "Run `xclaw hooks update --all` (or reinstall affected hooks) to refresh install metadata."
 		});
 	}
 	return findings;
@@ -691,7 +691,7 @@ async function collectPluginsCodeSafetyFindings(params) {
 				severity: "warn",
 				title: "Plugin extensions directory scan failed",
 				detail: `Static code scan could not list extensions directory: ${String(err)}`,
-				remediation: "Check file permissions and plugin layout, then rerun `xclaude security audit --deep`."
+				remediation: "Check file permissions and plugin layout, then rerun `xclaw security audit --deep`."
 			});
 		}
 	});
@@ -732,7 +732,7 @@ async function collectPluginsCodeSafetyFindings(params) {
 				severity: "warn",
 				title: `Plugin "${pluginName}" code scan failed`,
 				detail: `Static code scan could not complete: ${String(err)}`,
-				remediation: "Check file permissions and plugin layout, then rerun `xclaude security audit --deep`."
+				remediation: "Check file permissions and plugin layout, then rerun `xclaw security audit --deep`."
 			});
 			return null;
 		});
@@ -783,7 +783,7 @@ async function collectInstalledSkillsCodeSafetyFindings(params) {
 					severity: "warn",
 					title: `Skill "${skillName}" code scan failed`,
 					detail: `Static code scan could not complete for ${skillDir}: ${String(err)}`,
-					remediation: "Check file permissions and skill layout, then rerun `xclaude security audit --deep`."
+					remediation: "Check file permissions and skill layout, then rerun `xclaw security audit --deep`."
 				});
 				return null;
 			});

package/dist/banner-DPmt57Uz.js

@@ -15,7 +15,7 @@ function readCliBannerTaglineMode(env = process.env) {
 }
 //#endregion
 //#region src/cli/tagline.ts
-const DEFAULT_TAGLINE = "All your chats, one XClaude.";
+const DEFAULT_TAGLINE = "All your chats, one XClaw.";
 const HOLIDAY_TAGLINES = {
 	newYear: "New Year's Day: New year, new config—same old EADDRINUSE, but this time we resolve it like grown-ups.",
 	lunarNewYear: "Lunar New Year: May your builds be lucky, your branches prosperous, and your merge conflicts chased away with fireworks.",
@@ -301,7 +301,7 @@ function formatCliBannerLine(version, options = {}) {
 		mode: resolveTaglineMode(options)
 	});
 	const rich = options.richTty ?? isRich();
-	const title = "🦞 XClaude";
+	const title = "🦞 XClaw";
 	const columns = options.columns ?? process.stdout.columns ?? 120;
 	const plainBaseLine = `${title} ${version} (${commitLabel})`;
 	const plainFullLine = tagline ? `${plainBaseLine} — ${tagline}` : plainBaseLine;

package/dist/control-ui/assets/index-3G8b0Cq-.js

@@ -4125,7 +4125,7 @@ ${JSON.stringify(e.issues,null,2)}</pre
         </div>
       `:n`
       <div class="muted" style="margin-top: 8px">
-        ${P(`overview.auth.failed`,{command:`xclaude dashboard --no-open`})}
+        ${P(`overview.auth.failed`,{command:`xclaw dashboard --no-open`})}
         <div style="margin-top: 6px">
           <a
             class="session-link"

package/dist/cron-cli-bEZ6ElMg.js

@@ -643,7 +643,7 @@ function registerCronSimpleCommands(cron) {
 //#endregion
 //#region src/cli/cron-cli/register.ts
 function registerCronCli(program) {
-	const cron = program.command("cron").description("Manage cron jobs (via Gateway)").addHelpText("after", () => `\n${theme.muted("Docs:")} ${formatDocsLink("/cli/cron", "docs.xclaw.ai/cli/cron")}\n${theme.muted("Upgrade tip:")} run \`xclaude doctor --fix\` to normalize legacy cron job storage.\n`);
+	const cron = program.command("cron").description("Manage cron jobs (via Gateway)").addHelpText("after", () => `\n${theme.muted("Docs:")} ${formatDocsLink("/cli/cron", "docs.xclaw.ai/cli/cron")}\n${theme.muted("Upgrade tip:")} run \`xclaw doctor --fix\` to normalize legacy cron job storage.\n`);
 	registerCronStatusCommand(cron);
 	registerCronListCommand(cron);
 	registerCronAddCommand(cron);

package/dist/daemon-install-CUiHaOdT.js

@@ -53,7 +53,7 @@ async function installGatewayDaemonNonInteractive(params) {
 	const daemonRuntimeRaw = opts.daemonRuntime ?? "node";
 	const systemdAvailable = process.platform === "linux" ? await isSystemdUserServiceAvailable() : true;
 	if (process.platform === "linux" && !systemdAvailable) {
-		runtime.log("Systemd user services are unavailable; skipping service install. Use a direct shell run (`xclaude gateway run`) or rerun without --install-daemon on this session.");
+		runtime.log("Systemd user services are unavailable; skipping service install. Use a direct shell run (`xclaw gateway run`) or rerun without --install-daemon on this session.");
 		return {
 			installed: false,
 			skippedReason: "systemd-user-unavailable"

package/dist/directive-handling.shared-CQzigvOe.js

@@ -146,7 +146,7 @@ function formatElevatedUnavailableText(params) {
 	const failures = params.failures ?? [];
 	if (failures.length > 0) lines.push(`Failing gates: ${failures.map((f) => `${f.gate} (${f.key})`).join(", ")}`);
 	else lines.push("Fix-it keys: tools.elevated.enabled, tools.elevated.allowFrom.<provider>, agents.list[].tools.elevated.*");
-	if (params.sessionKey) lines.push(`See: ${formatCliCommand(`xclaude sandbox explain --session ${params.sessionKey}`)}`);
+	if (params.sessionKey) lines.push(`See: ${formatCliCommand(`xclaw sandbox explain --session ${params.sessionKey}`)}`);
 	return lines.join("\n");
 }
 //#endregion

package/dist/docker-CXxET5gG.js

@@ -1177,8 +1177,8 @@ async function readContainerConfigHash(containerName) {
 	return await readDockerContainerLabel(containerName, "xclaw.configHash");
 }
 function formatSandboxRecreateHint(params) {
-	if (params.scope === "session") return formatCliCommand(`xclaude sandbox recreate --session ${params.sessionKey}`);
-	if (params.scope === "agent") return formatCliCommand(`xclaude sandbox recreate --agent ${resolveSandboxAgentId(params.sessionKey) ?? "main"}`);
+	if (params.scope === "session") return formatCliCommand(`xclaw sandbox recreate --session ${params.sessionKey}`);
+	if (params.scope === "agent") return formatCliCommand(`xclaw sandbox recreate --agent ${resolveSandboxAgentId(params.sessionKey) ?? "main"}`);
 	return formatCliCommand("xclaw sandbox recreate --all");
 }
 async function ensureSandboxContainer(params) {

package/dist/extensions/matrix/index.js

@@ -269,7 +269,7 @@ function resolveMatrixCliAccountId(accountId) {
 }
 function formatMatrixCliCommand(command, accountId) {
 	const normalizedAccountId = normalizeAccountId(accountId);
-	return `xclaude matrix ${command}${normalizedAccountId === "default" ? "" : ` --account ${normalizedAccountId}`}`;
+	return `xclaw matrix ${command}${normalizedAccountId === "default" ? "" : ` --account ${normalizedAccountId}`}`;
 }
 function printMatrixOwnDevices(devices) {
 	if (devices.length === 0) {
@@ -618,7 +618,7 @@ function registerMatrixCli(params) {
 					console.log(`Profile sync: name ${result.profile.displayNameUpdated ? "updated" : "unchanged"}, avatar ${result.profile.avatarUpdated ? "updated" : "unchanged"}`);
 					if (result.profile.convertedAvatarFromHttp && result.profile.resolvedAvatarUrl) console.log(`Avatar converted and saved as: ${result.profile.resolvedAvatarUrl}`);
 				}
-				const bindHint = `xclaude agents bind --agent <id> --bind matrix:${result.accountId}`;
+				const bindHint = `xclaw agents bind --agent <id> --bind matrix:${result.accountId}`;
 				console.log(`Bind this account to an agent: ${bindHint}`);
 			},
 			errorPrefix: "Account setup failed"

package/dist/gateway-cli-DuhdO525.js

@@ -23941,7 +23941,7 @@ const GENERATED_BASE_CONFIG_SCHEMA = {
 		},
 		"gateway.nodes.allowCommands": {
 			label: "Gateway Node Allowlist (Extra Commands)",
-			help: "Extra node.invoke commands to allow beyond the gateway defaults (array of command strings). Enabling dangerous commands here is a security-sensitive override and is flagged by `xclaude security audit`.",
+			help: "Extra node.invoke commands to allow beyond the gateway defaults (array of command strings). Enabling dangerous commands here is a security-sensitive override and is flagged by `xclaw security audit`.",
 			tags: ["access", "network"]
 		},
 		"gateway.nodes.denyCommands": {
@@ -27182,7 +27182,7 @@ const GENERATED_BASE_CONFIG_SCHEMA = {
 		},
 		"plugins.installs": {
 			label: "Plugin Install Records",
-			help: "CLI-managed install metadata (used by `xclaude plugins update` to locate install sources).",
+			help: "CLI-managed install metadata (used by `xclaw plugins update` to locate install sources).",
 			tags: ["advanced"]
 		},
 		"plugins.installs.*.source": {
@@ -39604,7 +39604,7 @@ function logGatewayStartup(params) {
 	if (params.isNixMode) params.log.info("gateway: running in Nix mode (config managed externally)");
 	const enabledDangerousFlags = collectEnabledInsecureOrDangerousFlags(params.cfg);
 	if (enabledDangerousFlags.length > 0) {
-		const warning = `security warning: dangerous config flags enabled: ${enabledDangerousFlags.join(", ")}. Run \`xclaude security audit\`.`;
+		const warning = `security warning: dangerous config flags enabled: ${enabledDangerousFlags.join(", ")}. Run \`xclaw security audit\`.`;
 		params.log.warn(warning);
 	}
 }
@@ -41765,7 +41765,7 @@ async function startGatewayServer(port = 18789, opts = {}) {
 	});
 	cfgAtStart = authBootstrap.cfg;
 	if (authBootstrap.generatedToken) if (authBootstrap.persistedGeneratedToken) log.info("Gateway auth token was missing. Generated a new token and saved it to config (gateway.auth.token).");
-	else log.warn("Gateway auth token was missing. Generated a runtime token for this startup without changing config; restart will generate a different token. Persist one with `xclaude config set gateway.auth.mode token` and `xclaude config set gateway.auth.token <token>`.");
+	else log.warn("Gateway auth token was missing. Generated a runtime token for this startup without changing config; restart will generate a different token. Persist one with `xclaw config set gateway.auth.mode token` and `xclaw config set gateway.auth.token <token>`.");
 	const diagnosticsEnabled = isDiagnosticsEnabled(cfgAtStart);
 	if (diagnosticsEnabled) startDiagnosticHeartbeat();
 	setGatewaySigusr1RestartPolicy({ allowExternal: isRestartEnabled(cfgAtStart) });

package/dist/helpers-BVhEa8wW.js

@@ -6,7 +6,7 @@ function resolveChannelDefaultAccountId(params) {
 	return params.plugin.config.defaultAccountId?.(params.cfg) ?? accountIds[0] ?? "default";
 }
 function formatPairingApproveHint(channelId) {
-	return `Approve via: ${formatCliCommand(`xclaude pairing list ${channelId}`)} / ${formatCliCommand(`xclaude pairing approve ${channelId} <code>`)}`;
+	return `Approve via: ${formatCliCommand(`xclaw pairing list ${channelId}`)} / ${formatCliCommand(`xclaw pairing approve ${channelId} <code>`)}`;
 }
 function parseOptionalDelimitedEntries(value) {
 	if (!value?.trim()) return;

package/dist/hooks-cli-lIaN3kYr.js

@@ -521,15 +521,15 @@ function registerHooksCli(program) {
 	hooks.command("disable <name>").description("Disable a hook").action(async (name) => runHooksCliAction(async () => {
 		await disableHook(name);
 	}));
-	hooks.command("install").description("Deprecated: install a hook pack via `xclaude plugins install`").argument("<path-or-spec>", "Path to a hook pack or npm package spec").option("-l, --link", "Link a local path instead of copying", false).option("--pin", "Record npm installs as exact resolved <name>@<version>", false).action(async (raw, opts) => {
-		defaultRuntime.log(theme.warn("`xclaude hooks install` is deprecated; use `xclaude plugins install`."));
+	hooks.command("install").description("Deprecated: install a hook pack via `xclaw plugins install`").argument("<path-or-spec>", "Path to a hook pack or npm package spec").option("-l, --link", "Link a local path instead of copying", false).option("--pin", "Record npm installs as exact resolved <name>@<version>", false).action(async (raw, opts) => {
+		defaultRuntime.log(theme.warn("`xclaw hooks install` is deprecated; use `xclaw plugins install`."));
 		await runPluginInstallCommand({
 			raw,
 			opts
 		});
 	});
-	hooks.command("update").description("Deprecated: update hook packs via `xclaude plugins update`").argument("[id]", "Hook pack id (omit with --all)").option("--all", "Update all tracked hooks", false).option("--dry-run", "Show what would change without writing", false).action(async (id, opts) => {
-		defaultRuntime.log(theme.warn("`xclaude hooks update` is deprecated; use `xclaude plugins update`."));
+	hooks.command("update").description("Deprecated: update hook packs via `xclaw plugins update`").argument("[id]", "Hook pack id (omit with --all)").option("--all", "Update all tracked hooks", false).option("--dry-run", "Show what would change without writing", false).action(async (id, opts) => {
+		defaultRuntime.log(theme.warn("`xclaw hooks update` is deprecated; use `xclaw plugins update`."));
 		await runPluginUpdateCommand({
 			id,
 			opts

package/dist/logs-cli-Bq3nBNR2.js

@@ -121,7 +121,7 @@ function createLogWriters() {
 		beforeWrite: () => clearActiveProgressLine(),
 		onBrokenPipe: (err, stream) => {
 			const code = err.code ?? "EPIPE";
-			const message = `xclaude logs: output ${stream === process.stdout ? "stdout" : "stderr"} closed (${code}). Stopping tail.`;
+			const message = `xclaw logs: output ${stream === process.stdout ? "stdout" : "stderr"} closed (${code}). Stopping tail.`;
 			try {
 				clearActiveProgressLine();
 				process.stderr.write(`${message}\n`);

package/dist/method-scopes-DUy_ix8k.js

@@ -2064,7 +2064,7 @@ var GatewayClient = class {
 			try {
 				displayHost = new URL(url).hostname || url;
 			} catch {}
-			const error = /* @__PURE__ */ new Error(`SECURITY ERROR: Cannot connect to "${displayHost}" over plaintext ws://. Both credentials and chat data would be exposed to network interception. Use wss:// for remote URLs. Safe defaults: keep gateway.bind=loopback and connect via SSH tunnel (ssh -N -L 18789:127.0.0.1:18789 user@gateway-host), or use Tailscale Serve/Funnel. ` + (allowPrivateWs ? "" : "Break-glass (trusted private networks only): set XCLAW_ALLOW_INSECURE_PRIVATE_WS=1. ") + "Run `xclaude doctor --fix` for guidance.");
+			const error = /* @__PURE__ */ new Error(`SECURITY ERROR: Cannot connect to "${displayHost}" over plaintext ws://. Both credentials and chat data would be exposed to network interception. Use wss:// for remote URLs. Safe defaults: keep gateway.bind=loopback and connect via SSH tunnel (ssh -N -L 18789:127.0.0.1:18789 user@gateway-host), or use Tailscale Serve/Funnel. ` + (allowPrivateWs ? "" : "Break-glass (trusted private networks only): set XCLAW_ALLOW_INSECURE_PRIVATE_WS=1. ") + "Run `xclaw doctor --fix` for guidance.");
 			this.opts.onConnectError?.(error);
 			return;
 		}

package/dist/onboard-0qd28_MN.js

@@ -380,7 +380,7 @@ async function runNonInteractiveLocalSetup(params) {
 					skippedReason: daemonInstall.skippedReason
 				},
 				daemonRuntime: daemonRuntimeRaw,
-				hints: daemonInstall.skippedReason === "systemd-user-unavailable" ? ["Fix: rerun without `--install-daemon` for one-shot setup, or enable a working user-systemd session and retry.", "If your auth profile uses env-backed refs, keep those env vars set in the shell that runs `xclaude gateway run` or `xclaude agent --local`."] : [`Run \`${formatCliCommand("xclaw gateway status --deep")}\` for more detail.`]
+				hints: daemonInstall.skippedReason === "systemd-user-unavailable" ? ["Fix: rerun without `--install-daemon` for one-shot setup, or enable a working user-systemd session and retry.", "If your auth profile uses env-backed refs, keep those env vars set in the shell that runs `xclaw gateway run` or `xclaw agent --local`."] : [`Run \`${formatCliCommand("xclaw gateway status --deep")}\` for more detail.`]
 			});
 			runtime.exit(1);
 			return;

package/dist/onboard-channels-_XyFK_3V.js

@@ -837,7 +837,7 @@ async function maybeConfigureDmPolicies(params) {
 		};
 		await prompter.note([
 			"Default: pairing (unknown DMs get a pairing code).",
-			`Approve: ${formatCliCommand(`xclaude pairing approve ${policy.channel} <code>`)}`,
+			`Approve: ${formatCliCommand(`xclaw pairing approve ${policy.channel} <code>`)}`,
 			`Allowlist DMs: ${policyKey}="allowlist" + ${allowFromKey} entries.`,
 			`Public DMs: ${policyKey}="open" + ${allowFromKey} includes "*".`,
 			"Multi-user DMs: run: " + formatCliCommand("xclaw config set session.dmScope \"per-channel-peer\"") + " (or \"per-account-channel-peer\" for multi-account channels) to isolate sessions.",

package/dist/pairing-challenge-D9O9L50g.js

@@ -10,7 +10,7 @@ function buildPairingReply(params) {
 		`Pairing code: ${code}`,
 		"",
 		"Ask the bot owner to approve with:",
-		formatCliCommand(`xclaude pairing approve ${channel} ${code}`)
+		formatCliCommand(`xclaw pairing approve ${channel} ${code}`)
 	].join("\n");
 }
 //#endregion

package/dist/pi-embedded-B9OsuPCO.js

@@ -95264,7 +95264,7 @@ function formatElevatedUnavailableMessage(params) {
 	lines.push("- tools.elevated.allowFrom.<provider>");
 	lines.push("- agents.list[].tools.elevated.enabled");
 	lines.push("- agents.list[].tools.elevated.allowFrom.<provider>");
-	if (params.sessionKey) lines.push(`See: ${formatCliCommand(`xclaude sandbox explain --session ${params.sessionKey}`)}`);
+	if (params.sessionKey) lines.push(`See: ${formatCliCommand(`xclaw sandbox explain --session ${params.sessionKey}`)}`);
 	return lines.join("\n");
 }
 //#endregion
@@ -100372,7 +100372,7 @@ function buildSubagentSystemPrompt(params) {
 		"For ACP harness sessions (codex/claudecode/gemini), use `sessions_spawn` with `runtime: \"acp\"` (set `agentId` unless `acp.defaultAgent` is configured).",
 		"`agents_list` and `subagents` apply to XClaw sub-agents (`runtime: \"subagent\"`); ACP harness ids are controlled by `acp.allowedAgents`.",
 		"Do not ask users to run slash commands or CLI when `sessions_spawn` can do it directly.",
-		"Do not use `exec` (`xclaude ...`, `acpx ...`) to spawn ACP sessions.",
+		"Do not use `exec` (`xclaw ...`, `acpx ...`) to spawn ACP sessions.",
 		"Use `subagents` only for XClaw subagents (`runtime: \"subagent\"`).",
 		"Subagent results auto-announce back to you; ACP sessions continue in their bound thread.",
 		"Avoid polling loops; spawn, orchestrate, and synthesize results."
@@ -115552,7 +115552,7 @@ function buildDocsSection(params) {
 		"Community: https://discord.com/invite/clawd",
 		"Find new skills: https://clawhub.com",
 		"For XClaw behavior, commands, config, or architecture: consult local docs first.",
-		"When diagnosing issues, run `xclaude status` yourself when possible; only ask the user if you lack access (e.g., sandboxed).",
+		"When diagnosing issues, run `xclaw status` yourself when possible; only ask the user if you lack access (e.g., sandboxed).",
 		""
 	];
 }
@@ -115752,7 +115752,7 @@ function buildAgentSystemPrompt(params) {
 		"- xclaw gateway start",
 		"- xclaw gateway stop",
 		"- xclaw gateway restart",
-		"If unsure, ask the user to run `xclaude help` (or `xclaude gateway --help`) and paste the output.",
+		"If unsure, ask the user to run `xclaw help` (or `xclaw gateway --help`) and paste the output.",
 		"",
 		...skillsSection,
 		...memorySection,

package/dist/plugins-update-command-Dv8ta0bg.js

@@ -442,11 +442,11 @@ function buildInvalidPluginInstallConfigError(message) {
 	return error;
 }
 async function loadConfigFromSnapshotForInstall(request) {
-	if (resolvePluginInstallInvalidConfigPolicy(request) !== "recover-matrix-only") throw buildInvalidPluginInstallConfigError("Config invalid; run `xclaude doctor --fix` before installing plugins.");
+	if (resolvePluginInstallInvalidConfigPolicy(request) !== "recover-matrix-only") throw buildInvalidPluginInstallConfigError("Config invalid; run `xclaw doctor --fix` before installing plugins.");
 	const snapshot = await readConfigFileSnapshot();
 	const parsed = snapshot.parsed ?? {};
-	if (!snapshot.exists || Object.keys(parsed).length === 0) throw buildInvalidPluginInstallConfigError("Config file could not be parsed; run `xclaude doctor` to repair it.");
-	if (snapshot.legacyIssues.length > 0 || snapshot.issues.length === 0 || snapshot.issues.some((issue) => !isAllowedMatrixRecoveryIssue(issue))) throw buildInvalidPluginInstallConfigError("Config invalid outside the Matrix upgrade recovery path; run `xclaude doctor --fix` before reinstalling Matrix.");
+	if (!snapshot.exists || Object.keys(parsed).length === 0) throw buildInvalidPluginInstallConfigError("Config file could not be parsed; run `xclaw doctor` to repair it.");
+	if (snapshot.legacyIssues.length > 0 || snapshot.issues.length === 0 || snapshot.issues.some((issue) => !isAllowedMatrixRecoveryIssue(issue))) throw buildInvalidPluginInstallConfigError("Config invalid outside the Matrix upgrade recovery path; run `xclaw doctor --fix` before reinstalling Matrix.");
 	return (await cleanStaleMatrixPluginConfig(snapshot.config)).config;
 }
 async function loadConfigForInstall(request) {

package/dist/prompt-select-styled-CIEXnJnR.js

@@ -3368,7 +3368,7 @@ function noteSourceInstallIssues(root) {
 //#region src/commands/doctor-memory-search.ts
 /**
 * Check whether memory search has a usable embedding provider.
-* Runs as part of `xclaude doctor` — config-only, no network calls.
+* Runs as part of `xclaw doctor` — config-only, no network calls.
 */
 async function noteMemorySearchHealth(cfg, opts) {
 	const agentId = resolveDefaultAgentId(cfg);
@@ -4443,9 +4443,9 @@ async function noteStateIntegrity(cfg, prompter, configPath) {
 		});
 		if (missing.length > 0) warnings.push([
 			`- ${missing.length}/${recentTranscriptCandidates.length} recent sessions are missing transcripts.`,
-			`  Verify sessions in store: ${formatCliCommand(`xclaude sessions --store "${absoluteStorePath}"`)}`,
-			`  Preview cleanup impact: ${formatCliCommand(`xclaude sessions cleanup --store "${absoluteStorePath}" --dry-run`)}`,
-			`  Prune missing entries: ${formatCliCommand(`xclaude sessions cleanup --store "${absoluteStorePath}" --enforce --fix-missing`)}`
+			`  Verify sessions in store: ${formatCliCommand(`xclaw sessions --store "${absoluteStorePath}"`)}`,
+			`  Preview cleanup impact: ${formatCliCommand(`xclaw sessions cleanup --store "${absoluteStorePath}" --dry-run`)}`,
+			`  Prune missing entries: ${formatCliCommand(`xclaw sessions cleanup --store "${absoluteStorePath}" --enforce --fix-missing`)}`
 		].join("\n"));
 		const mainEntry = store[resolveMainSessionKey(cfg)];
 		if (mainEntry?.sessionId) {

package/dist/provider-auth-guidance-TPAXVl-G.js

@@ -17,7 +17,7 @@ function resolveProviderAuthLoginCommand(params) {
 		bundledProviderVitestCompat: true
 	}).find((candidate) => matchesProviderId(candidate, params.provider));
 	if (!provider || provider.auth.length === 0) return;
-	return formatCliCommand(`xclaude models auth login --provider ${provider.id}`);
+	return formatCliCommand(`xclaw models auth login --provider ${provider.id}`);
 }
 function buildProviderAuthRecoveryHint(params) {
 	const loginCommand = resolveProviderAuthLoginCommand(params);

package/dist/register.maintenance-yXtR6WPz.js

@@ -297,7 +297,7 @@ async function dashboardCommand(runtime = defaultRuntime, options = {}) {
 	if (resolvedToken.tokenSecretRefConfigured && token) runtime.log("Token auto-auth is disabled for SecretRef-managed gateway.auth.token; use your external token source if prompted.");
 	if (resolvedToken.unresolvedRefReason) {
 		runtime.log(`Token auto-auth unavailable: ${resolvedToken.unresolvedRefReason}`);
-		runtime.log("Set XCLAW_GATEWAY_TOKEN in this shell or resolve your secret provider, then rerun `xclaude dashboard`.");
+		runtime.log("Set XCLAW_GATEWAY_TOKEN in this shell or resolve your secret provider, then rerun `xclaw dashboard`.");
 	}
 	const copied = await copyToClipboard(dashboardUrl).catch(() => false);
 	runtime.log(copied ? "Copied to clipboard." : "Copy to clipboard unavailable.");

package/dist/routes-qV4l4oA9.js

@@ -3871,12 +3871,12 @@ async function launchXClawChrome(resolved, profile) {
 		});
 		log.info(`🦞 xclaw browser profile decorated (${profile.color})`);
 	} catch (err) {
-		log.warn(`xclaude browser profile decoration failed: ${String(err)}`);
+		log.warn(`xclaw browser profile decoration failed: ${String(err)}`);
 	}
 	try {
 		ensureProfileCleanExit(userDataDir);
 	} catch (err) {
-		log.warn(`xclaude browser clean-exit prefs failed: ${String(err)}`);
+		log.warn(`xclaw browser clean-exit prefs failed: ${String(err)}`);
 	}
 	const proc = spawnOnce();
 	const stderrChunks = [];
@@ -4629,7 +4629,7 @@ async function stopKnownBrowserProfiles(params) {
 			await ctx.forProfile(name).stopRunningBrowser();
 		} catch {}
 	} catch (err) {
-		params.onWarn(`xclaude browser stop failed: ${String(err)}`);
+		params.onWarn(`xclaw browser stop failed: ${String(err)}`);
 	}
 }
 //#endregion

package/dist/sandbox-CwT9Xq6-.js

@@ -96,7 +96,7 @@ function formatSandboxToolPolicyBlockedMessage(params) {
 	lines.push(`- agents.defaults.sandbox.mode=off (disable sandbox)`);
 	for (const fix of fixes) lines.push(`- ${fix}`);
 	if (runtime.mode === "non-main") lines.push(`- Use main session key (direct): ${runtime.mainSessionKey}`);
-	lines.push(`- See: ${formatCliCommand(`xclaude sandbox explain --session ${runtime.sessionKey}`)}`);
+	lines.push(`- See: ${formatCliCommand(`xclaw sandbox explain --session ${runtime.sessionKey}`)}`);
 	return lines.join("\n");
 }
 //#endregion
@@ -1790,8 +1790,8 @@ async function ensureSandboxBrowser(params) {
 			const lastUsedAtMs = registryEntry?.lastUsedAtMs;
 			if (running && (typeof lastUsedAtMs !== "number" || now - lastUsedAtMs < HOT_BROWSER_WINDOW_MS)) {
 				const hint = (() => {
-					if (params.cfg.scope === "session") return `xclaude sandbox recreate --browser --session ${params.scopeKey}`;
-					if (params.cfg.scope === "agent") return `xclaude sandbox recreate --browser --agent ${resolveSandboxAgentId(params.scopeKey) ?? "main"}`;
+					if (params.cfg.scope === "session") return `xclaw sandbox recreate --browser --session ${params.scopeKey}`;
+					if (params.cfg.scope === "agent") return `xclaw sandbox recreate --browser --agent ${resolveSandboxAgentId(params.scopeKey) ?? "main"}`;
 					return "xclaw sandbox recreate --browser --all";
 				})();
 				defaultRuntime.log(`Sandbox browser config changed for ${containerName} (recently used). Recreate to apply: ${hint}`);

package/dist/server-DDdC0fti.js

@@ -62,7 +62,7 @@ async function startBrowserControlServerFromConfig() {
 		const s = app.listen(port, "127.0.0.1", () => resolve(s));
 		s.once("error", reject);
 	}).catch((err) => {
-		logServer.error(`xclaude browser server failed to bind 127.0.0.1:${port}: ${String(err)}`);
+		logServer.error(`xclaw browser server failed to bind 127.0.0.1:${port}: ${String(err)}`);
 		return null;
 	});
 	if (!server) return null;

package/dist/shared-CMqWqPGJ.js

@@ -139,8 +139,8 @@ function buildTelegramDmAccessWarningLines(accountId) {
 		"Your bot is using DM policy: pairing.",
 		"Any Telegram user who discovers the bot can send pairing requests.",
 		"For private use, configure an allowlist with your Telegram user id:",
-		"  " + formatCliCommand(`xclaude config set ${configBase}.dmPolicy "allowlist"`),
-		"  " + formatCliCommand(`xclaude config set ${configBase}.allowFrom '["YOUR_USER_ID"]'`),
+		"  " + formatCliCommand(`xclaw config set ${configBase}.dmPolicy "allowlist"`),
+		"  " + formatCliCommand(`xclaw config set ${configBase}.allowFrom '["YOUR_USER_ID"]'`),
 		`Docs: ${formatDocsLink("/channels/pairing", "channels/pairing")}`
 	];
 }

package/dist/skills-C0FaD6iu.js

@@ -664,7 +664,7 @@ function resolveWorkspaceSkillPromptState(workspaceDir, opts) {
 		eligible,
 		prompt: [
 			remoteNote,
-			truncated ? `⚠️ Skills truncated: included ${skillsForPrompt.length} of ${resolvedSkills.length}${compact ? " (compact format, descriptions omitted)" : ""}. Run \`xclaude skills check\` to audit.` : compact ? `⚠️ Skills catalog using compact format (descriptions omitted). Run \`xclaude skills check\` to audit.` : "",
+			truncated ? `⚠️ Skills truncated: included ${skillsForPrompt.length} of ${resolvedSkills.length}${compact ? " (compact format, descriptions omitted)" : ""}. Run \`xclaw skills check\` to audit.` : compact ? `⚠️ Skills catalog using compact format (descriptions omitted). Run \`xclaw skills check\` to audit.` : "",
 			compact ? formatSkillsCompact(skillsForPrompt) : formatSkillsForPrompt(skillsForPrompt)
 		].filter(Boolean).join("\n"),
 		resolvedSkills

package/dist/skills-cli-D-35uKN9.js

@@ -21,7 +21,7 @@ import { i as updateSkillsFromClawHub, n as readTrackedClawHubSkillSlugs, r as s
 //#region src/cli/skills-cli.format.ts
 function appendClawHubHint(output, json) {
 	if (json) return output;
-	return `${output}\n\nTip: use \`xclaude skills search\`, \`xclaude skills install\`, and \`xclaude skills update\` for ClawHub-backed skills.`;
+	return `${output}\n\nTip: use \`xclaw skills search\`, \`xclaw skills install\`, and \`xclaw skills update\` for ClawHub-backed skills.`;
 }
 function formatSkillStatus(skill) {
 	if (skill.eligible) return theme.success("✓ ready");
@@ -198,7 +198,7 @@ function formatSkillInfo(report, skillName, opts) {
 		lines.push(theme.heading("API key setup:"));
 		if (safeHomepage) lines.push(`  Get your key: ${safeHomepage}`);
 		lines.push(`  Save via UI: ${theme.muted("Control UI → Skills → ")}${safeName}${theme.muted(" → Save key")}`);
-		lines.push(`  Save via CLI: ${formatCliCommand(`xclaude config set skills.entries.${safeSkillKey}.apiKey YOUR_KEY`)}`);
+		lines.push(`  Save via CLI: ${formatCliCommand(`xclaw config set skills.entries.${safeSkillKey}.apiKey YOUR_KEY`)}`);
 		lines.push(`  Stored in: ${theme.muted("~/.xclaw/xclaw.json")} ${theme.muted(`(skills.entries.${safeSkillKey}.apiKey)`)}`);
 	}
 	return appendClawHubHint(lines.join("\n"), opts.json);

package/dist/status-BNOiyDPY.js

@@ -1367,7 +1367,7 @@ async function statusCommand(opts, runtime) {
 	if (pairingRecovery) {
 		runtime.log("");
 		runtime.log(theme.warn("Gateway pairing approval required."));
-		if (pairingRecovery.requestId) runtime.log(theme.muted(`Recovery: ${formatCliCommand(`xclaude devices approve ${pairingRecovery.requestId}`)}`));
+		if (pairingRecovery.requestId) runtime.log(theme.muted(`Recovery: ${formatCliCommand(`xclaw devices approve ${pairingRecovery.requestId}`)}`));
 		runtime.log(theme.muted(`Fallback: ${formatCliCommand("xclaw devices approve --latest")}`));
 		runtime.log(theme.muted(`Inspect: ${formatCliCommand("xclaw devices list")}`));
 	}

package/dist/systemd-hints-DAFIxEJ1.js

@@ -173,7 +173,7 @@ function auditGatewayToken(command, issues, expectedGatewayToken) {
 	issues.push({
 		code: SERVICE_AUDIT_CODES.gatewayTokenEmbedded,
 		message: "Gateway service embeds XCLAW_GATEWAY_TOKEN and should be reinstalled.",
-		detail: "Run `xclaude gateway install --force` to remove embedded service token.",
+		detail: "Run `xclaw gateway install --force` to remove embedded service token.",
 		level: "recommended"
 	});
 	const expectedToken = expectedGatewayToken?.trim();
@@ -277,7 +277,7 @@ function checkTokenDrift(params) {
 	if (configToken && serviceToken !== configToken) return {
 		code: SERVICE_AUDIT_CODES.gatewayTokenDrift,
 		message: "Config token differs from service token. The daemon will use the old token after restart.",
-		detail: "Run `xclaude gateway install --force` to sync the token.",
+		detail: "Run `xclaw gateway install --force` to sync the token.",
 		level: "recommended"
 	};
 	return null;

package/dist/targets-CPrPEKB1.js

@@ -474,7 +474,7 @@ function resolveAcpInstallCommandHint(cfg) {
 	const backendId = resolveConfiguredAcpBackendId(cfg).toLowerCase();
 	if (backendId === "acpx") {
 		const localPath = path.resolve(process.cwd(), "extensions/acpx");
-		if (existsSync(localPath)) return `xclaude plugins install ${localPath}`;
+		if (existsSync(localPath)) return `xclaw plugins install ${localPath}`;
 		return "xclaw plugins install acpx";
 	}
 	return `Install and enable the plugin that provides ACP backend "${backendId}".`;

package/dist/tui-DThQ1HKV.js

@@ -3206,7 +3206,7 @@ function resolveGatewayDisconnectState(reason) {
 	if (/pairing required/i.test(reasonLabel)) return {
 		connectionStatus: `gateway disconnected: ${reasonLabel}`,
 		activityStatus: "pairing required: run xclaw devices list",
-		pairingHint: "Pairing required. Run `xclaude devices list`, approve your request ID, then reconnect."
+		pairingHint: "Pairing required. Run `xclaw devices list`, approve your request ID, then reconnect."
 	};
 	return {
 		connectionStatus: `gateway disconnected: ${reasonLabel}`,
@@ -3492,7 +3492,7 @@ async function runTui(opts) {
 	const updateHeader = () => {
 		const sessionLabel = formatSessionKey(currentSessionKey);
 		const agentLabel = formatAgentLabel(currentAgentId);
-		header.setText(theme.header(`xclaude tui - ${client.connection.url} - agent ${agentLabel} - session ${sessionLabel}`));
+		header.setText(theme.header(`xclaw tui - ${client.connection.url} - agent ${agentLabel} - session ${sessionLabel}`));
 	};
 	const busyStates = new Set([
 		"sending",

package/dist/update-cli-WDt52NwJ.js

@@ -1431,7 +1431,7 @@ async function updateCommand(opts) {
 //#region src/cli/update-cli/wizard.ts
 async function updateWizardCommand(opts = {}) {
 	if (!process.stdin.isTTY) {
-		defaultRuntime.error("Update wizard requires a TTY. Use `xclaude update --channel <stable|beta|dev>` instead.");
+		defaultRuntime.error("Update wizard requires a TTY. Use `xclaw update --channel <stable|beta|dev>` instead.");
 		defaultRuntime.exit(1);
 		return;
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amirtechai/xclaude",
-  "version": "2026.3.26",
+  "version": "2026.3.27",
   "description": "Multi-channel AI gateway with extensible messaging integrations",
   "keywords": [],
   "homepage": "https://xclaw.amirtech.ai",

package/xclaw.mjs

@@ -109,7 +109,7 @@ const exists = async (specifier) => {
 };
 
 const buildMissingEntryErrorMessage = async () => {
-  const lines = ["xclaude: missing dist/entry.(m)js (build output)."];
+  const lines = ["xclaw: missing dist/entry.(m)js (build output)."];
   if (!(await exists("./src/entry.ts"))) {
     return lines.join("\n");
   }