feat: improve gateway services and auto-reply commands

src/commands/configure.ts

@@ -17,7 +17,7 @@ import {
   resolveGatewayPort,
   writeConfigFile,
 } from "../config/config.js";
-import { GATEWAY_LAUNCH_AGENT_LABEL } from "../daemon/constants.js";
+import { resolveGatewayLaunchAgentLabel } from "../daemon/constants.js";
 import { resolveGatewayProgramArguments } from "../daemon/program-args.js";
 import { resolvePreferredNodePath } from "../daemon/runtime-paths.js";
 import { resolveGatewayService } from "../daemon/service.js";
@@ -340,7 +340,9 @@ async function maybeInstallDaemon(params: {
   daemonRuntime?: GatewayDaemonRuntime;
 }) {
   const service = resolveGatewayService();
-  const loaded = await service.isLoaded({ env: process.env });
+  const loaded = await service.isLoaded({
+    profile: process.env.CLAWDBOT_PROFILE,
+  });
   let shouldCheckLinger = false;
   let shouldInstall = true;
   let daemonRuntime = params.daemonRuntime ?? DEFAULT_GATEWAY_DAEMON_RUNTIME;
@@ -357,7 +359,10 @@ async function maybeInstallDaemon(params: {
       params.runtime,
     );
     if (action === "restart") {
-      await service.restart({ stdout: process.stdout });
+      await service.restart({
+        profile: process.env.CLAWDBOT_PROFILE,
+        stdout: process.stdout,
+      });
       shouldCheckLinger = true;
       shouldInstall = false;
     }
@@ -397,7 +402,9 @@ async function maybeInstallDaemon(params: {
       port: params.port,
       token: params.gatewayToken,
       launchdLabel:
-        process.platform === "darwin" ? GATEWAY_LAUNCH_AGENT_LABEL : undefined,
+        process.platform === "darwin"
+          ? resolveGatewayLaunchAgentLabel(process.env.CLAWDBOT_PROFILE)
+          : undefined,
     });
     await service.install({
       env: process.env,

src/commands/doctor-format.ts

@@ -1,4 +1,8 @@
-import { GATEWAY_LAUNCH_AGENT_LABEL } from "../daemon/constants.js";
+import {
+  resolveGatewayLaunchAgentLabel,
+  resolveGatewaySystemdServiceName,
+  resolveGatewayWindowsTaskName,
+} from "../daemon/constants.js";
 import { resolveGatewayLogPaths } from "../daemon/launchd.js";
 import type { GatewayServiceRuntime } from "../daemon/service-runtime.js";
 import { getResolvedLoggerSettings } from "../logging.js";
@@ -51,8 +55,9 @@ export function buildGatewayRuntimeHints(
     }
   })();
   if (runtime.cachedLabel && platform === "darwin") {
+    const label = resolveGatewayLaunchAgentLabel(env.CLAWDBOT_PROFILE);
     hints.push(
-      `LaunchAgent label cached but plist missing. Clear with: launchctl bootout gui/$UID/${GATEWAY_LAUNCH_AGENT_LABEL}`,
+      `LaunchAgent label cached but plist missing. Clear with: launchctl bootout gui/$UID/${label}`,
     );
     hints.push("Then reinstall: clawdbot daemon install");
   }
@@ -71,11 +76,13 @@ export function buildGatewayRuntimeHints(
       hints.push(`Launchd stdout (if installed): ${logs.stdoutPath}`);
       hints.push(`Launchd stderr (if installed): ${logs.stderrPath}`);
     } else if (platform === "linux") {
+      const unit = resolveGatewaySystemdServiceName(env.CLAWDBOT_PROFILE);
       hints.push(
-        "Logs: journalctl --user -u clawdbot-gateway.service -n 200 --no-pager",
+        `Logs: journalctl --user -u ${unit}.service -n 200 --no-pager`,
       );
     } else if (platform === "win32") {
-      hints.push('Logs: schtasks /Query /TN "Clawdbot Gateway" /V /FO LIST');
+      const task = resolveGatewayWindowsTaskName(env.CLAWDBOT_PROFILE);
+      hints.push(`Logs: schtasks /Query /TN "${task}" /V /FO LIST`);
     }
   }
   return hints;

src/commands/doctor-gateway-services.ts

@@ -4,7 +4,7 @@ import { note as clackNote } from "@clack/prompts";
 
 import type { ClawdbotConfig } from "../config/config.js";
 import { resolveGatewayPort, resolveIsNixMode } from "../config/paths.js";
-import { GATEWAY_LAUNCH_AGENT_LABEL } from "../daemon/constants.js";
+import { resolveGatewayLaunchAgentLabel } from "../daemon/constants.js";
 import {
   findExtraGatewayServices,
   renderGatewayServiceCleanupHints,
@@ -103,7 +103,9 @@ export async function maybeMigrateLegacyGatewayService(
   }
 
   const service = resolveGatewayService();
-  const loaded = await service.isLoaded({ env: process.env });
+  const loaded = await service.isLoaded({
+    profile: process.env.CLAWDBOT_PROFILE,
+  });
   if (loaded) {
     note(`Clawdbot ${service.label} already ${service.loadedText}.`, "Gateway");
     return;
@@ -143,7 +145,9 @@ export async function maybeMigrateLegacyGatewayService(
     port,
     token: cfg.gateway?.auth?.token ?? process.env.CLAWDBOT_GATEWAY_TOKEN,
     launchdLabel:
-      process.platform === "darwin" ? GATEWAY_LAUNCH_AGENT_LABEL : undefined,
+      process.platform === "darwin"
+        ? resolveGatewayLaunchAgentLabel(process.env.CLAWDBOT_PROFILE)
+        : undefined,
   });
   await service.install({
     env: process.env,
@@ -263,7 +267,9 @@ export async function maybeRepairGatewayServiceConfig(
     port,
     token: cfg.gateway?.auth?.token ?? process.env.CLAWDBOT_GATEWAY_TOKEN,
     launchdLabel:
-      process.platform === "darwin" ? GATEWAY_LAUNCH_AGENT_LABEL : undefined,
+      process.platform === "darwin"
+        ? resolveGatewayLaunchAgentLabel(process.env.CLAWDBOT_PROFILE)
+        : undefined,
   });
 
   try {

src/commands/doctor.ts

@@ -24,7 +24,7 @@ import {
   resolveGatewayPort,
   writeConfigFile,
 } from "../config/config.js";
-import { GATEWAY_LAUNCH_AGENT_LABEL } from "../daemon/constants.js";
+import { resolveGatewayLaunchAgentLabel } from "../daemon/constants.js";
 import { readLastGatewayErrorLine } from "../daemon/diagnostics.js";
 import { resolveGatewayProgramArguments } from "../daemon/program-args.js";
 import { resolvePreferredNodePath } from "../daemon/runtime-paths.js";
@@ -421,7 +421,9 @@ export async function doctorCommand(
     const service = resolveGatewayService();
     let loaded = false;
     try {
-      loaded = await service.isLoaded({ env: process.env });
+      loaded = await service.isLoaded({
+        profile: process.env.CLAWDBOT_PROFILE,
+      });
     } catch {
       loaded = false;
     }
@@ -503,7 +505,9 @@ export async function doctorCommand(
 
   if (!healthOk) {
     const service = resolveGatewayService();
-    const loaded = await service.isLoaded({ env: process.env });
+    const loaded = await service.isLoaded({
+      profile: process.env.CLAWDBOT_PROFILE,
+    });
     let serviceRuntime:
       | Awaited<ReturnType<typeof service.readRuntime>>
       | undefined;
@@ -562,7 +566,7 @@ export async function doctorCommand(
               cfg.gateway?.auth?.token ?? process.env.CLAWDBOT_GATEWAY_TOKEN,
             launchdLabel:
               process.platform === "darwin"
-                ? GATEWAY_LAUNCH_AGENT_LABEL
+                ? resolveGatewayLaunchAgentLabel(process.env.CLAWDBOT_PROFILE)
                 : undefined,
           });
           await service.install({
@@ -592,13 +596,19 @@ export async function doctorCommand(
           initialValue: true,
         });
         if (start) {
-          await service.restart({ stdout: process.stdout });
+          await service.restart({
+            profile: process.env.CLAWDBOT_PROFILE,
+            stdout: process.stdout,
+          });
           await sleep(1500);
         }
       }
       if (process.platform === "darwin") {
+        const label = resolveGatewayLaunchAgentLabel(
+          process.env.CLAWDBOT_PROFILE,
+        );
         note(
-          `LaunchAgent loaded; stopping requires "clawdbot daemon stop" or launchctl bootout gui/$UID/${GATEWAY_LAUNCH_AGENT_LABEL}.`,
+          `LaunchAgent loaded; stopping requires "clawdbot daemon stop" or launchctl bootout gui/$UID/${label}.`,
           "Gateway",
         );
       }
@@ -608,7 +618,10 @@ export async function doctorCommand(
           initialValue: true,
         });
         if (restart) {
-          await service.restart({ stdout: process.stdout });
+          await service.restart({
+            profile: process.env.CLAWDBOT_PROFILE,
+            stdout: process.stdout,
+          });
           await sleep(1500);
           try {
             await healthCommand({ json: false, timeoutMs: 10_000 }, runtime);

src/commands/onboard-non-interactive.ts

@@ -14,7 +14,7 @@ import {
   resolveGatewayPort,
   writeConfigFile,
 } from "../config/config.js";
-import { GATEWAY_LAUNCH_AGENT_LABEL } from "../daemon/constants.js";
+import { resolveGatewayLaunchAgentLabel } from "../daemon/constants.js";
 import { resolveGatewayProgramArguments } from "../daemon/program-args.js";
 import { resolvePreferredNodePath } from "../daemon/runtime-paths.js";
 import { resolveGatewayService } from "../daemon/service.js";
@@ -505,15 +505,15 @@ export async function runNonInteractiveOnboarding(
           runtime: daemonRuntimeRaw,
           nodePath,
         });
-      const environment = buildServiceEnvironment({
-        env: process.env,
-        port,
-        token: gatewayToken,
-        launchdLabel:
-          process.platform === "darwin"
-            ? GATEWAY_LAUNCH_AGENT_LABEL
-            : undefined,
-      });
+        const environment = buildServiceEnvironment({
+          env: process.env,
+          port,
+          token: gatewayToken,
+          launchdLabel:
+            process.platform === "darwin"
+              ? resolveGatewayLaunchAgentLabel(process.env.CLAWDBOT_PROFILE)
+              : undefined,
+        });
       await service.install({
         env: process.env,
         stdout: process.stdout,

src/commands/status-all.ts

@@ -119,7 +119,9 @@ export async function statusAllCommand(
         try {
           const service = resolveGatewayService();
           const [loaded, runtimeInfo, command] = await Promise.all([
-            service.isLoaded({ env: process.env }).catch(() => false),
+            service
+              .isLoaded({ profile: process.env.CLAWDBOT_PROFILE })
+              .catch(() => false),
             service.readRuntime(process.env).catch(() => undefined),
             service.readCommand(process.env).catch(() => null),
           ]);

src/commands/status.ts

@@ -257,7 +257,9 @@ async function getDaemonStatusSummary(): Promise<{
   try {
     const service = resolveGatewayService();
     const [loaded, runtime, command] = await Promise.all([
-      service.isLoaded({ env: process.env }).catch(() => false),
+      service
+        .isLoaded({ profile: process.env.CLAWDBOT_PROFILE })
+        .catch(() => false),
       service.readRuntime(process.env).catch(() => undefined),
       service.readCommand(process.env).catch(() => null),
     ]);