diff --git a/docs/cli/agent.md b/docs/cli/agent.md
index a42ee3a05..b7fb5bbe1 100644
--- a/docs/cli/agent.md
+++ b/docs/cli/agent.md
@@ -1,10 +1,10 @@
 ---
-summary: "CLI reference for `moltbot agent` (send one agent turn via the Gateway)"
+summary: "CLI reference for `clawdbot agent` (send one agent turn via the Gateway)"
 read_when:
   - You want to run one agent turn from scripts (optionally deliver reply)
 ---
 
-# `moltbot agent`
+# `clawdbot agent`
 
 Run an agent turn via the Gateway (use `--local` for embedded).
 Use `--agent <id>` to target a configured agent directly.
@@ -12,11 +12,26 @@ Use `--agent <id>` to target a configured agent directly.
 Related:
 - Agent send tool: [Agent send](/tools/agent-send)
 
+## Options
+
+| Flag | Description |
+|------|-------------|
+| `--url <url>` | Gateway WebSocket URL (for Docker setups where gateway is on a different host/container) |
+| `--local` | Run embedded agent locally instead of via gateway |
+| `--deliver` | Send the agent's reply back to the channel |
+| `--json` | Output result as JSON |
+| `--timeout <seconds>` | Override agent command timeout |
+
+See `clawdbot agent --help` for the full list of options.
+
 ## Examples
 
 ```bash
-moltbot agent --to +15555550123 --message "status update" --deliver
-moltbot agent --agent ops --message "Summarize logs"
-moltbot agent --session-id 1234 --message "Summarize inbox" --thinking medium
-moltbot agent --agent ops --message "Generate report" --deliver --reply-channel slack --reply-to "#reports"
+clawdbot agent --to +15555550123 --message "status update" --deliver
+clawdbot agent --agent ops --message "Summarize logs"
+clawdbot agent --session-id 1234 --message "Summarize inbox" --thinking medium
+clawdbot agent --agent ops --message "Generate report" --deliver --reply-channel slack --reply-to "#reports"
+
+# Docker: connect CLI container to gateway container
+docker compose run --rm clawdbot-cli agent --agent main --message "test" --url ws://clawdbot-gateway:18789
 ```
diff --git a/docs/tools/agent-send.md b/docs/tools/agent-send.md
index f102ce06e..3724a8188 100644
--- a/docs/tools/agent-send.md
+++ b/docs/tools/agent-send.md
@@ -1,11 +1,11 @@
 ---
-summary: "Direct `moltbot agent` CLI runs (with optional delivery)"
+summary: "Direct `clawdbot agent` CLI runs (with optional delivery)"
 read_when:
   - Adding or modifying the agent CLI entrypoint
 ---
-# `moltbot agent` (direct agent runs)
+# `clawdbot agent` (direct agent runs)
 
-`moltbot agent` runs a single agent turn without needing an inbound chat message.
+`clawdbot agent` runs a single agent turn without needing an inbound chat message.
 By default it goes **through the Gateway**; add `--local` to force the embedded
 runtime on the current machine.
 
@@ -21,7 +21,7 @@ runtime on the current machine.
 - Output:
   - default: prints reply text (plus `MEDIA:<url>` lines)
   - `--json`: prints structured payload + metadata
-- Optional delivery back to a channel with `--deliver` + `--channel` (target formats match `moltbot message --target`).
+- Optional delivery back to a channel with `--deliver` + `--channel` (target formats match `clawdbot message --target`).
 - Use `--reply-channel`/`--reply-to`/`--reply-account` to override delivery without changing the session.
 
 If the Gateway is unreachable, the CLI **falls back** to the embedded local run.
@@ -29,16 +29,20 @@ If the Gateway is unreachable, the CLI **falls back** to the embedded local run.
 ## Examples
 
 ```bash
-moltbot agent --to +15555550123 --message "status update"
-moltbot agent --agent ops --message "Summarize logs"
-moltbot agent --session-id 1234 --message "Summarize inbox" --thinking medium
-moltbot agent --to +15555550123 --message "Trace logs" --verbose on --json
-moltbot agent --to +15555550123 --message "Summon reply" --deliver
-moltbot agent --agent ops --message "Generate report" --deliver --reply-channel slack --reply-to "#reports"
+clawdbot agent --to +15555550123 --message "status update"
+clawdbot agent --agent ops --message "Summarize logs"
+clawdbot agent --session-id 1234 --message "Summarize inbox" --thinking medium
+clawdbot agent --to +15555550123 --message "Trace logs" --verbose on --json
+clawdbot agent --to +15555550123 --message "Summon reply" --deliver
+clawdbot agent --agent ops --message "Generate report" --deliver --reply-channel slack --reply-to "#reports"
+
+# Docker: connect CLI container to gateway container
+docker compose run --rm clawdbot-cli agent --agent main --message "test" --url ws://clawdbot-gateway:18789
 ```
 
 ## Flags
 
