feat: fold gateway service commands into gateway

src/cli/daemon-cli/install.ts

@@ -43,7 +43,7 @@ export async function runDaemonInstall(opts: DaemonInstallOptions) {
   };
 
   if (resolveIsNixMode(process.env)) {
-    fail("Nix mode detected; daemon install is disabled.");
+    fail("Nix mode detected; service install is disabled.");
     return;
   }
 
@@ -84,7 +84,7 @@ export async function runDaemonInstall(opts: DaemonInstallOptions) {
       if (!json) {
         defaultRuntime.log(`Gateway service already ${service.loadedText}.`);
         defaultRuntime.log(
-          `Reinstall with: ${formatCliCommand("clawdbot daemon install --force")}`,
+          `Reinstall with: ${formatCliCommand("clawdbot gateway install --force")}`,
         );
       }
       return;

src/cli/daemon-cli/lifecycle.ts

@@ -33,7 +33,7 @@ export async function runDaemonUninstall(opts: DaemonLifecycleOptions = {}) {
   };
 
   if (resolveIsNixMode(process.env)) {
-    fail("Nix mode detected; daemon uninstall is disabled.");
+    fail("Nix mode detected; service uninstall is disabled.");
     return;
   }
 
@@ -200,7 +200,7 @@ export async function runDaemonStop(opts: DaemonLifecycleOptions = {}) {
 }
 
 /**
- * Restart the gateway daemon service.
+ * Restart the gateway service service.
  * @returns `true` if restart succeeded, `false` if the service was not loaded.
  * Throws/exits on check or restart failures.
  */

src/cli/daemon-cli/register.ts

@@ -14,16 +14,16 @@ import {
 export function registerDaemonCli(program: Command) {
   const daemon = program
     .command("daemon")
-    .description("Manage the Gateway daemon service (launchd/systemd/schtasks)")
+    .description("Manage the Gateway service (launchd/systemd/schtasks)")
     .addHelpText(
       "after",
       () =>
-        `\n${theme.muted("Docs:")} ${formatDocsLink("/cli/daemon", "docs.clawd.bot/cli/daemon")}\n`,
+        `\n${theme.muted("Docs:")} ${formatDocsLink("/cli/gateway", "docs.clawd.bot/cli/gateway")}\n`,
     );
 
   daemon
     .command("status")
-    .description("Show daemon install status + probe the Gateway")
+    .description("Show service install status + probe the Gateway")
     .option("--url <url>", "Gateway WebSocket URL (defaults to config/remote/local)")
     .option("--token <token>", "Gateway token (if required)")
     .option("--password <password>", "Gateway password (password auth)")

src/cli/daemon-cli/shared.ts

@@ -123,7 +123,7 @@ export function renderRuntimeHints(
     }
   })();
   if (runtime.missingUnit) {
-    hints.push(`Service not installed. Run: ${formatCliCommand("clawdbot daemon install", env)}`);
+    hints.push(`Service not installed. Run: ${formatCliCommand("clawdbot gateway install", env)}`);
     if (fileLog) hints.push(`File logs: ${fileLog}`);
     return hints;
   }
@@ -146,7 +146,7 @@ export function renderRuntimeHints(
 
 export function renderGatewayServiceStartHints(env: NodeJS.ProcessEnv = process.env): string[] {
   const base = [
-    formatCliCommand("clawdbot daemon install", env),
+    formatCliCommand("clawdbot gateway install", env),
     formatCliCommand("clawdbot gateway", env),
   ];
   const profile = env.CLAWDBOT_PROFILE;

src/cli/daemon-cli/status.print.ts

@@ -60,7 +60,7 @@ export function printDaemonStatus(status: DaemonStatus, opts: { json: boolean })
   }
   const daemonEnvLines = safeDaemonEnv(service.command?.environment);
   if (daemonEnvLines.length > 0) {
-    defaultRuntime.log(`${label("Daemon env:")} ${daemonEnvLines.join(" ")}`);
+    defaultRuntime.log(`${label("Service env:")} ${daemonEnvLines.join(" ")}`);
   }
   spacer();
 
@@ -89,11 +89,11 @@ export function printDaemonStatus(status: DaemonStatus, opts: { json: boolean })
     }
     if (status.config.daemon) {
       const daemonCfg = `${status.config.daemon.path}${status.config.daemon.exists ? "" : " (missing)"}${status.config.daemon.valid ? "" : " (invalid)"}`;
-      defaultRuntime.log(`${label("Config (daemon):")} ${infoText(daemonCfg)}`);
+      defaultRuntime.log(`${label("Config (service):")} ${infoText(daemonCfg)}`);
       if (!status.config.daemon.valid && status.config.daemon.issues?.length) {
         for (const issue of status.config.daemon.issues.slice(0, 5)) {
           defaultRuntime.error(
-            `${errorText("Daemon config issue:")} ${issue.path || "<root>"}: ${issue.message}`,
+            `${errorText("Service config issue:")} ${issue.path || "<root>"}: ${issue.message}`,
           );
         }
       }
@@ -101,12 +101,12 @@ export function printDaemonStatus(status: DaemonStatus, opts: { json: boolean })
     if (status.config.mismatch) {
       defaultRuntime.error(
         errorText(
-          "Root cause: CLI and daemon are using different config paths (likely a profile/state-dir mismatch).",
+          "Root cause: CLI and service are using different config paths (likely a profile/state-dir mismatch).",
         ),
       );
       defaultRuntime.error(
         errorText(
-          `Fix: rerun \`${formatCliCommand("clawdbot daemon install --force")}\` from the same --profile / CLAWDBOT_STATE_DIR you expect.`,
+          `Fix: rerun \`${formatCliCommand("clawdbot gateway install --force")}\` from the same --profile / CLAWDBOT_STATE_DIR you expect.`,
         ),
       );
     }
@@ -209,7 +209,7 @@ export function printDaemonStatus(status: DaemonStatus, opts: { json: boolean })
       ),
     );
     defaultRuntime.error(
-      errorText(`Then reinstall: ${formatCliCommand("clawdbot daemon install")}`),
+      errorText(`Then reinstall: ${formatCliCommand("clawdbot gateway install")}`),
     );
     spacer();
   }

src/cli/daemon-cli/status.ts

@@ -14,7 +14,7 @@ export async function runDaemonStatus(opts: DaemonStatusOptions) {
     printDaemonStatus(status, { json: Boolean(opts.json) });
   } catch (err) {
     const rich = isRich();
-    defaultRuntime.error(colorize(rich, theme.error, `Daemon status failed: ${String(err)}`));
+    defaultRuntime.error(colorize(rich, theme.error, `Gateway status failed: ${String(err)}`));
     defaultRuntime.exit(1);
   }
 }