@gguf/pigbot 0.0.6 → 0.0.7

package/dist/commands/configure.wizard.js

@@ -44,7 +44,7 @@ async function promptChannelMode(runtime) {
             {
                 value: "remove",
                 label: "Remove channel config",
-                hint: "Delete channel tokens/settings from moltbot.json",
+                hint: "Delete channel tokens/settings from openclaw.json",
             },
         ],
         initialValue: "configure",
@@ -57,7 +57,7 @@ async function promptWebToolsConfig(nextConfig, runtime) {
     note([
         "Web search lets your agent look things up online using the `web_search` tool.",
         "It requires a Brave Search API key (you can store it in the config or set BRAVE_API_KEY in the Gateway environment).",
-        "Docs: https://docs.molt.bot/tools/web",
+        "Docs: https://docs.openclaw.ai/tools/web",
     ].join("\n"), "Web search");
     const enableSearch = guardCancel(await confirm({
         message: "Enable web_search (Brave Search)?",
@@ -82,7 +82,7 @@ async function promptWebToolsConfig(nextConfig, runtime) {
             note([
                 "No key stored yet, so web_search will stay unavailable.",
                 "Store a key here or set BRAVE_API_KEY in the Gateway environment.",
-                "Docs: https://docs.molt.bot/tools/web",
+                "Docs: https://docs.openclaw.ai/tools/web",
             ].join("\n"), "Web search");
         }
     }
@@ -109,7 +109,7 @@ async function promptWebToolsConfig(nextConfig, runtime) {
 export async function runConfigureWizard(opts, runtime = defaultRuntime) {
     try {
         printWizardHeader(runtime);
-        intro(opts.command === "update" ? "Moltbot update wizard" : "Moltbot configure");
+        intro(opts.command === "update" ? "OpenClaw update wizard" : "OpenClaw configure");
         const prompter = createClackPrompter();
         const snapshot = await readConfigFileSnapshot();
         const baseConfig = snapshot.valid ? snapshot.config : {};
@@ -120,11 +120,11 @@ export async function runConfigureWizard(opts, runtime = defaultRuntime) {
                 note([
                     ...snapshot.issues.map((iss) => `- ${iss.path}: ${iss.message}`),
                     "",
-                    "Docs: https://docs.molt.bot/gateway/configuration",
+                    "Docs: https://docs.openclaw.ai/gateway/configuration",
                 ].join("\n"), "Config issues");
             }
             if (!snapshot.valid) {
-                outro(`Config invalid. Run \`${formatCliCommand("moltbot doctor")}\` to repair it, then re-run configure.`);
+                outro(`Config invalid. Run \`${formatCliCommand("openclaw doctor")}\` to repair it, then re-run configure.`);
                 runtime.exit(1);
                 return;
             }
@@ -132,8 +132,8 @@ export async function runConfigureWizard(opts, runtime = defaultRuntime) {
         const localUrl = "ws://127.0.0.1:18789";
         const localProbe = await probeGatewayReachable({
             url: localUrl,
-            token: baseConfig.gateway?.auth?.token ?? process.env.CLAWDBOT_GATEWAY_TOKEN,
-            password: baseConfig.gateway?.auth?.password ?? process.env.CLAWDBOT_GATEWAY_PASSWORD,
+            token: baseConfig.gateway?.auth?.token ?? process.env.OPENCLAW_GATEWAY_TOKEN,
+            password: baseConfig.gateway?.auth?.password ?? process.env.OPENCLAW_GATEWAY_PASSWORD,
         });
         const remoteUrl = baseConfig.gateway?.remote?.url?.trim() ?? "";
         const remoteProbe = remoteUrl
@@ -192,7 +192,7 @@ export async function runConfigureWizard(opts, runtime = defaultRuntime) {
         let gatewayPort = resolveGatewayPort(baseConfig);
         let gatewayToken = nextConfig.gateway?.auth?.token ??
             baseConfig.gateway?.auth?.token ??
-            process.env.CLAWDBOT_GATEWAY_TOKEN;
+            process.env.OPENCLAW_GATEWAY_TOKEN;
         const persistConfig = async () => {
             nextConfig = applyWizardMetadata(nextConfig, {
                 command: opts.command,
@@ -277,8 +277,8 @@ export async function runConfigureWizard(opts, runtime = defaultRuntime) {
                 });
                 const remoteUrl = nextConfig.gateway?.remote?.url?.trim();
                 const wsUrl = nextConfig.gateway?.mode === "remote" && remoteUrl ? remoteUrl : localLinks.wsUrl;
-                const token = nextConfig.gateway?.auth?.token ?? process.env.CLAWDBOT_GATEWAY_TOKEN;
-                const password = nextConfig.gateway?.auth?.password ?? process.env.CLAWDBOT_GATEWAY_PASSWORD;
+                const token = nextConfig.gateway?.auth?.token ?? process.env.OPENCLAW_GATEWAY_TOKEN;
+                const password = nextConfig.gateway?.auth?.password ?? process.env.OPENCLAW_GATEWAY_PASSWORD;
                 await waitForGatewayReachable({
                     url: wsUrl,
                     token,
@@ -292,8 +292,8 @@ export async function runConfigureWizard(opts, runtime = defaultRuntime) {
                     runtime.error(formatHealthCheckFailure(err));
                     note([
                         "Docs:",
-                        "https://docs.molt.bot/gateway/health",
-                        "https://docs.molt.bot/gateway/troubleshooting",
+                        "https://docs.openclaw.ai/gateway/health",
+                        "https://docs.openclaw.ai/gateway/troubleshooting",
                     ].join("\n"), "Health check help");
                 }
             }
@@ -386,8 +386,8 @@ export async function runConfigureWizard(opts, runtime = defaultRuntime) {
                     });
                     const remoteUrl = nextConfig.gateway?.remote?.url?.trim();
                     const wsUrl = nextConfig.gateway?.mode === "remote" && remoteUrl ? remoteUrl : localLinks.wsUrl;
-                    const token = nextConfig.gateway?.auth?.token ?? process.env.CLAWDBOT_GATEWAY_TOKEN;
-                    const password = nextConfig.gateway?.auth?.password ?? process.env.CLAWDBOT_GATEWAY_PASSWORD;
+                    const token = nextConfig.gateway?.auth?.token ?? process.env.OPENCLAW_GATEWAY_TOKEN;
+                    const password = nextConfig.gateway?.auth?.password ?? process.env.OPENCLAW_GATEWAY_PASSWORD;
                     await waitForGatewayReachable({
                         url: wsUrl,
                         token,
@@ -401,8 +401,8 @@ export async function runConfigureWizard(opts, runtime = defaultRuntime) {
                         runtime.error(formatHealthCheckFailure(err));
                         note([
                             "Docs:",
-                            "https://docs.molt.bot/gateway/health",
-                            "https://docs.molt.bot/gateway/troubleshooting",
+                            "https://docs.openclaw.ai/gateway/health",
+                            "https://docs.openclaw.ai/gateway/troubleshooting",
                         ].join("\n"), "Health check help");
                     }
                 }
@@ -429,9 +429,9 @@ export async function runConfigureWizard(opts, runtime = defaultRuntime) {
             basePath: nextConfig.gateway?.controlUi?.basePath,
         });
         // Try both new and old passwords since gateway may still have old config.
-        const newPassword = nextConfig.gateway?.auth?.password ?? process.env.CLAWDBOT_GATEWAY_PASSWORD;
-        const oldPassword = baseConfig.gateway?.auth?.password ?? process.env.CLAWDBOT_GATEWAY_PASSWORD;
-        const token = nextConfig.gateway?.auth?.token ?? process.env.CLAWDBOT_GATEWAY_TOKEN;
+        const newPassword = nextConfig.gateway?.auth?.password ?? process.env.OPENCLAW_GATEWAY_PASSWORD;
+        const oldPassword = baseConfig.gateway?.auth?.password ?? process.env.OPENCLAW_GATEWAY_PASSWORD;
+        const token = nextConfig.gateway?.auth?.token ?? process.env.OPENCLAW_GATEWAY_TOKEN;
         let gatewayProbe = await probeGatewayReachable({
             url: links.wsUrl,
             token,
@@ -452,7 +452,7 @@ export async function runConfigureWizard(opts, runtime = defaultRuntime) {
             `Web UI: ${links.httpUrl}`,
             `Gateway WS: ${links.wsUrl}`,
             gatewayStatusLine,
-            "Docs: https://docs.molt.bot/web/control-ui",
+            "Docs: https://docs.openclaw.ai/web/control-ui",
         ].join("\n"), "Control UI");
         outro("Configure complete.");
     }

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

@@ -33,7 +33,7 @@ export async function buildGatewayInstallPlan(params) {
         port: params.port,
         token: params.token,
         launchdLabel: process.platform === "darwin"
-            ? resolveGatewayLaunchAgentLabel(params.env.CLAWDBOT_PROFILE)
+            ? resolveGatewayLaunchAgentLabel(params.env.OPENCLAW_PROFILE)
             : undefined,
     });
     // Merge config env vars into the service environment (vars + inline env keys).
@@ -47,5 +47,5 @@ export async function buildGatewayInstallPlan(params) {
 export function gatewayInstallErrorHint(platform = process.platform) {
     return platform === "win32"
         ? "Tip: rerun from an elevated PowerShell (Start → type PowerShell → right-click → Run as administrator) or skip service install."
-        : `Tip: rerun \`${formatCliCommand("moltbot gateway install")}\` after fixing the error.`;
+        : `Tip: rerun \`${formatCliCommand("openclaw gateway install")}\` after fixing the error.`;
 }

package/dist/commands/dashboard.js

@@ -9,7 +9,7 @@ export async function dashboardCommand(runtime = defaultRuntime, options = {}) {
     const bind = cfg.gateway?.bind ?? "loopback";
     const basePath = cfg.gateway?.controlUi?.basePath;
     const customBindHost = cfg.gateway?.customBindHost;
-    const token = cfg.gateway?.auth?.token ?? process.env.CLAWDBOT_GATEWAY_TOKEN ?? "";
+    const token = cfg.gateway?.auth?.token ?? process.env.OPENCLAW_GATEWAY_TOKEN ?? "";
     const links = resolveControlUiLinks({
         port,
         bind,
@@ -39,7 +39,7 @@ export async function dashboardCommand(runtime = defaultRuntime, options = {}) {
         hint = "Browser launch disabled (--no-open). Use the URL above.";
     }
     if (opened) {
-        runtime.log("Opened in your browser. Keep that tab to control Moltbot.");
+        runtime.log("Opened in your browser. Keep that tab to control OpenClaw.");
     }
     else if (hint) {
         runtime.log(hint);

package/dist/commands/docs.js

@@ -3,7 +3,7 @@ import { runCommandWithTimeout } from "../process/exec.js";
 import { formatDocsLink } from "../terminal/links.js";
 import { isRich, theme } from "../terminal/theme.js";
 import { formatCliCommand } from "../cli/command-format.js";
-const SEARCH_TOOL = "https://docs.molt.bot/mcp.SearchMoltbot";
+const SEARCH_TOOL = "https://docs.openclaw.ai/mcp.SearchOpenClaw";
 const SEARCH_TIMEOUT_MS = 30_000;
 const DEFAULT_SNIPPET_MAX = 220;
 function resolveNodeRunner() {
@@ -119,14 +119,14 @@ async function renderMarkdown(markdown, runtime) {
 export async function docsSearchCommand(queryParts, runtime) {
     const query = queryParts.join(" ").trim();
     if (!query) {
-        const docs = formatDocsLink("/", "docs.molt.bot");
+        const docs = formatDocsLink("/", "docs.openclaw.ai");
         if (isRich()) {
             runtime.log(`${theme.muted("Docs:")} ${docs}`);
-            runtime.log(`${theme.muted("Search:")} ${formatCliCommand('moltbot docs "your query"')}`);
+            runtime.log(`${theme.muted("Search:")} ${formatCliCommand('openclaw docs "your query"')}`);
         }
         else {
-            runtime.log("Docs: https://docs.molt.bot/");
-            runtime.log(`Search: ${formatCliCommand('moltbot docs "your query"')}`);
+            runtime.log("Docs: https://docs.openclaw.ai/");
+            runtime.log(`Search: ${formatCliCommand('openclaw docs "your query"')}`);
         }
         return;
     }

package/dist/commands/doctor-auth.js

@@ -82,10 +82,10 @@ export async function maybeRemoveDeprecatedCliAuthProfiles(cfg, prompter) {
         return cfg;
     const lines = ["Deprecated external CLI auth profiles detected (no longer supported):"];
     if (deprecated.has(CLAUDE_CLI_PROFILE_ID)) {
-        lines.push(`- ${CLAUDE_CLI_PROFILE_ID} (Anthropic): use setup-token → ${formatCliCommand("moltbot models auth setup-token")}`);
+        lines.push(`- ${CLAUDE_CLI_PROFILE_ID} (Anthropic): use setup-token → ${formatCliCommand("openclaw models auth setup-token")}`);
     }
     if (deprecated.has(CODEX_CLI_PROFILE_ID)) {
-        lines.push(`- ${CODEX_CLI_PROFILE_ID} (OpenAI Codex): use OAuth → ${formatCliCommand("moltbot models auth login --provider openai-codex")}`);
+        lines.push(`- ${CODEX_CLI_PROFILE_ID} (OpenAI Codex): use OAuth → ${formatCliCommand("openclaw models auth login --provider openai-codex")}`);
     }
     note(lines.join("\n"), "Auth profiles");
     const shouldRemove = await prompter.confirmRepair({
@@ -142,12 +142,12 @@ export async function maybeRemoveDeprecatedCliAuthProfiles(cfg, prompter) {
 }
 function formatAuthIssueHint(issue) {
     if (issue.provider === "anthropic" && issue.profileId === CLAUDE_CLI_PROFILE_ID) {
-        return `Deprecated profile. Use ${formatCliCommand("moltbot models auth setup-token")} or ${formatCliCommand("moltbot configure")}.`;
+        return `Deprecated profile. Use ${formatCliCommand("openclaw models auth setup-token")} or ${formatCliCommand("openclaw configure")}.`;
     }
     if (issue.provider === "openai-codex" && issue.profileId === CODEX_CLI_PROFILE_ID) {
-        return `Deprecated profile. Use ${formatCliCommand("moltbot models auth login --provider openai-codex")} or ${formatCliCommand("moltbot configure")}.`;
+        return `Deprecated profile. Use ${formatCliCommand("openclaw models auth login --provider openai-codex")} or ${formatCliCommand("openclaw configure")}.`;
     }
-    return `Re-auth via \`${formatCliCommand("moltbot configure")}\` or \`${formatCliCommand("moltbot onboard")}\`.`;
+    return `Re-auth via \`${formatCliCommand("openclaw configure")}\` or \`${formatCliCommand("openclaw onboard")}\`.`;
 }
 function formatAuthIssueLine(issue) {
     const remaining = issue.remainingMs !== undefined ? ` (${formatRemainingShort(issue.remainingMs)})` : "";

package/dist/commands/doctor-config-flow.js

@@ -1,8 +1,12 @@
-import { MoltbotSchema, CONFIG_PATH, migrateLegacyConfig, readConfigFileSnapshot, } from "../config/config.js";
+import fs from "node:fs/promises";
+import path from "node:path";
+import { OpenClawSchema, CONFIG_PATH, migrateLegacyConfig, readConfigFileSnapshot, } from "../config/config.js";
 import { applyPluginAutoEnable } from "../config/plugin-auto-enable.js";
 import { formatCliCommand } from "../cli/command-format.js";
 import { note } from "../terminal/note.js";
 import { normalizeLegacyConfigValues } from "./doctor-legacy-config.js";
+import { autoMigrateLegacyStateDir } from "./doctor-state-migrations.js";
+import { resolveHomeDir } from "../utils.js";
 function isRecord(value) {
     return Boolean(value && typeof value === "object" && !Array.isArray(value));
 }
@@ -46,7 +50,7 @@ function resolvePathTarget(root, path) {
     return current;
 }
 function stripUnknownConfigKeys(config) {
-    const parsed = MoltbotSchema.safeParse(config);
+    const parsed = OpenClawSchema.safeParse(config);
     if (parsed.success) {
         return { config, removed: [] };
     }
@@ -96,9 +100,62 @@ function noteOpencodeProviderOverrides(cfg) {
     lines.push("- Remove these entries to restore per-model API routing + costs (then re-run onboarding if needed).");
     note(lines.join("\n"), "OpenCode Zen");
 }
+async function maybeMigrateLegacyConfig() {
+    const changes = [];
+    const home = resolveHomeDir();
+    if (!home)
+        return changes;
+    const targetDir = path.join(home, ".openclaw");
+    const targetPath = path.join(targetDir, "openclaw.json");
+    try {
+        await fs.access(targetPath);
+        return changes;
+    }
+    catch {
+        // missing config
+    }
+    const legacyCandidates = [
+        path.join(home, ".clawdbot", "clawdbot.json"),
+        path.join(home, ".moltbot", "moltbot.json"),
+        path.join(home, ".moldbot", "moldbot.json"),
+    ];
+    let legacyPath = null;
+    for (const candidate of legacyCandidates) {
+        try {
+            await fs.access(candidate);
+            legacyPath = candidate;
+            break;
+        }
+        catch {
+            // continue
+        }
+    }
+    if (!legacyPath)
+        return changes;
+    await fs.mkdir(targetDir, { recursive: true });
+    try {
+        await fs.copyFile(legacyPath, targetPath, fs.constants.COPYFILE_EXCL);
+        changes.push(`Migrated legacy config: ${legacyPath} -> ${targetPath}`);
+    }
+    catch {
+        // If it already exists, skip silently.
+    }
+    return changes;
+}
 export async function loadAndMaybeMigrateDoctorConfig(params) {
     const shouldRepair = params.options.repair === true || params.options.yes === true;
-    const snapshot = await readConfigFileSnapshot();
+    const stateDirResult = await autoMigrateLegacyStateDir({ env: process.env });
+    if (stateDirResult.changes.length > 0) {
+        note(stateDirResult.changes.map((entry) => `- ${entry}`).join("\n"), "Doctor changes");
+    }
+    if (stateDirResult.warnings.length > 0) {
+        note(stateDirResult.warnings.map((entry) => `- ${entry}`).join("\n"), "Doctor warnings");
+    }
+    const legacyConfigChanges = await maybeMigrateLegacyConfig();
+    if (legacyConfigChanges.length > 0) {
+        note(legacyConfigChanges.map((entry) => `- ${entry}`).join("\n"), "Doctor changes");
+    }
+    let snapshot = await readConfigFileSnapshot();
     const baseCfg = snapshot.config ?? {};
     let cfg = baseCfg;
     let candidate = structuredClone(baseCfg);
@@ -129,7 +186,7 @@ export async function loadAndMaybeMigrateDoctorConfig(params) {
                 cfg = migrated;
         }
         else {
-            fixHints.push(`Run "${formatCliCommand("moltbot doctor --fix")}" to apply legacy migrations.`);
+            fixHints.push(`Run "${formatCliCommand("openclaw doctor --fix")}" to apply legacy migrations.`);
         }
     }
     const normalized = normalizeLegacyConfigValues(candidate);
@@ -141,7 +198,7 @@ export async function loadAndMaybeMigrateDoctorConfig(params) {
             cfg = normalized.config;
         }
         else {
-            fixHints.push(`Run "${formatCliCommand("moltbot doctor --fix")}" to apply these changes.`);
+            fixHints.push(`Run "${formatCliCommand("openclaw doctor --fix")}" to apply these changes.`);
         }
     }
     const autoEnable = applyPluginAutoEnable({ config: candidate, env: process.env });
@@ -153,7 +210,7 @@ export async function loadAndMaybeMigrateDoctorConfig(params) {
             cfg = autoEnable.config;
         }
         else {
-            fixHints.push(`Run "${formatCliCommand("moltbot doctor --fix")}" to apply these changes.`);
+            fixHints.push(`Run "${formatCliCommand("openclaw doctor --fix")}" to apply these changes.`);
         }
     }
     const unknown = stripUnknownConfigKeys(candidate);
@@ -167,7 +224,7 @@ export async function loadAndMaybeMigrateDoctorConfig(params) {
         }
         else {
             note(lines, "Unknown config keys");
-            fixHints.push('Run "moltbot doctor --fix" to remove these keys.');
+            fixHints.push('Run "openclaw doctor --fix" to remove these keys.');
         }
     }
     if (!shouldRepair && pendingChanges) {

package/dist/commands/doctor-format.js

@@ -53,12 +53,12 @@ export function buildGatewayRuntimeHints(runtime, options = {}) {
         return hints;
     }
     if (runtime.cachedLabel && platform === "darwin") {
-        const label = resolveGatewayLaunchAgentLabel(env.CLAWDBOT_PROFILE);
+        const label = resolveGatewayLaunchAgentLabel(env.OPENCLAW_PROFILE);
         hints.push(`LaunchAgent label cached but plist missing. Clear with: launchctl bootout gui/$UID/${label}`);
-        hints.push(`Then reinstall: ${formatCliCommand("moltbot gateway install", env)}`);
+        hints.push(`Then reinstall: ${formatCliCommand("openclaw gateway install", env)}`);
     }
     if (runtime.missingUnit) {
-        hints.push(`Service not installed. Run: ${formatCliCommand("moltbot gateway install", env)}`);
+        hints.push(`Service not installed. Run: ${formatCliCommand("openclaw gateway install", env)}`);
         if (fileLog)
             hints.push(`File logs: ${fileLog}`);
         return hints;
@@ -73,11 +73,11 @@ export function buildGatewayRuntimeHints(runtime, options = {}) {
             hints.push(`Launchd stderr (if installed): ${logs.stderrPath}`);
         }
         else if (platform === "linux") {
-            const unit = resolveGatewaySystemdServiceName(env.CLAWDBOT_PROFILE);
+            const unit = resolveGatewaySystemdServiceName(env.OPENCLAW_PROFILE);
             hints.push(`Logs: journalctl --user -u ${unit}.service -n 200 --no-pager`);
         }
         else if (platform === "win32") {
-            const task = resolveGatewayWindowsTaskName(env.CLAWDBOT_PROFILE);
+            const task = resolveGatewayWindowsTaskName(env.OPENCLAW_PROFILE);
             hints.push(`Logs: schtasks /Query /TN "${task}" /V /FO LIST`);
         }
     }

package/dist/commands/doctor-gateway-daemon-flow.js

@@ -72,7 +72,10 @@ export async function maybeRepairGatewayDaemon(params) {
             prompter: params.prompter,
         });
         await maybeRepairLaunchAgentBootstrap({
-            env: { ...process.env, CLAWDBOT_LAUNCHD_LABEL: resolveNodeLaunchAgentLabel() },
+            env: {
+                ...process.env,
+                OPENCLAW_LAUNCHD_LABEL: resolveNodeLaunchAgentLabel(),
+            },
             title: "Node",
             runtime: params.runtime,
             prompter: params.prompter,
@@ -121,7 +124,7 @@ export async function maybeRepairGatewayDaemon(params) {
                 const { programArguments, workingDirectory, environment } = await buildGatewayInstallPlan({
                     env: process.env,
                     port,
-                    token: params.cfg.gateway?.auth?.token ?? process.env.CLAWDBOT_GATEWAY_TOKEN,
+                    token: params.cfg.gateway?.auth?.token ?? process.env.OPENCLAW_GATEWAY_TOKEN,
                     runtime: daemonRuntime,
                     warn: (message, title) => note(message, title),
                     config: params.cfg,
@@ -169,8 +172,8 @@ export async function maybeRepairGatewayDaemon(params) {
         }
     }
     if (process.platform === "darwin") {
-        const label = resolveGatewayLaunchAgentLabel(process.env.CLAWDBOT_PROFILE);
-        note(`LaunchAgent loaded; stopping requires "${formatCliCommand("moltbot gateway stop")}" or launchctl bootout gui/$UID/${label}.`, "Gateway");
+        const label = resolveGatewayLaunchAgentLabel(process.env.OPENCLAW_PROFILE);
+        note(`LaunchAgent loaded; stopping requires "${formatCliCommand("openclaw gateway stop")}" or launchctl bootout gui/$UID/${label}.`, "Gateway");
     }
     if (serviceRuntime?.status === "running") {
         const restart = await params.prompter.confirmSkipInNonInteractive({

package/dist/commands/doctor-gateway-services.js

@@ -1,13 +1,17 @@
+import { execFile } from "node:child_process";
+import fs from "node:fs/promises";
+import os from "node:os";
 import path from "node:path";
+import { promisify } from "node:util";
 import { resolveGatewayPort, resolveIsNixMode } from "../config/paths.js";
 import { findExtraGatewayServices, renderGatewayServiceCleanupHints } from "../daemon/inspect.js";
-import { findLegacyGatewayServices, uninstallLegacyGatewayServices } from "../daemon/legacy.js";
 import { renderSystemNodeWarning, resolveSystemNodeInfo } from "../daemon/runtime-paths.js";
 import { resolveGatewayService } from "../daemon/service.js";
 import { auditGatewayServiceConfig, needsNodeRuntimeMigration, SERVICE_AUDIT_CODES, } from "../daemon/service-audit.js";
 import { note } from "../terminal/note.js";
-import { buildGatewayInstallPlan, gatewayInstallErrorHint } from "./daemon-install-helpers.js";
-import { DEFAULT_GATEWAY_DAEMON_RUNTIME, GATEWAY_DAEMON_RUNTIME_OPTIONS, } from "./daemon-runtime.js";
+import { buildGatewayInstallPlan } from "./daemon-install-helpers.js";
+import { DEFAULT_GATEWAY_DAEMON_RUNTIME } from "./daemon-runtime.js";
+const execFileAsync = promisify(execFile);
 function detectGatewayRuntime(programArguments) {
     const first = programArguments?.[0];
     if (first) {
@@ -30,73 +34,36 @@ function findGatewayEntrypoint(programArguments) {
 function normalizeExecutablePath(value) {
     return path.resolve(value);
 }
-export async function maybeMigrateLegacyGatewayService(cfg, mode, runtime, prompter) {
-    const legacyServices = await findLegacyGatewayServices(process.env);
-    if (legacyServices.length === 0)
-        return;
-    note(legacyServices.map((svc) => `- ${svc.label} (${svc.platform}, ${svc.detail})`).join("\n"), "Legacy gateway services detected");
-    const migrate = await prompter.confirmSkipInNonInteractive({
-        message: "Migrate legacy gateway services to Moltbot now?",
-        initialValue: true,
-    });
-    if (!migrate)
-        return;
+function extractDetailPath(detail, prefix) {
+    if (!detail.startsWith(prefix))
+        return null;
+    const value = detail.slice(prefix.length).trim();
+    return value.length > 0 ? value : null;
+}
+async function cleanupLegacyLaunchdService(params) {
+    const domain = typeof process.getuid === "function" ? `gui/${process.getuid()}` : "gui/501";
+    await execFileAsync("launchctl", ["bootout", domain, params.plistPath]).catch(() => undefined);
+    await execFileAsync("launchctl", ["unload", params.plistPath]).catch(() => undefined);
+    const trashDir = path.join(os.homedir(), ".Trash");
     try {
-        await uninstallLegacyGatewayServices({
-            env: process.env,
-            stdout: process.stdout,
-        });
-    }
-    catch (err) {
-        runtime.error(`Legacy service cleanup failed: ${String(err)}`);
-        return;
+        await fs.mkdir(trashDir, { recursive: true });
     }
-    if (resolveIsNixMode(process.env)) {
-        note("Nix mode detected; skip installing services.", "Gateway");
-        return;
+    catch {
+        // ignore
     }
-    if (mode === "remote") {
-        note("Gateway mode is remote; skipped local service install.", "Gateway");
-        return;
+    try {
+        await fs.access(params.plistPath);
     }
-    const service = resolveGatewayService();
-    const loaded = await service.isLoaded({ env: process.env });
-    if (loaded) {
-        note(`Moltbot ${service.label} already ${service.loadedText}.`, "Gateway");
-        return;
+    catch {
+        return null;
     }
-    const install = await prompter.confirmSkipInNonInteractive({
-        message: "Install Moltbot gateway service now?",
-        initialValue: true,
-    });
-    if (!install)
-        return;
-    const daemonRuntime = await prompter.select({
-        message: "Gateway service runtime",
-        options: GATEWAY_DAEMON_RUNTIME_OPTIONS,
-        initialValue: DEFAULT_GATEWAY_DAEMON_RUNTIME,
-    }, DEFAULT_GATEWAY_DAEMON_RUNTIME);
-    const port = resolveGatewayPort(cfg, process.env);
-    const { programArguments, workingDirectory, environment } = await buildGatewayInstallPlan({
-        env: process.env,
-        port,
-        token: cfg.gateway?.auth?.token ?? process.env.CLAWDBOT_GATEWAY_TOKEN,
-        runtime: daemonRuntime,
-        warn: (message, title) => note(message, title),
-        config: cfg,
-    });
+    const dest = path.join(trashDir, `${params.label}-${Date.now()}.plist`);
     try {
-        await service.install({
-            env: process.env,
-            stdout: process.stdout,
-            programArguments,
-            workingDirectory,
-            environment,
-        });
+        await fs.rename(params.plistPath, dest);
+        return dest;
     }
-    catch (err) {
-        runtime.error(`Gateway service install failed: ${String(err)}`);
-        note(gatewayInstallErrorHint(), "Gateway");
+    catch {
+        return null;
     }
 }
 export async function maybeRepairGatewayServiceConfig(cfg, mode, runtime, prompter) {
@@ -138,7 +105,7 @@ export async function maybeRepairGatewayServiceConfig(cfg, mode, runtime, prompt
     const { programArguments, workingDirectory, environment } = await buildGatewayInstallPlan({
         env: process.env,
         port,
-        token: cfg.gateway?.auth?.token ?? process.env.CLAWDBOT_GATEWAY_TOKEN,
+        token: cfg.gateway?.auth?.token ?? process.env.OPENCLAW_GATEWAY_TOKEN,
         runtime: needsNodeRuntime && systemNodePath ? "node" : runtimeChoice,
         nodePath: systemNodePath ?? undefined,
         warn: (message, title) => note(message, title),
@@ -190,13 +157,53 @@ export async function maybeRepairGatewayServiceConfig(cfg, mode, runtime, prompt
         runtime.error(`Gateway service update failed: ${String(err)}`);
     }
 }
-export async function maybeScanExtraGatewayServices(options) {
+export async function maybeScanExtraGatewayServices(options, runtime, prompter) {
     const extraServices = await findExtraGatewayServices(process.env, {
         deep: options.deep,
     });
     if (extraServices.length === 0)
         return;
     note(extraServices.map((svc) => `- ${svc.label} (${svc.scope}, ${svc.detail})`).join("\n"), "Other gateway-like services detected");
+    const legacyServices = extraServices.filter((svc) => svc.legacy === true);
+    if (legacyServices.length > 0) {
+        const shouldRemove = await prompter.confirmSkipInNonInteractive({
+            message: "Remove legacy gateway services (clawdbot/moltbot) now?",
+            initialValue: true,
+        });
+        if (shouldRemove) {
+            const removed = [];
+            const failed = [];
+            for (const svc of legacyServices) {
+                if (svc.platform !== "darwin") {
+                    failed.push(`${svc.label} (${svc.platform})`);
+                    continue;
+                }
+                if (svc.scope !== "user") {
+                    failed.push(`${svc.label} (${svc.scope})`);
+                    continue;
+                }
+                const plistPath = extractDetailPath(svc.detail, "plist:");
+                if (!plistPath) {
+                    failed.push(`${svc.label} (missing plist path)`);
+                    continue;
+                }
+                const dest = await cleanupLegacyLaunchdService({
+                    label: svc.label,
+                    plistPath,
+                });
+                removed.push(dest ? `${svc.label} -> ${dest}` : svc.label);
+            }
+            if (removed.length > 0) {
+                note(removed.map((line) => `- ${line}`).join("\n"), "Legacy gateway removed");
+            }
+            if (failed.length > 0) {
+                note(failed.map((line) => `- ${line}`).join("\n"), "Legacy gateway cleanup skipped");
+            }
+            if (removed.length > 0) {
+                runtime.log("Legacy gateway services removed. Installing OpenClaw gateway next.");
+            }
+        }
+    }
     const cleanupHints = renderGatewayServiceCleanupHints();
     if (cleanupHints.length > 0) {
         note(cleanupHints.map((hint) => `- ${hint}`).join("\n"), "Cleanup hints");