refactor: simplify cli commands

src/cli/gateway-cli.coverage.test.ts

@@ -2,21 +2,15 @@ import { Command } from "commander";
 import { describe, expect, it, vi } from "vitest";
 
 const callGateway = vi.fn(async () => ({ ok: true }));
-const randomIdempotencyKey = vi.fn(() => "rk_test");
 const startGatewayServer = vi.fn(async () => ({
   close: vi.fn(async () => {}),
 }));
 const setVerbose = vi.fn();
-const createDefaultDeps = vi.fn();
 const forceFreePortAndWait = vi.fn(async () => ({
   killed: [],
   waitedMs: 0,
   escalatedToSigkill: false,
 }));
-const serviceInstall = vi.fn().mockResolvedValue(undefined);
-const serviceStop = vi.fn().mockResolvedValue(undefined);
-const serviceUninstall = vi.fn().mockResolvedValue(undefined);
-const serviceRestart = vi.fn().mockResolvedValue(undefined);
 const serviceIsLoaded = vi.fn().mockResolvedValue(true);
 
 const runtimeLogs: string[] = [];
@@ -53,7 +47,7 @@ async function withEnvOverride<T>(
 
 vi.mock("../gateway/call.js", () => ({
   callGateway: (opts: unknown) => callGateway(opts),
-  randomIdempotencyKey: () => randomIdempotencyKey(),
+  randomIdempotencyKey: () => "rk_test",
 }));
 
 vi.mock("../gateway/server.js", () => ({
@@ -71,10 +65,6 @@ vi.mock("../runtime.js", () => ({
   defaultRuntime,
 }));
 
-vi.mock("./deps.js", () => ({
-  createDefaultDeps: () => createDefaultDeps(),
-}));
-
 vi.mock("./ports.js", () => ({
   forceFreePortAndWait: (port: number) => forceFreePortAndWait(port),
 }));
@@ -84,10 +74,10 @@ vi.mock("../daemon/service.js", () => ({
     label: "LaunchAgent",
     loadedText: "loaded",
     notLoadedText: "not loaded",
-    install: serviceInstall,
-    uninstall: serviceUninstall,
-    stop: serviceStop,
-    restart: serviceRestart,
+    install: vi.fn(),
+    uninstall: vi.fn(),
+    stop: vi.fn(),
+    restart: vi.fn(),
     isLoaded: serviceIsLoaded,
     readCommand: vi.fn(),
     readRuntime: vi.fn().mockResolvedValue({ status: "running" }),
@@ -96,12 +86,12 @@ vi.mock("../daemon/service.js", () => ({
 
 vi.mock("../daemon/program-args.js", () => ({
   resolveGatewayProgramArguments: async () => ({
-    programArguments: ["/bin/node", "cli", "gateway-daemon", "--port", "18789"],
+    programArguments: ["/bin/node", "cli", "gateway", "--port", "18789"],
   }),
 }));
 
 describe("gateway-cli coverage", () => {
-  it("registers call/health/status/send/agent commands and routes to callGateway", async () => {
+  it("registers call/health/status commands and routes to callGateway", async () => {
     runtimeLogs.length = 0;
     runtimeErrors.length = 0;
     callGateway.mockClear();
@@ -141,66 +131,6 @@ describe("gateway-cli coverage", () => {
     expect(runtimeErrors.join("\n")).toContain("Gateway call failed:");
   });
 
-  it("fills idempotency keys for send/agent when missing", async () => {
-    runtimeLogs.length = 0;
-    runtimeErrors.length = 0;
-    callGateway.mockClear();
-    randomIdempotencyKey.mockClear();
-
-    const { registerGatewayCli } = await import("./gateway-cli.js");
-    const program = new Command();
-    program.exitOverride();
-    registerGatewayCli(program);
-
-    await program.parseAsync(
-      ["gateway", "send", "--to", "+1555", "--message", "hi"],
-      { from: "user" },
-    );
-
-    await program.parseAsync(
-      ["gateway", "agent", "--message", "hello", "--deliver"],
-      { from: "user" },
-    );
-
-    expect(randomIdempotencyKey).toHaveBeenCalled();
-    const callArgs = callGateway.mock.calls.map((c) => c[0]) as Array<{
-      method: string;
-      params?: { idempotencyKey?: string };
-      expectFinal?: boolean;
-    }>;
-    expect(callArgs.some((c) => c.method === "send")).toBe(true);
-    expect(
-      callArgs.some((c) => c.method === "agent" && c.expectFinal === true),
-    ).toBe(true);
-    expect(callArgs.every((c) => c.params?.idempotencyKey === "rk_test")).toBe(
-      true,
-    );
-  });
-
-  it("passes gifPlayback for gateway send when flag set", async () => {
-    runtimeLogs.length = 0;
-    runtimeErrors.length = 0;
-    callGateway.mockClear();
-    randomIdempotencyKey.mockClear();
-
-    const { registerGatewayCli } = await import("./gateway-cli.js");
-    const program = new Command();
-    program.exitOverride();
-    registerGatewayCli(program);
-
-    await program.parseAsync(
-      ["gateway", "send", "--to", "+1555", "--message", "hi", "--gif-playback"],
-      { from: "user" },
-    );
-
-    expect(callGateway).toHaveBeenCalledWith(
-      expect.objectContaining({
-        method: "send",
-        params: expect.objectContaining({ gifPlayback: true }),
-      }),
-    );
-  });
-
   it("validates gateway ports and handles force/start errors", async () => {
     runtimeLogs.length = 0;
     runtimeErrors.length = 0;
@@ -254,49 +184,6 @@ describe("gateway-cli coverage", () => {
     }
   });
 
-  it("supports gateway stop/restart via service helper", async () => {
-    runtimeLogs.length = 0;
-    runtimeErrors.length = 0;
-    serviceStop.mockClear();
-    serviceRestart.mockClear();
-    serviceIsLoaded.mockResolvedValue(true);
-
-    const { registerGatewayCli } = await import("./gateway-cli.js");
-    const program = new Command();
-    program.exitOverride();
-    registerGatewayCli(program);
-
-    await program.parseAsync(["gateway", "stop"], { from: "user" });
-    await program.parseAsync(["gateway", "restart"], { from: "user" });
-
-    expect(serviceStop).toHaveBeenCalledTimes(1);
-    expect(serviceRestart).toHaveBeenCalledTimes(1);
-  });
-
-  it("supports gateway install/uninstall/start via daemon helpers", async () => {
-    runtimeLogs.length = 0;
-    runtimeErrors.length = 0;
-    serviceInstall.mockClear();
-    serviceUninstall.mockClear();
-    serviceRestart.mockClear();
-    serviceIsLoaded.mockResolvedValueOnce(false);
-
-    const { registerGatewayCli } = await import("./gateway-cli.js");
-    const program = new Command();
-    program.exitOverride();
-    registerGatewayCli(program);
-
-    await program.parseAsync(["gateway", "install", "--port", "18789"], {
-      from: "user",
-    });
-    await program.parseAsync(["gateway", "uninstall"], { from: "user" });
-    await program.parseAsync(["gateway", "start"], { from: "user" });
-
-    expect(serviceInstall).toHaveBeenCalledTimes(1);
-    expect(serviceUninstall).toHaveBeenCalledTimes(1);
-    expect(serviceRestart).toHaveBeenCalledTimes(1);
-  });
-
   it("prints stop hints on GatewayLockError when service is loaded", async () => {
     runtimeLogs.length = 0;
     runtimeErrors.length = 0;
@@ -320,7 +207,7 @@ describe("gateway-cli coverage", () => {
 
     expect(startGatewayServer).toHaveBeenCalled();
     expect(runtimeErrors.join("\n")).toContain("Gateway failed to start:");
-    expect(runtimeErrors.join("\n")).toContain("clawdbot gateway stop");
+    expect(runtimeErrors.join("\n")).toContain("clawdbot daemon stop");
   });
 
   it("uses env/config port when --port is omitted", async () => {