feat: scan extra gateways in doctor

src/cli/daemon-cli.ts

@@ -15,6 +15,7 @@ import {
 import {
   type FindExtraGatewayServicesOptions,
   findExtraGatewayServices,
+  renderGatewayServiceCleanupHints,
 } from "../daemon/inspect.js";
 import { findLegacyGatewayServices } from "../daemon/legacy.js";
 import { resolveGatewayProgramArguments } from "../daemon/program-args.js";
@@ -110,25 +111,6 @@ function renderGatewayServiceStartHints(): string[] {
   }
 }
 
-function renderGatewayServiceCleanupHints(): string[] {
-  switch (process.platform) {
-    case "darwin":
-      return [
-        `launchctl bootout gui/$UID/${GATEWAY_LAUNCH_AGENT_LABEL}`,
-        `rm ~/Library/LaunchAgents/${GATEWAY_LAUNCH_AGENT_LABEL}.plist`,
-      ];
-    case "linux":
-      return [
-        `systemctl --user disable --now ${GATEWAY_SYSTEMD_SERVICE_NAME}.service`,
-        `rm ~/.config/systemd/user/${GATEWAY_SYSTEMD_SERVICE_NAME}.service`,
-      ];
-    case "win32":
-      return [`schtasks /Delete /TN "${GATEWAY_WINDOWS_TASK_NAME}" /F`];
-    default:
-      return [];
-  }
-}
-
 async function gatherDaemonStatus(opts: {
   rpc: GatewayRpcOpts;
   probe: boolean;

src/cli/program.ts

@@ -324,12 +324,14 @@ export function buildProgram() {
       "Run without prompts (safe migrations only)",
       false,
     )
+    .option("--deep", "Scan system services for extra gateway installs", false)
     .action(async (opts) => {
       try {
         await doctorCommand(defaultRuntime, {
           workspaceSuggestions: opts.workspaceSuggestions,
           yes: Boolean(opts.yes),
           nonInteractive: Boolean(opts.nonInteractive),
+          deep: Boolean(opts.deep),
         });
       } catch (err) {
         defaultRuntime.error(String(err));

src/commands/doctor.test.ts

@@ -60,6 +60,8 @@ const createConfigIO = vi.fn(() => ({
 
 const findLegacyGatewayServices = vi.fn().mockResolvedValue([]);
 const uninstallLegacyGatewayServices = vi.fn().mockResolvedValue([]);
+const findExtraGatewayServices = vi.fn().mockResolvedValue([]);
+const renderGatewayServiceCleanupHints = vi.fn().mockReturnValue(["cleanup"]);
 const resolveGatewayProgramArguments = vi.fn().mockResolvedValue({
   programArguments: ["node", "cli", "gateway-daemon", "--port", "18789"],
 });
@@ -98,6 +100,11 @@ vi.mock("../daemon/legacy.js", () => ({
   uninstallLegacyGatewayServices,
 }));
 
+vi.mock("../daemon/inspect.js", () => ({
+  findExtraGatewayServices,
+  renderGatewayServiceCleanupHints,
+}));
+
 vi.mock("../daemon/program-args.js", () => ({
   resolveGatewayProgramArguments,
 }));

src/commands/doctor.ts

@@ -24,6 +24,10 @@ import {
 } from "../config/config.js";
 import { resolveGatewayPort, resolveIsNixMode } from "../config/paths.js";
 import { GATEWAY_LAUNCH_AGENT_LABEL } from "../daemon/constants.js";
+import {
+  findExtraGatewayServices,
+  renderGatewayServiceCleanupHints,
+} from "../daemon/inspect.js";
 import {
   findLegacyGatewayServices,
   uninstallLegacyGatewayServices,
@@ -351,6 +355,7 @@ type DoctorOptions = {
   workspaceSuggestions?: boolean;
   yes?: boolean;
   nonInteractive?: boolean;
+  deep?: boolean;
 };
 
 type DoctorPrompter = {
@@ -863,6 +868,34 @@ async function maybeMigrateLegacyGatewayService(
   });
 }
 
+async function maybeScanExtraGatewayServices(options: DoctorOptions) {
+  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 cleanupHints = renderGatewayServiceCleanupHints();
+  if (cleanupHints.length > 0) {
+    note(cleanupHints.map((hint) => `- ${hint}`).join("\n"), "Cleanup hints");
+  }
+
+  note(
+    [
+      "Recommendation: run a single gateway per machine.",
+      "One gateway supports multiple agents.",
+      "If you need multiple gateways, isolate ports + config/state (see docs: /gateway#multiple-gateways-same-host).",
+    ].join("\n"),
+    "Gateway recommendation",
+  );
+}
+
 export async function doctorCommand(
   runtime: RuntimeEnv = defaultRuntime,
   options: DoctorOptions = {},
@@ -939,6 +972,7 @@ export async function doctorCommand(
   cfg = await maybeRepairSandboxImages(cfg, runtime, prompter);
 
   await maybeMigrateLegacyGatewayService(cfg, runtime, prompter);
+  await maybeScanExtraGatewayServices(options);
 
   await noteSecurityWarnings(cfg);
 

src/daemon/inspect.ts

@@ -26,6 +26,25 @@ export type FindExtraGatewayServicesOptions = {
 const EXTRA_MARKERS = ["clawdbot", "clawdis", "gateway-daemon"];
 const execFileAsync = promisify(execFile);
 
+export function renderGatewayServiceCleanupHints(): string[] {
+  switch (process.platform) {
+    case "darwin":
+      return [
+        `launchctl bootout gui/$UID/${GATEWAY_LAUNCH_AGENT_LABEL}`,
+        `rm ~/Library/LaunchAgents/${GATEWAY_LAUNCH_AGENT_LABEL}.plist`,
+      ];
+    case "linux":
+      return [
+        `systemctl --user disable --now ${GATEWAY_SYSTEMD_SERVICE_NAME}.service`,
+        `rm ~/.config/systemd/user/${GATEWAY_SYSTEMD_SERVICE_NAME}.service`,
+      ];
+    case "win32":
+      return [`schtasks /Delete /TN "${GATEWAY_WINDOWS_TASK_NAME}" /F`];
+    default:
+      return [];
+  }
+}
+
 function resolveHomeDir(env: Record<string, string | undefined>): string {
   const home = env.HOME?.trim() || env.USERPROFILE?.trim();
   if (!home) throw new Error("Missing HOME");