@gguf/pigbot 0.0.6 → 0.0.7

package/dist/commands/doctor-platform-notes.js

@@ -12,9 +12,10 @@ function resolveHomeDir() {
 export async function noteMacLaunchAgentOverrides() {
     if (process.platform !== "darwin")
         return;
-    const markerPath = path.join(resolveHomeDir(), ".clawdbot", "disable-launchagent");
-    const hasMarker = fs.existsSync(markerPath);
-    if (!hasMarker)
+    const home = resolveHomeDir();
+    const markerCandidates = [path.join(home, ".openclaw", "disable-launchagent")];
+    const markerPath = markerCandidates.find((candidate) => fs.existsSync(candidate));
+    if (!markerPath)
         return;
     const displayMarkerPath = shortenHomePath(markerPath);
     const lines = [
@@ -48,19 +49,60 @@ export async function noteMacLaunchctlGatewayEnvOverrides(cfg, deps) {
     if (!hasConfigGatewayCreds(cfg))
         return;
     const getenv = deps?.getenv ?? launchctlGetenv;
-    const envToken = await getenv("CLAWDBOT_GATEWAY_TOKEN");
-    const envPassword = await getenv("CLAWDBOT_GATEWAY_PASSWORD");
+    const deprecatedLaunchctlEntries = [
+        ["MOLTBOT_GATEWAY_TOKEN", await getenv("MOLTBOT_GATEWAY_TOKEN")],
+        ["MOLTBOT_GATEWAY_PASSWORD", await getenv("MOLTBOT_GATEWAY_PASSWORD")],
+        ["CLAWDBOT_GATEWAY_TOKEN", await getenv("CLAWDBOT_GATEWAY_TOKEN")],
+        ["CLAWDBOT_GATEWAY_PASSWORD", await getenv("CLAWDBOT_GATEWAY_PASSWORD")],
+    ].filter((entry) => Boolean(entry[1]?.trim()));
+    if (deprecatedLaunchctlEntries.length > 0) {
+        const lines = [
+            "- Deprecated launchctl environment variables detected (ignored).",
+            ...deprecatedLaunchctlEntries.map(([key]) => `- \`${key}\` is set; use \`OPENCLAW_${key.slice(key.indexOf("_") + 1)}\` instead.`),
+        ];
+        (deps?.noteFn ?? note)(lines.join("\n"), "Gateway (macOS)");
+    }
+    const tokenEntries = [
+        ["OPENCLAW_GATEWAY_TOKEN", await getenv("OPENCLAW_GATEWAY_TOKEN")],
+    ];
+    const passwordEntries = [
+        ["OPENCLAW_GATEWAY_PASSWORD", await getenv("OPENCLAW_GATEWAY_PASSWORD")],
+    ];
+    const tokenEntry = tokenEntries.find(([, value]) => value?.trim());
+    const passwordEntry = passwordEntries.find(([, value]) => value?.trim());
+    const envToken = tokenEntry?.[1]?.trim() ?? "";
+    const envPassword = passwordEntry?.[1]?.trim() ?? "";
+    const envTokenKey = tokenEntry?.[0];
+    const envPasswordKey = passwordEntry?.[0];
     if (!envToken && !envPassword)
         return;
     const lines = [
         "- launchctl environment overrides detected (can cause confusing unauthorized errors).",
-        envToken ? "- `CLAWDBOT_GATEWAY_TOKEN` is set; it overrides config tokens." : undefined,
+        envToken && envTokenKey
+            ? `- \`${envTokenKey}\` is set; it overrides config tokens.`
+            : undefined,
         envPassword
-            ? "- `CLAWDBOT_GATEWAY_PASSWORD` is set; it overrides config passwords."
+            ? `- \`${envPasswordKey ?? "OPENCLAW_GATEWAY_PASSWORD"}\` is set; it overrides config passwords.`
             : undefined,
         "- Clear overrides and restart the app/gateway:",
-        envToken ? "  launchctl unsetenv CLAWDBOT_GATEWAY_TOKEN" : undefined,
-        envPassword ? "  launchctl unsetenv CLAWDBOT_GATEWAY_PASSWORD" : undefined,
+        envTokenKey ? `  launchctl unsetenv ${envTokenKey}` : undefined,
+        envPasswordKey ? `  launchctl unsetenv ${envPasswordKey}` : undefined,
     ].filter((line) => Boolean(line));
     (deps?.noteFn ?? note)(lines.join("\n"), "Gateway (macOS)");
 }
+export function noteDeprecatedLegacyEnvVars(env = process.env, deps) {
+    const entries = Object.entries(env)
+        .filter(([key, value]) => (key.startsWith("MOLTBOT_") || key.startsWith("CLAWDBOT_")) && value?.trim())
+        .map(([key]) => key);
+    if (entries.length === 0)
+        return;
+    const lines = [
+        "- Deprecated legacy environment variables detected (ignored).",
+        "- Use OPENCLAW_* equivalents instead:",
+        ...entries.map((key) => {
+            const suffix = key.slice(key.indexOf("_") + 1);
+            return `  ${key} -> OPENCLAW_${suffix}`;
+        }),
+    ];
+    (deps?.noteFn ?? note)(lines.join("\n"), "Environment");
+}

package/dist/commands/doctor-sandbox.js

@@ -113,11 +113,11 @@ async function handleMissingSandboxImage(params, runtime, prompter) {
     const buildHint = params.buildScript
         ? `Build it with ${params.buildScript}.`
         : "Build or pull it first.";
-    note(`Sandbox ${params.label} image missing: ${params.image}. ${buildHint}`, "Sandbox");
+    note(`Sandbox ${params.kind} image missing: ${params.image}. ${buildHint}`, "Sandbox");
     let built = false;
     if (params.buildScript) {
         const build = await prompter.confirmSkipInNonInteractive({
-            message: `Build ${params.label} sandbox image now?`,
+            message: `Build ${params.kind} sandbox image now?`,
             initialValue: true,
         });
         if (build) {
@@ -141,7 +141,7 @@ export async function maybeRepairSandboxImages(cfg, runtime, prompter) {
     const changes = [];
     const dockerImage = resolveSandboxDockerImage(cfg);
     await handleMissingSandboxImage({
-        label: "base",
+        kind: "base",
         image: dockerImage,
         buildScript: dockerImage === DEFAULT_SANDBOX_COMMON_IMAGE
             ? "scripts/sandbox-common-setup.sh"
@@ -155,7 +155,7 @@ export async function maybeRepairSandboxImages(cfg, runtime, prompter) {
     }, runtime, prompter);
     if (sandbox.browser?.enabled) {
         await handleMissingSandboxImage({
-            label: "browser",
+            kind: "browser",
             image: resolveSandboxBrowserImage(cfg),
             buildScript: "scripts/sandbox-browser-setup.sh",
             updateConfig: (image) => {

package/dist/commands/doctor-security.js

@@ -7,7 +7,7 @@ import { resolveGatewayAuth } from "../gateway/auth.js";
 import { isLoopbackHost, resolveGatewayBindHost } from "../gateway/net.js";
 export async function noteSecurityWarnings(cfg) {
     const warnings = [];
-    const auditHint = `- Run: ${formatCliCommand("moltbot security audit --deep")}`;
+    const auditHint = `- Run: ${formatCliCommand("openclaw security audit --deep")}`;
     // ===========================================
     // GATEWAY NETWORK EXPOSURE CHECK
     // ===========================================
@@ -39,14 +39,14 @@ export async function noteSecurityWarnings(cfg) {
         if (!hasSharedSecret) {
             const authFixLines = resolvedAuth.mode === "password"
                 ? [
-                    `  Fix: ${formatCliCommand("moltbot configure")} to set a password`,
-                    `  Or switch to token: ${formatCliCommand("moltbot config set gateway.auth.mode token")}`,
+                    `  Fix: ${formatCliCommand("openclaw configure")} to set a password`,
+                    `  Or switch to token: ${formatCliCommand("openclaw config set gateway.auth.mode token")}`,
                 ]
                 : [
-                    `  Fix: ${formatCliCommand("moltbot doctor --fix")} to generate a token`,
-                    `  Or set token directly: ${formatCliCommand("moltbot config set gateway.auth.mode token")}`,
+                    `  Fix: ${formatCliCommand("openclaw doctor --fix")} to generate a token`,
+                    `  Or set token directly: ${formatCliCommand("openclaw config set gateway.auth.mode token")}`,
                 ];
-            warnings.push(`- CRITICAL: Gateway bound to ${bindDescriptor} without authentication.`, `  Anyone on your network (or internet if port-forwarded) can fully control your agent.`, `  Fix: ${formatCliCommand("moltbot config set gateway.bind loopback")}`, ...authFixLines);
+            warnings.push(`- CRITICAL: Gateway bound to ${bindDescriptor} without authentication.`, `  Anyone on your network (or internet if port-forwarded) can fully control your agent.`, `  Fix: ${formatCliCommand("openclaw config set gateway.bind loopback")}`, ...authFixLines);
         }
         else {
             // Auth is configured, but still warn about network exposure
@@ -87,7 +87,7 @@ export async function noteSecurityWarnings(cfg) {
             warnings.push(`  ${params.approveHint}`);
         }
         if (dmScope === "main" && isMultiUserDm) {
-            warnings.push(`- ${params.label} DMs: multiple senders share the main session; set session.dmScope="per-channel-peer" to isolate sessions.`);
+            warnings.push(`- ${params.label} DMs: multiple senders share the main session; set session.dmScope="per-channel-peer" (or "per-account-channel-peer" for multi-account channels) to isolate sessions.`);
         }
     };
     for (const plugin of listChannelPlugins()) {

package/dist/commands/doctor-state-integrity.js

@@ -96,11 +96,13 @@ function findOtherStateDirs(stateDir) {
                 continue;
             if (entry.name.startsWith("."))
                 continue;
-            const candidate = path.resolve(root, entry.name, ".clawdbot");
-            if (candidate === resolvedState)
-                continue;
-            if (existsDir(candidate))
-                found.push(candidate);
+            const candidates = [".openclaw"].map((dir) => path.resolve(root, entry.name, dir));
+            for (const candidate of candidates) {
+                if (candidate === resolvedState)
+                    continue;
+                if (existsDir(candidate))
+                    found.push(candidate);
+            }
         }
     }
     return found;
@@ -111,7 +113,7 @@ export async function noteStateIntegrity(cfg, prompter, configPath) {
     const env = process.env;
     const homedir = os.homedir;
     const stateDir = resolveStateDir(env, homedir);
-    const defaultStateDir = path.join(homedir(), ".clawdbot");
+    const defaultStateDir = path.join(homedir(), ".openclaw");
     const oauthDir = resolveOAuthDir(env, stateDir);
     const agentId = resolveDefaultAgentId(cfg);
     const sessionsDir = resolveSessionTranscriptsDirForAgent(agentId, env, homedir);
@@ -326,7 +328,7 @@ export function noteWorkspaceBackupTip(workspaceDir) {
         return;
     note([
         "- Tip: back up the workspace in a private git repo (GitHub or GitLab).",
-        "- Keep ~/.clawdbot out of git; it contains credentials and session history.",
+        "- Keep ~/.openclaw out of git; it contains credentials and session history.",
         "- Details: /concepts/agent-workspace#git-backup-recommended",
     ].join("\n"), "Workspace");
 }

package/dist/commands/doctor-state-migrations.js

@@ -1 +1 @@
-export { autoMigrateLegacyAgentDir, autoMigrateLegacyState, detectLegacyStateMigrations, migrateLegacyAgentDir, resetAutoMigrateLegacyAgentDirForTest, resetAutoMigrateLegacyStateForTest, runLegacyStateMigrations, } from "../infra/state-migrations.js";
+export { autoMigrateLegacyStateDir, autoMigrateLegacyAgentDir, autoMigrateLegacyState, detectLegacyStateMigrations, migrateLegacyAgentDir, resetAutoMigrateLegacyStateDirForTest, resetAutoMigrateLegacyAgentDirForTest, resetAutoMigrateLegacyStateForTest, runLegacyStateMigrations, } from "../infra/state-migrations.js";

package/dist/commands/doctor-ui.js

@@ -1,10 +1,10 @@
 import fs from "node:fs/promises";
 import path from "node:path";
-import { resolveMoltbotPackageRoot } from "../infra/moltbot-root.js";
+import { resolveOpenClawPackageRoot } from "../infra/openclaw-root.js";
 import { runCommandWithTimeout } from "../process/exec.js";
 import { note } from "../terminal/note.js";
 export async function maybeRepairUiProtocolFreshness(_runtime, prompter) {
-    const root = await resolveMoltbotPackageRoot({
+    const root = await resolveOpenClawPackageRoot({
         moduleUrl: import.meta.url,
         argv1: process.argv[1],
         cwd: process.cwd(),

package/dist/commands/doctor-update.js

@@ -3,7 +3,7 @@ import { isTruthyEnvValue } from "../infra/env.js";
 import { runCommandWithTimeout } from "../process/exec.js";
 import { note } from "../terminal/note.js";
 import { formatCliCommand } from "../cli/command-format.js";
-async function detectMoltbotGitCheckout(root) {
+async function detectOpenClawGitCheckout(root) {
     const res = await runCommandWithTimeout(["git", "-C", root, "rev-parse", "--show-toplevel"], {
         timeoutMs: 5000,
     }).catch(() => null);
@@ -20,7 +20,7 @@ async function detectMoltbotGitCheckout(root) {
     return res.stdout.trim() === root ? "git" : "not-git";
 }
 export async function maybeOfferUpdateBeforeDoctor(params) {
-    const updateInProgress = isTruthyEnvValue(process.env.CLAWDBOT_UPDATE_IN_PROGRESS);
+    const updateInProgress = isTruthyEnvValue(process.env.OPENCLAW_UPDATE_IN_PROGRESS);
     const canOfferUpdate = !updateInProgress &&
         params.options.nonInteractive !== true &&
         params.options.yes !== true &&
@@ -28,10 +28,10 @@ export async function maybeOfferUpdateBeforeDoctor(params) {
         Boolean(process.stdin.isTTY);
     if (!canOfferUpdate || !params.root)
         return { updated: false };
-    const git = await detectMoltbotGitCheckout(params.root);
+    const git = await detectOpenClawGitCheckout(params.root);
     if (git === "git") {
         const shouldUpdate = await params.confirm({
-            message: "Update Moltbot from git before running doctor?",
+            message: "Update OpenClaw from git before running doctor?",
             initialValue: true,
         });
         if (!shouldUpdate)
@@ -58,7 +58,7 @@ export async function maybeOfferUpdateBeforeDoctor(params) {
     if (git === "not-git") {
         note([
             "This install is not a git checkout.",
-            `Run \`${formatCliCommand("moltbot update")}\` to update via your package manager (npm/pnpm), then rerun doctor.`,
+            `Run \`${formatCliCommand("openclaw update")}\` to update via your package manager (npm/pnpm), then rerun doctor.`,
         ].join("\n"), "Update");
     }
     return { updated: false };

package/dist/commands/doctor-workspace-status.js

@@ -1,6 +1,6 @@
 import { resolveAgentWorkspaceDir, resolveDefaultAgentId } from "../agents/agent-scope.js";
 import { buildWorkspaceSkillStatus } from "../agents/skills-status.js";
-import { loadMoltbotPlugins } from "../plugins/loader.js";
+import { loadOpenClawPlugins } from "../plugins/loader.js";
 import { note } from "../terminal/note.js";
 import { detectLegacyWorkspaceDirs, formatLegacyWorkspaceWarning } from "./doctor-workspace.js";
 export function noteWorkspaceStatus(cfg) {
@@ -16,7 +16,7 @@ export function noteWorkspaceStatus(cfg) {
             .length}`,
         `Blocked by allowlist: ${skillsReport.skills.filter((s) => s.blockedByAllowlist).length}`,
     ].join("\n"), "Skills status");
-    const pluginRegistry = loadMoltbotPlugins({
+    const pluginRegistry = loadOpenClawPlugins({
         config: cfg,
         workspaceDir,
         logger: {

package/dist/commands/doctor-workspace.js

@@ -1,15 +1,14 @@
 import fs from "node:fs";
-import os from "node:os";
 import path from "node:path";
-import { DEFAULT_AGENTS_FILENAME, DEFAULT_IDENTITY_FILENAME, DEFAULT_SOUL_FILENAME, DEFAULT_USER_FILENAME, } from "../agents/workspace.js";
+import { DEFAULT_AGENTS_FILENAME } from "../agents/workspace.js";
 import { shortenHomePath } from "../utils.js";
 export const MEMORY_SYSTEM_PROMPT = [
     "Memory system not found in workspace.",
     "Paste this into your agent:",
     "",
     "Install the memory system by applying:",
-    "https://github.com/moltbot/moltbot/commit/9ffea23f31ca1df5183b25668f8f814bee0fb34e",
-    "https://github.com/moltbot/moltbot/commit/7d1fee70e76f2f634f1b41fca927ee663914183a",
+    "https://github.com/openclaw/openclaw/commit/9ffea23f31ca1df5183b25668f8f814bee0fb34e",
+    "https://github.com/openclaw/openclaw/commit/7d1fee70e76f2f634f1b41fca927ee663914183a",
 ].join("\n");
 export async function shouldSuggestMemorySystem(workspaceDir) {
     const memoryPaths = [path.join(workspaceDir, "MEMORY.md"), path.join(workspaceDir, "memory.md")];
@@ -33,30 +32,9 @@ export async function shouldSuggestMemorySystem(workspaceDir) {
     }
     return true;
 }
-function looksLikeWorkspaceDir(dir, exists) {
-    const markers = [
-        DEFAULT_AGENTS_FILENAME,
-        DEFAULT_SOUL_FILENAME,
-        DEFAULT_USER_FILENAME,
-        DEFAULT_IDENTITY_FILENAME,
-    ];
-    return markers.some((name) => exists(path.join(dir, name)));
-}
 export function detectLegacyWorkspaceDirs(params) {
-    const homedir = params.homedir ?? os.homedir;
-    const exists = params.exists ?? fs.existsSync;
-    const home = homedir();
     const activeWorkspace = path.resolve(params.workspaceDir);
-    const candidates = [path.join(home, "moltbot")];
-    const legacyDirs = candidates
-        .filter((candidate) => {
-        if (!exists(candidate))
-            return false;
-        return path.resolve(candidate) !== activeWorkspace;
-    })
-        .filter((candidate) => {
-        return looksLikeWorkspaceDir(candidate, exists);
-    });
+    const legacyDirs = [];
     return { activeWorkspace, legacyDirs };
 }
 export function formatLegacyWorkspaceWarning(detection) {
@@ -64,6 +42,6 @@ export function formatLegacyWorkspaceWarning(detection) {
         "Extra workspace directories detected (may contain old agent files):",
         ...detection.legacyDirs.map((dir) => `- ${shortenHomePath(dir)}`),
         `Active workspace: ${shortenHomePath(detection.activeWorkspace)}`,
-        "If unused, archive or move to Trash (e.g. trash ~/moltbot).",
+        "If unused, archive or move to Trash.",
     ].join("\n");
 }

package/dist/commands/doctor.js

@@ -10,7 +10,7 @@ import { logConfigUpdated } from "../config/logging.js";
 import { resolveGatewayService } from "../daemon/service.js";
 import { resolveGatewayAuth } from "../gateway/auth.js";
 import { buildGatewayConnectionDetails } from "../gateway/call.js";
-import { resolveMoltbotPackageRoot } from "../infra/moltbot-root.js";
+import { resolveOpenClawPackageRoot } from "../infra/openclaw-root.js";
 import { defaultRuntime } from "../runtime.js";
 import { note } from "../terminal/note.js";
 import { stylePromptTitle } from "../terminal/prompt-style.js";
@@ -19,9 +19,9 @@ import { maybeRemoveDeprecatedCliAuthProfiles, maybeRepairAnthropicOAuthProfileI
 import { loadAndMaybeMigrateDoctorConfig } from "./doctor-config-flow.js";
 import { maybeRepairGatewayDaemon } from "./doctor-gateway-daemon-flow.js";
 import { checkGatewayHealth } from "./doctor-gateway-health.js";
-import { maybeMigrateLegacyGatewayService, maybeRepairGatewayServiceConfig, maybeScanExtraGatewayServices, } from "./doctor-gateway-services.js";
+import { maybeRepairGatewayServiceConfig, maybeScanExtraGatewayServices, } from "./doctor-gateway-services.js";
 import { noteSourceInstallIssues } from "./doctor-install.js";
-import { noteMacLaunchAgentOverrides, noteMacLaunchctlGatewayEnvOverrides, } from "./doctor-platform-notes.js";
+import { noteMacLaunchAgentOverrides, noteMacLaunchctlGatewayEnvOverrides, noteDeprecatedLegacyEnvVars, } from "./doctor-platform-notes.js";
 import { createDoctorPrompter } from "./doctor-prompter.js";
 import { maybeRepairSandboxImages, noteSandboxScopeWarnings } from "./doctor-sandbox.js";
 import { noteSecurityWarnings } from "./doctor-security.js";
@@ -41,8 +41,8 @@ function resolveMode(cfg) {
 export async function doctorCommand(runtime = defaultRuntime, options = {}) {
     const prompter = createDoctorPrompter({ runtime, options });
     printWizardHeader(runtime);
-    intro("Moltbot doctor");
-    const root = await resolveMoltbotPackageRoot({
+    intro("OpenClaw doctor");
+    const root = await resolveOpenClawPackageRoot({
         moduleUrl: import.meta.url,
         argv1: process.argv[1],
         cwd: process.cwd(),
@@ -58,6 +58,7 @@ export async function doctorCommand(runtime = defaultRuntime, options = {}) {
         return;
     await maybeRepairUiProtocolFreshness(runtime, prompter);
     noteSourceInstallIssues(root);
+    noteDeprecatedLegacyEnvVars();
     const configResult = await loadAndMaybeMigrateDoctorConfig({
         options,
         confirm: (p) => prompter.confirm(p),
@@ -67,11 +68,11 @@ export async function doctorCommand(runtime = defaultRuntime, options = {}) {
     if (!cfg.gateway?.mode) {
         const lines = [
             "gateway.mode is unset; gateway start will be blocked.",
-            `Fix: run ${formatCliCommand("moltbot configure")} and set Gateway mode (local/remote).`,
-            `Or set directly: ${formatCliCommand("moltbot config set gateway.mode local")}`,
+            `Fix: run ${formatCliCommand("openclaw configure")} and set Gateway mode (local/remote).`,
+            `Or set directly: ${formatCliCommand("openclaw config set gateway.mode local")}`,
         ];
         if (!fs.existsSync(configPath)) {
-            lines.push(`Missing config: run ${formatCliCommand("moltbot setup")} first.`);
+            lines.push(`Missing config: run ${formatCliCommand("openclaw setup")} first.`);
         }
         note(lines.join("\n"), "Gateway");
     }
@@ -143,8 +144,7 @@ export async function doctorCommand(runtime = defaultRuntime, options = {}) {
     await noteStateIntegrity(cfg, prompter, configResult.path ?? CONFIG_PATH);
     cfg = await maybeRepairSandboxImages(cfg, runtime, prompter);
     noteSandboxScopeWarnings(cfg);
-    await maybeMigrateLegacyGatewayService(cfg, resolveMode(cfg), runtime, prompter);
-    await maybeScanExtraGatewayServices(options);
+    await maybeScanExtraGatewayServices(options, runtime, prompter);
     await maybeRepairGatewayServiceConfig(cfg, resolveMode(cfg), runtime, prompter);
     await noteMacLaunchAgentOverrides();
     await noteMacLaunchctlGatewayEnvOverrides(cfg);
@@ -231,7 +231,7 @@ export async function doctorCommand(runtime = defaultRuntime, options = {}) {
         }
     }
     else {
-        runtime.log(`Run "${formatCliCommand("moltbot doctor --fix")}" to apply changes.`);
+        runtime.log(`Run "${formatCliCommand("openclaw doctor --fix")}" to apply changes.`);
     }
     if (options.workspaceSuggestions !== false) {
         const workspaceDir = resolveAgentWorkspaceDir(cfg, resolveDefaultAgentId(cfg));

package/dist/commands/gateway-status/helpers.js

@@ -91,8 +91,8 @@ export function resolveAuthForTarget(cfg, target, overrides) {
             password: password.length > 0 ? password : undefined,
         };
     }
-    const envToken = process.env.CLAWDBOT_GATEWAY_TOKEN?.trim() || "";
-    const envPassword = process.env.CLAWDBOT_GATEWAY_PASSWORD?.trim() || "";
+    const envToken = process.env.OPENCLAW_GATEWAY_TOKEN?.trim() || "";
+    const envPassword = process.env.OPENCLAW_GATEWAY_PASSWORD?.trim() || "";
     const cfgToken = typeof cfg.gateway?.auth?.token === "string" ? cfg.gateway.auth.token.trim() : "";
     const cfgPassword = typeof cfg.gateway?.auth?.password === "string" ? cfg.gateway.auth.password.trim() : "";
     return {

package/dist/commands/gateway-status.js

@@ -2,6 +2,7 @@ import { withProgress } from "../cli/progress.js";
 import { loadConfig, resolveGatewayPort } from "../config/config.js";
 import { probeGateway } from "../gateway/probe.js";
 import { discoverGatewayBeacons } from "../infra/bonjour-discovery.js";
+import { resolveWideAreaDiscoveryDomain } from "../infra/widearea-dns.js";
 import { resolveSshConfig } from "../infra/ssh-config.js";
 import { parseSshTarget, startSshPortForward } from "../infra/ssh-tunnel.js";
 import { colorize, isRich, theme } from "../terminal/theme.js";
@@ -11,11 +12,15 @@ export async function gatewayStatusCommand(opts, runtime) {
     const cfg = loadConfig();
     const rich = isRich() && opts.json !== true;
     const overallTimeoutMs = parseTimeoutMs(opts.timeout, 3000);
+    const wideAreaDomain = resolveWideAreaDiscoveryDomain({
+        configDomain: cfg.discovery?.wideArea?.domain,
+    });
     const baseTargets = resolveTargets(cfg, opts.url);
     const network = buildNetworkHints(cfg);
     const discoveryTimeoutMs = Math.min(1200, overallTimeoutMs);
     const discoveryPromise = discoverGatewayBeacons({
         timeoutMs: discoveryTimeoutMs,
+        wideAreaDomain,
     });
     let sshTarget = sanitizeSshTarget(opts.ssh) ?? sanitizeSshTarget(cfg.gateway?.remote?.sshTarget);
     let sshIdentity = sanitizeSshTarget(opts.sshIdentity) ?? sanitizeSshTarget(cfg.gateway?.remote?.sshIdentity);
@@ -71,7 +76,7 @@ export async function gatewayStatusCommand(opts, runtime) {
                 const base = user ? `${user}@${host.trim()}` : host.trim();
                 return sshPort !== 22 ? `${base}:${sshPort}` : base;
             })
-                .filter((x) => Boolean(x));
+                .filter((candidate) => Boolean(candidate && parseSshTarget(candidate)));
             if (candidates.length > 0)
                 sshTarget = candidates[0] ?? null;
         }
@@ -214,9 +219,10 @@ export async function gatewayStatusCommand(opts, runtime) {
     }
     runtime.log("");
     runtime.log(colorize(rich, theme.heading, "Discovery (this machine)"));
+    const discoveryDomains = wideAreaDomain ? `local. + ${wideAreaDomain}` : "local.";
     runtime.log(discovery.length > 0
-        ? `Found ${discovery.length} gateway(s) via Bonjour (local. + moltbot.internal.)`
-        : "Found 0 gateways via Bonjour (local. + moltbot.internal.)");
+        ? `Found ${discovery.length} gateway(s) via Bonjour (${discoveryDomains})`
+        : `Found 0 gateways via Bonjour (${discoveryDomains})`);
     if (discovery.length === 0) {
         runtime.log(colorize(rich, theme.muted, "Tip: if the gateway is remote, mDNS won’t cross networks; use Wide-Area Bonjour (split DNS) or SSH tunnels."));
     }

package/dist/commands/health.js

@@ -14,7 +14,7 @@ import { normalizeAgentId } from "../routing/session-key.js";
 import { theme } from "../terminal/theme.js";
 const DEFAULT_TIMEOUT_MS = 10_000;
 const debugHealth = (...args) => {
-    if (isTruthyEnvValue(process.env.CLAWDBOT_DEBUG_HEALTH)) {
+    if (isTruthyEnvValue(process.env.OPENCLAW_DEBUG_HEALTH)) {
         console.warn("[health:debug]", ...args);
     }
 };
@@ -420,7 +420,7 @@ export async function healthCommand(opts, runtime) {
         runtime.log(JSON.stringify(summary, null, 2));
     }
     else {
-        const debugEnabled = isTruthyEnvValue(process.env.CLAWDBOT_DEBUG_HEALTH);
+        const debugEnabled = isTruthyEnvValue(process.env.OPENCLAW_DEBUG_HEALTH);
         if (opts.verbose) {
             const details = buildGatewayConnectionDetails({ config: cfg });
             runtime.log(info("Gateway connection:"));

package/dist/commands/models/auth.js

@@ -247,7 +247,7 @@ export async function modelsAuthLoginCommand(opts, runtime) {
     const workspaceDir = resolveAgentWorkspaceDir(config, defaultAgentId) ?? resolveDefaultAgentWorkspaceDir();
     const providers = resolvePluginProviders({ config, workspaceDir });
     if (providers.length === 0) {
-        throw new Error(`No provider plugins found. Install one via \`${formatCliCommand("moltbot plugins install")}\`.`);
+        throw new Error(`No provider plugins found. Install one via \`${formatCliCommand("openclaw plugins install")}\`.`);
     }
     const prompter = createClackPrompter();
     const selectedProvider = resolveProviderMatch(providers, opts.provider) ??

package/dist/commands/models/list.probe.js

@@ -1,6 +1,6 @@
 import crypto from "node:crypto";
 import fs from "node:fs/promises";
-import { resolveMoltbotAgentDir } from "../../agents/agent-paths.js";
+import { resolveOpenClawAgentDir } from "../../agents/agent-paths.js";
 import { ensureAuthProfileStore, listProfilesForProvider, resolveAuthProfileDisplayLabel, resolveAuthProfileOrder, } from "../../agents/auth-profiles.js";
 import { runEmbeddedPiAgent } from "../../agents/pi-embedded.js";
 import { describeFailoverError } from "../../agents/failover-error.js";
@@ -250,7 +250,7 @@ async function runTargetsWithConcurrency(params) {
     const { cfg, targets, timeoutMs, maxTokens, onProgress } = params;
     const concurrency = Math.max(1, Math.min(targets.length || 1, params.concurrency));
     const agentId = resolveDefaultAgentId(cfg);
-    const agentDir = resolveMoltbotAgentDir();
+    const agentDir = resolveOpenClawAgentDir();
     const workspaceDir = resolveAgentWorkspaceDir(cfg, agentId) ?? resolveDefaultAgentWorkspaceDir();
     const sessionDir = resolveSessionTranscriptsDirForAgent(agentId);
     await fs.mkdir(workspaceDir, { recursive: true });

package/dist/commands/models/list.registry.js

@@ -1,8 +1,8 @@
 import { discoverAuthStorage, discoverModels } from "@mariozechner/pi-coding-agent";
-import { resolveMoltbotAgentDir } from "../../agents/agent-paths.js";
+import { resolveOpenClawAgentDir } from "../../agents/agent-paths.js";
 import { listProfilesForProvider } from "../../agents/auth-profiles.js";
 import { getCustomProviderApiKey, resolveAwsSdkEnvVarName, resolveEnvApiKey, } from "../../agents/model-auth.js";
-import { ensureMoltbotModelsJson } from "../../agents/models-config.js";
+import { ensureOpenClawModelsJson } from "../../agents/models-config.js";
 import { modelKey } from "./shared.js";
 const isLocalBaseUrl = (baseUrl) => {
     try {
@@ -30,8 +30,8 @@ const hasAuthForProvider = (provider, cfg, authStore) => {
     return false;
 };
 export async function loadModelRegistry(cfg) {
-    await ensureMoltbotModelsJson(cfg);
-    const agentDir = resolveMoltbotAgentDir();
+    await ensureOpenClawModelsJson(cfg);
+    const agentDir = resolveOpenClawAgentDir();
     const authStorage = discoverAuthStorage(agentDir);
     const registry = discoverModels(authStorage, agentDir);
     const models = registry.getAll();

package/dist/commands/models/list.status-command.js

@@ -1,5 +1,5 @@
 import path from "node:path";
-import { resolveMoltbotAgentDir } from "../../agents/agent-paths.js";
+import { resolveOpenClawAgentDir } from "../../agents/agent-paths.js";
 import { buildAuthHealthSummary, DEFAULT_OAUTH_WARN_MS, formatRemainingShort, } from "../../agents/auth-health.js";
 import { ensureAuthProfileStore, resolveAuthStorePathForDisplay, resolveProfileUnusableUntilForDisplay, } from "../../agents/auth-profiles.js";
 import { resolveEnvApiKey } from "../../agents/model-auth.js";
@@ -42,7 +42,7 @@ export async function modelsStatusCommand(opts, runtime) {
         return acc;
     }, {});
     const allowed = Object.keys(cfg.agents?.defaults?.models ?? {});
-    const agentDir = resolveMoltbotAgentDir();
+    const agentDir = resolveOpenClawAgentDir();
     const store = ensureAuthProfileStore();
     const modelsPath = path.join(agentDir, "models.json");
     const providersFromStore = new Set(Object.values(store.profiles)
@@ -292,8 +292,8 @@ export async function modelsStatusCommand(opts, runtime) {
         runtime.log(colorize(rich, theme.heading, "Missing auth"));
         for (const provider of missingProvidersInUse) {
             const hint = provider === "anthropic"
-                ? `Run \`claude setup-token\`, then \`${formatCliCommand("moltbot models auth setup-token")}\` or \`${formatCliCommand("moltbot configure")}\`.`
-                : `Run \`${formatCliCommand("moltbot configure")}\` or set an API key env var.`;
+                ? `Run \`claude setup-token\`, then \`${formatCliCommand("openclaw models auth setup-token")}\` or \`${formatCliCommand("openclaw configure")}\`.`
+                : `Run \`${formatCliCommand("openclaw configure")}\` or set an API key env var.`;
             runtime.log(`- ${theme.heading(provider)} ${hint}`);
         }
     }

package/dist/commands/node-daemon-install-helpers.js

@@ -29,7 +29,7 @@ export async function buildNodeInstallPlan(params) {
     }
     const environment = buildNodeServiceEnvironment({ env: params.env });
     const description = formatNodeServiceDescription({
-        version: environment.CLAWDBOT_SERVICE_VERSION,
+        version: environment.OPENCLAW_SERVICE_VERSION,
     });
     return { programArguments, workingDirectory, environment, description };
 }