+- `--url <url>`: Gateway WebSocket URL (for Docker setups where gateway is on a different host/container)
 - `--local`: run locally (requires model provider API keys in your shell)
 - `--deliver`: send the reply to the chosen channel
 - `--channel`: delivery channel (`whatsapp|telegram|discord|googlechat|slack|signal|imessage`, default: `whatsapp`)
diff --git a/src/cli/program/register.agent.ts b/src/cli/program/register.agent.ts
index 6e5bbc210..ca17f955e 100644
--- a/src/cli/program/register.agent.ts
+++ b/src/cli/program/register.agent.ts
@@ -45,6 +45,7 @@ export function registerAgentCommands(program: Command, args: { agentChannelOpti
       "--timeout <seconds>",
       "Override agent command timeout (seconds, default 600 or config value)",
     )
+    .option("--url <url>", "Gateway WebSocket URL (defaults to gateway.remote.url when configured)")
     .addHelpText(
       "after",
       () =>
@@ -66,6 +67,10 @@ ${formatHelpExamples([
     'moltbot agent --agent ops --message "Generate report" --deliver --reply-channel slack --reply-to "#reports"',
     "Send reply to a different channel/target.",
   ],
+  [
+    'docker compose run --rm clawdbot-cli agent --agent main --message "test" --url ws://clawdbot-gateway:18789',
+    "Connect from CLI container to gateway container (Docker).",
+  ],
 ])}
 
 ${theme.muted("Docs:")} ${formatDocsLink("/cli/agent", "docs.molt.bot/cli/agent")}`,
diff --git a/src/commands/agent-via-gateway.test.ts b/src/commands/agent-via-gateway.test.ts
index 3b6672f35..096da0569 100644
--- a/src/commands/agent-via-gateway.test.ts
+++ b/src/commands/agent-via-gateway.test.ts
@@ -123,4 +123,40 @@ describe("agentCliCommand", () => {
       fs.rmSync(dir, { recursive: true, force: true });
     }
   });
+
+  it("passes url option to callGateway", async () => {
+    const dir = fs.mkdtempSync(path.join(os.tmpdir(), "clawdbot-agent-cli-"));
+    const store = path.join(dir, "sessions.json");
+    mockConfig(store);
+
+    vi.mocked(callGateway).mockResolvedValue({
+      runId: "idem-1",
+      status: "ok",
+      result: {
+        payloads: [{ text: "hello" }],
+        meta: { stub: true },
+      },
+    });
+
+    try {
+      await agentCliCommand(
+        {
+          message: "hi",
+          to: "+1555",
+          url: "ws://clawdbot-gateway:18789",
+        },
+        runtime,
+      );
+
+      expect(callGateway).toHaveBeenCalledTimes(1);
+      expect(callGateway).toHaveBeenCalledWith(
+        expect.objectContaining({
+          url: "ws://clawdbot-gateway:18789",
+        }),
+      );
+      expect(agentCommand).not.toHaveBeenCalled();
+    } finally {
+      fs.rmSync(dir, { recursive: true, force: true });
+    }
+  });
 });
diff --git a/src/commands/agent-via-gateway.ts b/src/commands/agent-via-gateway.ts
index b8401e2a1..8cc53cc7a 100644
--- a/src/commands/agent-via-gateway.ts
+++ b/src/commands/agent-via-gateway.ts
@@ -50,6 +50,7 @@ export type AgentCliOpts = {
   runId?: string;
   extraSystemPrompt?: string;
   local?: boolean;
+  url?: string;
 };
 
 function parseTimeoutSeconds(opts: { cfg: ReturnType<typeof loadConfig>; timeout?: string }) {
@@ -118,6 +119,7 @@ export async function agentViaGatewayCommand(opts: AgentCliOpts, runtime: Runtim
     },
     async () =>
       await callGateway<GatewayAgentResponse>({
+        url: opts.url,
         method: "agent",
         params: {
           message: body,