fix: hydrate Slack thread root files (#1479 ) (thanks @travisirby)

2026-01-23 05:00:59 +00:00
151 changed files with 3853 additions and 5645 deletions
@@ -51,7 +51,6 @@
 - Framework: Vitest with V8 coverage thresholds (70% lines/branches/functions/statements).
 - Naming: match source names with `*.test.ts`; e2e in `*.e2e.test.ts`.
 - Run `pnpm test` (or `pnpm test:coverage`) before pushing when you touch logic.
- Do not set test workers above 16; tried already.
 - Live tests (real keys): `CLAWDBOT_LIVE_TEST=1 pnpm test:live` (Clawdbot-only) or `LIVE=1 pnpm test:live` (includes provider live tests). Docker: `pnpm test:docker:live-models`, `pnpm test:docker:live-gateway`. Onboarding Docker E2E: `pnpm test:docker:onboard`.
 - Full kit + what’s covered: `docs/testing.md`.
 - Pure test additions/fixes generally do **not** need a changelog entry unless they alter user-facing behavior or the user asks for one.
@@ -5,38 +5,44 @@ Docs: https://docs.clawd.bot
 ## 2026.1.22

 ### Changes
- Highlight: Compaction safeguard now uses adaptive chunking, progressive fallback, and UI status + retries. (#1466) Thanks @dlauer.
- Providers: add Antigravity usage tracking to status output. (#1490) Thanks @patelhiren.
- Slack: add chat-type reply threading overrides via `replyToModeByChatType`. (#1442) Thanks @stefangalescu.
+- Highlight: Lobster optional plugin tool for typed workflows + approval gates. https://docs.clawd.bot/tools/lobster
+- Lobster: allow workflow file args via `argsJson` in the plugin tool. https://docs.clawd.bot/tools/lobster
+- Agents: add identity avatar config support and Control UI avatar rendering. (#1329, #1424) Thanks @dlauer.
+- Memory: prevent CLI hangs by deferring vector probes, adding sqlite-vec/embedding timeouts, and showing sync progress early.
 - BlueBubbles: add `asVoice` support for MP3/CAF voice memos in sendAttachment. (#1477, #1482) Thanks @Nicell.
+- Docs: add troubleshooting entry for gateway.mode blocking gateway start. https://docs.clawd.bot/gateway/troubleshooting
+- Docs: add /model allowlist troubleshooting note. (#1405)
+- Docs: add per-message Gmail search example for gog. (#1220) Thanks @mbelinky.
+- UI: show per-session assistant identity in the Control UI. (#1420) Thanks @robbyczgw-cla.
 - Onboarding: add hatch choice (TUI/Web/Later), token explainer, background dashboard seed on macOS, and showcase link.
+- Onboarding: remove the run setup-token auth option (paste setup-token or reuse CLI creds instead).
+- Signal: add typing indicators and DM read receipts via signal-cli.
+- MSTeams: add file uploads, adaptive cards, and attachment handling improvements. (#1410) Thanks @Evizero.
+- CLI: add `clawdbot update wizard` for interactive channel selection and restart prompts. https://docs.clawd.bot/cli/update
+
+### Breaking
+- **BREAKING:** Envelope and system event timestamps now default to host-local time (was UTC) so agents don’t have to constantly convert.

 ### Fixes
 - BlueBubbles: stop typing indicator on idle/no-reply. (#1439) Thanks @Nicell.
 - Message tool: keep path/filePath as-is for send; hydrate buffers only for sendAttachment. (#1444) Thanks @hopyky.
 - Auto-reply: only report a model switch when session state is available. (#1465) Thanks @robbyczgw-cla.
 - Control UI: resolve local avatar URLs with basePath across injection + identity RPC. (#1457) Thanks @dlauer.
- Agents: sanitize assistant history text to strip tool-call markers. (#1456) Thanks @zerone0x.
- Discord: clarify Message Content Intent onboarding hint. (#1487) Thanks @kyleok.
- Gateway: stop the service before uninstalling and fail if it remains loaded.
 - Agents: surface concrete API error details instead of generic AI service errors.
- Exec: fall back to non-PTY when PTY spawn fails (EBADF). (#1484)
 - Exec approvals: allow per-segment allowlists for chained shell commands on gateway + node hosts. (#1458) Thanks @czekaj.
 - Agents: make OpenAI sessions image-sanitize-only; gate tool-id/repair sanitization by provider.
 - Doctor: honor CLAWDBOT_GATEWAY_TOKEN for auth checks and security audit token reuse. (#1448) Thanks @azade-c.
 - Agents: make tool summaries more readable and only show optional params when set.
- Agents: honor SOUL.md guidance even when the file is nested or path-qualified. (#1434) Thanks @neooriginal.
- Matrix (plugin): persist m.direct for resolved DMs and harden room fallback. (#1436, #1486) Thanks @sibbl.
 - CLI: prefer `~` for home paths in output.
 - Mattermost (plugin): enforce pairing/allowlist gating, keep @username targets, and clarify plugin-only docs. (#1428) Thanks @damoahdominic.
 - Agents: centralize transcript sanitization in the runner; keep <final> tags and error turns intact.
 - Auth: skip auth profiles in cooldown during initial selection and rotation. (#1316) Thanks @odrobnik.
 - Agents/TUI: honor user-pinned auth profiles during cooldown and preserve search picker ranking. (#1432) Thanks @tobiasbischoff.
 - Docs: fix gog auth services example to include docs scope. (#1454) Thanks @zerone0x.
- Slack: reduce WebClient retries to avoid duplicate sends. (#1481)
 - Slack: read thread replies for message reads when threadId is provided (replies-only). (#1450) Thanks @rodrigouroz.
+- Slack: hydrate thread root attachments for replies and include multi-file context. (#1479) Thanks @travisirby.
 - macOS: prefer linked channels in gateway summary to avoid false “not linked” status.
- macOS/tests: fix gateway summary lookup after guard unwrap; prevent browser opens during tests. (ECID-1483)
+- Providers: improve GitHub Copilot integration (enterprise support, base URL, and auth flow alignment).

 ## 2026.1.21-2

@@ -47,8 +53,6 @@ Docs: https://docs.clawd.bot
 ## 2026.1.21

 ### Changes
- Highlight: Lobster optional plugin tool for typed workflows + approval gates. https://docs.clawd.bot/tools/lobster
- Lobster: allow workflow file args via `argsJson` in the plugin tool. https://docs.clawd.bot/tools/lobster
 - Heartbeat: allow running heartbeats in an explicit session key. (#1256) Thanks @zknicker.
 - CLI: default exec approvals to the local host, add gateway/node targeting flags, and show target details in allowlist output.
 - CLI: exec approvals mutations render tables instead of raw JSON.
@@ -58,24 +62,13 @@ Docs: https://docs.clawd.bot
 - CLI: flatten node service commands under `clawdbot node` and remove `service node` docs.
 - CLI: move gateway service commands under `clawdbot gateway` and add `gateway probe` for reachability.
 - Sessions: add per-channel reset overrides via `session.resetByChannel`. (#1353) Thanks @cash-echo-bot.
- Agents: add identity avatar config support and Control UI avatar rendering. (#1329, #1424) Thanks @dlauer.
- UI: show per-session assistant identity in the Control UI. (#1420) Thanks @robbyczgw-cla.
- CLI: add `clawdbot update wizard` for interactive channel selection and restart prompts. https://docs.clawd.bot/cli/update
- Signal: add typing indicators and DM read receipts via signal-cli.
- MSTeams: add file uploads, adaptive cards, and attachment handling improvements. (#1410) Thanks @Evizero.
- Onboarding: remove the run setup-token auth option (paste setup-token or reuse CLI creds instead).
- Docs: add troubleshooting entry for gateway.mode blocking gateway start. https://docs.clawd.bot/gateway/troubleshooting
- Docs: add /model allowlist troubleshooting note. (#1405)
- Docs: add per-message Gmail search example for gog. (#1220) Thanks @mbelinky.

 ### Breaking
 - **BREAKING:** Control UI now rejects insecure HTTP without device identity by default. Use HTTPS (Tailscale Serve) or set `gateway.controlUi.allowInsecureAuth: true` to allow token-only auth. https://docs.clawd.bot/web/control-ui#insecure-http
- **BREAKING:** Envelope and system event timestamps now default to host-local time (was UTC) so agents don’t have to constantly convert.

 ### Fixes
 - Nodes/macOS: prompt on allowlist miss for node exec approvals, persist allowlist decisions, and flatten node invoke errors. (#1394) Thanks @ngutman.
 - Gateway: keep auto bind loopback-first and add explicit tailnet binding to avoid Tailscale taking over local UI. (#1380)
- Memory: prevent CLI hangs by deferring vector probes, adding sqlite-vec/embedding timeouts, and showing sync progress early.
 - Agents: enforce 9-char alphanumeric tool call ids for Mistral providers. (#1372) Thanks @zerone0x.
 - Embedded runner: persist injected history images so attachments aren’t reloaded each turn. (#1374) Thanks @Nicell.
 - Nodes tool: include agent/node/gateway context in tool failure logs to speed approval debugging.
@@ -102,9 +102,7 @@ struct DebugSettings: View {
                        }
                    }

-                Text(
-                    "When enabled, Clawdbot won't install or manage \(gatewayLaunchdLabel). " +
-                        "It will only attach to an existing Gateway.")
+                Text("When enabled, Clawdbot won't install or manage \(gatewayLaunchdLabel). It will only attach to an existing Gateway.")
                    .font(.caption)
                    .foregroundStyle(.secondary)

@@ -248,11 +248,12 @@ final class GatewayProcessManager {
            guard let linkId else {
                return "port \(port), health probe succeeded, \(instanceText)"
            }
-            let linked = snap.channels[linkId]?.linked ?? false
-            let authAge = snap.channels[linkId]?.authAgeMs.flatMap(msToAge) ?? "unknown age"
+            let linked = linkId.flatMap { snap.channels[$0]?.linked } ?? false
+            let authAge = linkId.flatMap { snap.channels[$0]?.authAgeMs }.flatMap(msToAge) ?? "unknown age"
            let label =
-                snap.channelLabels?[linkId] ??
-                linkId.capitalized
+                linkId.flatMap { snap.channelLabels?[$0] } ??
+                linkId?.capitalized ??
+                "channel"
            let linkText = linked ? "linked" : "not linked"
            return "port \(port), \(label) \(linkText), auth \(authAge), \(instanceText)"
        }
@@ -304,8 +304,7 @@ Slack uses Socket Mode only (no HTTP webhook server). Provide both tokens:
      "policy": "pairing",
      "allowFrom": ["U123", "U456", "*"],
      "groupEnabled": false,
-      "groupChannels": ["G123"],
-      "replyToMode": "all"
+      "groupChannels": ["G123"]
    },
    "channels": {
      "C123": { "allow": true, "requireMention": true },
@@ -362,73 +361,6 @@ By default, Clawdbot replies in the main channel. Use `channels.slack.replyToMod

 The mode applies to both auto-replies and agent tool calls (`slack sendMessage`).

-### Per-chat-type threading
-You can configure different threading behavior per chat type by setting `channels.slack.replyToModeByChatType`:
-
-```json5
-{
-  channels: {
-    slack: {
-      replyToMode: "off",        // default for channels
-      replyToModeByChatType: {
-        direct: "all",           // DMs always thread
-        group: "first"           // group DMs/MPIM thread first reply
-      },
-    }
-  }
-}
-```
-
-Supported chat types:
- `direct`: 1:1 DMs (Slack `im`)
- `group`: group DMs / MPIMs (Slack `mpim`)
- `channel`: standard channels (public/private)
-
-Precedence:
-1) `replyToModeByChatType.<chatType>`
-2) `replyToMode`
-3) Provider default (`off`)
-
-Legacy `channels.slack.dm.replyToMode` is still accepted as a fallback for `direct` when no chat-type override is set.
-
-Examples:
-
-Thread DMs only:
-```json5
-{
-  channels: {
-    slack: {
-      replyToMode: "off",
-      replyToModeByChatType: { direct: "all" }
-    }
-  }
-}
-```
-
-Thread group DMs but keep channels in the root:
-```json5
-{
-  channels: {
-    slack: {
-      replyToMode: "off",
-      replyToModeByChatType: { group: "first" }
-    }
-  }
-}
-```
-
-Make channels thread, keep DMs in the root:
-```json5
-{
-  channels: {
-    slack: {
-      replyToMode: "first",
-      replyToModeByChatType: { direct: "off", group: "off" }
-    }
-  }
-}
-```
-
 ### Manual threading tags
 For fine-grained control, use these tags in agent responses:
 - `[[reply_to_current]]` — reply to the triggering message (start/continue thread).
@@ -129,7 +129,7 @@ Save to `~/.clawdbot/clawdbot.json` and you can DM the bot from that number.
        enabled: true,
        maxBytes: 20971520,
        models: [
-          { provider: "openai", model: "gpt-4o-mini-transcribe" },
+          { provider: "openai", model: "whisper-1" },
          // Optional CLI fallback (Whisper binary):
          // { type: "cli", command: "whisper", args: ["--model", "base", "{{MediaPath}}"] }
        ],
@@ -1865,7 +1865,7 @@ Note: `applyPatch` is only under `tools.exec`.
 - Each `models[]` entry:
  - Provider entry (`type: "provider"` or omitted):
    - `provider`: API provider id (`openai`, `anthropic`, `google`/`gemini`, `groq`, etc).
-    - `model`: model id override (required for image; defaults to `gpt-4o-mini-transcribe`/`whisper-large-v3-turbo` for audio providers, and `gemini-3-flash-preview` for video).
+    - `model`: model id override (required for image; defaults to `whisper-1`/`whisper-large-v3-turbo` for audio providers, and `gemini-3-flash-preview` for video).
    - `profile` / `preferredProfile`: auth profile selection.
  - CLI entry (`type: "cli"`):
    - `command`: executable to run.
@@ -1890,7 +1890,7 @@ Example:
          rules: [{ action: "allow", match: { chatType: "direct" } }]
        },
        models: [
-          { provider: "openai", model: "gpt-4o-mini-transcribe" },
+          { provider: "openai", model: "whisper-1" },
          { type: "cli", command: "whisper", args: ["--model", "base", "{{MediaPath}}"] }
        ]
      },
@@ -6,7 +6,7 @@ read_when:
 # Audio / Voice Notes — 2026-01-17

 ## What works
- **Media understanding (audio)**: If audio understanding is enabled (or auto‑detected), Clawdbot:
+- **Media understanding (audio)**: If `tools.media.audio` is enabled (or a shared `tools.media.models` entry supports audio), Clawdbot:
  1) Locates the first audio attachment (local path or URL) and downloads it if needed.
  2) Enforces `maxBytes` before sending to each model entry.
  3) Runs the first eligible model entry in order (provider or CLI).
@@ -15,21 +15,6 @@ read_when:
 - **Command parsing**: When transcription succeeds, `CommandBody`/`RawBody` are set to the transcript so slash commands still work.
 - **Verbose logging**: In `--verbose`, we log when transcription runs and when it replaces the body.

-## Auto-detection (default)
-If you **don’t configure models** and `tools.media.audio.enabled` is **not** set to `false`,
-Clawdbot auto-detects in this order and stops at the first working option:
-
-1) **Local CLIs** (if installed)
-   - `sherpa-onnx-offline` (requires `SHERPA_ONNX_MODEL_DIR` with encoder/decoder/joiner/tokens)
-   - `whisper-cli` (from `whisper-cpp`; uses `WHISPER_CPP_MODEL` or the bundled tiny model)
-   - `whisper` (Python CLI; downloads models automatically)
-2) **Gemini CLI** (`gemini`) using `read_many_files`
-3) **Provider keys** (OpenAI → Groq → Deepgram → Google)
-
-To disable auto-detection, set `tools.media.audio.enabled: false`.
-To customize, set `tools.media.audio.models`.
-Note: Binary detection is best-effort across macOS/Linux/Windows; ensure the CLI is on `PATH` (we expand `~`), or set an explicit CLI model with a full command path.
-
 ## Config examples

 ### Provider + CLI fallback (OpenAI + Whisper CLI)
@@ -41,7 +26,7 @@ Note: Binary detection is best-effort across macOS/Linux/Windows; ensure the CLI
        enabled: true,
        maxBytes: 20971520,
        models: [
-          { provider: "openai", model: "gpt-4o-mini-transcribe" },
+          { provider: "openai", model: "whisper-1" },
          {
            type: "cli",
            command: "whisper",
@@ -69,7 +54,7 @@ Note: Binary detection is best-effort across macOS/Linux/Windows; ensure the CLI
          ]
        },
        models: [
-          { provider: "openai", model: "gpt-4o-mini-transcribe" }
+          { provider: "openai", model: "whisper-1" }
        ]
      }
    }
@@ -98,7 +83,6 @@ Note: Binary detection is best-effort across macOS/Linux/Windows; ensure the CLI
 - Audio providers can override `baseUrl`, `headers`, and `providerOptions` via `tools.media.audio`.
 - Default size cap is 20MB (`tools.media.audio.maxBytes`). Oversize audio is skipped for that model and the next entry is tried.
 - Default `maxChars` for audio is **unset** (full transcript). Set `tools.media.audio.maxChars` or per-entry `maxChars` to trim output.
- OpenAI auto default is `gpt-4o-mini-transcribe`; set `model: "gpt-4o-transcribe"` for higher accuracy.
 - Use `tools.media.audio.attachments` to process multiple voice notes (`mode: "all"` + `maxAttachments`).
 - Transcript is available to templates as `{{Transcript}}`.
 - CLI stdout is capped (5MB); keep CLI output concise.
@@ -6,7 +6,7 @@ read_when:
 ---
 # Media Understanding (Inbound) — 2026-01-17

-Clawdbot can **summarize inbound media** (image/audio/video) before the reply pipeline runs. It auto‑detects when local tools or provider keys are available, and can be disabled or customized. If understanding is off, models still receive the original files/URLs as usual.
+Clawdbot can optionally **summarize inbound media** (image/audio/video) before the reply pipeline runs. This is **opt-in** and separate from the base attachment flow—if understanding is off, models still receive the original files/URLs as usual.

 ## Goals
 - Optional: pre‑digest inbound media into short text for faster routing + better command parsing.
@@ -88,11 +88,6 @@ Each `models[]` entry can be **provider** or **CLI**:
 }
 ```

-CLI templates can also use:
- `{{MediaDir}}` (directory containing the media file)
- `{{OutputDir}}` (scratch dir created for this run)
- `{{OutputBase}}` (scratch file base path, no extension)
-
 ## Defaults and limits
 Recommended defaults:
 - `maxChars`: **500** for image/video (short, command‑friendly)
@@ -109,22 +104,17 @@ Rules:
 - If `<capability>.enabled: true` but no models are configured, Clawdbot tries the
  **active reply model** when its provider supports the capability.

-### Auto-detect media understanding (default)
-If `tools.media.<capability>.enabled` is **not** set to `false` and you haven’t
-configured models, Clawdbot auto-detects in this order and **stops at the first
-working option**:
+### Auto-enable audio (when keys exist)
+If `tools.media.audio.enabled` is **not** set to `false` and you have any supported
+audio provider keys configured, Clawdbot will **auto-enable audio transcription**
+even when you haven’t listed models explicitly.

-1) **Local CLIs** (audio only; if installed)
-   - `sherpa-onnx-offline` (requires `SHERPA_ONNX_MODEL_DIR` with encoder/decoder/joiner/tokens)
-   - `whisper-cli` (`whisper-cpp`; uses `WHISPER_CPP_MODEL` or the bundled tiny model)
-   - `whisper` (Python CLI; downloads models automatically)
-2) **Gemini CLI** (`gemini`) using `read_many_files`
-3) **Provider keys**
-   - Audio: OpenAI → Groq → Deepgram → Google
-   - Image: OpenAI → Anthropic → Google → MiniMax
-   - Video: Google
+Providers checked (in order):
+1) OpenAI
+2) Groq
+3) Deepgram

-To disable auto-detection, set:
+To disable this behavior, set:
 ```json5
 {
  tools: {
@@ -136,7 +126,6 @@ To disable auto-detection, set:
  }
 }
 ```
-Note: Binary detection is best-effort across macOS/Linux/Windows; ensure the CLI is on `PATH` (we expand `~`), or set an explicit CLI model with a full command path.

 ## Capabilities (optional)
 If you set `capabilities`, the entry only runs for those media types. For shared
@@ -153,7 +142,7 @@ If you omit `capabilities`, the entry is eligible for the list it appears in.
 | Capability | Provider integration | Notes |
 |------------|----------------------|-------|
 | Image | OpenAI / Anthropic / Google / others via `pi-ai` | Any image-capable model in the registry works. |
-| Audio | OpenAI, Groq, Deepgram, Google | Provider transcription (Whisper/Deepgram/Gemini). |
+| Audio | OpenAI, Groq, Deepgram | Provider transcription (Whisper/Deepgram). |
 | Video | Google (Gemini API) | Provider video understanding. |

 ## Recommended providers
@@ -162,8 +151,8 @@ If you omit `capabilities`, the entry is eligible for the list it appears in.
 - Good defaults: `openai/gpt-5.2`, `anthropic/claude-opus-4-5`, `google/gemini-3-pro-preview`.

 **Audio**
- `openai/gpt-4o-mini-transcribe`, `groq/whisper-large-v3-turbo`, or `deepgram/nova-3`.
- CLI fallback: `whisper-cli` (whisper-cpp) or `whisper`.
+- `openai/whisper-1`, `groq/whisper-large-v3-turbo`, or `deepgram/nova-3`.
+- CLI fallback: `whisper` binary.
 - Deepgram setup: [Deepgram (audio transcription)](/providers/deepgram).

 **Video**
@@ -220,7 +209,7 @@ When `mode: "all"`, outputs are labeled `[Image 1/2]`, `[Audio 2/2]`, etc.
      audio: {
        enabled: true,
        models: [
-          { provider: "openai", model: "gpt-4o-mini-transcribe" },
+          { provider: "openai", model: "whisper-1" },
          {
            type: "cli",
            command: "whisper",
@@ -16,9 +16,9 @@ provider in two different ways.

 ### 1) Built-in GitHub Copilot provider (`github-copilot`)

-Use the native device-login flow to obtain a GitHub token, then exchange it for
-Copilot API tokens when Clawdbot runs. This is the **default** and simplest path
-because it does not require VS Code.
+Use the native device-login flow to obtain a GitHub token and use it directly
+against the Copilot API. This is the **default** and simplest path because it
+does not require VS Code. Enterprise domains are supported.

 ### 2) Copilot Proxy plugin (`copilot-proxy`)

@@ -39,6 +39,8 @@ clawdbot models auth login-github-copilot

 You'll be prompted to visit a URL and enter a one-time code. Keep the terminal
 open until it completes.
+If you're on GitHub Enterprise, the login will ask for your enterprise URL or
+domain (for example `company.ghe.com`).

 ### Optional flags

@@ -66,5 +68,7 @@ clawdbot models set github-copilot/gpt-4o
 - Requires an interactive TTY; run it directly in a terminal.
 - Copilot model availability depends on your plan; if a model is rejected, try
  another ID (for example `github-copilot/gpt-4.1`).
- The login stores a GitHub token in the auth profile store and exchanges it for a
-  Copilot API token when Clawdbot runs.
+- The login stores a GitHub token in the auth profile store and uses it directly
+  for Copilot API calls.
+- Base URL: `https://api.githubcopilot.com` (public) or `https://copilot-api.<domain>`
+  for GitHub Enterprise.
@@ -53,7 +53,7 @@ export async function resolveMatrixAuth(params?: {
    saveMatrixCredentials,
    credentialsMatchConfig,
    touchMatrixCredentials,
-  } = await import("../credentials.js");
+  } = await import("./credentials.js");

  const cached = loadMatrixCredentials(env);
  const cachedCredentials =
@@ -1,102 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from "vitest";
-
-import type { MatrixClient } from "matrix-bot-sdk";
-import { EventType } from "./types.js";
-
-let resolveMatrixRoomId: typeof import("./targets.js").resolveMatrixRoomId;
-let normalizeThreadId: typeof import("./targets.js").normalizeThreadId;
-
-beforeEach(async () => {
-  vi.resetModules();
-  ({ resolveMatrixRoomId, normalizeThreadId } = await import("./targets.js"));
-});
-
-describe("resolveMatrixRoomId", () => {
-  it("uses m.direct when available", async () => {
-    const userId = "@user:example.org";
-    const client = {
-      getAccountData: vi.fn().mockResolvedValue({
-        [userId]: ["!room:example.org"],
-      }),
-      getJoinedRooms: vi.fn(),
-      getJoinedRoomMembers: vi.fn(),
-      setAccountData: vi.fn(),
-    } as unknown as MatrixClient;
-
-    const roomId = await resolveMatrixRoomId(client, userId);
-
-    expect(roomId).toBe("!room:example.org");
-    expect(client.getJoinedRooms).not.toHaveBeenCalled();
-    expect(client.setAccountData).not.toHaveBeenCalled();
-  });
-
-  it("falls back to joined rooms and persists m.direct", async () => {
-    const userId = "@fallback:example.org";
-    const roomId = "!room:example.org";
-    const setAccountData = vi.fn().mockResolvedValue(undefined);
-    const client = {
-      getAccountData: vi.fn().mockRejectedValue(new Error("nope")),
-      getJoinedRooms: vi.fn().mockResolvedValue([roomId]),
-      getJoinedRoomMembers: vi.fn().mockResolvedValue([
-        "@bot:example.org",
-        userId,
-      ]),
-      setAccountData,
-    } as unknown as MatrixClient;
-
-    const resolved = await resolveMatrixRoomId(client, userId);
-
-    expect(resolved).toBe(roomId);
-    expect(setAccountData).toHaveBeenCalledWith(
-      EventType.Direct,
-      expect.objectContaining({ [userId]: [roomId] }),
-    );
-  });
-
-  it("continues when a room member lookup fails", async () => {
-    const userId = "@continue:example.org";
-    const roomId = "!good:example.org";
-    const setAccountData = vi.fn().mockResolvedValue(undefined);
-    const getJoinedRoomMembers = vi
-      .fn()
-      .mockRejectedValueOnce(new Error("boom"))
-      .mockResolvedValueOnce(["@bot:example.org", userId]);
-    const client = {
-      getAccountData: vi.fn().mockRejectedValue(new Error("nope")),
-      getJoinedRooms: vi.fn().mockResolvedValue(["!bad:example.org", roomId]),
-      getJoinedRoomMembers,
-      setAccountData,
-    } as unknown as MatrixClient;
-
-    const resolved = await resolveMatrixRoomId(client, userId);
-
-    expect(resolved).toBe(roomId);
-    expect(setAccountData).toHaveBeenCalled();
-  });
-
-  it("allows larger rooms when no 1:1 match exists", async () => {
-    const userId = "@group:example.org";
-    const roomId = "!group:example.org";
-    const client = {
-      getAccountData: vi.fn().mockRejectedValue(new Error("nope")),
-      getJoinedRooms: vi.fn().mockResolvedValue([roomId]),
-      getJoinedRoomMembers: vi.fn().mockResolvedValue([
-        "@bot:example.org",
-        userId,
-        "@extra:example.org",
-      ]),
-      setAccountData: vi.fn().mockResolvedValue(undefined),
-    } as unknown as MatrixClient;
-
-    const resolved = await resolveMatrixRoomId(client, userId);
-
-    expect(resolved).toBe(roomId);
-  });
-});
-
-describe("normalizeThreadId", () => {
-  it("returns null for empty thread ids", () => {
-    expect(normalizeThreadId("   ")).toBeNull();
-    expect(normalizeThreadId("$thread")).toBe("$thread");
-  });
-});
@@ -16,100 +16,22 @@ export function normalizeThreadId(raw?: string | number | null): string | null {
  return trimmed ? trimmed : null;
 }

-const directRoomCache = new Map<string, string>();
-
-async function persistDirectRoom(
-  client: MatrixClient,
-  userId: string,
-  roomId: string,
-): Promise<void> {
-  let directContent: MatrixDirectAccountData | null = null;
-  try {
-    directContent = (await client.getAccountData(
-      EventType.Direct,
-    )) as MatrixDirectAccountData | null;
-  } catch {
-    // Ignore fetch errors and fall back to an empty map.
-  }
-  const existing =
-    directContent && !Array.isArray(directContent) ? directContent : {};
-  const current = Array.isArray(existing[userId]) ? existing[userId] : [];
-  if (current[0] === roomId) return;
-  const next = [roomId, ...current.filter((id) => id !== roomId)];
-  try {
-    await client.setAccountData(EventType.Direct, {
-      ...existing,
-      [userId]: next,
-    });
-  } catch {
-    // Ignore persistence errors.
-  }
-}
-
-async function resolveDirectRoomId(
-  client: MatrixClient,
-  userId: string,
-): Promise<string> {
+async function resolveDirectRoomId(client: MatrixClient, userId: string): Promise<string> {
  const trimmed = userId.trim();
  if (!trimmed.startsWith("@")) {
-    throw new Error(
-      `Matrix user IDs must be fully qualified (got "${trimmed}")`,
-    );
+    throw new Error(`Matrix user IDs must be fully qualified (got "${trimmed}")`);
  }
-
-  const cached = directRoomCache.get(trimmed);
-  if (cached) return cached;
-
-  // 1) Fast path: use account data (m.direct) for *this* logged-in user (the bot).
+  // matrix-bot-sdk: use getAccountData to retrieve m.direct
  try {
-    const directContent = (await client.getAccountData(
-      EventType.Direct,
-    )) as MatrixDirectAccountData | null;
-    const list = Array.isArray(directContent?.[trimmed])
-      ? directContent[trimmed]
-      : [];
-    if (list.length > 0) {
-      directRoomCache.set(trimmed, list[0]);
-      return list[0];
-    }
+    const directContent = await client.getAccountData(EventType.Direct) as MatrixDirectAccountData | null;
+    const list = Array.isArray(directContent?.[trimmed]) ? directContent[trimmed] : [];
+    if (list.length > 0) return list[0];
  } catch {
-    // Ignore and fall back.
+    // Ignore errors, try fetching from server
  }
-
-  // 2) Fallback: look for an existing joined room that looks like a 1:1 with the user.
-  // Many clients only maintain m.direct for *their own* account data, so relying on it is brittle.
-  let fallbackRoom: string | null = null;
-  try {
-    const rooms = await client.getJoinedRooms();
-    for (const roomId of rooms) {
-      let members: string[];
-      try {
-        members = await client.getJoinedRoomMembers(roomId);
-      } catch {
-        continue;
-      }
-      if (!members.includes(trimmed)) continue;
-      // Prefer classic 1:1 rooms, but allow larger rooms if requested.
-      if (members.length === 2) {
-        directRoomCache.set(trimmed, roomId);
-        await persistDirectRoom(client, trimmed, roomId);
-        return roomId;
-      }
-      if (!fallbackRoom) {
-        fallbackRoom = roomId;
-      }
-    }
-  } catch {
-    // Ignore and fall back.
-  }
-
-  if (fallbackRoom) {
-    directRoomCache.set(trimmed, fallbackRoom);
-    await persistDirectRoom(client, trimmed, fallbackRoom);
-    return fallbackRoom;
-  }
-
-  throw new Error(`No direct room found for ${trimmed} (m.direct missing)`);
+  throw new Error(
+    `No m.direct room found for ${trimmed}. Open a DM first so Matrix can set m.direct.`,
+  );
 }

 export async function resolveMatrixRoomId(
@@ -1,6 +1,6 @@
 {
  "name": "@clawdbot/mattermost",
-  "version": "2026.1.22",
+  "version": "2026.1.20-2",
  "type": "module",
  "description": "Clawdbot Mattermost channel plugin",
  "clawdbot": {
@@ -14,12 +14,11 @@ import fs from "node:fs/promises";
 import path from "node:path";
 import os from "node:os";

-const OPENAI_API_KEY = process.env.OPENAI_API_KEY ?? "test-key";
-const HAS_OPENAI_KEY = Boolean(process.env.OPENAI_API_KEY);
-const liveEnabled = HAS_OPENAI_KEY && process.env.CLAWDBOT_LIVE_TEST === "1";
-const describeLive = liveEnabled ? describe : describe.skip;
+// Skip if no OpenAI API key
+const OPENAI_API_KEY = process.env.OPENAI_API_KEY;
+const describeWithKey = OPENAI_API_KEY ? describe : describe.skip;

-describe("memory plugin e2e", () => {
+describeWithKey("memory plugin e2e", () => {
  let tmpDir: string;
  let dbPath: string;

@@ -160,7 +159,7 @@ describe("memory plugin e2e", () => {
 });

 // Live tests that require OpenAI API key and actually use LanceDB
-describeLive("memory plugin live tests", () => {
+describeWithKey("memory plugin live tests", () => {
  let tmpDir: string;
  let dbPath: string;

@@ -177,7 +176,6 @@ describeLive("memory plugin live tests", () => {

  test("memory tools work end-to-end", async () => {
    const { default: memoryPlugin } = await import("./index.js");
-    const liveApiKey = process.env.OPENAI_API_KEY ?? "";

    // Mock plugin API
    const registeredTools: any[] = [];
@@ -193,7 +191,7 @@ describeLive("memory plugin live tests", () => {
      config: {},
      pluginConfig: {
        embedding: {
-          apiKey: liveApiKey,
+          apiKey: OPENAI_API_KEY,
          model: "text-embedding-3-small",
        },
        dbPath,
@@ -1,6 +1,6 @@
 {
  "name": "@clawdbot/open-prose",
-  "version": "2026.1.22",
+  "version": "2026.1.23",
  "type": "module",
  "description": "OpenProse VM skill pack plugin (slash command + telemetry).",
  "clawdbot": {
@@ -19,7 +19,6 @@ import {
  readStringParam,
  resolveDefaultSlackAccountId,
  resolveSlackAccount,
-  resolveSlackReplyToMode,
  resolveSlackGroupRequireMention,
  buildSlackThreadingToolContext,
  setAccountEnabledInConfigSection,
@@ -163,8 +162,8 @@ export const slackPlugin: ChannelPlugin<ResolvedSlackAccount> = {
    resolveRequireMention: resolveSlackGroupRequireMention,
  },
  threading: {
-    resolveReplyToMode: ({ cfg, accountId, chatType }) =>
-      resolveSlackReplyToMode(resolveSlackAccount({ cfg, accountId }), chatType),
+    resolveReplyToMode: ({ cfg, accountId }) =>
+      resolveSlackAccount({ cfg, accountId }).replyToMode ?? "off",
    allowTagsWhenOff: true,
    buildToolContext: (params) => buildSlackThreadingToolContext(params),
  },
@@ -111,7 +111,7 @@
    "format:swift": "swiftformat --lint --config .swiftformat apps/macos/Sources apps/ios/Sources apps/shared/ClawdbotKit/Sources",
    "format:all": "pnpm format && pnpm format:swift",
    "format:fix": "oxfmt --write src test",
-    "test": "node scripts/test-parallel.mjs",
+    "test": "vitest run",
    "test:watch": "vitest",
    "test:ui": "pnpm --dir ui test",
    "test:force": "node --import tsx scripts/test-force.ts",
@@ -46,7 +46,7 @@ TRASH
    local needle="$1"
    local timeout_s="${2:-45}"
    local needle_compact
-    needle_compact="$(printf "%s" "$needle" | tr -cd "[:alnum:]")"
+    needle_compact="$(printf "%s" "$needle" | sed -E "s/[[:space:]]+//g")"
    local start_s
    start_s="$(date +%s)"
    while true; do
@@ -61,12 +61,17 @@ TRASH
          let text = \"\";
          try { text = fs.readFileSync(file, \"utf8\"); } catch { process.exit(1); }
          if (text.length > 20000) text = text.slice(-20000);
-          const stripAnsi = (value) => value.replace(/\\x1b\\[[0-9;]*[A-Za-z]/g, \"\");
-          const compact = (value) => stripAnsi(value).toLowerCase().replace(/[^a-z0-9]+/g, \"\");
-          const haystack = compact(text);
-          const compactNeedle = compact(needle);
-          if (!compactNeedle) process.exit(1);
-          process.exit(haystack.includes(compactNeedle) ? 0 : 1);
+          const sanitize = (value) => value.replace(/[\\x00-\\x1f\\x7f]/g, \"\");
+          const haystack = sanitize(text);
+          const safeNeedle = sanitize(needle);
+          const needsEscape = new Set([\"\\\\\", \"^\", \"$\", \".\", \"*\", \"+\", \"?\", \"(\", \")\", \"[\", \"]\", \"{\", \"}\", \"|\"]);
+          let escaped = \"\";
+          for (const ch of safeNeedle) {
+            escaped += needsEscape.has(ch) ? \"\\\\\" + ch : ch;
+          }
+          const pattern = escaped.split(\"\").join(\".*\");
+          const re = new RegExp(pattern, \"i\");
+          process.exit(re.test(haystack) ? 0 : 1);
        "; then
          return 0
        fi
@@ -255,11 +260,9 @@ TRASH

  send_skills_flow() {
    # Select skills section and skip optional installs.
-    wait_for_log "Where will the Gateway run?" 60 || true
-    send $'"'"'\r'"'"' 0.6
+    send $'"'"'\r'"'"' 1.2
    # Configure skills now? -> No
-    wait_for_log "Configure skills now?" 60 || true
-    send $'"'"'n\r'"'"' 0.8
+    send $'"'"'n\r'"'"' 1.5
    send "" 1.0
  }

@@ -1,43 +0,0 @@
-import { spawn } from "node:child_process";
-
-const pnpm = process.platform === "win32" ? "pnpm.cmd" : "pnpm";
-
-const runs = [
-  {
-    name: "unit",
-    args: ["vitest", "run", "--config", "vitest.unit.config.ts"],
-  },
-  {
-    name: "gateway",
-    args: ["vitest", "run", "--config", "vitest.gateway.config.ts"],
-  },
-];
-
-const children = new Set();
-
-const run = (entry) =>
-  new Promise((resolve) => {
-    const child = spawn(pnpm, entry.args, {
-      stdio: "inherit",
-      env: { ...process.env, VITEST_GROUP: entry.name },
-      shell: process.platform === "win32",
-    });
-    children.add(child);
-    child.on("exit", (code, signal) => {
-      children.delete(child);
-      resolve(code ?? (signal ? 1 : 0));
-    });
-  });
-
-const shutdown = (signal) => {
-  for (const child of children) {
-    child.kill(signal);
-  }
-};
-
-process.on("SIGINT", () => shutdown("SIGINT"));
-process.on("SIGTERM", () => shutdown("SIGTERM"));
-
-const codes = await Promise.all(runs.map(run));
-const failed = codes.find((code) => code !== 0);
-process.exit(failed ?? 0);
@@ -0,0 +1,70 @@
+import fs from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+
+import { afterEach, describe, expect, it, vi } from "vitest";
+import {
+  type AuthProfileStore,
+  ensureAuthProfileStore,
+  resolveApiKeyForProfile,
+} from "./auth-profiles.js";
+
+vi.mock("@mariozechner/pi-ai", () => ({
+  getOAuthApiKey: vi.fn(() => {
+    throw new Error("refresh should not be called");
+  }),
+}));
+
+describe("auth-profiles (github-copilot)", () => {
+  const previousStateDir = process.env.CLAWDBOT_STATE_DIR;
+  const previousAgentDir = process.env.CLAWDBOT_AGENT_DIR;
+  const previousPiAgentDir = process.env.PI_CODING_AGENT_DIR;
+  let tempDir: string | null = null;
+
+  afterEach(async () => {
+    vi.unstubAllGlobals();
+    if (tempDir) {
+      await fs.rm(tempDir, { recursive: true, force: true });
+      tempDir = null;
+    }
+    if (previousStateDir === undefined) delete process.env.CLAWDBOT_STATE_DIR;
+    else process.env.CLAWDBOT_STATE_DIR = previousStateDir;
+    if (previousAgentDir === undefined) delete process.env.CLAWDBOT_AGENT_DIR;
+    else process.env.CLAWDBOT_AGENT_DIR = previousAgentDir;
+    if (previousPiAgentDir === undefined) delete process.env.PI_CODING_AGENT_DIR;
+    else process.env.PI_CODING_AGENT_DIR = previousPiAgentDir;
+  });
+
+  it("treats copilot oauth tokens with expires=0 as non-expiring", async () => {
+    tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-copilot-"));
+    process.env.CLAWDBOT_STATE_DIR = tempDir;
+    process.env.CLAWDBOT_AGENT_DIR = path.join(tempDir, "agents", "main", "agent");
+    process.env.PI_CODING_AGENT_DIR = process.env.CLAWDBOT_AGENT_DIR;
+
+    const authProfilePath = path.join(tempDir, "agents", "main", "agent", "auth-profiles.json");
+    await fs.mkdir(path.dirname(authProfilePath), { recursive: true });
+
+    const store: AuthProfileStore = {
+      version: 1,
+      profiles: {
+        "github-copilot:github": {
+          type: "oauth",
+          provider: "github-copilot",
+          refresh: "gh-token",
+          access: "gh-token",
+          expires: 0,
+          enterpriseUrl: "company.ghe.com",
+        },
+      },
+    };
+    await fs.writeFile(authProfilePath, `${JSON.stringify(store)}\n`);
+
+    const loaded = ensureAuthProfileStore();
+    const resolved = await resolveApiKeyForProfile({
+      store: loaded,
+      profileId: "github-copilot:github",
+    });
+
+    expect(resolved?.apiKey).toBe("gh-token");
+  });
+});
@@ -39,6 +39,15 @@ async function refreshOAuthTokenWithLock(params: {
    const cred = store.profiles[params.profileId];
    if (!cred || cred.type !== "oauth") return null;

+    if (
+      cred.provider === "github-copilot" &&
+      (!Number.isFinite(cred.expires) || cred.expires <= 0)
+    ) {
+      return {
+        apiKey: buildOAuthApiKey(cred.provider, cred),
+        newCredentials: cred,
+      };
+    }
    if (Date.now() < cred.expires) {
      return {
        apiKey: buildOAuthApiKey(cred.provider, cred),
@@ -103,6 +112,20 @@ async function tryResolveOAuthProfile(params: {
  if (profileConfig && profileConfig.provider !== cred.provider) return null;
  if (profileConfig && profileConfig.mode !== cred.type) return null;

+  if (cred.provider === "github-copilot" && (!Number.isFinite(cred.expires) || cred.expires <= 0)) {
+    return {
+      apiKey: buildOAuthApiKey(cred.provider, cred),
+      provider: cred.provider,
+      email: cred.email,
+    };
+  }
+  if (cred.provider === "github-copilot" && (!Number.isFinite(cred.expires) || cred.expires <= 0)) {
+    return {
+      apiKey: buildOAuthApiKey(cred.provider, cred),
+      provider: cred.provider,
+      email: cred.email,
+    };
+  }
  if (Date.now() < cred.expires) {
    return {
      apiKey: buildOAuthApiKey(cred.provider, cred),
@@ -19,6 +19,7 @@ export type TokenCredential = {
  token: string;
  /** Optional expiry timestamp (ms since epoch). */
  expires?: number;
+  enterpriseUrl?: string;
  email?: string;
 };

@@ -1,31 +0,0 @@
-import { afterEach, expect, test, vi } from "vitest";
-
-import { resetProcessRegistryForTests } from "./bash-process-registry";
-
-afterEach(() => {
-  resetProcessRegistryForTests();
-  vi.resetModules();
-  vi.clearAllMocks();
-});
-
-test("exec falls back when PTY spawn fails", async () => {
-  vi.doMock("@lydell/node-pty", () => ({
-    spawn: () => {
-      const err = new Error("spawn EBADF");
-      (err as NodeJS.ErrnoException).code = "EBADF";
-      throw err;
-    },
-  }));
-
-  const { createExecTool } = await import("./bash-tools.exec");
-  const tool = createExecTool({ allowBackground: false });
-  const result = await tool.execute("toolcall", {
-    command: "printf ok",
-    pty: true,
-  });
-
-  expect(result.details.status).toBe("completed");
-  const text = result.content?.[0]?.text ?? "";
-  expect(text).toContain("ok");
-  expect(text).toContain("PTY spawn failed");
-});
@@ -26,7 +26,7 @@ import {
  resolveShellEnvFallbackTimeoutMs,
 } from "../infra/shell-env.js";
 import { enqueueSystemEvent } from "../infra/system-events.js";
-import { logInfo, logWarn } from "../logger.js";
+import { logInfo } from "../logger.js";
 import {
  type ProcessSession,
  type SessionStdin,
@@ -381,56 +381,41 @@ async function runExecProcess(opts: {
    ) as ChildProcessWithoutNullStreams;
    stdin = child.stdin;
  } else if (opts.usePty) {
-    const { shell, args: shellArgs } = getShellConfig();
-    try {
-      const ptyModule = (await import("@lydell/node-pty")) as unknown as {
-        spawn?: PtySpawn;
-        default?: { spawn?: PtySpawn };
-      };
-      const spawnPty = ptyModule.spawn ?? ptyModule.default?.spawn;
-      if (!spawnPty) {
-        throw new Error("PTY support is unavailable (node-pty spawn not found).");
-      }
-      pty = spawnPty(shell, [...shellArgs, opts.command], {
-        cwd: opts.workdir,
-        env: opts.env,
-        name: process.env.TERM ?? "xterm-256color",
-        cols: 120,
-        rows: 30,
-      });
-      stdin = {
-        destroyed: false,
-        write: (data, cb) => {
-          try {
-            pty?.write(data);
-            cb?.(null);
-          } catch (err) {
-            cb?.(err as Error);
-          }
-        },
-        end: () => {
-          try {
-            const eof = process.platform === "win32" ? "\x1a" : "\x04";
-            pty?.write(eof);
-          } catch {
-            // ignore EOF errors
-          }
-        },
-      };
-    } catch (err) {
-      const errText = String(err);
-      const warning = `Warning: PTY spawn failed (${errText}); retrying without PTY for \`${opts.command}\`.`;
-      logWarn(`exec: PTY spawn failed (${errText}); retrying without PTY for "${opts.command}".`);
-      opts.warnings.push(warning);
-      child = spawn(shell, [...shellArgs, opts.command], {
-        cwd: opts.workdir,
-        env: opts.env,
-        detached: process.platform !== "win32",
-        stdio: ["pipe", "pipe", "pipe"],
-        windowsHide: true,
-      }) as ChildProcessWithoutNullStreams;
-      stdin = child.stdin;
+    const ptyModule = (await import("@lydell/node-pty")) as unknown as {
+      spawn?: PtySpawn;
+      default?: { spawn?: PtySpawn };
+    };
+    const spawnPty = ptyModule.spawn ?? ptyModule.default?.spawn;
+    if (!spawnPty) {
+      throw new Error("PTY support is unavailable (node-pty spawn not found).");
    }
+    const { shell, args: shellArgs } = getShellConfig();
+    pty = spawnPty(shell, [...shellArgs, opts.command], {
+      cwd: opts.workdir,
+      env: opts.env,
+      name: process.env.TERM ?? "xterm-256color",
+      cols: 120,
+      rows: 30,
+    });
+    stdin = {
+      destroyed: false,
+      write: (data, cb) => {
+        try {
+          pty?.write(data);
+          cb?.(null);
+        } catch (err) {
+          cb?.(err as Error);
+        }
+      },
+      end: () => {
+        try {
+          const eof = process.platform === "win32" ? "\x1a" : "\x04";
+          pty?.write(eof);
+        } catch {
+          // ignore EOF errors
+        }
+      },
+    };
  } else {
    const { shell, args: shellArgs } = getShellConfig();
    child = spawn(shell, [...shellArgs, opts.command], {
@@ -1335,7 +1320,7 @@ export function createExecTool(

      const effectiveTimeout =
        typeof params.timeout === "number" ? params.timeout : defaultTimeoutSec;
-      const getWarningText = () => (warnings.length ? `${warnings.join("\n")}\n\n` : "");
+      const warningText = warnings.length ? `${warnings.join("\n")}\n\n` : "";
      const usePty = params.pty === true && !sandbox;
      const run = await runExecProcess({
        command: params.command,
@@ -1375,7 +1360,7 @@ export function createExecTool(
              {
                type: "text",
                text:
-                  `${getWarningText()}` +
+                  `${warningText}` +
                  `Command still running (session ${run.session.id}, pid ${
                    run.session.pid ?? "n/a"
                  }). ` +
@@ -1425,7 +1410,7 @@ export function createExecTool(
              content: [
                {
                  type: "text",
-                  text: `${getWarningText()}${outcome.aggregated || "(no output)"}`,
+                  text: `${warningText}${outcome.aggregated || "(no output)"}`,
                },
              ],
              details: {
@@ -0,0 +1,235 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+const callGatewayMock = vi.fn();
+vi.mock("../gateway/call.js", () => ({
+  callGateway: (opts: unknown) => callGatewayMock(opts),
+}));
+
+let configOverride: ReturnType<(typeof import("../config/config.js"))["loadConfig"]> = {
+  session: {
+    mainKey: "main",
+    scope: "per-sender",
+  },
+};
+
+vi.mock("../config/config.js", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("../config/config.js")>();
+  return {
+    ...actual,
+    loadConfig: () => configOverride,
+    resolveGatewayPort: () => 18789,
+  };
+});
+
+import { emitAgentEvent } from "../infra/agent-events.js";
+import { createClawdbotTools } from "./clawdbot-tools.js";
+import { resetSubagentRegistryForTests } from "./subagent-registry.js";
+
+describe("clawdbot-tools: subagents", () => {
+  beforeEach(() => {
+    configOverride = {
+      session: {
+        mainKey: "main",
+        scope: "per-sender",
+      },
+    };
+  });
+
+  it("sessions_spawn runs cleanup via lifecycle events", async () => {
+    resetSubagentRegistryForTests();
+    callGatewayMock.mockReset();
+    const calls: Array<{ method?: string; params?: unknown }> = [];
+    let agentCallCount = 0;
+    let deletedKey: string | undefined;
+    let childRunId: string | undefined;
+    let childSessionKey: string | undefined;
+    const waitCalls: Array<{ runId?: string; timeoutMs?: number }> = [];
+
+    callGatewayMock.mockImplementation(async (opts: unknown) => {
+      const request = opts as { method?: string; params?: unknown };
+      calls.push(request);
+      if (request.method === "agent") {
+        agentCallCount += 1;
+        const runId = `run-${agentCallCount}`;
+        const params = request.params as {
+          message?: string;
+          sessionKey?: string;
+          channel?: string;
+          timeout?: number;
+          lane?: string;
+        };
+        // Only capture the first agent call (subagent spawn, not main agent trigger)
+        if (params?.lane === "subagent") {
+          childRunId = runId;
+          childSessionKey = params?.sessionKey ?? "";
+          expect(params?.channel).toBe("discord");
+          expect(params?.timeout).toBe(1);
+        }
+        return {
+          runId,
+          status: "accepted",
+          acceptedAt: 1000 + agentCallCount,
+        };
+      }
+      if (request.method === "agent.wait") {
+        const params = request.params as { runId?: string; timeoutMs?: number } | undefined;
+        waitCalls.push(params ?? {});
+        // Return "ok" with timing info for the child run
+        return { runId: params?.runId ?? "run-1", status: "ok", startedAt: 1000, endedAt: 2000 };
+      }
+      if (request.method === "sessions.delete") {
+        const params = request.params as { key?: string } | undefined;
+        deletedKey = params?.key;
+        return { ok: true };
+      }
+      return {};
+    });
+
+    const tool = createClawdbotTools({
+      agentSessionKey: "discord:group:req",
+      agentChannel: "discord",
+    }).find((candidate) => candidate.name === "sessions_spawn");
+    if (!tool) throw new Error("missing sessions_spawn tool");
+
+    const result = await tool.execute("call1", {
+      task: "do thing",
+      runTimeoutSeconds: 1,
+      cleanup: "delete",
+    });
+    expect(result.details).toMatchObject({
+      status: "accepted",
+      runId: "run-1",
+    });
+
+    if (!childRunId) throw new Error("missing child runId");
+    emitAgentEvent({
+      runId: childRunId,
+      stream: "lifecycle",
+      data: {
+        phase: "end",
+        startedAt: 1234,
+        endedAt: 2345,
+      },
+    });
+
+    await new Promise((resolve) => setTimeout(resolve, 0));
+    await new Promise((resolve) => setTimeout(resolve, 0));
+    await new Promise((resolve) => setTimeout(resolve, 0));
+
+    const childWait = waitCalls.find((call) => call.runId === childRunId);
+    expect(childWait?.timeoutMs).toBe(1000);
+
+    // Two agent calls: subagent spawn + main agent trigger
+    const agentCalls = calls.filter((call) => call.method === "agent");
+    expect(agentCalls).toHaveLength(2);
+
+    // First call: subagent spawn
+    const first = agentCalls[0]?.params as
+      | {
+          lane?: string;
+          deliver?: boolean;
+          sessionKey?: string;
+          channel?: string;
+        }
+      | undefined;
+    expect(first?.lane).toBe("subagent");
+    expect(first?.deliver).toBe(false);
+    expect(first?.channel).toBe("discord");
+    expect(first?.sessionKey?.startsWith("agent:main:subagent:")).toBe(true);
+    expect(childSessionKey?.startsWith("agent:main:subagent:")).toBe(true);
+
+    // Second call: main agent trigger with announce message
+    const second = agentCalls[1]?.params as
+      | {
+          sessionKey?: string;
+          message?: string;
+          deliver?: boolean;
+        }
+      | undefined;
+    expect(second?.sessionKey).toBe("discord:group:req");
+    expect(second?.deliver).toBe(true);
+    expect(second?.message).toContain("background task");
+
+    // No direct send to external channel (main agent handles delivery)
+    const sendCalls = calls.filter((c) => c.method === "send");
+    expect(sendCalls.length).toBe(0);
+
+    // Session should be deleted since cleanup=delete
+    expect(deletedKey?.startsWith("agent:main:subagent:")).toBe(true);
+  });
+
+  it("sessions_spawn announces with requester accountId", async () => {
+    resetSubagentRegistryForTests();
+    callGatewayMock.mockReset();
+    const calls: Array<{ method?: string; params?: unknown }> = [];
+    let agentCallCount = 0;
+    let childRunId: string | undefined;
+
+    callGatewayMock.mockImplementation(async (opts: unknown) => {
+      const request = opts as { method?: string; params?: unknown };
+      calls.push(request);
+      if (request.method === "agent") {
+        agentCallCount += 1;
+        const runId = `run-${agentCallCount}`;
+        const params = request.params as { lane?: string; sessionKey?: string } | undefined;
+        if (params?.lane === "subagent") {
+          childRunId = runId;
+        }
+        return {
+          runId,
+          status: "accepted",
+          acceptedAt: 4000 + agentCallCount,
+        };
+      }
+      if (request.method === "agent.wait") {
+        const params = request.params as { runId?: string; timeoutMs?: number } | undefined;
+        return { runId: params?.runId ?? "run-1", status: "ok", startedAt: 1000, endedAt: 2000 };
+      }
+      if (request.method === "sessions.delete" || request.method === "sessions.patch") {
+        return { ok: true };
+      }
+      return {};
+    });
+
+    const tool = createClawdbotTools({
+      agentSessionKey: "main",
+      agentChannel: "whatsapp",
+      agentAccountId: "kev",
+    }).find((candidate) => candidate.name === "sessions_spawn");
+    if (!tool) throw new Error("missing sessions_spawn tool");
+
+    const result = await tool.execute("call2", {
+      task: "do thing",
+      runTimeoutSeconds: 1,
+      cleanup: "keep",
+    });
+    expect(result.details).toMatchObject({
+      status: "accepted",
+      runId: "run-1",
+    });
+
+    if (!childRunId) throw new Error("missing child runId");
+    emitAgentEvent({
+      runId: childRunId,
+      stream: "lifecycle",
+      data: {
+        phase: "end",
+        startedAt: 1000,
+        endedAt: 2000,
+      },
+    });
+
+    await new Promise((resolve) => setTimeout(resolve, 0));
+    await new Promise((resolve) => setTimeout(resolve, 0));
+    await new Promise((resolve) => setTimeout(resolve, 0));
+
+    const agentCalls = calls.filter((call) => call.method === "agent");
+    expect(agentCalls).toHaveLength(2);
+    const announceParams = agentCalls[1]?.params as
+      | { accountId?: string; channel?: string; deliver?: boolean }
+      | undefined;
+    expect(announceParams?.deliver).toBe(true);
+    expect(announceParams?.channel).toBe("whatsapp");
+    expect(announceParams?.accountId).toBe("kev");
+  });
+});
@@ -21,7 +21,6 @@ vi.mock("../config/config.js", async (importOriginal) => {
  };
 });

-import { emitAgentEvent } from "../infra/agent-events.js";
 import { createClawdbotTools } from "./clawdbot-tools.js";
 import { resetSubagentRegistryForTests } from "./subagent-registry.js";

@@ -121,195 +120,4 @@ describe("clawdbot-tools: subagents", () => {
    });
    expect(callGatewayMock).not.toHaveBeenCalled();
  });
-
-  it("sessions_spawn runs cleanup via lifecycle events", async () => {
-    resetSubagentRegistryForTests();
-    callGatewayMock.mockReset();
-    const calls: Array<{ method?: string; params?: unknown }> = [];
-    let agentCallCount = 0;
-    let deletedKey: string | undefined;
-    let childRunId: string | undefined;
-    let childSessionKey: string | undefined;
-    const waitCalls: Array<{ runId?: string; timeoutMs?: number }> = [];
-
-    callGatewayMock.mockImplementation(async (opts: unknown) => {
-      const request = opts as { method?: string; params?: unknown };
-      calls.push(request);
-      if (request.method === "agent") {
-        agentCallCount += 1;
-        const runId = `run-${agentCallCount}`;
-        const params = request.params as {
-          message?: string;
-          sessionKey?: string;
-          channel?: string;
-          timeout?: number;
-          lane?: string;
-        };
-        if (params?.lane === "subagent") {
-          childRunId = runId;
-          childSessionKey = params?.sessionKey ?? "";
-          expect(params?.channel).toBe("discord");
-          expect(params?.timeout).toBe(1);
-        }
-        return {
-          runId,
-          status: "accepted",
-          acceptedAt: 1000 + agentCallCount,
-        };
-      }
-      if (request.method === "agent.wait") {
-        const params = request.params as { runId?: string; timeoutMs?: number } | undefined;
-        waitCalls.push(params ?? {});
-        return { runId: params?.runId ?? "run-1", status: "ok", startedAt: 1000, endedAt: 2000 };
-      }
-      if (request.method === "sessions.delete") {
-        const params = request.params as { key?: string } | undefined;
-        deletedKey = params?.key;
-        return { ok: true };
-      }
-      return {};
-    });
-
-    const tool = createClawdbotTools({
-      agentSessionKey: "discord:group:req",
-      agentChannel: "discord",
-    }).find((candidate) => candidate.name === "sessions_spawn");
-    if (!tool) throw new Error("missing sessions_spawn tool");
-
-    const result = await tool.execute("call1", {
-      task: "do thing",
-      runTimeoutSeconds: 1,
-      cleanup: "delete",
-    });
-    expect(result.details).toMatchObject({
-      status: "accepted",
-      runId: "run-1",
-    });
-
-    if (!childRunId) throw new Error("missing child runId");
-    emitAgentEvent({
-      runId: childRunId,
-      stream: "lifecycle",
-      data: {
-        phase: "end",
-        startedAt: 1234,
-        endedAt: 2345,
-      },
-    });
-
-    await new Promise((resolve) => setTimeout(resolve, 0));
-    await new Promise((resolve) => setTimeout(resolve, 0));
-    await new Promise((resolve) => setTimeout(resolve, 0));
-
-    const childWait = waitCalls.find((call) => call.runId === childRunId);
-    expect(childWait?.timeoutMs).toBe(1000);
-
-    const agentCalls = calls.filter((call) => call.method === "agent");
-    expect(agentCalls).toHaveLength(2);
-
-    const first = agentCalls[0]?.params as
-      | {
-          lane?: string;
-          deliver?: boolean;
-          sessionKey?: string;
-          channel?: string;
-        }
-      | undefined;
-    expect(first?.lane).toBe("subagent");
-    expect(first?.deliver).toBe(false);
-    expect(first?.channel).toBe("discord");
-    expect(first?.sessionKey?.startsWith("agent:main:subagent:")).toBe(true);
-    expect(childSessionKey?.startsWith("agent:main:subagent:")).toBe(true);
-
-    const second = agentCalls[1]?.params as
-      | {
-          sessionKey?: string;
-          message?: string;
-          deliver?: boolean;
-        }
-      | undefined;
-    expect(second?.sessionKey).toBe("discord:group:req");
-    expect(second?.deliver).toBe(true);
-    expect(second?.message).toContain("background task");
-
-    const sendCalls = calls.filter((c) => c.method === "send");
-    expect(sendCalls.length).toBe(0);
-
-    expect(deletedKey?.startsWith("agent:main:subagent:")).toBe(true);
-  });
-
-  it("sessions_spawn announces with requester accountId", async () => {
-    resetSubagentRegistryForTests();
-    callGatewayMock.mockReset();
-    const calls: Array<{ method?: string; params?: unknown }> = [];
-    let agentCallCount = 0;
-    let childRunId: string | undefined;
-
-    callGatewayMock.mockImplementation(async (opts: unknown) => {
-      const request = opts as { method?: string; params?: unknown };
-      calls.push(request);
-      if (request.method === "agent") {
-        agentCallCount += 1;
-        const runId = `run-${agentCallCount}`;
-        const params = request.params as { lane?: string; sessionKey?: string } | undefined;
-        if (params?.lane === "subagent") {
-          childRunId = runId;
-        }
-        return {
-          runId,
-          status: "accepted",
-          acceptedAt: 4000 + agentCallCount,
-        };
-      }
-      if (request.method === "agent.wait") {
-        const params = request.params as { runId?: string; timeoutMs?: number } | undefined;
-        return { runId: params?.runId ?? "run-1", status: "ok", startedAt: 1000, endedAt: 2000 };
-      }
-      if (request.method === "sessions.delete" || request.method === "sessions.patch") {
-        return { ok: true };
-      }
-      return {};
-    });
-
-    const tool = createClawdbotTools({
-      agentSessionKey: "main",
-      agentChannel: "whatsapp",
-      agentAccountId: "kev",
-    }).find((candidate) => candidate.name === "sessions_spawn");
-    if (!tool) throw new Error("missing sessions_spawn tool");
-
-    const result = await tool.execute("call2", {
-      task: "do thing",
-      runTimeoutSeconds: 1,
-      cleanup: "keep",
-    });
-    expect(result.details).toMatchObject({
-      status: "accepted",
-      runId: "run-1",
-    });
-
-    if (!childRunId) throw new Error("missing child runId");
-    emitAgentEvent({
-      runId: childRunId,
-      stream: "lifecycle",
-      data: {
-        phase: "end",
-        startedAt: 1000,
-        endedAt: 2000,
-      },
-    });
-
-    await new Promise((resolve) => setTimeout(resolve, 0));
-    await new Promise((resolve) => setTimeout(resolve, 0));
-    await new Promise((resolve) => setTimeout(resolve, 0));
-
-    const agentCalls = calls.filter((call) => call.method === "agent");
-    expect(agentCalls).toHaveLength(2);
-    const announceParams = agentCalls[1]?.params as
-      | { accountId?: string; channel?: string; deliver?: boolean }
-      | undefined;
-    expect(announceParams?.deliver).toBe(true);
-    expect(announceParams?.channel).toBe("whatsapp");
-    expect(announceParams?.accountId).toBe("kev");
-  });
 });
@@ -3,6 +3,7 @@ import path from "node:path";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { withTempHome as withTempHomeBase } from "../../test/helpers/temp-home.js";
 import type { ClawdbotConfig } from "../config/config.js";
+import { DEFAULT_GITHUB_COPILOT_BASE_URL } from "../providers/github-copilot-utils.js";

 async function withTempHome<T>(fn: (home: string) => Promise<T>): Promise<T> {
  return withTempHomeBase(fn, { prefix: "clawdbot-models-" });
@@ -51,16 +52,6 @@ describe("models-config", () => {
      try {
        vi.resetModules();

-        vi.doMock("../providers/github-copilot-token.js", () => ({
-          DEFAULT_COPILOT_API_BASE_URL: "https://api.individual.githubcopilot.com",
-          resolveCopilotApiToken: vi.fn().mockResolvedValue({
-            token: "copilot",
-            expiresAt: Date.now() + 60 * 60 * 1000,
-            source: "mock",
-            baseUrl: "https://api.copilot.example",
-          }),
-        }));
-
        const { ensureClawdbotModelsJson } = await import("./models-config.js");

        const agentDir = path.join(home, "agent-default-base-url");
@@ -71,48 +62,55 @@ describe("models-config", () => {
          providers: Record<string, { baseUrl?: string; models?: unknown[] }>;
        };

-        expect(parsed.providers["github-copilot"]?.baseUrl).toBe("https://api.copilot.example");
+        expect(parsed.providers["github-copilot"]?.baseUrl).toBe(DEFAULT_GITHUB_COPILOT_BASE_URL);
        expect(parsed.providers["github-copilot"]?.models?.length ?? 0).toBe(0);
      } finally {
        process.env.COPILOT_GITHUB_TOKEN = previous;
      }
    });
  });
-  it("prefers COPILOT_GITHUB_TOKEN over GH_TOKEN and GITHUB_TOKEN", async () => {
+  it("uses enterprise URL from auth profiles to derive base URL", async () => {
    await withTempHome(async () => {
-      const previous = process.env.COPILOT_GITHUB_TOKEN;
-      const previousGh = process.env.GH_TOKEN;
-      const previousGithub = process.env.GITHUB_TOKEN;
-      process.env.COPILOT_GITHUB_TOKEN = "copilot-token";
-      process.env.GH_TOKEN = "gh-token";
-      process.env.GITHUB_TOKEN = "github-token";
-
      try {
        vi.resetModules();

-        const resolveCopilotApiToken = vi.fn().mockResolvedValue({
-          token: "copilot",
-          expiresAt: Date.now() + 60 * 60 * 1000,
-          source: "mock",
-          baseUrl: "https://api.copilot.example",
-        });
-
-        vi.doMock("../providers/github-copilot-token.js", () => ({
-          DEFAULT_COPILOT_API_BASE_URL: "https://api.individual.githubcopilot.com",
-          resolveCopilotApiToken,
-        }));
+        const agentDir = path.join(process.env.HOME ?? home, "agent-enterprise");
+        await fs.mkdir(agentDir, { recursive: true });
+        await fs.writeFile(
+          path.join(agentDir, "auth-profiles.json"),
+          JSON.stringify(
+            {
+              version: 1,
+              profiles: {
+                "github-copilot:github": {
+                  type: "oauth",
+                  provider: "github-copilot",
+                  refresh: "gh-token",
+                  access: "gh-token",
+                  expires: 0,
+                  enterpriseUrl: "company.ghe.com",
+                },
+              },
+            },
+            null,
+            2,
+          ),
+        );

        const { ensureClawdbotModelsJson } = await import("./models-config.js");

-        await ensureClawdbotModelsJson({ models: { providers: {} } });
+        await ensureClawdbotModelsJson({ models: { providers: {} } }, agentDir);

-        expect(resolveCopilotApiToken).toHaveBeenCalledWith(
-          expect.objectContaining({ githubToken: "copilot-token" }),
+        const raw = await fs.readFile(path.join(agentDir, "models.json"), "utf8");
+        const parsed = JSON.parse(raw) as {
+          providers: Record<string, { baseUrl?: string }>;
+        };
+
+        expect(parsed.providers["github-copilot"]?.baseUrl).toBe(
+          "https://copilot-api.company.ghe.com",
        );
      } finally {
-        process.env.COPILOT_GITHUB_TOKEN = previous;
-        process.env.GH_TOKEN = previousGh;
-        process.env.GITHUB_TOKEN = previousGithub;
+        // no-op
      }
    });
  });
@@ -3,6 +3,7 @@ import path from "node:path";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { withTempHome as withTempHomeBase } from "../../test/helpers/temp-home.js";
 import type { ClawdbotConfig } from "../config/config.js";
+import { DEFAULT_GITHUB_COPILOT_BASE_URL } from "../providers/github-copilot-utils.js";

 async function withTempHome<T>(fn: (home: string) => Promise<T>): Promise<T> {
  return withTempHomeBase(fn, { prefix: "clawdbot-models-" });
@@ -43,7 +44,7 @@ describe("models-config", () => {
    process.env.HOME = previousHome;
  });

-  it("falls back to default baseUrl when token exchange fails", async () => {
+  it("uses default baseUrl when env token is present", async () => {
    await withTempHome(async () => {
      const previous = process.env.COPILOT_GITHUB_TOKEN;
      process.env.COPILOT_GITHUB_TOKEN = "gh-token";
@@ -51,11 +52,6 @@ describe("models-config", () => {
      try {
        vi.resetModules();

-        vi.doMock("../providers/github-copilot-token.js", () => ({
-          DEFAULT_COPILOT_API_BASE_URL: "https://api.default.test",
-          resolveCopilotApiToken: vi.fn().mockRejectedValue(new Error("boom")),
-        }));
-
        const { ensureClawdbotModelsJson } = await import("./models-config.js");
        const { resolveClawdbotAgentDir } = await import("./agent-paths.js");

@@ -67,13 +63,13 @@ describe("models-config", () => {
          providers: Record<string, { baseUrl?: string }>;
        };

-        expect(parsed.providers["github-copilot"]?.baseUrl).toBe("https://api.default.test");
+        expect(parsed.providers["github-copilot"]?.baseUrl).toBe(DEFAULT_GITHUB_COPILOT_BASE_URL);
      } finally {
        process.env.COPILOT_GITHUB_TOKEN = previous;
      }
    });
  });
-  it("uses agentDir override auth profiles for copilot injection", async () => {
+  it("normalizes enterprise URL when deriving base URL", async () => {
    await withTempHome(async (home) => {
      const previous = process.env.COPILOT_GITHUB_TOKEN;
      const previousGh = process.env.GH_TOKEN;
@@ -94,9 +90,12 @@ describe("models-config", () => {
              version: 1,
              profiles: {
                "github-copilot:github": {
-                  type: "token",
+                  type: "oauth",
                  provider: "github-copilot",
-                  token: "gh-profile-token",
+                  refresh: "gh-profile-token",
+                  access: "gh-profile-token",
+                  expires: 0,
+                  enterpriseUrl: "https://company.ghe.com/",
                },
              },
            },
@@ -105,16 +104,6 @@ describe("models-config", () => {
          ),
        );

-        vi.doMock("../providers/github-copilot-token.js", () => ({
-          DEFAULT_COPILOT_API_BASE_URL: "https://api.individual.githubcopilot.com",
-          resolveCopilotApiToken: vi.fn().mockResolvedValue({
-            token: "copilot",
-            expiresAt: Date.now() + 60 * 60 * 1000,
-            source: "mock",
-            baseUrl: "https://api.copilot.example",
-          }),
-        }));
-
        const { ensureClawdbotModelsJson } = await import("./models-config.js");

        await ensureClawdbotModelsJson({ models: { providers: {} } }, agentDir);
@@ -124,7 +113,9 @@ describe("models-config", () => {
          providers: Record<string, { baseUrl?: string }>;
        };

-        expect(parsed.providers["github-copilot"]?.baseUrl).toBe("https://api.copilot.example");
+        expect(parsed.providers["github-copilot"]?.baseUrl).toBe(
+          "https://copilot-api.company.ghe.com",
+        );
      } finally {
        if (previous === undefined) delete process.env.COPILOT_GITHUB_TOKEN;
        else process.env.COPILOT_GITHUB_TOKEN = previous;
@@ -1,8 +1,8 @@
 import type { ClawdbotConfig } from "../config/config.js";
 import {
-  DEFAULT_COPILOT_API_BASE_URL,
-  resolveCopilotApiToken,
-} from "../providers/github-copilot-token.js";
+  normalizeGithubCopilotDomain,
+  resolveGithubCopilotBaseUrl,
+} from "../providers/github-copilot-utils.js";
 import { ensureAuthProfileStore, listProfilesForProvider } from "./auth-profiles.js";
 import { resolveAwsSdkEnvVarName, resolveEnvApiKey } from "./model-auth.js";
 import {
@@ -331,29 +331,18 @@ export async function resolveImplicitCopilotProvider(params: {

  if (!hasProfile && !githubToken) return null;

-  let selectedGithubToken = githubToken;
-  if (!selectedGithubToken && hasProfile) {
+  let enterpriseDomain: string | null = null;
+  if (hasProfile) {
    // Use the first available profile as a default for discovery (it will be
    // re-resolved per-run by the embedded runner).
    const profileId = listProfilesForProvider(authStore, "github-copilot")[0];
    const profile = profileId ? authStore.profiles[profileId] : undefined;
-    if (profile && profile.type === "token") {
-      selectedGithubToken = profile.token;
+    if (profile && "enterpriseUrl" in profile && typeof profile.enterpriseUrl === "string") {
+      enterpriseDomain = normalizeGithubCopilotDomain(profile.enterpriseUrl);
    }
  }

-  let baseUrl = DEFAULT_COPILOT_API_BASE_URL;
-  if (selectedGithubToken) {
-    try {
-      const token = await resolveCopilotApiToken({
-        githubToken: selectedGithubToken,
-        env,
-      });
-      baseUrl = token.baseUrl;
-    } catch {
-      baseUrl = DEFAULT_COPILOT_API_BASE_URL;
-    }
-  }
+  const baseUrl = resolveGithubCopilotBaseUrl(enterpriseDomain);

  // pi-coding-agent's ModelRegistry marks a model "available" only if its
  // `AuthStorage` has auth configured for that provider (via auth.json/env/etc).
@@ -364,7 +353,7 @@ export async function resolveImplicitCopilotProvider(params: {
  // GitHub token (not the exchanged Copilot token), and (3) matches existing
  // patterns for OAuth-like providers in pi-coding-agent.
  // Note: we deliberately do not write pi-coding-agent's `auth.json` here.
-  // Clawdbot uses its own auth store and exchanges tokens at runtime.
+  // Clawdbot uses its own auth store and passes the GitHub token at runtime.
  // `models list` uses Clawdbot's auth heuristics for availability.

  // We intentionally do NOT define custom models for Copilot in models.json.
@@ -3,6 +3,7 @@ import path from "node:path";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { withTempHome as withTempHomeBase } from "../../test/helpers/temp-home.js";
 import type { ClawdbotConfig } from "../config/config.js";
+import { DEFAULT_GITHUB_COPILOT_BASE_URL } from "../providers/github-copilot-utils.js";

 async function withTempHome<T>(fn: (home: string) => Promise<T>): Promise<T> {
  return withTempHomeBase(fn, { prefix: "clawdbot-models-" });
@@ -80,25 +81,16 @@ describe("models-config", () => {
          ),
        );

-        const resolveCopilotApiToken = vi.fn().mockResolvedValue({
-          token: "copilot",
-          expiresAt: Date.now() + 60 * 60 * 1000,
-          source: "mock",
-          baseUrl: "https://api.copilot.example",
-        });
-
-        vi.doMock("../providers/github-copilot-token.js", () => ({
-          DEFAULT_COPILOT_API_BASE_URL: "https://api.individual.githubcopilot.com",
-          resolveCopilotApiToken,
-        }));
-
        const { ensureClawdbotModelsJson } = await import("./models-config.js");

        await ensureClawdbotModelsJson({ models: { providers: {} } }, agentDir);

-        expect(resolveCopilotApiToken).toHaveBeenCalledWith(
-          expect.objectContaining({ githubToken: "alpha-token" }),
-        );
+        const raw = await fs.readFile(path.join(agentDir, "models.json"), "utf8");
+        const parsed = JSON.parse(raw) as {
+          providers: Record<string, { baseUrl?: string }>;
+        };
+
+        expect(parsed.providers["github-copilot"]?.baseUrl).toBe(DEFAULT_GITHUB_COPILOT_BASE_URL);
      } finally {
        if (previous === undefined) delete process.env.COPILOT_GITHUB_TOKEN;
        else process.env.COPILOT_GITHUB_TOKEN = previous;
@@ -117,16 +109,6 @@ describe("models-config", () => {
      try {
        vi.resetModules();

-        vi.doMock("../providers/github-copilot-token.js", () => ({
-          DEFAULT_COPILOT_API_BASE_URL: "https://api.individual.githubcopilot.com",
-          resolveCopilotApiToken: vi.fn().mockResolvedValue({
-            token: "copilot",
-            expiresAt: Date.now() + 60 * 60 * 1000,
-            source: "mock",
-            baseUrl: "https://api.copilot.example",
-          }),
-        }));
-
        const { ensureClawdbotModelsJson } = await import("./models-config.js");
        const { resolveClawdbotAgentDir } = await import("./agent-paths.js");

@@ -3,7 +3,7 @@ import os from "node:os";
 import path from "node:path";

 import type { AssistantMessage } from "@mariozechner/pi-ai";
-import { beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+import { beforeEach, describe, expect, it, vi } from "vitest";

 import type { ClawdbotConfig } from "../config/config.js";
 import type { EmbeddedRunAttemptResult } from "./pi-embedded-runner/run/types.js";
@@ -16,13 +16,11 @@ vi.mock("./pi-embedded-runner/run/attempt.js", () => ({

 let runEmbeddedPiAgent: typeof import("./pi-embedded-runner.js").runEmbeddedPiAgent;

-beforeAll(async () => {
-  ({ runEmbeddedPiAgent } = await import("./pi-embedded-runner.js"));
-});
-
-beforeEach(() => {
+beforeEach(async () => {
  vi.useRealTimers();
+  vi.resetModules();
  runEmbeddedAttemptMock.mockReset();
+  ({ runEmbeddedPiAgent } = await import("./pi-embedded-runner.js"));
 });

 const baseUsage = {
@@ -128,13 +128,6 @@ export async function compactEmbeddedPiSession(params: {
              `No API key resolved for provider "${model.provider}" (auth mode: ${apiKeyInfo.mode}).`,
            );
          }
-        } else if (model.provider === "github-copilot") {
-          const { resolveCopilotApiToken } =
-            await import("../../providers/github-copilot-token.js");
-          const copilotToken = await resolveCopilotApiToken({
-            githubToken: apiKeyInfo.apiKey,
-          });
-          authStorage.setRuntimeApiKey(model.provider, copilotToken.token);
        } else {
          authStorage.setRuntimeApiKey(model.provider, apiKeyInfo.apiKey);
        }
@@ -1,5 +1,3 @@
-import { EventEmitter } from "node:events";
-
 import type { AgentMessage, AgentTool } from "@mariozechner/pi-agent-core";
 import type { TSchema } from "@sinclair/typebox";
 import type { SessionManager } from "@mariozechner/pi-coding-agent";
@@ -186,28 +184,10 @@ export function logToolSchemasForGoogle(params: { tools: AgentTool[]; provider:
  }
 }

-// Event emitter for unhandled compaction failures that escape try-catch blocks.
-// Listeners can use this to trigger session recovery with retry.
-const compactionFailureEmitter = new EventEmitter();
-
-export type CompactionFailureListener = (reason: string) => void;
-
-/**
- * Register a listener for unhandled compaction failures.
- * Called when auto-compaction fails in a way that escapes the normal try-catch,
- * e.g., when the summarization request itself exceeds the model's token limit.
- * Returns an unsubscribe function.
- */
-export function onUnhandledCompactionFailure(cb: CompactionFailureListener): () => void {
-  compactionFailureEmitter.on("failure", cb);
-  return () => compactionFailureEmitter.off("failure", cb);
-}
-
 registerUnhandledRejectionHandler((reason) => {
  const message = describeUnknownError(reason);
  if (!isCompactionFailureError(message)) return false;
  log.error(`Auto-compaction failed (unhandled): ${message}`);
-  compactionFailureEmitter.emit("failure", message);
  return true;
 });

@@ -7,9 +7,20 @@ import { resolveClawdbotAgentDir } from "../agent-paths.js";
 import { DEFAULT_CONTEXT_TOKENS } from "../defaults.js";
 import { normalizeModelCompat } from "../model-compat.js";
 import { normalizeProviderId } from "../model-selection.js";
+import { resolveGithubCopilotUserAgent } from "../../providers/github-copilot-utils.js";

 type InlineModelEntry = ModelDefinitionConfig & { provider: string };

+function applyProviderModelOverrides(model: Model<Api>): Model<Api> {
+  if (model.provider === "github-copilot") {
+    const headers = model.headers
+      ? { ...model.headers, "User-Agent": resolveGithubCopilotUserAgent() }
+      : { "User-Agent": resolveGithubCopilotUserAgent() };
+    return { ...model, headers };
+  }
+  return model;
+}
+
 export function buildInlineProviderModels(
  providers: Record<string, { models?: ModelDefinitionConfig[] }>,
 ): InlineModelEntry[] {
@@ -60,7 +71,7 @@ export function resolveModel(
    if (inlineMatch) {
      const normalized = normalizeModelCompat(inlineMatch as Model<Api>);
      return {
-        model: normalized,
+        model: applyProviderModelOverrides(normalized),
        authStorage,
        modelRegistry,
      };
@@ -78,7 +89,7 @@ export function resolveModel(
        contextWindow: providerCfg?.models?.[0]?.contextWindow ?? DEFAULT_CONTEXT_TOKENS,
        maxTokens: providerCfg?.models?.[0]?.maxTokens ?? DEFAULT_CONTEXT_TOKENS,
      } as Model<Api>);
-      return { model: fallbackModel, authStorage, modelRegistry };
+      return { model: applyProviderModelOverrides(fallbackModel), authStorage, modelRegistry };
    }
    return {
      error: `Unknown model: ${provider}/${modelId}`,
@@ -86,5 +97,9 @@ export function resolveModel(
      modelRegistry,
    };
  }
-  return { model: normalizeModelCompat(model), authStorage, modelRegistry };
+  return {
+    model: applyProviderModelOverrides(normalizeModelCompat(model)),
+    authStorage,
+    modelRegistry,
+  };
 }
@@ -184,17 +184,8 @@ export async function runEmbeddedPiAgent(
          lastProfileId = resolvedProfileId;
          return;
        }
-        if (model.provider === "github-copilot") {
-          const { resolveCopilotApiToken } =
-            await import("../../providers/github-copilot-token.js");
-          const copilotToken = await resolveCopilotApiToken({
-            githubToken: apiKeyInfo.apiKey,
-          });
-          authStorage.setRuntimeApiKey(model.provider, copilotToken.token);
-        } else {
-          authStorage.setRuntimeApiKey(model.provider, apiKeyInfo.apiKey);
-        }
-        lastProfileId = apiKeyInfo.profileId;
+        authStorage.setRuntimeApiKey(model.provider, apiKeyInfo.apiKey);
+        lastProfileId = resolvedProfileId;
      };

      const advanceAuthProfile = async (): Promise<boolean> => {
@@ -9,7 +9,7 @@ import { formatToolDetail, resolveToolDisplay } from "./tool-display.js";
 * - <invoke name="...">...</invoke> blocks
 * - </minimax:tool_call> closing tags
 */
-export function stripMinimaxToolCallXml(text: string): string {
+function stripMinimaxToolCallXml(text: string): string {
  if (!text) return text;
  if (!/minimax:tool_call/i.test(text)) return text;

@@ -28,7 +28,7 @@ export function stripMinimaxToolCallXml(text: string): string {
 * downgraded to text blocks like `[Tool Call: name (ID: ...)]`. These should
 * not be shown to users.
 */
-export function stripDowngradedToolCallText(text: string): string {
+function stripDowngradedToolCallText(text: string): string {
  if (!text) return text;
  if (!/\[Tool (?:Call|Result)/i.test(text)) return text;

@@ -165,7 +165,7 @@ export function stripDowngradedToolCallText(text: string): string {
 * This is a safety net for cases where the model outputs <think> tags
 * that slip through other filtering mechanisms.
 */
-export function stripThinkingTagsFromText(text: string): string {
+function stripThinkingTagsFromText(text: string): string {
  if (!text) return text;
  // Quick check to avoid regex overhead when no tags present.
  if (!/(?:think(?:ing)?|thought|antthinking)/i.test(text)) return text;
@@ -3,15 +3,7 @@ import { describe, expect, it } from "vitest";

 import { __testing } from "./compaction-safeguard.js";

-const {
-  collectToolFailures,
-  formatToolFailuresSection,
-  computeAdaptiveChunkRatio,
-  isOversizedForSummary,
-  BASE_CHUNK_RATIO,
-  MIN_CHUNK_RATIO,
-  SAFETY_MARGIN,
-} = __testing;
+const { collectToolFailures, formatToolFailuresSection } = __testing;

 describe("compaction-safeguard tool failures", () => {
  it("formats tool failures with meta and summary", () => {
@@ -104,107 +96,3 @@ describe("compaction-safeguard tool failures", () => {
    expect(section).toBe("");
  });
 });
-
-describe("computeAdaptiveChunkRatio", () => {
-  const CONTEXT_WINDOW = 200_000;
-
-  it("returns BASE_CHUNK_RATIO for normal messages", () => {
-    // Small messages: 1000 tokens each, well under 10% of context
-    const messages: AgentMessage[] = [
-      { role: "user", content: "x".repeat(1000), timestamp: Date.now() },
-      {
-        role: "assistant",
-        content: [{ type: "text", text: "y".repeat(1000) }],
-        timestamp: Date.now(),
-      },
-    ];
-
-    const ratio = computeAdaptiveChunkRatio(messages, CONTEXT_WINDOW);
-    expect(ratio).toBe(BASE_CHUNK_RATIO);
-  });
-
-  it("reduces ratio when average message > 10% of context", () => {
-    // Large messages: ~50K tokens each (25% of context)
-    const messages: AgentMessage[] = [
-      { role: "user", content: "x".repeat(50_000 * 4), timestamp: Date.now() },
-      {
-        role: "assistant",
-        content: [{ type: "text", text: "y".repeat(50_000 * 4) }],
-        timestamp: Date.now(),
-      },
-    ];
-
-    const ratio = computeAdaptiveChunkRatio(messages, CONTEXT_WINDOW);
-    expect(ratio).toBeLessThan(BASE_CHUNK_RATIO);
-    expect(ratio).toBeGreaterThanOrEqual(MIN_CHUNK_RATIO);
-  });
-
-  it("respects MIN_CHUNK_RATIO floor", () => {
-    // Very large messages that would push ratio below minimum
-    const messages: AgentMessage[] = [
-      { role: "user", content: "x".repeat(150_000 * 4), timestamp: Date.now() },
-    ];
-
-    const ratio = computeAdaptiveChunkRatio(messages, CONTEXT_WINDOW);
-    expect(ratio).toBeGreaterThanOrEqual(MIN_CHUNK_RATIO);
-  });
-
-  it("handles empty message array", () => {
-    const ratio = computeAdaptiveChunkRatio([], CONTEXT_WINDOW);
-    expect(ratio).toBe(BASE_CHUNK_RATIO);
-  });
-
-  it("handles single huge message", () => {
-    // Single massive message
-    const messages: AgentMessage[] = [
-      { role: "user", content: "x".repeat(180_000 * 4), timestamp: Date.now() },
-    ];
-
-    const ratio = computeAdaptiveChunkRatio(messages, CONTEXT_WINDOW);
-    expect(ratio).toBeGreaterThanOrEqual(MIN_CHUNK_RATIO);
-    expect(ratio).toBeLessThanOrEqual(BASE_CHUNK_RATIO);
-  });
-});
-
-describe("isOversizedForSummary", () => {
-  const CONTEXT_WINDOW = 200_000;
-
-  it("returns false for small messages", () => {
-    const msg: AgentMessage = {
-      role: "user",
-      content: "Hello, world!",
-      timestamp: Date.now(),
-    };
-
-    expect(isOversizedForSummary(msg, CONTEXT_WINDOW)).toBe(false);
-  });
-
-  it("returns true for messages > 50% of context", () => {
-    // Message with ~120K tokens (60% of 200K context)
-    // After safety margin (1.2x), effective is 144K which is > 100K (50%)
-    const msg: AgentMessage = {
-      role: "user",
-      content: "x".repeat(120_000 * 4),
-      timestamp: Date.now(),
-    };
-
-    expect(isOversizedForSummary(msg, CONTEXT_WINDOW)).toBe(true);
-  });
-
-  it("applies safety margin", () => {
-    // Message at exactly 50% of context before margin
-    // After SAFETY_MARGIN (1.2), it becomes 60% which is > 50%
-    const halfContextChars = (CONTEXT_WINDOW * 0.5) / SAFETY_MARGIN;
-    const msg: AgentMessage = {
-      role: "user",
-      content: "x".repeat(Math.floor(halfContextChars * 4)),
-      timestamp: Date.now(),
-    };
-
-    // With safety margin applied, this should be at the boundary
-    // The function checks if tokens * SAFETY_MARGIN > contextWindow * 0.5
-    const isOversized = isOversizedForSummary(msg, CONTEXT_WINDOW);
-    // Due to token estimation, this could be either true or false at the boundary
-    expect(typeof isOversized).toBe("boolean");
-  });
-});
@@ -4,9 +4,7 @@ import { estimateTokens, generateSummary } from "@mariozechner/pi-coding-agent";

 import { DEFAULT_CONTEXT_TOKENS } from "../defaults.js";

-const BASE_CHUNK_RATIO = 0.4;
-const MIN_CHUNK_RATIO = 0.15;
-const SAFETY_MARGIN = 1.2; // 20% buffer for estimateTokens() inaccuracy
+const MAX_CHUNK_RATIO = 0.4;
 const FALLBACK_SUMMARY =
  "Summary unavailable due to context limits. Older messages were truncated.";
 const TURN_PREFIX_INSTRUCTIONS =
@@ -162,38 +160,6 @@ function chunkMessages(messages: AgentMessage[], maxTokens: number): AgentMessag
  return chunks;
 }

-/**
- * Compute adaptive chunk ratio based on average message size.
- * When messages are large, we use smaller chunks to avoid exceeding model limits.
- */
-function computeAdaptiveChunkRatio(messages: AgentMessage[], contextWindow: number): number {
-  if (messages.length === 0) return BASE_CHUNK_RATIO;
-
-  const totalTokens = messages.reduce((sum, m) => sum + estimateTokens(m), 0);
-  const avgTokens = totalTokens / messages.length;
-
-  // Apply safety margin to account for estimation inaccuracy
-  const safeAvgTokens = avgTokens * SAFETY_MARGIN;
-  const avgRatio = safeAvgTokens / contextWindow;
-
-  // If average message is > 10% of context, reduce chunk ratio
-  if (avgRatio > 0.1) {
-    const reduction = Math.min(avgRatio * 2, BASE_CHUNK_RATIO - MIN_CHUNK_RATIO);
-    return Math.max(MIN_CHUNK_RATIO, BASE_CHUNK_RATIO - reduction);
-  }
-
-  return BASE_CHUNK_RATIO;
-}
-
-/**
- * Check if a single message is too large to summarize.
- * If single message > 50% of context, it can't be summarized safely.
- */
-function isOversizedForSummary(msg: AgentMessage, contextWindow: number): boolean {
-  const tokens = estimateTokens(msg) * SAFETY_MARGIN;
-  return tokens > contextWindow * 0.5;
-}
-
 async function summarizeChunks(params: {
  messages: AgentMessage[];
  model: NonNullable<ExtensionContext["model"]>;
@@ -226,78 +192,6 @@ async function summarizeChunks(params: {
  return summary ?? "No prior history.";
 }

-/**
- * Summarize with progressive fallback for handling oversized messages.
- * If full summarization fails, tries partial summarization excluding oversized messages.
- */
-async function summarizeWithFallback(params: {
-  messages: AgentMessage[];
-  model: NonNullable<ExtensionContext["model"]>;
-  apiKey: string;
-  signal: AbortSignal;
-  reserveTokens: number;
-  maxChunkTokens: number;
-  contextWindow: number;
-  customInstructions?: string;
-  previousSummary?: string;
-}): Promise<string> {
-  const { messages, contextWindow } = params;
-
-  if (messages.length === 0) {
-    return params.previousSummary ?? "No prior history.";
-  }
-
-  // Try full summarization first
-  try {
-    return await summarizeChunks(params);
-  } catch (fullError) {
-    console.warn(
-      `Full summarization failed, trying partial: ${
-        fullError instanceof Error ? fullError.message : String(fullError)
-      }`,
-    );
-  }
-
-  // Fallback 1: Summarize only small messages, note oversized ones
-  const smallMessages: AgentMessage[] = [];
-  const oversizedNotes: string[] = [];
-
-  for (const msg of messages) {
-    if (isOversizedForSummary(msg, contextWindow)) {
-      const role = (msg as { role?: string }).role ?? "message";
-      const tokens = estimateTokens(msg);
-      oversizedNotes.push(
-        `[Large ${role} (~${Math.round(tokens / 1000)}K tokens) omitted from summary]`,
-      );
-    } else {
-      smallMessages.push(msg);
-    }
-  }
-
-  if (smallMessages.length > 0) {
-    try {
-      const partialSummary = await summarizeChunks({
-        ...params,
-        messages: smallMessages,
-      });
-      const notes = oversizedNotes.length > 0 ? `\n\n${oversizedNotes.join("\n")}` : "";
-      return partialSummary + notes;
-    } catch (partialError) {
-      console.warn(
-        `Partial summarization also failed: ${
-          partialError instanceof Error ? partialError.message : String(partialError)
-        }`,
-      );
-    }
-  }
-
-  // Final fallback: Just note what was there
-  return (
-    `Context contained ${messages.length} messages (${oversizedNotes.length} oversized). ` +
-    `Summary unavailable due to size limits.`
-  );
-}
-
 export default function compactionSafeguardExtension(api: ExtensionAPI): void {
  api.on("session_before_compact", async (event, ctx) => {
    const { preparation, customInstructions, signal } = event;
@@ -339,35 +233,29 @@ export default function compactionSafeguardExtension(api: ExtensionAPI): void {
        1,
        Math.floor(model.contextWindow ?? DEFAULT_CONTEXT_TOKENS),
      );
-
-      // Use adaptive chunk ratio based on message sizes
-      const allMessages = [...preparation.messagesToSummarize, ...preparation.turnPrefixMessages];
-      const adaptiveRatio = computeAdaptiveChunkRatio(allMessages, contextWindowTokens);
-      const maxChunkTokens = Math.max(1, Math.floor(contextWindowTokens * adaptiveRatio));
+      const maxChunkTokens = Math.max(1, Math.floor(contextWindowTokens * MAX_CHUNK_RATIO));
      const reserveTokens = Math.max(1, Math.floor(preparation.settings.reserveTokens));

-      const historySummary = await summarizeWithFallback({
+      const historySummary = await summarizeChunks({
        messages: preparation.messagesToSummarize,
        model,
        apiKey,
        signal,
        reserveTokens,
        maxChunkTokens,
-        contextWindow: contextWindowTokens,
        customInstructions,
        previousSummary: preparation.previousSummary,
      });

      let summary = historySummary;
      if (preparation.isSplitTurn && preparation.turnPrefixMessages.length > 0) {
-        const prefixSummary = await summarizeWithFallback({
+        const prefixSummary = await summarizeChunks({
          messages: preparation.turnPrefixMessages,
          model,
          apiKey,
          signal,
          reserveTokens,
          maxChunkTokens,
-          contextWindow: contextWindowTokens,
          customInstructions: TURN_PREFIX_INSTRUCTIONS,
        });
        summary = `${historySummary}\n\n---\n\n**Turn Context (split turn):**\n\n${prefixSummary}`;
@@ -405,9 +293,4 @@ export default function compactionSafeguardExtension(api: ExtensionAPI): void {
 export const __testing = {
  collectToolFailures,
  formatToolFailuresSection,
-  computeAdaptiveChunkRatio,
-  isOversizedForSummary,
-  BASE_CHUNK_RATIO,
-  MIN_CHUNK_RATIO,
-  SAFETY_MARGIN,
 } as const;
@@ -0,0 +1,212 @@
+import type { AgentTool } from "@mariozechner/pi-agent-core";
+import { describe, expect, it, vi } from "vitest";
+import { __testing, createClawdbotCodingTools } from "./pi-tools.js";
+import { createBrowserTool } from "./tools/browser-tool.js";
+
+describe("createClawdbotCodingTools", () => {
+  describe("Claude/Gemini alias support", () => {
+    it("adds Claude-style aliases to schemas without dropping metadata", () => {
+      const base: AgentTool = {
+        name: "write",
+        description: "test",
+        parameters: {
+          type: "object",
+          required: ["path", "content"],
+          properties: {
+            path: { type: "string", description: "Path" },
+            content: { type: "string", description: "Body" },
+          },
+        },
+        execute: vi.fn(),
+      };
+
+      const patched = __testing.patchToolSchemaForClaudeCompatibility(base);
+      const params = patched.parameters as {
+        properties?: Record<string, unknown>;
+        required?: string[];
+      };
+      const props = params.properties ?? {};
+
+      expect(props.file_path).toEqual(props.path);
+      expect(params.required ?? []).not.toContain("path");
+      expect(params.required ?? []).not.toContain("file_path");
+    });
+
+    it("normalizes file_path to path and enforces required groups at runtime", async () => {
+      const execute = vi.fn(async (_id, args) => args);
+      const tool: AgentTool = {
+        name: "write",
+        description: "test",
+        parameters: {
+          type: "object",
+          required: ["path", "content"],
+          properties: {
+            path: { type: "string" },
+            content: { type: "string" },
+          },
+        },
+        execute,
+      };
+
+      const wrapped = __testing.wrapToolParamNormalization(tool, [{ keys: ["path", "file_path"] }]);
+
+      await wrapped.execute("tool-1", { file_path: "foo.txt", content: "x" });
+      expect(execute).toHaveBeenCalledWith(
+        "tool-1",
+        { path: "foo.txt", content: "x" },
+        undefined,
+        undefined,
+      );
+
+      await expect(wrapped.execute("tool-2", { content: "x" })).rejects.toThrow(
+        /Missing required parameter/,
+      );
+      await expect(wrapped.execute("tool-3", { file_path: "   ", content: "x" })).rejects.toThrow(
+        /Missing required parameter/,
+      );
+    });
+  });
+
+  it("keeps browser tool schema OpenAI-compatible without normalization", () => {
+    const browser = createBrowserTool();
+    const schema = browser.parameters as { type?: unknown; anyOf?: unknown };
+    expect(schema.type).toBe("object");
+    expect(schema.anyOf).toBeUndefined();
+  });
+  it("mentions Chrome extension relay in browser tool description", () => {
+    const browser = createBrowserTool();
+    expect(browser.description).toMatch(/Chrome extension/i);
+    expect(browser.description).toMatch(/profile="chrome"/i);
+  });
+  it("keeps browser tool schema properties after normalization", () => {
+    const tools = createClawdbotCodingTools();
+    const browser = tools.find((tool) => tool.name === "browser");
+    expect(browser).toBeDefined();
+    const parameters = browser?.parameters as {
+      anyOf?: unknown[];
+      properties?: Record<string, unknown>;
+      required?: string[];
+    };
+    expect(parameters.properties?.action).toBeDefined();
+    expect(parameters.properties?.target).toBeDefined();
+    expect(parameters.properties?.controlUrl).toBeDefined();
+    expect(parameters.properties?.targetUrl).toBeDefined();
+    expect(parameters.properties?.request).toBeDefined();
+    expect(parameters.required ?? []).toContain("action");
+  });
+  it("exposes raw for gateway config.apply tool calls", () => {
+    const tools = createClawdbotCodingTools();
+    const gateway = tools.find((tool) => tool.name === "gateway");
+    expect(gateway).toBeDefined();
+
+    const parameters = gateway?.parameters as {
+      type?: unknown;
+      required?: string[];
+      properties?: Record<string, unknown>;
+    };
+    expect(parameters.type).toBe("object");
+    expect(parameters.properties?.raw).toBeDefined();
+    expect(parameters.required ?? []).not.toContain("raw");
+  });
+  it("flattens anyOf-of-literals to enum for provider compatibility", () => {
+    const tools = createClawdbotCodingTools();
+    const browser = tools.find((tool) => tool.name === "browser");
+    expect(browser).toBeDefined();
+
+    const parameters = browser?.parameters as {
+      properties?: Record<string, unknown>;
+    };
+    const action = parameters.properties?.action as
+      | {
+          type?: unknown;
+          enum?: unknown[];
+          anyOf?: unknown[];
+        }
+      | undefined;
+
+    expect(action?.type).toBe("string");
+    expect(action?.anyOf).toBeUndefined();
+    expect(Array.isArray(action?.enum)).toBe(true);
+    expect(action?.enum).toContain("act");
+
+    const snapshotFormat = parameters.properties?.snapshotFormat as
+      | {
+          type?: unknown;
+          enum?: unknown[];
+          anyOf?: unknown[];
+        }
+      | undefined;
+    expect(snapshotFormat?.type).toBe("string");
+    expect(snapshotFormat?.anyOf).toBeUndefined();
+    expect(snapshotFormat?.enum).toEqual(["aria", "ai"]);
+  });
+  it("inlines local $ref before removing unsupported keywords", () => {
+    const cleaned = __testing.cleanToolSchemaForGemini({
+      type: "object",
+      properties: {
+        foo: { $ref: "#/$defs/Foo" },
+      },
+      $defs: {
+        Foo: { type: "string", enum: ["a", "b"] },
+      },
+    }) as {
+      $defs?: unknown;
+      properties?: Record<string, unknown>;
+    };
+
+    expect(cleaned.$defs).toBeUndefined();
+    expect(cleaned.properties).toBeDefined();
+    expect(cleaned.properties?.foo).toMatchObject({
+      type: "string",
+      enum: ["a", "b"],
+    });
+  });
+  it("cleans tuple items schemas", () => {
+    const cleaned = __testing.cleanToolSchemaForGemini({
+      type: "object",
+      properties: {
+        tuples: {
+          type: "array",
+          items: [
+            { type: "string", format: "uuid" },
+            { type: "number", minimum: 1 },
+          ],
+        },
+      },
+    }) as {
+      properties?: Record<string, unknown>;
+    };
+
+    const tuples = cleaned.properties?.tuples as { items?: unknown } | undefined;
+    const items = Array.isArray(tuples?.items) ? tuples?.items : [];
+    const first = items[0] as { format?: unknown } | undefined;
+    const second = items[1] as { minimum?: unknown } | undefined;
+
+    expect(first?.format).toBeUndefined();
+    expect(second?.minimum).toBeUndefined();
+  });
+  it("drops null-only union variants without flattening other unions", () => {
+    const cleaned = __testing.cleanToolSchemaForGemini({
+      type: "object",
+      properties: {
+        parentId: { anyOf: [{ type: "string" }, { type: "null" }] },
+        count: { oneOf: [{ type: "string" }, { type: "number" }] },
+      },
+    }) as {
+      properties?: Record<string, unknown>;
+    };
+
+    const parentId = cleaned.properties?.parentId as
+      | { type?: unknown; anyOf?: unknown; oneOf?: unknown }
+      | undefined;
+    expect(parentId?.anyOf).toBeUndefined();
+    expect(parentId?.oneOf).toBeUndefined();
+    expect(parentId?.type).toBe("string");
+
+    const count = cleaned.properties?.count as
+      | { type?: unknown; anyOf?: unknown; oneOf?: unknown }
+      | undefined;
+    expect(count?.anyOf).toBeUndefined();
+    expect(Array.isArray(count?.oneOf)).toBe(true);
+  });
+});
@@ -1,11 +1,74 @@
-import { describe, expect, it } from "vitest";
+import type { AgentTool } from "@mariozechner/pi-agent-core";
+import { describe, expect, it, vi } from "vitest";
 import type { ClawdbotConfig } from "../config/config.js";
-import { createClawdbotCodingTools } from "./pi-tools.js";
-
-const defaultTools = createClawdbotCodingTools();
+import { __testing, createClawdbotCodingTools } from "./pi-tools.js";

 describe("createClawdbotCodingTools", () => {
+  describe("Claude/Gemini alias support", () => {
+    it("adds Claude-style aliases to schemas without dropping metadata", () => {
+      const base: AgentTool = {
+        name: "write",
+        description: "test",
+        parameters: {
+          type: "object",
+          required: ["path", "content"],
+          properties: {
+            path: { type: "string", description: "Path" },
+            content: { type: "string", description: "Body" },
+          },
+        },
+        execute: vi.fn(),
+      };
+
+      const patched = __testing.patchToolSchemaForClaudeCompatibility(base);
+      const params = patched.parameters as {
+        properties?: Record<string, unknown>;
+        required?: string[];
+      };
+      const props = params.properties ?? {};
+
+      expect(props.file_path).toEqual(props.path);
+      expect(params.required ?? []).not.toContain("path");
+      expect(params.required ?? []).not.toContain("file_path");
+    });
+
+    it("normalizes file_path to path and enforces required groups at runtime", async () => {
+      const execute = vi.fn(async (_id, args) => args);
+      const tool: AgentTool = {
+        name: "write",
+        description: "test",
+        parameters: {
+          type: "object",
+          required: ["path", "content"],
+          properties: {
+            path: { type: "string" },
+            content: { type: "string" },
+          },
+        },
+        execute,
+      };
+
+      const wrapped = __testing.wrapToolParamNormalization(tool, [{ keys: ["path", "file_path"] }]);
+
+      await wrapped.execute("tool-1", { file_path: "foo.txt", content: "x" });
+      expect(execute).toHaveBeenCalledWith(
+        "tool-1",
+        { path: "foo.txt", content: "x" },
+        undefined,
+        undefined,
+      );
+
+      await expect(wrapped.execute("tool-2", { content: "x" })).rejects.toThrow(
+        /Missing required parameter/,
+      );
+      await expect(wrapped.execute("tool-3", { file_path: "   ", content: "x" })).rejects.toThrow(
+        /Missing required parameter/,
+      );
+    });
+  });
+
  it("preserves action enums in normalized schemas", () => {
+    const tools = createClawdbotCodingTools();
    const toolNames = ["browser", "canvas", "nodes", "cron", "gateway", "message"];

    const collectActionValues = (schema: unknown, values: Set<string>): void => {
@@ -25,7 +88,7 @@ describe("createClawdbotCodingTools", () => {
    };

    for (const name of toolNames) {
-      const tool = defaultTools.find((candidate) => candidate.name === name);
+      const tool = tools.find((candidate) => candidate.name === name);
      expect(tool).toBeDefined();
      const parameters = tool?.parameters as {
        properties?: Record<string, unknown>;
@@ -45,9 +108,10 @@ describe("createClawdbotCodingTools", () => {
    }
  });
  it("includes exec and process tools by default", () => {
-    expect(defaultTools.some((tool) => tool.name === "exec")).toBe(true);
-    expect(defaultTools.some((tool) => tool.name === "process")).toBe(true);
-    expect(defaultTools.some((tool) => tool.name === "apply_patch")).toBe(false);
+    const tools = createClawdbotCodingTools();
+    expect(tools.some((tool) => tool.name === "exec")).toBe(true);
+    expect(tools.some((tool) => tool.name === "process")).toBe(true);
+    expect(tools.some((tool) => tool.name === "apply_patch")).toBe(false);
  });
  it("gates apply_patch behind tools.exec.applyPatch for OpenAI models", () => {
    const config: ClawdbotConfig = {
@@ -1,15 +1,78 @@
 import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
+import type { AgentTool } from "@mariozechner/pi-agent-core";
 import sharp from "sharp";
-import { describe, expect, it } from "vitest";
-import { createClawdbotCodingTools } from "./pi-tools.js";
-
-const defaultTools = createClawdbotCodingTools();
+import { describe, expect, it, vi } from "vitest";
+import { __testing, createClawdbotCodingTools } from "./pi-tools.js";

 describe("createClawdbotCodingTools", () => {
+  describe("Claude/Gemini alias support", () => {
+    it("adds Claude-style aliases to schemas without dropping metadata", () => {
+      const base: AgentTool = {
+        name: "write",
+        description: "test",
+        parameters: {
+          type: "object",
+          required: ["path", "content"],
+          properties: {
+            path: { type: "string", description: "Path" },
+            content: { type: "string", description: "Body" },
+          },
+        },
+        execute: vi.fn(),
+      };
+
+      const patched = __testing.patchToolSchemaForClaudeCompatibility(base);
+      const params = patched.parameters as {
+        properties?: Record<string, unknown>;
+        required?: string[];
+      };
+      const props = params.properties ?? {};
+
+      expect(props.file_path).toEqual(props.path);
+      expect(params.required ?? []).not.toContain("path");
+      expect(params.required ?? []).not.toContain("file_path");
+    });
+
+    it("normalizes file_path to path and enforces required groups at runtime", async () => {
+      const execute = vi.fn(async (_id, args) => args);
+      const tool: AgentTool = {
+        name: "write",
+        description: "test",
+        parameters: {
+          type: "object",
+          required: ["path", "content"],
+          properties: {
+            path: { type: "string" },
+            content: { type: "string" },
+          },
+        },
+        execute,
+      };
+
+      const wrapped = __testing.wrapToolParamNormalization(tool, [{ keys: ["path", "file_path"] }]);
+
+      await wrapped.execute("tool-1", { file_path: "foo.txt", content: "x" });
+      expect(execute).toHaveBeenCalledWith(
+        "tool-1",
+        { path: "foo.txt", content: "x" },
+        undefined,
+        undefined,
+      );
+
+      await expect(wrapped.execute("tool-2", { content: "x" })).rejects.toThrow(
+        /Missing required parameter/,
+      );
+      await expect(wrapped.execute("tool-3", { file_path: "   ", content: "x" })).rejects.toThrow(
+        /Missing required parameter/,
+      );
+    });
+  });
+
  it("keeps read tool image metadata intact", async () => {
-    const readTool = defaultTools.find((tool) => tool.name === "read");
+    const tools = createClawdbotCodingTools();
+    const readTool = tools.find((tool) => tool.name === "read");
    expect(readTool).toBeDefined();

    const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-read-"));
@@ -0,0 +1,183 @@
+import type { AgentTool } from "@mariozechner/pi-agent-core";
+import { describe, expect, it, vi } from "vitest";
+import { __testing, createClawdbotCodingTools } from "./pi-tools.js";
+
+describe("createClawdbotCodingTools", () => {
+  describe("Claude/Gemini alias support", () => {
+    it("adds Claude-style aliases to schemas without dropping metadata", () => {
+      const base: AgentTool = {
+        name: "write",
+        description: "test",
+        parameters: {
+          type: "object",
+          required: ["path", "content"],
+          properties: {
+            path: { type: "string", description: "Path" },
+            content: { type: "string", description: "Body" },
+          },
+        },
+        execute: vi.fn(),
+      };
+
+      const patched = __testing.patchToolSchemaForClaudeCompatibility(base);
+      const params = patched.parameters as {
+        properties?: Record<string, unknown>;
+        required?: string[];
+      };
+      const props = params.properties ?? {};
+
+      expect(props.file_path).toEqual(props.path);
+      expect(params.required ?? []).not.toContain("path");
+      expect(params.required ?? []).not.toContain("file_path");
+    });
+
+    it("normalizes file_path to path and enforces required groups at runtime", async () => {
+      const execute = vi.fn(async (_id, args) => args);
+      const tool: AgentTool = {
+        name: "write",
+        description: "test",
+        parameters: {
+          type: "object",
+          required: ["path", "content"],
+          properties: {
+            path: { type: "string" },
+            content: { type: "string" },
+          },
+        },
+        execute,
+      };
+
+      const wrapped = __testing.wrapToolParamNormalization(tool, [{ keys: ["path", "file_path"] }]);
+
+      await wrapped.execute("tool-1", { file_path: "foo.txt", content: "x" });
+      expect(execute).toHaveBeenCalledWith(
+        "tool-1",
+        { path: "foo.txt", content: "x" },
+        undefined,
+        undefined,
+      );
+
+      await expect(wrapped.execute("tool-2", { content: "x" })).rejects.toThrow(
+        /Missing required parameter/,
+      );
+      await expect(wrapped.execute("tool-3", { file_path: "   ", content: "x" })).rejects.toThrow(
+        /Missing required parameter/,
+      );
+    });
+  });
+
+  it("applies tool profiles before allow/deny policies", () => {
+    const tools = createClawdbotCodingTools({
+      config: { tools: { profile: "messaging" } },
+    });
+    const names = new Set(tools.map((tool) => tool.name));
+    expect(names.has("message")).toBe(true);
+    expect(names.has("sessions_send")).toBe(true);
+    expect(names.has("sessions_spawn")).toBe(false);
+    expect(names.has("exec")).toBe(false);
+    expect(names.has("browser")).toBe(false);
+  });
+  it("expands group shorthands in global tool policy", () => {
+    const tools = createClawdbotCodingTools({
+      config: { tools: { allow: ["group:fs"] } },
+    });
+    const names = new Set(tools.map((tool) => tool.name));
+    expect(names.has("read")).toBe(true);
+    expect(names.has("write")).toBe(true);
+    expect(names.has("edit")).toBe(true);
+    expect(names.has("exec")).toBe(false);
+    expect(names.has("browser")).toBe(false);
+  });
+  it("expands group shorthands in global tool deny policy", () => {
+    const tools = createClawdbotCodingTools({
+      config: { tools: { deny: ["group:fs"] } },
+    });
+    const names = new Set(tools.map((tool) => tool.name));
+    expect(names.has("read")).toBe(false);
+    expect(names.has("write")).toBe(false);
+    expect(names.has("edit")).toBe(false);
+    expect(names.has("exec")).toBe(true);
+  });
+  it("lets agent profiles override global profiles", () => {
+    const tools = createClawdbotCodingTools({
+      sessionKey: "agent:work:main",
+      config: {
+        tools: { profile: "coding" },
+        agents: {
+          list: [{ id: "work", tools: { profile: "messaging" } }],
+        },
+      },
+    });
+    const names = new Set(tools.map((tool) => tool.name));
+    expect(names.has("message")).toBe(true);
+    expect(names.has("exec")).toBe(false);
+    expect(names.has("read")).toBe(false);
+  });
+  it("removes unsupported JSON Schema keywords for Cloud Code Assist API compatibility", () => {
+    const tools = createClawdbotCodingTools();
+
+    // Helper to recursively check schema for unsupported keywords
+    const unsupportedKeywords = new Set([
+      "patternProperties",
+      "additionalProperties",
+      "$schema",
+      "$id",
+      "$ref",
+      "$defs",
+      "definitions",
+      "examples",
+      "minLength",
+      "maxLength",
+      "minimum",
+      "maximum",
+      "multipleOf",
+      "pattern",
+      "format",
+      "minItems",
+      "maxItems",
+      "uniqueItems",
+      "minProperties",
+      "maxProperties",
+    ]);
+
+    const findUnsupportedKeywords = (schema: unknown, path: string): string[] => {
+      const found: string[] = [];
+      if (!schema || typeof schema !== "object") return found;
+      if (Array.isArray(schema)) {
+        schema.forEach((item, i) => {
+          found.push(...findUnsupportedKeywords(item, `${path}[${i}]`));
+        });
+        return found;
+      }
+
+      const record = schema as Record<string, unknown>;
+      const properties =
+        record.properties &&
+        typeof record.properties === "object" &&
+        !Array.isArray(record.properties)
+          ? (record.properties as Record<string, unknown>)
+          : undefined;
+      if (properties) {
+        for (const [key, value] of Object.entries(properties)) {
+          found.push(...findUnsupportedKeywords(value, `${path}.properties.${key}`));
+        }
+      }
+
+      for (const [key, value] of Object.entries(record)) {
+        if (key === "properties") continue;
+        if (unsupportedKeywords.has(key)) {
+          found.push(`${path}.${key}`);
+        }
+        if (value && typeof value === "object") {
+          found.push(...findUnsupportedKeywords(value, `${path}.${key}`));
+        }
+      }
+      return found;
+    };
+
+    for (const tool of tools) {
+      const violations = findUnsupportedKeywords(tool.parameters, `${tool.name}.parameters`);
+      expect(violations).toEqual([]);
+    }
+  });
+});
@@ -1,10 +1,74 @@
 import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
-import { describe, expect, it } from "vitest";
-import { createClawdbotCodingTools } from "./pi-tools.js";
+import type { AgentTool } from "@mariozechner/pi-agent-core";
+import { describe, expect, it, vi } from "vitest";
+import { __testing, createClawdbotCodingTools } from "./pi-tools.js";

 describe("createClawdbotCodingTools", () => {
+  describe("Claude/Gemini alias support", () => {
+    it("adds Claude-style aliases to schemas without dropping metadata", () => {
+      const base: AgentTool = {
+        name: "write",
+        description: "test",
+        parameters: {
+          type: "object",
+          required: ["path", "content"],
+          properties: {
+            path: { type: "string", description: "Path" },
+            content: { type: "string", description: "Body" },
+          },
+        },
+        execute: vi.fn(),
+      };
+
+      const patched = __testing.patchToolSchemaForClaudeCompatibility(base);
+      const params = patched.parameters as {
+        properties?: Record<string, unknown>;
+        required?: string[];
+      };
+      const props = params.properties ?? {};
+
+      expect(props.file_path).toEqual(props.path);
+      expect(params.required ?? []).not.toContain("path");
+      expect(params.required ?? []).not.toContain("file_path");
+    });
+
+    it("normalizes file_path to path and enforces required groups at runtime", async () => {
+      const execute = vi.fn(async (_id, args) => args);
+      const tool: AgentTool = {
+        name: "write",
+        description: "test",
+        parameters: {
+          type: "object",
+          required: ["path", "content"],
+          properties: {
+            path: { type: "string" },
+            content: { type: "string" },
+          },
+        },
+        execute,
+      };
+
+      const wrapped = __testing.wrapToolParamNormalization(tool, [{ keys: ["path", "file_path"] }]);
+
+      await wrapped.execute("tool-1", { file_path: "foo.txt", content: "x" });
+      expect(execute).toHaveBeenCalledWith(
+        "tool-1",
+        { path: "foo.txt", content: "x" },
+        undefined,
+        undefined,
+      );
+
+      await expect(wrapped.execute("tool-2", { content: "x" })).rejects.toThrow(
+        /Missing required parameter/,
+      );
+      await expect(wrapped.execute("tool-3", { file_path: "   ", content: "x" })).rejects.toThrow(
+        /Missing required parameter/,
+      );
+    });
+  });
+
  it("uses workspaceDir for Read tool path resolution", async () => {
    const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-ws-"));
    try {
@@ -0,0 +1,95 @@
+import fs from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import type { AgentTool } from "@mariozechner/pi-agent-core";
+import { describe, expect, it, vi } from "vitest";
+import { __testing, createClawdbotCodingTools } from "./pi-tools.js";
+import { createSandboxedReadTool } from "./pi-tools.read.js";
+
+describe("createClawdbotCodingTools", () => {
+  describe("Claude/Gemini alias support", () => {
+    it("adds Claude-style aliases to schemas without dropping metadata", () => {
+      const base: AgentTool = {
+        name: "write",
+        description: "test",
+        parameters: {
+          type: "object",
+          required: ["path", "content"],
+          properties: {
+            path: { type: "string", description: "Path" },
+            content: { type: "string", description: "Body" },
+          },
+        },
+        execute: vi.fn(),
+      };
+
+      const patched = __testing.patchToolSchemaForClaudeCompatibility(base);
+      const params = patched.parameters as {
+        properties?: Record<string, unknown>;
+        required?: string[];
+      };
+      const props = params.properties ?? {};
+
+      expect(props.file_path).toEqual(props.path);
+      expect(params.required ?? []).not.toContain("path");
+      expect(params.required ?? []).not.toContain("file_path");
+    });
+
+    it("normalizes file_path to path and enforces required groups at runtime", async () => {
+      const execute = vi.fn(async (_id, args) => args);
+      const tool: AgentTool = {
+        name: "write",
+        description: "test",
+        parameters: {
+          type: "object",
+          required: ["path", "content"],
+          properties: {
+            path: { type: "string" },
+            content: { type: "string" },
+          },
+        },
+        execute,
+      };
+
+      const wrapped = __testing.wrapToolParamNormalization(tool, [{ keys: ["path", "file_path"] }]);
+
+      await wrapped.execute("tool-1", { file_path: "foo.txt", content: "x" });
+      expect(execute).toHaveBeenCalledWith(
+        "tool-1",
+        { path: "foo.txt", content: "x" },
+        undefined,
+        undefined,
+      );
+
+      await expect(wrapped.execute("tool-2", { content: "x" })).rejects.toThrow(
+        /Missing required parameter/,
+      );
+      await expect(wrapped.execute("tool-3", { file_path: "   ", content: "x" })).rejects.toThrow(
+        /Missing required parameter/,
+      );
+    });
+  });
+
+  it("applies sandbox path guards to file_path alias", async () => {
+    const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-sbx-"));
+    const outsidePath = path.join(os.tmpdir(), "clawdbot-outside.txt");
+    await fs.writeFile(outsidePath, "outside", "utf8");
+    try {
+      const readTool = createSandboxedReadTool(tmpDir);
+      await expect(readTool.execute("tool-sbx-1", { file_path: outsidePath })).rejects.toThrow();
+    } finally {
+      await fs.rm(tmpDir, { recursive: true, force: true });
+      await fs.rm(outsidePath, { force: true });
+    }
+  });
+  it("falls back to process.cwd() when workspaceDir not provided", () => {
+    const prevCwd = process.cwd();
+    const tools = createClawdbotCodingTools();
+    // Tools should be created without error
+    expect(tools.some((tool) => tool.name === "read")).toBe(true);
+    expect(tools.some((tool) => tool.name === "write")).toBe(true);
+    expect(tools.some((tool) => tool.name === "edit")).toBe(true);
+    // cwd should be unchanged
+    expect(process.cwd()).toBe(prevCwd);
+  });
+});
@@ -1,14 +1,7 @@
-import fs from "node:fs/promises";
-import os from "node:os";
-import path from "node:path";
 import type { AgentTool } from "@mariozechner/pi-agent-core";
 import { describe, expect, it, vi } from "vitest";
 import { createClawdbotTools } from "./clawdbot-tools.js";
 import { __testing, createClawdbotCodingTools } from "./pi-tools.js";
-import { createSandboxedReadTool } from "./pi-tools.read.js";
-import { createBrowserTool } from "./tools/browser-tool.js";
-
-const defaultTools = createClawdbotCodingTools();

 describe("createClawdbotCodingTools", () => {
  describe("Claude/Gemini alias support", () => {
@@ -74,144 +67,8 @@ describe("createClawdbotCodingTools", () => {
    });
  });

-  it("keeps browser tool schema OpenAI-compatible without normalization", () => {
-    const browser = createBrowserTool();
-    const schema = browser.parameters as { type?: unknown; anyOf?: unknown };
-    expect(schema.type).toBe("object");
-    expect(schema.anyOf).toBeUndefined();
-  });
-  it("mentions Chrome extension relay in browser tool description", () => {
-    const browser = createBrowserTool();
-    expect(browser.description).toMatch(/Chrome extension/i);
-    expect(browser.description).toMatch(/profile="chrome"/i);
-  });
-  it("keeps browser tool schema properties after normalization", () => {
-    const browser = defaultTools.find((tool) => tool.name === "browser");
-    expect(browser).toBeDefined();
-    const parameters = browser?.parameters as {
-      anyOf?: unknown[];
-      properties?: Record<string, unknown>;
-      required?: string[];
-    };
-    expect(parameters.properties?.action).toBeDefined();
-    expect(parameters.properties?.target).toBeDefined();
-    expect(parameters.properties?.controlUrl).toBeDefined();
-    expect(parameters.properties?.targetUrl).toBeDefined();
-    expect(parameters.properties?.request).toBeDefined();
-    expect(parameters.required ?? []).toContain("action");
-  });
-  it("exposes raw for gateway config.apply tool calls", () => {
-    const gateway = defaultTools.find((tool) => tool.name === "gateway");
-    expect(gateway).toBeDefined();
-
-    const parameters = gateway?.parameters as {
-      type?: unknown;
-      required?: string[];
-      properties?: Record<string, unknown>;
-    };
-    expect(parameters.type).toBe("object");
-    expect(parameters.properties?.raw).toBeDefined();
-    expect(parameters.required ?? []).not.toContain("raw");
-  });
-  it("flattens anyOf-of-literals to enum for provider compatibility", () => {
-    const browser = defaultTools.find((tool) => tool.name === "browser");
-    expect(browser).toBeDefined();
-
-    const parameters = browser?.parameters as {
-      properties?: Record<string, unknown>;
-    };
-    const action = parameters.properties?.action as
-      | {
-          type?: unknown;
-          enum?: unknown[];
-          anyOf?: unknown[];
-        }
-      | undefined;
-
-    expect(action?.type).toBe("string");
-    expect(action?.anyOf).toBeUndefined();
-    expect(Array.isArray(action?.enum)).toBe(true);
-    expect(action?.enum).toContain("act");
-
-    const snapshotFormat = parameters.properties?.snapshotFormat as
-      | {
-          type?: unknown;
-          enum?: unknown[];
-          anyOf?: unknown[];
-        }
-      | undefined;
-    expect(snapshotFormat?.type).toBe("string");
-    expect(snapshotFormat?.anyOf).toBeUndefined();
-    expect(snapshotFormat?.enum).toEqual(["aria", "ai"]);
-  });
-  it("inlines local $ref before removing unsupported keywords", () => {
-    const cleaned = __testing.cleanToolSchemaForGemini({
-      type: "object",
-      properties: {
-        foo: { $ref: "#/$defs/Foo" },
-      },
-      $defs: {
-        Foo: { type: "string", enum: ["a", "b"] },
-      },
-    }) as {
-      $defs?: unknown;
-      properties?: Record<string, unknown>;
-    };
-
-    expect(cleaned.$defs).toBeUndefined();
-    expect(cleaned.properties).toBeDefined();
-    expect(cleaned.properties?.foo).toMatchObject({
-      type: "string",
-      enum: ["a", "b"],
-    });
-  });
-  it("cleans tuple items schemas", () => {
-    const cleaned = __testing.cleanToolSchemaForGemini({
-      type: "object",
-      properties: {
-        tuples: {
-          type: "array",
-          items: [
-            { type: "string", format: "uuid" },
-            { type: "number", minimum: 1 },
-          ],
-        },
-      },
-    }) as {
-      properties?: Record<string, unknown>;
-    };
-
-    const tuples = cleaned.properties?.tuples as { items?: unknown } | undefined;
-    const items = Array.isArray(tuples?.items) ? tuples?.items : [];
-    const first = items[0] as { format?: unknown } | undefined;
-    const second = items[1] as { minimum?: unknown } | undefined;
-
-    expect(first?.format).toBeUndefined();
-    expect(second?.minimum).toBeUndefined();
-  });
-  it("drops null-only union variants without flattening other unions", () => {
-    const cleaned = __testing.cleanToolSchemaForGemini({
-      type: "object",
-      properties: {
-        parentId: { anyOf: [{ type: "string" }, { type: "null" }] },
-        count: { oneOf: [{ type: "string" }, { type: "number" }] },
-      },
-    }) as {
-      properties?: Record<string, unknown>;
-    };
-
-    const parentId = cleaned.properties?.parentId as
-      | { type?: unknown; anyOf?: unknown; oneOf?: unknown }
-      | undefined;
-    const count = cleaned.properties?.count as
-      | { type?: unknown; anyOf?: unknown; oneOf?: unknown }
-      | undefined;
-
-    expect(parentId?.type).toBe("string");
-    expect(parentId?.anyOf).toBeUndefined();
-    expect(count?.oneOf).toBeDefined();
-  });
  it("avoids anyOf/oneOf/allOf in tool schemas", () => {
+    const tools = createClawdbotCodingTools();
    const offenders: Array<{
      name: string;
      keyword: string;
@@ -239,7 +96,7 @@ describe("createClawdbotCodingTools", () => {
      }
    };

-    for (const tool of defaultTools) {
+    for (const tool of tools) {
      walk(tool.parameters, "", tool.name);
    }

@@ -335,131 +192,4 @@ describe("createClawdbotCodingTools", () => {
    });
    expect(tools.map((tool) => tool.name)).toEqual(["read"]);
  });
-
-  it("applies tool profiles before allow/deny policies", () => {
-    const tools = createClawdbotCodingTools({
-      config: { tools: { profile: "messaging" } },
-    });
-    const names = new Set(tools.map((tool) => tool.name));
-    expect(names.has("message")).toBe(true);
-    expect(names.has("sessions_send")).toBe(true);
-    expect(names.has("sessions_spawn")).toBe(false);
-    expect(names.has("exec")).toBe(false);
-    expect(names.has("browser")).toBe(false);
-  });
-  it("expands group shorthands in global tool policy", () => {
-    const tools = createClawdbotCodingTools({
-      config: { tools: { allow: ["group:fs"] } },
-    });
-    const names = new Set(tools.map((tool) => tool.name));
-    expect(names.has("read")).toBe(true);
-    expect(names.has("write")).toBe(true);
-    expect(names.has("edit")).toBe(true);
-    expect(names.has("exec")).toBe(false);
-    expect(names.has("browser")).toBe(false);
-  });
-  it("expands group shorthands in global tool deny policy", () => {
-    const tools = createClawdbotCodingTools({
-      config: { tools: { deny: ["group:fs"] } },
-    });
-    const names = new Set(tools.map((tool) => tool.name));
-    expect(names.has("read")).toBe(false);
-    expect(names.has("write")).toBe(false);
-    expect(names.has("edit")).toBe(false);
-    expect(names.has("exec")).toBe(true);
-  });
-  it("lets agent profiles override global profiles", () => {
-    const tools = createClawdbotCodingTools({
-      sessionKey: "agent:work:main",
-      config: {
-        tools: { profile: "coding" },
-        agents: {
-          list: [{ id: "work", tools: { profile: "messaging" } }],
-        },
-      },
-    });
-    const names = new Set(tools.map((tool) => tool.name));
-    expect(names.has("message")).toBe(true);
-    expect(names.has("exec")).toBe(false);
-    expect(names.has("read")).toBe(false);
-  });
-  it("removes unsupported JSON Schema keywords for Cloud Code Assist API compatibility", () => {
-    // Helper to recursively check schema for unsupported keywords
-    const unsupportedKeywords = new Set([
-      "patternProperties",
-      "additionalProperties",
-      "$schema",
-      "$id",
-      "$ref",
-      "$defs",
-      "definitions",
-      "examples",
-      "minLength",
-      "maxLength",
-      "minimum",
-      "maximum",
-      "multipleOf",
-      "pattern",
-      "format",
-      "minItems",
-      "maxItems",
-      "uniqueItems",
-      "minProperties",
-      "maxProperties",
-    ]);
-
-    const findUnsupportedKeywords = (schema: unknown, path: string): string[] => {
-      const found: string[] = [];
-      if (!schema || typeof schema !== "object") return found;
-      if (Array.isArray(schema)) {
-        schema.forEach((item, i) => {
-          found.push(...findUnsupportedKeywords(item, `${path}[${i}]`));
-        });
-        return found;
-      }
-
-      const record = schema as Record<string, unknown>;
-      const properties =
-        record.properties &&
-        typeof record.properties === "object" &&
-        !Array.isArray(record.properties)
-          ? (record.properties as Record<string, unknown>)
-          : undefined;
-      if (properties) {
-        for (const [key, value] of Object.entries(properties)) {
-          found.push(...findUnsupportedKeywords(value, `${path}.properties.${key}`));
-        }
-      }
-
-      for (const [key, value] of Object.entries(record)) {
-        if (key === "properties") continue;
-        if (unsupportedKeywords.has(key)) {
-          found.push(`${path}.${key}`);
-        }
-        if (value && typeof value === "object") {
-          found.push(...findUnsupportedKeywords(value, `${path}.${key}`));
-        }
-      }
-      return found;
-    };
-
-    for (const tool of defaultTools) {
-      const violations = findUnsupportedKeywords(tool.parameters, `${tool.name}.parameters`);
-      expect(violations).toEqual([]);
-    }
-  });
-  it("applies sandbox path guards to file_path alias", async () => {
-    const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-sbx-"));
-    const outsidePath = path.join(os.tmpdir(), "clawdbot-outside.txt");
-    await fs.writeFile(outsidePath, "outside", "utf8");
-    try {
-      const readTool = createSandboxedReadTool(tmpDir);
-      await expect(readTool.execute("sandbox-1", { file_path: outsidePath })).rejects.toThrow(
-        /sandbox root/i,
-      );
-    } finally {
-      await fs.rm(outsidePath, { force: true });
-      await fs.rm(tmpDir, { recursive: true, force: true });
-    }
-  });
 });
@@ -237,20 +237,6 @@ describe("buildAgentSystemPrompt", () => {
    expect(prompt).toContain("Bravo");
  });

-  it("adds SOUL guidance when a soul file is present", () => {
-    const prompt = buildAgentSystemPrompt({
-      workspaceDir: "/tmp/clawd",
-      contextFiles: [
-        { path: "./SOUL.md", content: "Persona" },
-        { path: "dir\\SOUL.md", content: "Persona Windows" },
-      ],
-    });
-
-    expect(prompt).toContain(
-      "If SOUL.md is present, embody its persona and tone. Avoid stiff, generic replies; follow its guidance unless higher-priority instructions override it.",
-    );
-  });
-
  it("summarizes the message tool when available", () => {
    const prompt = buildAgentSystemPrompt({
      workspaceDir: "/tmp/clawd",
@@ -517,18 +517,12 @@ export function buildAgentSystemPrompt(params: {

  const contextFiles = params.contextFiles ?? [];
  if (contextFiles.length > 0) {
-    const hasSoulFile = contextFiles.some((file) => {
-      const normalizedPath = file.path.trim().replace(/\\/g, "/");
-      const baseName = normalizedPath.split("/").pop() ?? normalizedPath;
-      return baseName.toLowerCase() === "soul.md";
-    });
-    lines.push("# Project Context", "", "The following project context files have been loaded:");
-    if (hasSoulFile) {
-      lines.push(
-        "If SOUL.md is present, embody its persona and tone. Avoid stiff, generic replies; follow its guidance unless higher-priority instructions override it.",
-      );
-    }
-    lines.push("");
+    lines.push(
+      "# Project Context",
+      "",
+      "The following project context files have been loaded:",
+      "",
+    );
    for (const file of contextFiles) {
      lines.push(`## ${file.path}`, "", file.content, "");
    }
@@ -1,34 +0,0 @@
-import { describe, expect, it } from "vitest";
-
-import { extractAssistantText, sanitizeTextContent } from "./sessions-helpers.js";
-
-describe("sanitizeTextContent", () => {
-  it("strips minimax tool call XML and downgraded markers", () => {
-    const input =
-      'Hello <invoke name="tool">payload</invoke></minimax:tool_call> ' +
-      "[Tool Call: foo (ID: 1)] world";
-    const result = sanitizeTextContent(input).trim();
-    expect(result).toBe("Hello  world");
-    expect(result).not.toContain("invoke");
-    expect(result).not.toContain("Tool Call");
-  });
-
-  it("strips thinking tags", () => {
-    const input = "Before <think>secret</think> after";
-    const result = sanitizeTextContent(input).trim();
-    expect(result).toBe("Before  after");
-  });
-});
-
-describe("extractAssistantText", () => {
-  it("sanitizes blocks without injecting newlines", () => {
-    const message = {
-      role: "assistant",
-      content: [
-        { type: "text", text: "Hi " },
-        { type: "text", text: "<think>secret</think>there" },
-      ],
-    };
-    expect(extractAssistantText(message)).toBe("Hi there");
-  });
-});
@@ -1,10 +1,4 @@
 import type { ClawdbotConfig } from "../../config/config.js";
-import { sanitizeUserFacingText } from "../pi-embedded-helpers.js";
-import {
-  stripDowngradedToolCallText,
-  stripMinimaxToolCallXml,
-  stripThinkingTagsFromText,
-} from "../pi-embedded-utils.js";
 import { normalizeMainKey } from "../../routing/session-key.js";

 export type SessionKind = "main" | "group" | "cron" | "hook" | "node" | "other";
@@ -106,15 +100,6 @@ export function stripToolMessages(messages: unknown[]): unknown[] {
  });
 }

-/**
- * Sanitize text content to strip tool call markers and thinking tags.
- * This ensures user-facing text doesn't leak internal tool representations.
- */
-export function sanitizeTextContent(text: string): string {
-  if (!text) return text;
-  return stripThinkingTagsFromText(stripDowngradedToolCallText(stripMinimaxToolCallXml(text)));
-}
-
 export function extractAssistantText(message: unknown): string | undefined {
  if (!message || typeof message !== "object") return undefined;
  if ((message as { role?: unknown }).role !== "assistant") return undefined;
@@ -125,13 +110,10 @@ export function extractAssistantText(message: unknown): string | undefined {
    if (!block || typeof block !== "object") continue;
    if ((block as { type?: unknown }).type !== "text") continue;
    const text = (block as { text?: unknown }).text;
-    if (typeof text === "string") {
-      const sanitized = sanitizeTextContent(text);
-      if (sanitized.trim()) {
-        chunks.push(sanitized);
-      }
+    if (typeof text === "string" && text.trim()) {
+      chunks.push(text);
    }
  }
  const joined = chunks.join("").trim();
-  return joined ? sanitizeUserFacingText(joined) : undefined;
+  return joined ? joined : undefined;
 }
@@ -136,7 +136,6 @@ export async function runReplyAgent(params: {
    followupRun.run.config,
    replyToChannel,
    sessionCtx.AccountId,
-    sessionCtx.ChatType,
  );
  const applyReplyToMode = createReplyToModeFilterForChannel(replyToMode, replyToChannel);
  const cfg = followupRun.run.config;
@@ -1,23 +0,0 @@
-import { describe, expect, it } from "vitest";
-
-import { extractMessageText } from "./commands-subagents.js";
-
-describe("extractMessageText", () => {
-  it("preserves user text that looks like tool call markers", () => {
-    const message = {
-      role: "user",
-      content: "Here [Tool Call: foo (ID: 1)] ok",
-    };
-    const result = extractMessageText(message);
-    expect(result?.text).toContain("[Tool Call: foo (ID: 1)]");
-  });
-
-  it("sanitizes assistant tool call markers", () => {
-    const message = {
-      role: "assistant",
-      content: "Here [Tool Call: foo (ID: 1)] ok",
-    };
-    const result = extractMessageText(message);
-    expect(result?.text).toBe("Here ok");
-  });
-});
@@ -7,7 +7,6 @@ import {
  extractAssistantText,
  resolveInternalSessionKey,
  resolveMainSessionAlias,
-  sanitizeTextContent,
  stripToolMessages,
 } from "../../agents/tools/sessions-helpers.js";
 import type { SubagentRunRecord } from "../../agents/subagent-registry.js";
@@ -107,14 +106,11 @@ function normalizeMessageText(text: string) {
  return text.replace(/\s+/g, " ").trim();
 }

-export function extractMessageText(message: ChatMessage): { role: string; text: string } | null {
+function extractMessageText(message: ChatMessage): { role: string; text: string } | null {
  const role = typeof message.role === "string" ? message.role : "";
-  const shouldSanitize = role === "assistant";
  const content = message.content;
  if (typeof content === "string") {
-    const normalized = normalizeMessageText(
-      shouldSanitize ? sanitizeTextContent(content) : content,
-    );
+    const normalized = normalizeMessageText(content);
    return normalized ? { role, text: normalized } : null;
  }
  if (!Array.isArray(content)) return null;
@@ -123,11 +119,8 @@ export function extractMessageText(message: ChatMessage): { role: string; text:
    if (!block || typeof block !== "object") continue;
    if ((block as { type?: unknown }).type !== "text") continue;
    const text = (block as { text?: unknown }).text;
-    if (typeof text === "string") {
-      const value = shouldSanitize ? sanitizeTextContent(text) : text;
-      if (value.trim()) {
-        chunks.push(value);
-      }
+    if (typeof text === "string" && text.trim()) {
+      chunks.push(text);
    }
  }
  const joined = normalizeMessageText(chunks.join(" "));
@@ -204,7 +204,6 @@ export function createFollowupRunner(params: {
        queued.run.config,
        replyToChannel,
        queued.originatingAccountId,
-        queued.originatingChatType,
      );

      const replyTaggedPayloads: ReplyPayload[] = applyReplyThreading({
@@ -358,7 +358,6 @@ export async function runPreparedReply(
    originatingTo: ctx.OriginatingTo,
    originatingAccountId: ctx.AccountId,
    originatingThreadId: ctx.MessageThreadId,
-    originatingChatType: ctx.ChatType,
    run: {
      agentId,
      agentDir,
@@ -39,8 +39,6 @@ export type FollowupRun = {
  originatingAccountId?: string;
  /** Thread id for reply routing (Telegram topic id or Matrix thread event id). */
  originatingThreadId?: string | number;
-  /** Chat type for context-aware threading (e.g., DM vs channel). */
-  originatingChatType?: string;
  run: {
    agentId: string;
    agentDir: string;
@@ -31,46 +31,6 @@ describe("resolveReplyToMode", () => {
    expect(resolveReplyToMode(cfg, "discord")).toBe("first");
    expect(resolveReplyToMode(cfg, "slack")).toBe("all");
  });
-
-  it("uses chat-type replyToMode overrides for Slack when configured", () => {
-    const cfg = {
-      channels: {
-        slack: {
-          replyToMode: "off",
-          replyToModeByChatType: { direct: "all", group: "first" },
-        },
-      },
-    } as ClawdbotConfig;
-    expect(resolveReplyToMode(cfg, "slack", null, "direct")).toBe("all");
-    expect(resolveReplyToMode(cfg, "slack", null, "group")).toBe("first");
-    expect(resolveReplyToMode(cfg, "slack", null, "channel")).toBe("off");
-    expect(resolveReplyToMode(cfg, "slack", null, undefined)).toBe("off");
-  });
-
-  it("falls back to top-level replyToMode when no chat-type override is set", () => {
-    const cfg = {
-      channels: {
-        slack: {
-          replyToMode: "first",
-        },
-      },
-    } as ClawdbotConfig;
-    expect(resolveReplyToMode(cfg, "slack", null, "direct")).toBe("first");
-    expect(resolveReplyToMode(cfg, "slack", null, "channel")).toBe("first");
-  });
-
-  it("uses legacy dm.replyToMode for direct messages when no chat-type override exists", () => {
-    const cfg = {
-      channels: {
-        slack: {
-          replyToMode: "off",
-          dm: { replyToMode: "all" },
-        },
-      },
-    } as ClawdbotConfig;
-    expect(resolveReplyToMode(cfg, "slack", null, "direct")).toBe("all");
-    expect(resolveReplyToMode(cfg, "slack", null, "channel")).toBe("off");
-  });
 });

 describe("createReplyToModeFilter", () => {
@@ -9,14 +9,12 @@ export function resolveReplyToMode(
  cfg: ClawdbotConfig,
  channel?: OriginatingChannelType,
  accountId?: string | null,
-  chatType?: string | null,
 ): ReplyToMode {
  const provider = normalizeChannelId(channel);
  if (!provider) return "all";
  const resolved = getChannelDock(provider)?.threading?.resolveReplyToMode?.({
    cfg,
    accountId,
-    chatType,
  });
  return resolved ?? "all";
 }
@@ -60,12 +60,9 @@ export type MsgContext = {
  MediaPath?: string;
  MediaUrl?: string;
  MediaType?: string;
-  MediaDir?: string;
  MediaPaths?: string[];
  MediaUrls?: string[];
  MediaTypes?: string[];
-  OutputDir?: string;
-  OutputBase?: string;
  /** Remote host for SCP when media lives on a different machine (e.g., clawdbot@192.168.64.3). */
  MediaRemoteHost?: string;
  Transcript?: string;
@@ -2,7 +2,7 @@ import type { ClawdbotConfig } from "../config/config.js";
 import { resolveDiscordAccount } from "../discord/accounts.js";
 import { resolveIMessageAccount } from "../imessage/accounts.js";
 import { resolveSignalAccount } from "../signal/accounts.js";
-import { resolveSlackAccount, resolveSlackReplyToMode } from "../slack/accounts.js";
+import { resolveSlackAccount } from "../slack/accounts.js";
 import { buildSlackThreadingToolContext } from "../slack/threading-tool-context.js";
 import { resolveTelegramAccount } from "../telegram/accounts.js";
 import { normalizeE164 } from "../utils.js";
@@ -224,8 +224,8 @@ const DOCKS: Record<ChatChannelId, ChannelDock> = {
      resolveRequireMention: resolveSlackGroupRequireMention,
    },
    threading: {
-      resolveReplyToMode: ({ cfg, accountId, chatType }) =>
-        resolveSlackReplyToMode(resolveSlackAccount({ cfg, accountId }), chatType),
+      resolveReplyToMode: ({ cfg, accountId }) =>
+        resolveSlackAccount({ cfg, accountId }).replyToMode ?? "off",
      allowTagsWhenOff: true,
      buildToolContext: (params) => buildSlackThreadingToolContext(params),
    },
@@ -47,7 +47,7 @@ async function noteDiscordTokenHelp(prompter: WizardPrompter): Promise<void> {
      "1) Discord Developer Portal → Applications → New Application",
      "2) Bot → Add Bot → Reset Token → copy token",
      "3) OAuth2 → URL Generator → scope 'bot' → invite to your server",
-      "Tip: enable Message Content Intent if you need message text. (Bot → Privileged Gateway Intents → Message Content Intent)",
+      "Tip: enable Message Content Intent if you need message text.",
      `Docs: ${formatDocsLink("/discord", "discord")}`,
    ].join("\n"),
    "Discord bot token",
@@ -198,7 +198,6 @@ export type ChannelThreadingAdapter = {
  resolveReplyToMode?: (params: {
    cfg: ClawdbotConfig;
    accountId?: string | null;
-    chatType?: string | null;
  }) => "off" | "first" | "all";
  allowTagsWhenOff?: boolean;
  buildToolContext?: (params: {
@@ -38,19 +38,6 @@ export async function runDaemonUninstall(opts: DaemonLifecycleOptions = {}) {
  }

  const service = resolveGatewayService();
-  let loaded = false;
-  try {
-    loaded = await service.isLoaded({ env: process.env });
-  } catch {
-    loaded = false;
-  }
-  if (loaded) {
-    try {
-      await service.stop({ env: process.env, stdout });
-    } catch {
-      // Best-effort stop; final loaded check gates success.
-    }
-  }
  try {
    await service.uninstall({ env: process.env, stdout });
  } catch (err) {
@@ -58,16 +45,12 @@ export async function runDaemonUninstall(opts: DaemonLifecycleOptions = {}) {
    return;
  }

-  loaded = false;
+  let loaded = false;
  try {
    loaded = await service.isLoaded({ env: process.env });
  } catch {
    loaded = false;
  }
-  if (loaded) {
-    fail("Gateway service still loaded after uninstall.");
-    return;
-  }
  emit({
    ok: true,
    result: "uninstalled",
@@ -46,7 +46,7 @@ const AUTH_CHOICE_GROUP_DEFS: {
    value: "anthropic",
    label: "Anthropic",
    hint: "Claude Code CLI + API key",
-    choices: ["token", "claude-cli", "apiKey"],
+    choices: ["claude-cli", "token", "apiKey"],
  },
  {
    value: "minimax",
@@ -198,20 +198,10 @@ export async function applyAuthChoiceAnthropic(
  }

  if (params.authChoice === "apiKey") {
-    if (params.opts?.tokenProvider && params.opts.tokenProvider !== "anthropic") {
-      return null;
-    }
-
    let nextConfig = params.config;
    let hasCredential = false;
    const envKey = process.env.ANTHROPIC_API_KEY?.trim();
-
-    if (params.opts?.token) {
-      await setAnthropicApiKey(normalizeApiKeyInput(params.opts.token), params.agentDir);
-      hasCredential = true;
-    }
-
-    if (!hasCredential && envKey) {
+    if (envKey) {
      const useExisting = await params.prompter.confirm({
        message: `Use existing ANTHROPIC_API_KEY (env, ${formatApiKeyPreview(envKey)})?`,
        initialValue: true,
@@ -56,33 +56,7 @@ export async function applyAuthChoiceApiProviders(
    );
  };

-  let authChoice = params.authChoice;
-  if (
-    authChoice === "apiKey" &&
-    params.opts?.tokenProvider &&
-    params.opts.tokenProvider !== "anthropic" &&
-    params.opts.tokenProvider !== "openai"
-  ) {
-    if (params.opts.tokenProvider === "openrouter") {
-      authChoice = "openrouter-api-key";
-    } else if (params.opts.tokenProvider === "vercel-ai-gateway") {
-      authChoice = "ai-gateway-api-key";
-    } else if (params.opts.tokenProvider === "moonshot") {
-      authChoice = "moonshot-api-key";
-    } else if (params.opts.tokenProvider === "kimi-code") {
-      authChoice = "kimi-code-api-key";
-    } else if (params.opts.tokenProvider === "google") {
-      authChoice = "gemini-api-key";
-    } else if (params.opts.tokenProvider === "zai") {
-      authChoice = "zai-api-key";
-    } else if (params.opts.tokenProvider === "synthetic") {
-      authChoice = "synthetic-api-key";
-    } else if (params.opts.tokenProvider === "opencode") {
-      authChoice = "opencode-zen";
-    }
-  }
-
-  if (authChoice === "openrouter-api-key") {
+  if (params.authChoice === "openrouter-api-key") {
    const store = ensureAuthProfileStore(params.agentDir, {
      allowKeychainPrompt: false,
    });
@@ -108,11 +82,6 @@ export async function applyAuthChoiceApiProviders(
      hasCredential = true;
    }

-    if (!hasCredential && params.opts?.token && params.opts?.tokenProvider === "openrouter") {
-      await setOpenrouterApiKey(normalizeApiKeyInput(params.opts.token), params.agentDir);
-      hasCredential = true;
-    }
-
    if (!hasCredential) {
      const envKey = resolveEnvApiKey("openrouter");
      if (envKey) {
@@ -160,18 +129,8 @@ export async function applyAuthChoiceApiProviders(
    return { config: nextConfig, agentModelOverride };
  }

-  if (authChoice === "ai-gateway-api-key") {
+  if (params.authChoice === "ai-gateway-api-key") {
    let hasCredential = false;
-
-    if (
-      !hasCredential &&
-      params.opts?.token &&
-      params.opts?.tokenProvider === "vercel-ai-gateway"
-    ) {
-      await setVercelAiGatewayApiKey(normalizeApiKeyInput(params.opts.token), params.agentDir);
-      hasCredential = true;
-    }
-
    const envKey = resolveEnvApiKey("vercel-ai-gateway");
    if (envKey) {
      const useExisting = await params.prompter.confirm({
@@ -212,14 +171,8 @@ export async function applyAuthChoiceApiProviders(
    return { config: nextConfig, agentModelOverride };
  }

-  if (authChoice === "moonshot-api-key") {
+  if (params.authChoice === "moonshot-api-key") {
    let hasCredential = false;
-
-    if (!hasCredential && params.opts?.token && params.opts?.tokenProvider === "moonshot") {
-      await setMoonshotApiKey(normalizeApiKeyInput(params.opts.token), params.agentDir);
-      hasCredential = true;
-    }
-
    const envKey = resolveEnvApiKey("moonshot");
    if (envKey) {
      const useExisting = await params.prompter.confirm({
@@ -259,22 +212,15 @@ export async function applyAuthChoiceApiProviders(
    return { config: nextConfig, agentModelOverride };
  }

-  if (authChoice === "kimi-code-api-key") {
+  if (params.authChoice === "kimi-code-api-key") {
+    await params.prompter.note(
+      [
+        "Kimi Code uses a dedicated endpoint and API key.",
+        "Get your API key at: https://www.kimi.com/code/en",
+      ].join("\n"),
+      "Kimi Code",
+    );
    let hasCredential = false;
-    if (!hasCredential && params.opts?.token && params.opts?.tokenProvider === "kimi-code") {
-      await setKimiCodeApiKey(normalizeApiKeyInput(params.opts.token), params.agentDir);
-      hasCredential = true;
-    }
-
-    if (!hasCredential) {
-      await params.prompter.note(
-        [
-          "Kimi Code uses a dedicated endpoint and API key.",
-          "Get your API key at: https://www.kimi.com/code/en",
-        ].join("\n"),
-        "Kimi Code",
-      );
-    }
    const envKey = resolveEnvApiKey("kimi-code");
    if (envKey) {
      const useExisting = await params.prompter.confirm({
@@ -315,14 +261,8 @@ export async function applyAuthChoiceApiProviders(
    return { config: nextConfig, agentModelOverride };
  }

-  if (authChoice === "gemini-api-key") {
+  if (params.authChoice === "gemini-api-key") {
    let hasCredential = false;
-
-    if (!hasCredential && params.opts?.token && params.opts?.tokenProvider === "google") {
-      await setGeminiApiKey(normalizeApiKeyInput(params.opts.token), params.agentDir);
-      hasCredential = true;
-    }
-
    const envKey = resolveEnvApiKey("google");
    if (envKey) {
      const useExisting = await params.prompter.confirm({
@@ -362,14 +302,8 @@ export async function applyAuthChoiceApiProviders(
    return { config: nextConfig, agentModelOverride };
  }

-  if (authChoice === "zai-api-key") {
+  if (params.authChoice === "zai-api-key") {
    let hasCredential = false;
-
-    if (!hasCredential && params.opts?.token && params.opts?.tokenProvider === "zai") {
-      await setZaiApiKey(normalizeApiKeyInput(params.opts.token), params.agentDir);
-      hasCredential = true;
-    }
-
    const envKey = resolveEnvApiKey("zai");
    if (envKey) {
      const useExisting = await params.prompter.confirm({
@@ -425,16 +359,12 @@ export async function applyAuthChoiceApiProviders(
    return { config: nextConfig, agentModelOverride };
  }

-  if (authChoice === "synthetic-api-key") {
-    if (params.opts?.token && params.opts?.tokenProvider === "synthetic") {
-      await setSyntheticApiKey(String(params.opts.token).trim(), params.agentDir);
-    } else {
-      const key = await params.prompter.text({
-        message: "Enter Synthetic API key",
-        validate: (value) => (value?.trim() ? undefined : "Required"),
-      });
-      await setSyntheticApiKey(String(key).trim(), params.agentDir);
-    }
+  if (params.authChoice === "synthetic-api-key") {
+    const key = await params.prompter.text({
+      message: "Enter Synthetic API key",
+      validate: (value) => (value?.trim() ? undefined : "Required"),
+    });
+    await setSyntheticApiKey(String(key).trim(), params.agentDir);
    nextConfig = applyAuthProfileConfig(nextConfig, {
      profileId: "synthetic:default",
      provider: "synthetic",
@@ -457,23 +387,16 @@ export async function applyAuthChoiceApiProviders(
    return { config: nextConfig, agentModelOverride };
  }

-  if (authChoice === "opencode-zen") {
+  if (params.authChoice === "opencode-zen") {
+    await params.prompter.note(
+      [
+        "OpenCode Zen provides access to Claude, GPT, Gemini, and more models.",
+        "Get your API key at: https://opencode.ai/auth",
+        "Requires an active OpenCode Zen subscription.",
+      ].join("\n"),
+      "OpenCode Zen",
+    );
    let hasCredential = false;
-    if (!hasCredential && params.opts?.token && params.opts?.tokenProvider === "opencode") {
-      await setOpencodeZenApiKey(normalizeApiKeyInput(params.opts.token), params.agentDir);
-      hasCredential = true;
-    }
-
-    if (!hasCredential) {
-      await params.prompter.note(
-        [
-          "OpenCode Zen provides access to Claude, GPT, Gemini, and more models.",
-          "Get your API key at: https://opencode.ai/auth",
-          "Requires an active OpenCode Zen subscription.",
-        ].join("\n"),
-        "OpenCode Zen",
-      );
-    }
    const envKey = resolveEnvApiKey("opencode");
    if (envKey) {
      const useExisting = await params.prompter.confirm({
@@ -35,7 +35,7 @@ export async function applyAuthChoiceGitHubCopilot(
  nextConfig = applyAuthProfileConfig(nextConfig, {
    profileId: "github-copilot:github",
    provider: "github-copilot",
-    mode: "token",
+    mode: "oauth",
  });

  if (params.setDefaultModel) {
@@ -20,12 +20,7 @@ import {
 export async function applyAuthChoiceOpenAI(
  params: ApplyAuthChoiceParams,
 ): Promise<ApplyAuthChoiceResult | null> {
-  let authChoice = params.authChoice;
-  if (authChoice === "apiKey" && params.opts?.tokenProvider === "openai") {
-    authChoice = "openai-api-key";
-  }
-
-  if (authChoice === "openai-api-key") {
+  if (params.authChoice === "openai-api-key") {
    const envKey = resolveEnvApiKey("openai");
    if (envKey) {
      const useExisting = await params.prompter.confirm({
@@ -48,16 +43,10 @@ export async function applyAuthChoiceOpenAI(
      }
    }

-    let key: string | undefined;
-    if (params.opts?.token && params.opts?.tokenProvider === "openai") {
-      key = params.opts.token;
-    } else {
-      key = await params.prompter.text({
-        message: "Enter OpenAI API key",
-        validate: validateApiKeyInput,
-      });
-    }
-
+    const key = await params.prompter.text({
+      message: "Enter OpenAI API key",
+      validate: validateApiKeyInput,
+    });
    const trimmed = normalizeApiKeyInput(String(key));
    const result = upsertSharedEnvVar({
      key: "OPENAI_API_KEY",
@@ -21,10 +21,6 @@ export type ApplyAuthChoiceParams = {
  agentDir?: string;
  setDefaultModel: boolean;
  agentId?: string;
-  opts?: {
-    tokenProvider?: string;
-    token?: string;
-  };
 };

 export type ApplyAuthChoiceResult = {
@@ -1,4 +1,4 @@
-import { afterEach, describe, expect, it, vi } from "vitest";
+import { describe, expect, it, vi } from "vitest";

 import { openUrl, resolveBrowserOpenCommand, resolveControlUiLinks } from "./onboard-helpers.js";

@@ -21,17 +21,9 @@ vi.mock("../infra/tailnet.js", () => ({
  pickPrimaryTailnetIPv4: mocks.pickPrimaryTailnetIPv4,
 }));

-afterEach(() => {
-  vi.unstubAllEnvs();
-});
-
 describe("openUrl", () => {
  it("quotes URLs on win32 so '&' is not treated as cmd separator", async () => {
-    vi.stubEnv("VITEST", "");
-    vi.stubEnv("NODE_ENV", "");
-    const platformSpy = vi.spyOn(process, "platform", "get").mockReturnValue("win32");
-    vi.stubEnv("VITEST", "");
-    vi.stubEnv("NODE_ENV", "development");
+    vi.spyOn(process, "platform", "get").mockReturnValue("win32");

    const url =
      "https://accounts.google.com/o/oauth2/v2/auth?client_id=abc&response_type=code&redirect_uri=http%3A%2F%2Flocalhost";
@@ -47,18 +39,15 @@ describe("openUrl", () => {
      timeoutMs: 5_000,
      windowsVerbatimArguments: true,
    });
-
-    platformSpy.mockRestore();
  });
 });

 describe("resolveBrowserOpenCommand", () => {
  it("marks win32 commands as quoteUrl=true", async () => {
-    const platformSpy = vi.spyOn(process, "platform", "get").mockReturnValue("win32");
+    vi.spyOn(process, "platform", "get").mockReturnValue("win32");
    const resolved = await resolveBrowserOpenCommand();
    expect(resolved.argv).toEqual(["cmd", "/c", "start", ""]);
    expect(resolved.quoteUrl).toBe(true);
-    platformSpy.mockRestore();
  });
 });

@@ -192,7 +192,6 @@ function resolveSshTargetHint(): string {
 }

 export async function openUrl(url: string): Promise<boolean> {
-  if (shouldSkipBrowserOpenInTests()) return false;
  const resolved = await resolveBrowserOpenCommand();
  if (!resolved.argv) return false;
  const quoteUrl = resolved.quoteUrl === true;
@@ -219,7 +218,6 @@ export async function openUrl(url: string): Promise<boolean> {
 }

 export async function openUrlInBackground(url: string): Promise<boolean> {
-  if (shouldSkipBrowserOpenInTests()) return false;
  if (process.platform !== "darwin") return false;
  const resolved = await resolveBrowserOpenCommand();
  if (!resolved.argv || resolved.command !== "open") return false;
@@ -310,11 +308,6 @@ export async function detectBinary(name: string): Promise<boolean> {
  }
 }

-function shouldSkipBrowserOpenInTests(): boolean {
-  if (process.env.VITEST) return true;
-  return process.env.NODE_ENV === "test";
-}
-
 export async function probeGatewayReachable(params: {
  url: string;
  token?: string;
@@ -4,43 +4,18 @@ import os from "node:os";
 import path from "node:path";

 import { afterAll, beforeAll, describe, expect, it, vi } from "vitest";
+import { WebSocket } from "ws";

+import {
+  loadOrCreateDeviceIdentity,
+  publicKeyRawBase64UrlFromPem,
+  signDevicePayload,
+} from "../infra/device-identity.js";
+import { buildDeviceAuthPayload } from "../gateway/device-auth.js";
+import { PROTOCOL_VERSION } from "../gateway/protocol/index.js";
+import { rawDataToString } from "../infra/ws.js";
 import { getDeterministicFreePortBlock } from "../test-utils/ports.js";
-
-const gatewayClientCalls: Array<{
-  url?: string;
-  token?: string;
-  password?: string;
-  onHelloOk?: () => void;
-  onClose?: (code: number, reason: string) => void;
-}> = [];
-
-vi.mock("../gateway/client.js", () => ({
-  GatewayClient: class {
-    params: {
-      url?: string;
-      token?: string;
-      password?: string;
-      onHelloOk?: () => void;
-    };
-    constructor(params: {
-      url?: string;
-      token?: string;
-      password?: string;
-      onHelloOk?: () => void;
-    }) {
-      this.params = params;
-      gatewayClientCalls.push(params);
-    }
-    async request() {
-      return { ok: true };
-    }
-    start() {
-      queueMicrotask(() => this.params.onHelloOk?.());
-    }
-    stop() {}
-  },
-}));
+import { GATEWAY_CLIENT_MODES, GATEWAY_CLIENT_NAMES } from "../utils/message-channel.js";

 async function getFreePort(): Promise<number> {
  return await new Promise((resolve, reject) => {
@@ -66,6 +41,85 @@ async function getFreeGatewayPort(): Promise<number> {
  return await getDeterministicFreePortBlock({ offsets: [0, 1, 2, 4] });
 }

+async function onceMessage<T = unknown>(
+  ws: WebSocket,
+  filter: (obj: unknown) => boolean,
+  timeoutMs = 5000,
+): Promise<T> {
+  return await new Promise<T>((resolve, reject) => {
+    const timer = setTimeout(() => reject(new Error("timeout")), timeoutMs);
+    const closeHandler = (code: number, reason: Buffer) => {
+      clearTimeout(timer);
+      ws.off("message", handler);
+      reject(new Error(`closed ${code}: ${rawDataToString(reason)}`));
+    };
+    const handler = (data: WebSocket.RawData) => {
+      const obj = JSON.parse(rawDataToString(data));
+      if (!filter(obj)) return;
+      clearTimeout(timer);
+      ws.off("message", handler);
+      ws.off("close", closeHandler);
+      resolve(obj as T);
+    };
+    ws.on("message", handler);
+    ws.once("close", closeHandler);
+  });
+}
+
+async function connectReq(params: { url: string; token?: string }) {
+  const ws = new WebSocket(params.url);
+  await new Promise<void>((resolve) => ws.once("open", resolve));
+  const identity = loadOrCreateDeviceIdentity();
+  const signedAtMs = Date.now();
+  const payload = buildDeviceAuthPayload({
+    deviceId: identity.deviceId,
+    clientId: GATEWAY_CLIENT_NAMES.TEST,
+    clientMode: GATEWAY_CLIENT_MODES.TEST,
+    role: "operator",
+    scopes: [],
+    signedAtMs,
+    token: params.token ?? null,
+  });
+  const device = {
+    id: identity.deviceId,
+    publicKey: publicKeyRawBase64UrlFromPem(identity.publicKeyPem),
+    signature: signDevicePayload(identity.privateKeyPem, payload),
+    signedAt: signedAtMs,
+  };
+  ws.send(
+    JSON.stringify({
+      type: "req",
+      id: "c1",
+      method: "connect",
+      params: {
+        minProtocol: PROTOCOL_VERSION,
+        maxProtocol: PROTOCOL_VERSION,
+        client: {
+          id: GATEWAY_CLIENT_NAMES.TEST,
+          displayName: "vitest",
+          version: "dev",
+          platform: process.platform,
+          mode: GATEWAY_CLIENT_MODES.TEST,
+        },
+        caps: [],
+        auth: params.token ? { token: params.token } : undefined,
+        device,
+      },
+    }),
+  );
+  const res = await onceMessage<{
+    type: "res";
+    id: string;
+    ok: boolean;
+    error?: { message?: string };
+  }>(ws, (o) => {
+    const obj = o as { type?: unknown; id?: unknown } | undefined;
+    return obj?.type === "res" && obj?.id === "c1";
+  });
+  ws.close();
+  return res;
+}
+
 const runtime = {
  log: () => {},
  error: (msg: string) => {
@@ -98,6 +152,7 @@ describe("onboard (non-interactive): gateway and remote auth", () => {
    const stateDir = await fs.mkdtemp(path.join(tempHome, prefix));
    process.env.CLAWDBOT_STATE_DIR = stateDir;
    delete process.env.CLAWDBOT_CONFIG_PATH;
+    vi.resetModules();
    return stateDir;
  };

@@ -152,9 +207,8 @@ describe("onboard (non-interactive): gateway and remote auth", () => {
      runtime,
    );

-    const { resolveConfigPath } = await import("../config/paths.js");
-    const configPath = resolveConfigPath(process.env, stateDir);
-    const cfg = JSON.parse(await fs.readFile(configPath, "utf8")) as {
+    const { CONFIG_PATH_CLAWDBOT } = await import("../config/config.js");
+    const cfg = JSON.parse(await fs.readFile(CONFIG_PATH_CLAWDBOT, "utf8")) as {
      gateway?: { auth?: { mode?: string; token?: string } };
      agents?: { defaults?: { workspace?: string } };
    };
@@ -163,12 +217,25 @@ describe("onboard (non-interactive): gateway and remote auth", () => {
    expect(cfg?.gateway?.auth?.mode).toBe("token");
    expect(cfg?.gateway?.auth?.token).toBe(token);

-    const { authorizeGatewayConnect, resolveGatewayAuth } = await import("../gateway/auth.js");
-    const auth = resolveGatewayAuth({ authConfig: cfg.gateway?.auth, env: process.env });
-    const resNoToken = await authorizeGatewayConnect({ auth, connectAuth: { token: undefined } });
-    expect(resNoToken.ok).toBe(false);
-    const resToken = await authorizeGatewayConnect({ auth, connectAuth: { token } });
-    expect(resToken.ok).toBe(true);
+    const { startGatewayServer } = await import("../gateway/server.js");
+    const port = await getFreePort();
+    const server = await startGatewayServer(port, {
+      bind: "loopback",
+      controlUiEnabled: false,
+    });
+    try {
+      const resNoToken = await connectReq({ url: `ws://127.0.0.1:${port}` });
+      expect(resNoToken.ok).toBe(false);
+      expect(resNoToken.error?.message ?? "").toContain("unauthorized");
+
+      const resToken = await connectReq({
+        url: `ws://127.0.0.1:${port}`,
+        token,
+      });
+      expect(resToken.ok).toBe(true);
+    } finally {
+      await server.close({ reason: "non-interactive onboard auth test" });
+    }

    await fs.rm(stateDir, { recursive: true, force: true });
  }, 60_000);
@@ -177,37 +244,43 @@ describe("onboard (non-interactive): gateway and remote auth", () => {
    const stateDir = await initStateDir("state-remote-");
    const port = await getFreePort();
    const token = "tok_remote_123";
-    const { runNonInteractiveOnboarding } = await import("./onboard-non-interactive.js");
-    await runNonInteractiveOnboarding(
-      {
-        nonInteractive: true,
-        mode: "remote",
-        remoteUrl: `ws://127.0.0.1:${port}`,
-        remoteToken: token,
-        authChoice: "skip",
-        json: true,
-      },
-      runtime,
-    );
+    const { startGatewayServer } = await import("../gateway/server.js");
+    const server = await startGatewayServer(port, {
+      bind: "loopback",
+      auth: { mode: "token", token },
+      controlUiEnabled: false,
+    });

-    const { resolveConfigPath } = await import("../config/config.js");
-    const cfg = JSON.parse(await fs.readFile(resolveConfigPath(), "utf8")) as {
-      gateway?: { mode?: string; remote?: { url?: string; token?: string } };
-    };
+    try {
+      const { runNonInteractiveOnboarding } = await import("./onboard-non-interactive.js");
+      await runNonInteractiveOnboarding(
+        {
+          nonInteractive: true,
+          mode: "remote",
+          remoteUrl: `ws://127.0.0.1:${port}`,
+          remoteToken: token,
+          authChoice: "skip",
+          json: true,
+        },
+        runtime,
+      );

-    expect(cfg.gateway?.mode).toBe("remote");
-    expect(cfg.gateway?.remote?.url).toBe(`ws://127.0.0.1:${port}`);
-    expect(cfg.gateway?.remote?.token).toBe(token);
+      const { resolveConfigPath } = await import("../config/config.js");
+      const cfg = JSON.parse(await fs.readFile(resolveConfigPath(), "utf8")) as {
+        gateway?: { mode?: string; remote?: { url?: string; token?: string } };
+      };

-    gatewayClientCalls.length = 0;
-    const { callGateway } = await import("../gateway/call.js");
-    const health = await callGateway<{ ok?: boolean }>({ method: "health" });
-    expect(health?.ok).toBe(true);
-    const lastCall = gatewayClientCalls[gatewayClientCalls.length - 1];
-    expect(lastCall?.url).toBe(`ws://127.0.0.1:${port}`);
-    expect(lastCall?.token).toBe(token);
+      expect(cfg.gateway?.mode).toBe("remote");
+      expect(cfg.gateway?.remote?.url).toBe(`ws://127.0.0.1:${port}`);
+      expect(cfg.gateway?.remote?.token).toBe(token);

-    await fs.rm(stateDir, { recursive: true, force: true });
+      const { callGateway } = await import("../gateway/call.js");
+      const health = await callGateway<{ ok?: boolean }>({ method: "health" });
+      expect(health?.ok).toBe(true);
+    } finally {
+      await server.close({ reason: "non-interactive remote test complete" });
+      await fs.rm(stateDir, { recursive: true, force: true });
+    }
  }, 60_000);

  it("auto-enables token auth when binding LAN and persists the token", async () => {
@@ -263,12 +336,27 @@ describe("onboard (non-interactive): gateway and remote auth", () => {
    const token = cfg.gateway?.auth?.token ?? "";
    expect(token.length).toBeGreaterThan(8);

-    const { authorizeGatewayConnect, resolveGatewayAuth } = await import("../gateway/auth.js");
-    const auth = resolveGatewayAuth({ authConfig: cfg.gateway?.auth, env: process.env });
-    const resNoToken = await authorizeGatewayConnect({ auth, connectAuth: { token: undefined } });
-    expect(resNoToken.ok).toBe(false);
-    const resToken = await authorizeGatewayConnect({ auth, connectAuth: { token } });
-    expect(resToken.ok).toBe(true);
+    const { startGatewayServer } = await import("../gateway/server.js");
+    const server = await startGatewayServer(port, {
+      controlUiEnabled: false,
+      auth: {
+        mode: "token",
+        token,
+      },
+    });
+    try {
+      const resNoToken = await connectReq({ url: `ws://127.0.0.1:${port}` });
+      expect(resNoToken.ok).toBe(false);
+      expect(resNoToken.error?.message ?? "").toContain("unauthorized");
+
+      const resToken = await connectReq({
+        url: `ws://127.0.0.1:${port}`,
+        token,
+      });
+      expect(resToken.ok).toBe(true);
+    } finally {
+      await server.close({ reason: "lan auto-token test complete" });
+    }

    await fs.rm(stateDir, { recursive: true, force: true });
  }, 60_000);
@@ -17,8 +17,6 @@ export type SlackDmConfig = {
  groupEnabled?: boolean;
  /** Optional allowlist for group DM channels (ids or slugs). */
  groupChannels?: Array<string | number>;
-  /** @deprecated Prefer channels.slack.replyToModeByChatType.direct. */
-  replyToMode?: ReplyToMode;
 };

 export type SlackChannelConfig = {
@@ -119,11 +117,6 @@ export type SlackAccountConfig = {
  reactionAllowlist?: Array<string | number>;
  /** Control reply threading when reply tags are present (off|first|all). */
  replyToMode?: ReplyToMode;
-  /**
-   * Optional per-chat-type reply threading overrides.
-   * Example: { direct: "all", group: "first", channel: "off" }.
-   */
-  replyToModeByChatType?: Partial<Record<"direct" | "group" | "channel", ReplyToMode>>;
  /** Thread session behavior. */
  thread?: SlackThreadConfig;
  actions?: SlackActionConfig;
@@ -248,7 +248,6 @@ export const SlackDmSchema = z
    allowFrom: z.array(z.union([z.string(), z.number()])).optional(),
    groupEnabled: z.boolean().optional(),
    groupChannels: z.array(z.union([z.string(), z.number()])).optional(),
-    replyToMode: ReplyToModeSchema.optional(),
  })
  .strict()
  .superRefine((value, ctx) => {
@@ -281,14 +280,6 @@ export const SlackThreadSchema = z
  })
  .strict();

-const SlackReplyToModeByChatTypeSchema = z
-  .object({
-    direct: ReplyToModeSchema.optional(),
-    group: ReplyToModeSchema.optional(),
-    channel: ReplyToModeSchema.optional(),
-  })
-  .strict();
-
 export const SlackAccountSchema = z
  .object({
    name: z.string().optional(),
@@ -316,7 +307,6 @@ export const SlackAccountSchema = z
    reactionNotifications: z.enum(["off", "own", "all", "allowlist"]).optional(),
    reactionAllowlist: z.array(z.union([z.string(), z.number()])).optional(),
    replyToMode: ReplyToModeSchema.optional(),
-    replyToModeByChatType: SlackReplyToModeByChatTypeSchema.optional(),
    thread: SlackThreadSchema.optional(),
    actions: z
      .object({
@@ -36,7 +36,6 @@ vi.mock("../config/sessions.js", async (importOriginal) => {
 });

 beforeEach(() => {
-  vi.useRealTimers();
  sendMock.mockReset().mockResolvedValue(undefined);
  updateLastRouteMock.mockReset();
  dispatchMock.mockReset().mockImplementation(async ({ dispatcher }) => {
@@ -1,9 +1,6 @@
 import type { Client } from "@buape/carbon";
 import { ChannelType, MessageType } from "@buape/carbon";
 import { beforeEach, describe, expect, it, vi } from "vitest";
-import { createDiscordMessageHandler } from "./monitor.js";
-import { __resetDiscordChannelInfoCacheForTest } from "./monitor/message-utils.js";
-import { __resetDiscordThreadStarterCacheForTest } from "./monitor/threading.js";

 const sendMock = vi.fn();
 const reactMock = vi.fn();
@@ -44,12 +41,12 @@ beforeEach(() => {
  });
  readAllowFromStoreMock.mockReset().mockResolvedValue([]);
  upsertPairingRequestMock.mockReset().mockResolvedValue({ code: "PAIRCODE", created: true });
-  __resetDiscordChannelInfoCacheForTest();
-  __resetDiscordThreadStarterCacheForTest();
+  vi.resetModules();
 });

 describe("discord tool result dispatch", () => {
  it("sends status replies with responsePrefix", async () => {
+    const { createDiscordMessageHandler } = await import("./monitor.js");
    const cfg = {
      agents: {
        defaults: {
@@ -119,6 +116,7 @@ describe("discord tool result dispatch", () => {
  }, 30_000);

  it("caches channel info lookups between messages", async () => {
+    const { createDiscordMessageHandler } = await import("./monitor.js");
    const cfg = {
      agents: {
        defaults: {
@@ -191,6 +189,7 @@ describe("discord tool result dispatch", () => {
  });

  it("includes forwarded message snapshots in body", async () => {
+    const { createDiscordMessageHandler } = await import("./monitor.js");
    let capturedBody = "";
    dispatchMock.mockImplementationOnce(async ({ ctx, dispatcher }) => {
      capturedBody = ctx.Body ?? "";
@@ -30,10 +30,6 @@ type DiscordThreadParentInfo = {

 const DISCORD_THREAD_STARTER_CACHE = new Map<string, DiscordThreadStarter>();

-export function __resetDiscordThreadStarterCacheForTest() {
-  DISCORD_THREAD_STARTER_CACHE.clear();
-}
-
 function isDiscordThreadType(type: ChannelType | undefined): boolean {
  return (
    type === ChannelType.PublicThread ||
@@ -7,8 +7,7 @@ import { normalizeAgentId } from "../routing/session-key.js";
 const MAX_ASSISTANT_NAME = 50;
 const MAX_ASSISTANT_AVATAR = 200;

-export const DEFAULT_ASSISTANT_IDENTITY: AssistantIdentity = {
-  agentId: "main",
+export const DEFAULT_ASSISTANT_IDENTITY = {
  name: "Assistant",
  avatar: "A",
 };
@@ -1,23 +1,11 @@
-import { afterAll, beforeAll, describe, expect, it } from "vitest";
+import { describe, expect, it } from "vitest";

 import { HISTORY_CONTEXT_MARKER } from "../auto-reply/reply/history.js";
 import { CURRENT_MESSAGE_MARKER } from "../auto-reply/reply/mentions.js";
 import { emitAgentEvent } from "../infra/agent-events.js";
 import { agentCommand, getFreePort, installGatewayTestHooks } from "./test-helpers.js";

-installGatewayTestHooks({ scope: "suite" });
-
-let enabledServer: Awaited<ReturnType<typeof startServer>>;
-let enabledPort: number;
-
-beforeAll(async () => {
-  enabledPort = await getFreePort();
-  enabledServer = await startServer(enabledPort);
-});
-
-afterAll(async () => {
-  await enabledServer.close({ reason: "openai http enabled suite done" });
-});
+installGatewayTestHooks();

 async function startServerWithDefaultConfig(port: number) {
  const { startGatewayServer } = await import("./server.js");
@@ -94,7 +82,8 @@ describe("OpenAI-compatible HTTP API (e2e)", () => {
  });

  it("handles request validation and routing", async () => {
-    const port = enabledPort;
+    const port = await getFreePort();
+    const server = await startServer(port);
    const mockAgentOnce = (payloads: Array<{ text: string }>) => {
      agentCommand.mockReset();
      agentCommand.mockResolvedValueOnce({ payloads } as never);
@@ -341,12 +330,13 @@ describe("OpenAI-compatible HTTP API (e2e)", () => {
        );
      }
    } finally {
-      // shared server
+      await server.close({ reason: "test done" });
    }
  });

  it("streams SSE chunks when stream=true", async () => {
-    const port = enabledPort;
+    const port = await getFreePort();
+    const server = await startServer(port);
    try {
      {
        agentCommand.mockReset();
@@ -426,7 +416,7 @@ describe("OpenAI-compatible HTTP API (e2e)", () => {
        expect(fallbackText).toContain("hello");
      }
    } finally {
-      // shared server
+      await server.close({ reason: "test done" });
    }
  });
 });
@@ -1,23 +1,11 @@
-import { afterAll, beforeAll, describe, expect, it } from "vitest";
+import { describe, expect, it } from "vitest";

 import { HISTORY_CONTEXT_MARKER } from "../auto-reply/reply/history.js";
 import { CURRENT_MESSAGE_MARKER } from "../auto-reply/reply/mentions.js";
 import { emitAgentEvent } from "../infra/agent-events.js";
 import { agentCommand, getFreePort, installGatewayTestHooks } from "./test-helpers.js";

-installGatewayTestHooks({ scope: "suite" });
-
-let enabledServer: Awaited<ReturnType<typeof startServer>>;
-let enabledPort: number;
-
-beforeAll(async () => {
-  enabledPort = await getFreePort();
-  enabledServer = await startServer(enabledPort);
-});
-
-afterAll(async () => {
-  await enabledServer.close({ reason: "openresponses enabled suite done" });
-});
+installGatewayTestHooks();

 async function startServerWithDefaultConfig(port: number) {
  const { startGatewayServer } = await import("./server.js");
@@ -84,7 +72,7 @@ async function ensureResponseConsumed(res: Response) {
 describe("OpenResponses HTTP API (e2e)", () => {
  it("rejects when disabled (default + config)", { timeout: 120_000 }, async () => {
    const port = await getFreePort();
-    const _server = await startServerWithDefaultConfig(port);
+    const server = await startServerWithDefaultConfig(port);
    try {
      const res = await postResponses(port, {
        model: "clawdbot",
@@ -93,7 +81,7 @@ describe("OpenResponses HTTP API (e2e)", () => {
      expect(res.status).toBe(404);
      await ensureResponseConsumed(res);
    } finally {
-      // shared server
+      await server.close({ reason: "test done" });
    }

    const disabledPort = await getFreePort();
@@ -113,7 +101,8 @@ describe("OpenResponses HTTP API (e2e)", () => {
  });

  it("handles OpenResponses request parsing and validation", async () => {
-    const port = enabledPort;
+    const port = await getFreePort();
+    const server = await startServer(port);
    const mockAgentOnce = (payloads: Array<{ text: string }>, meta?: unknown) => {
      agentCommand.mockReset();
      agentCommand.mockResolvedValueOnce({ payloads, meta } as never);
@@ -417,12 +406,14 @@ describe("OpenResponses HTTP API (e2e)", () => {
      );
      await ensureResponseConsumed(resNoUser);
    } finally {
-      // shared server
+      await server.close({ reason: "test done" });
    }
  });

  it("streams OpenResponses SSE events", async () => {
-    const port = enabledPort;
+    const port = await getFreePort();
+    const server = await startServer(port);
+
    try {
      agentCommand.mockReset();
      agentCommand.mockImplementationOnce(async (opts: unknown) => {
@@ -498,7 +489,7 @@ describe("OpenResponses HTTP API (e2e)", () => {
        expect(event.event).toBe(parsed.type);
      }
    } finally {
-      // shared server
+      await server.close({ reason: "test done" });
    }
  });
 });
@@ -1,21 +1,7 @@
 export const MAX_PAYLOAD_BYTES = 512 * 1024; // cap incoming frame size
 export const MAX_BUFFERED_BYTES = 1.5 * 1024 * 1024; // per-connection send buffer limit

-const DEFAULT_MAX_CHAT_HISTORY_MESSAGES_BYTES = 6 * 1024 * 1024; // keep history responses comfortably under client WS limits
-let maxChatHistoryMessagesBytes = DEFAULT_MAX_CHAT_HISTORY_MESSAGES_BYTES;
-
-export const getMaxChatHistoryMessagesBytes = () => maxChatHistoryMessagesBytes;
-
-export const __setMaxChatHistoryMessagesBytesForTest = (value?: number) => {
-  if (!process.env.VITEST && process.env.NODE_ENV !== "test") return;
-  if (value === undefined) {
-    maxChatHistoryMessagesBytes = DEFAULT_MAX_CHAT_HISTORY_MESSAGES_BYTES;
-    return;
-  }
-  if (Number.isFinite(value) && value > 0) {
-    maxChatHistoryMessagesBytes = value;
-  }
-};
+export const MAX_CHAT_HISTORY_MESSAGES_BYTES = 6 * 1024 * 1024; // keep history responses comfortably under client WS limits
 export const DEFAULT_HANDSHAKE_TIMEOUT_MS = 10_000;
 export const getHandshakeTimeoutMs = () => {
  if (process.env.VITEST && process.env.CLAWDBOT_TEST_HANDSHAKE_TIMEOUT_MS) {
@@ -28,7 +28,7 @@ import {
  validateChatInjectParams,
  validateChatSendParams,
 } from "../protocol/index.js";
-import { getMaxChatHistoryMessagesBytes } from "../server-constants.js";
+import { MAX_CHAT_HISTORY_MESSAGES_BYTES } from "../server-constants.js";
 import {
  capArrayByJsonBytes,
  loadSessionEntry,
@@ -66,7 +66,7 @@ export const chatHandlers: GatewayRequestHandlers = {
    const max = Math.min(hardMax, requested);
    const sliced = rawMessages.length > max ? rawMessages.slice(-max) : rawMessages;
    const sanitized = stripEnvelopeFromMessages(sliced);
-    const capped = capArrayByJsonBytes(sanitized, getMaxChatHistoryMessagesBytes()).items;
+    const capped = capArrayByJsonBytes(sanitized, MAX_CHAT_HISTORY_MESSAGES_BYTES).items;
    let thinkingLevel = entry?.thinkingLevel;
    if (!thinkingLevel) {
      const configured = cfg.agents?.defaults?.thinkingDefault;
@@ -1,10 +1,9 @@
 import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
-import { afterAll, beforeAll, describe, expect, test, vi } from "vitest";
+import { describe, expect, test, vi } from "vitest";
 import type { ChannelPlugin } from "../channels/plugins/types.js";
 import type { PluginRegistry } from "../plugins/registry.js";
-import { setActivePluginRegistry } from "../plugins/runtime.js";
 import {
  agentCommand,
  connectOk,
@@ -15,22 +14,7 @@ import {
  writeSessionStore,
 } from "./test-helpers.js";

-installGatewayTestHooks({ scope: "suite" });
-
-let server: Awaited<ReturnType<typeof startServerWithClient>>["server"];
-let ws: Awaited<ReturnType<typeof startServerWithClient>>["ws"];
-
-beforeAll(async () => {
-  const started = await startServerWithClient();
-  server = started.server;
-  ws = started.ws;
-  await connectOk(ws);
-});
-
-afterAll(async () => {
-  ws.close();
-  await server.close();
-});
+installGatewayTestHooks();

 const registryState = vi.hoisted(() => ({
  registry: {
@@ -59,11 +43,6 @@ vi.mock("./server-plugins.js", async () => {
  };
 });

-const setRegistry = (registry: PluginRegistry) => {
-  registryState.registry = registry;
-  setActivePluginRegistry(registry);
-};
-
 const BASE_IMAGE_PNG =
  "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAwMCAO+X3mIAAAAASUVORK5CYII=";

@@ -163,7 +142,7 @@ const defaultRegistry = createRegistry([

 describe("gateway server agent", () => {
  test("agent marks implicit delivery when lastTo is stale", async () => {
-    setRegistry(defaultRegistry);
+    registryState.registry = defaultRegistry;
    testState.allowFrom = ["+436769770569"];
    const dir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-gw-"));
    testState.sessionStorePath = path.join(dir, "sessions.json");
@@ -177,6 +156,10 @@ describe("gateway server agent", () => {
        },
      },
    });
+
+    const { server, ws } = await startServerWithClient();
+    await connectOk(ws);
+
    const res = await rpcReq(ws, "agent", {
      message: "hi",
      sessionKey: "main",
@@ -192,11 +175,14 @@ describe("gateway server agent", () => {
    expect(call.to).toBe("+1555");
    expect(call.deliveryTargetMode).toBe("implicit");
    expect(call.sessionId).toBe("sess-main-stale");
+
+    ws.close();
+    await server.close();
    testState.allowFrom = undefined;
  });

  test("agent forwards sessionKey to agentCommand", async () => {
-    setRegistry(defaultRegistry);
+    registryState.registry = defaultRegistry;
    const dir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-gw-"));
    testState.sessionStorePath = path.join(dir, "sessions.json");
    await writeSessionStore({
@@ -207,6 +193,10 @@ describe("gateway server agent", () => {
        },
      },
    });
+
+    const { server, ws } = await startServerWithClient();
+    await connectOk(ws);
+
    const res = await rpcReq(ws, "agent", {
      message: "hi",
      sessionKey: "agent:main:subagent:abc",
@@ -221,10 +211,13 @@ describe("gateway server agent", () => {
    expectChannels(call, "webchat");
    expect(call.deliver).toBe(false);
    expect(call.to).toBeUndefined();
+
+    ws.close();
+    await server.close();
  });

  test("agent derives sessionKey from agentId", async () => {
-    setRegistry(defaultRegistry);
+    registryState.registry = defaultRegistry;
    const dir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-gw-"));
    testState.sessionStorePath = path.join(dir, "sessions.json");
    testState.agentsConfig = { list: [{ id: "ops" }] };
@@ -237,6 +230,10 @@ describe("gateway server agent", () => {
        },
      },
    });
+
+    const { server, ws } = await startServerWithClient();
+    await connectOk(ws);
+
    const res = await rpcReq(ws, "agent", {
      message: "hi",
      agentId: "ops",
@@ -248,10 +245,16 @@ describe("gateway server agent", () => {
    const call = spy.mock.calls.at(-1)?.[0] as Record<string, unknown>;
    expect(call.sessionKey).toBe("agent:ops:main");
    expect(call.sessionId).toBe("sess-ops");
+
+    ws.close();
+    await server.close();
  });

  test("agent rejects unknown reply channel", async () => {
-    setRegistry(defaultRegistry);
+    registryState.registry = defaultRegistry;
+    const { server, ws } = await startServerWithClient();
+    await connectOk(ws);
+
    const res = await rpcReq(ws, "agent", {
      message: "hi",
      replyChannel: "unknown-channel",
@@ -262,11 +265,18 @@ describe("gateway server agent", () => {

    const spy = vi.mocked(agentCommand);
    expect(spy).not.toHaveBeenCalled();
+
+    ws.close();
+    await server.close();
  });

  test("agent rejects mismatched agentId and sessionKey", async () => {
-    setRegistry(defaultRegistry);
+    registryState.registry = defaultRegistry;
    testState.agentsConfig = { list: [{ id: "ops" }] };
+
+    const { server, ws } = await startServerWithClient();
+    await connectOk(ws);
+
    const res = await rpcReq(ws, "agent", {
      message: "hi",
      agentId: "ops",
@@ -278,10 +288,13 @@ describe("gateway server agent", () => {

    const spy = vi.mocked(agentCommand);
    expect(spy).not.toHaveBeenCalled();
+
+    ws.close();
+    await server.close();
  });

  test("agent forwards accountId to agentCommand", async () => {
-    setRegistry(defaultRegistry);
+    registryState.registry = defaultRegistry;
    testState.allowFrom = ["+1555"];
    const dir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-gw-"));
    testState.sessionStorePath = path.join(dir, "sessions.json");
@@ -296,6 +309,10 @@ describe("gateway server agent", () => {
        },
      },
    });
+
+    const { server, ws } = await startServerWithClient();
+    await connectOk(ws);
+
    const res = await rpcReq(ws, "agent", {
      message: "hi",
      sessionKey: "main",
@@ -312,11 +329,14 @@ describe("gateway server agent", () => {
    expect(call.accountId).toBe("kev");
    const runContext = call.runContext as { accountId?: string } | undefined;
    expect(runContext?.accountId).toBe("kev");
+
+    ws.close();
+    await server.close();
    testState.allowFrom = undefined;
  });

  test("agent avoids lastAccountId when explicit to is provided", async () => {
-    setRegistry(defaultRegistry);
+    registryState.registry = defaultRegistry;
    testState.allowFrom = ["+1555"];
    const dir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-gw-"));
    testState.sessionStorePath = path.join(dir, "sessions.json");
@@ -331,6 +351,10 @@ describe("gateway server agent", () => {
        },
      },
    });
+
+    const { server, ws } = await startServerWithClient();
+    await connectOk(ws);
+
    const res = await rpcReq(ws, "agent", {
      message: "hi",
      sessionKey: "main",
@@ -345,11 +369,14 @@ describe("gateway server agent", () => {
    expectChannels(call, "whatsapp");
    expect(call.to).toBe("+1666");
    expect(call.accountId).toBeUndefined();
+
+    ws.close();
+    await server.close();
    testState.allowFrom = undefined;
  });

  test("agent keeps explicit accountId when explicit to is provided", async () => {
-    setRegistry(defaultRegistry);
+    registryState.registry = defaultRegistry;
    testState.allowFrom = ["+1555"];
    const dir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-gw-"));
    testState.sessionStorePath = path.join(dir, "sessions.json");
@@ -364,6 +391,10 @@ describe("gateway server agent", () => {
        },
      },
    });
+
+    const { server, ws } = await startServerWithClient();
+    await connectOk(ws);
+
    const res = await rpcReq(ws, "agent", {
      message: "hi",
      sessionKey: "main",
@@ -379,11 +410,14 @@ describe("gateway server agent", () => {
    expectChannels(call, "whatsapp");
    expect(call.to).toBe("+1666");
    expect(call.accountId).toBe("primary");
+
+    ws.close();
+    await server.close();
    testState.allowFrom = undefined;
  });

  test("agent falls back to lastAccountId for implicit delivery", async () => {
-    setRegistry(defaultRegistry);
+    registryState.registry = defaultRegistry;
    testState.allowFrom = ["+1555"];
    const dir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-gw-"));
    testState.sessionStorePath = path.join(dir, "sessions.json");
@@ -398,6 +432,10 @@ describe("gateway server agent", () => {
        },
      },
    });
+
+    const { server, ws } = await startServerWithClient();
+    await connectOk(ws);
+
    const res = await rpcReq(ws, "agent", {
      message: "hi",
      sessionKey: "main",
@@ -411,11 +449,14 @@ describe("gateway server agent", () => {
    expectChannels(call, "whatsapp");
    expect(call.to).toBe("+1555");
    expect(call.accountId).toBe("kev");
+
+    ws.close();
+    await server.close();
    testState.allowFrom = undefined;
  });

  test("agent forwards image attachments as images[]", async () => {
-    setRegistry(defaultRegistry);
+    registryState.registry = defaultRegistry;
    const dir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-gw-"));
    testState.sessionStorePath = path.join(dir, "sessions.json");
    await writeSessionStore({
@@ -426,6 +467,10 @@ describe("gateway server agent", () => {
        },
      },
    });
+
+    const { server, ws } = await startServerWithClient();
+    await connectOk(ws);
+
    const res = await rpcReq(ws, "agent", {
      message: "what is in the image?",
      sessionKey: "main",
@@ -452,10 +497,13 @@ describe("gateway server agent", () => {
    expect(images[0]?.type).toBe("image");
    expect(images[0]?.mimeType).toBe("image/png");
    expect(images[0]?.data).toBe(BASE_IMAGE_PNG);
+
+    ws.close();
+    await server.close();
  });

  test("agent falls back to whatsapp when delivery requested and no last channel exists", async () => {
-    setRegistry(defaultRegistry);
+    registryState.registry = defaultRegistry;
    testState.allowFrom = ["+1555"];
    const dir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-gw-"));
    testState.sessionStorePath = path.join(dir, "sessions.json");
@@ -467,6 +515,10 @@ describe("gateway server agent", () => {
        },
      },
    });
+
+    const { server, ws } = await startServerWithClient();
+    await connectOk(ws);
+
    const res = await rpcReq(ws, "agent", {
      message: "hi",
      sessionKey: "main",
@@ -481,11 +533,14 @@ describe("gateway server agent", () => {
    expect(call.to).toBe("+1555");
    expect(call.deliver).toBe(true);
    expect(call.sessionId).toBe("sess-main-missing-provider");
+
+    ws.close();
+    await server.close();
    testState.allowFrom = undefined;
  });

  test("agent routes main last-channel whatsapp", async () => {
-    setRegistry(defaultRegistry);
+    registryState.registry = defaultRegistry;
    const dir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-gw-"));
    testState.sessionStorePath = path.join(dir, "sessions.json");
    await writeSessionStore({
@@ -498,6 +553,10 @@ describe("gateway server agent", () => {
        },
      },
    });
+
+    const { server, ws } = await startServerWithClient();
+    await connectOk(ws);
+
    const res = await rpcReq(ws, "agent", {
      message: "hi",
      sessionKey: "main",
@@ -515,10 +574,13 @@ describe("gateway server agent", () => {
    expect(call.deliver).toBe(true);
    expect(call.bestEffortDeliver).toBe(true);
    expect(call.sessionId).toBe("sess-main-whatsapp");
+
+    ws.close();
+    await server.close();
  });

  test("agent routes main last-channel telegram", async () => {
-    setRegistry(defaultRegistry);
+    registryState.registry = defaultRegistry;
    const dir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-gw-"));
    testState.sessionStorePath = path.join(dir, "sessions.json");
    await writeSessionStore({
@@ -531,6 +593,10 @@ describe("gateway server agent", () => {
        },
      },
    });
+
+    const { server, ws } = await startServerWithClient();
+    await connectOk(ws);
+
    const res = await rpcReq(ws, "agent", {
      message: "hi",
      sessionKey: "main",
@@ -547,10 +613,13 @@ describe("gateway server agent", () => {
    expect(call.deliver).toBe(true);
    expect(call.bestEffortDeliver).toBe(true);
    expect(call.sessionId).toBe("sess-main");
+
+    ws.close();
+    await server.close();
  });

  test("agent routes main last-channel discord", async () => {
-    setRegistry(defaultRegistry);
+    registryState.registry = defaultRegistry;
    const dir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-gw-"));
    testState.sessionStorePath = path.join(dir, "sessions.json");
    await writeSessionStore({
@@ -563,6 +632,10 @@ describe("gateway server agent", () => {
        },
      },
    });
+
+    const { server, ws } = await startServerWithClient();
+    await connectOk(ws);
+
    const res = await rpcReq(ws, "agent", {
      message: "hi",
      sessionKey: "main",
@@ -579,10 +652,13 @@ describe("gateway server agent", () => {
    expect(call.deliver).toBe(true);
    expect(call.bestEffortDeliver).toBe(true);
    expect(call.sessionId).toBe("sess-discord");
+
+    ws.close();
+    await server.close();
  });

  test("agent routes main last-channel slack", async () => {
-    setRegistry(defaultRegistry);
+    registryState.registry = defaultRegistry;
    const dir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-gw-"));
    testState.sessionStorePath = path.join(dir, "sessions.json");
    await writeSessionStore({
@@ -595,6 +671,10 @@ describe("gateway server agent", () => {
        },
      },
    });
+
+    const { server, ws } = await startServerWithClient();
+    await connectOk(ws);
+
    const res = await rpcReq(ws, "agent", {
      message: "hi",
      sessionKey: "main",
@@ -611,10 +691,13 @@ describe("gateway server agent", () => {
    expect(call.deliver).toBe(true);
    expect(call.bestEffortDeliver).toBe(true);
    expect(call.sessionId).toBe("sess-slack");
+
+    ws.close();
+    await server.close();
  });

  test("agent routes main last-channel signal", async () => {
-    setRegistry(defaultRegistry);
+    registryState.registry = defaultRegistry;
    const dir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-gw-"));
    testState.sessionStorePath = path.join(dir, "sessions.json");
    await writeSessionStore({
@@ -627,6 +710,10 @@ describe("gateway server agent", () => {
        },
      },
    });
+
+    const { server, ws } = await startServerWithClient();
+    await connectOk(ws);
+
    const res = await rpcReq(ws, "agent", {
      message: "hi",
      sessionKey: "main",
@@ -643,5 +730,8 @@ describe("gateway server agent", () => {
    expect(call.deliver).toBe(true);
    expect(call.bestEffortDeliver).toBe(true);
    expect(call.sessionId).toBe("sess-signal");
+
+    ws.close();
+    await server.close();
  });
 });
@@ -1,7 +1,7 @@
 import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
-import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
 import { WebSocket } from "ws";
 import type { ChannelPlugin } from "../channels/plugins/types.js";
 import { emitAgentEvent, registerAgentRunContext } from "../infra/agent-events.js";
@@ -22,24 +22,7 @@ import {
  writeSessionStore,
 } from "./test-helpers.js";

-installGatewayTestHooks({ scope: "suite" });
-
-let server: Awaited<ReturnType<typeof startServerWithClient>>["server"];
-let ws: Awaited<ReturnType<typeof startServerWithClient>>["ws"];
-let port: number;
-
-beforeAll(async () => {
-  const started = await startServerWithClient();
-  server = started.server;
-  ws = started.ws;
-  port = started.port;
-  await connectOk(ws);
-});
-
-afterAll(async () => {
-  ws.close();
-  await server.close();
-});
+installGatewayTestHooks();

 const registryState = vi.hoisted(() => ({
  registry: {
@@ -147,6 +130,10 @@ describe("gateway server agent", () => {
        },
      },
    });
+
+    const { server, ws } = await startServerWithClient();
+    await connectOk(ws);
+
    const res = await rpcReq(ws, "agent", {
      message: "hi",
      sessionKey: "main",
@@ -163,6 +150,9 @@ describe("gateway server agent", () => {
    expect(call.deliver).toBe(true);
    expect(call.bestEffortDeliver).toBe(true);
    expect(call.sessionId).toBe("sess-teams");
+
+    ws.close();
+    await server.close();
  });

  test("agent accepts channel aliases (imsg/teams)", async () => {
@@ -187,6 +177,10 @@ describe("gateway server agent", () => {
        },
      },
    });
+
+    const { server, ws } = await startServerWithClient();
+    await connectOk(ws);
+
    const resIMessage = await rpcReq(ws, "agent", {
      message: "hi",
      sessionKey: "main",
@@ -214,9 +208,15 @@ describe("gateway server agent", () => {
    const lastTeamsCall = spy.mock.calls.at(-1)?.[0] as Record<string, unknown>;
    expectChannels(lastTeamsCall, "msteams");
    expect(lastTeamsCall.to).toBe("conversation:teams-abc");
+
+    ws.close();
+    await server.close();
  });

  test("agent rejects unknown channel", async () => {
+    const { server, ws } = await startServerWithClient();
+    await connectOk(ws);
+
    const res = await rpcReq(ws, "agent", {
      message: "hi",
      sessionKey: "main",
@@ -225,6 +225,9 @@ describe("gateway server agent", () => {
    });
    expect(res.ok).toBe(false);
    expect(res.error?.code).toBe("INVALID_REQUEST");
+
+    ws.close();
+    await server.close();
  });

  test("agent ignores webchat last-channel for routing", async () => {
@@ -241,6 +244,10 @@ describe("gateway server agent", () => {
        },
      },
    });
+
+    const { server, ws } = await startServerWithClient();
+    await connectOk(ws);
+
    const res = await rpcReq(ws, "agent", {
      message: "hi",
      sessionKey: "main",
@@ -257,6 +264,9 @@ describe("gateway server agent", () => {
    expect(call.deliver).toBe(true);
    expect(call.bestEffortDeliver).toBe(true);
    expect(call.sessionId).toBe("sess-main-webchat");
+
+    ws.close();
+    await server.close();
  });

  test("agent uses webchat for internal runs when last provider is webchat", async () => {
@@ -272,6 +282,10 @@ describe("gateway server agent", () => {
        },
      },
    });
+
+    const { server, ws } = await startServerWithClient();
+    await connectOk(ws);
+
    const res = await rpcReq(ws, "agent", {
      message: "hi",
      sessionKey: "main",
@@ -288,9 +302,15 @@ describe("gateway server agent", () => {
    expect(call.deliver).toBe(false);
    expect(call.bestEffortDeliver).toBe(true);
    expect(call.sessionId).toBe("sess-main-webchat-internal");
+
+    ws.close();
+    await server.close();
  });

  test("agent ack response then final response", { timeout: 8000 }, async () => {
+    const { server, ws } = await startServerWithClient();
+    await connectOk(ws);
+
    const ackP = onceMessage(
      ws,
      (o) => o.type === "res" && o.id === "ag1" && o.payload?.status === "accepted",
@@ -313,9 +333,15 @@ describe("gateway server agent", () => {
    expect(ack.payload.runId).toBeDefined();
    expect(final.payload.runId).toBe(ack.payload.runId);
    expect(final.payload.status).toBe("ok");
+
+    ws.close();
+    await server.close();
  });

  test("agent dedupes by idempotencyKey after completion", async () => {
+    const { server, ws } = await startServerWithClient();
+    await connectOk(ws);
+
    const firstFinalP = onceMessage(
      ws,
      (o) => o.type === "res" && o.id === "ag1" && o.payload?.status !== "accepted",
@@ -341,6 +367,9 @@ describe("gateway server agent", () => {
    );
    const second = await secondP;
    expect(second.payload).toEqual(firstFinal.payload);
+
+    ws.close();
+    await server.close();
  });

  test("agent dedupe survives reconnect", { timeout: 60_000 }, async () => {
@@ -404,9 +433,8 @@ describe("gateway server agent", () => {
      },
    });

-    const webchatWs = new WebSocket(`ws://127.0.0.1:${port}`);
-    await new Promise<void>((resolve) => webchatWs.once("open", resolve));
-    await connectOk(webchatWs, {
+    const { server, ws } = await startServerWithClient();
+    await connectOk(ws, {
      client: {
        id: GATEWAY_CLIENT_NAMES.WEBCHAT,
        version: "1.0.0",
@@ -418,7 +446,7 @@ describe("gateway server agent", () => {
    registerAgentRunContext("run-auto-1", { sessionKey: "main" });

    const finalChatP = onceMessage(
-      webchatWs,
+      ws,
      (o) => {
        if (o.type !== "event" || o.event !== "chat") return false;
        const payload = o.payload as { state?: unknown; runId?: unknown } | undefined;
@@ -446,6 +474,7 @@ describe("gateway server agent", () => {
    expect(payload.sessionKey).toBe("main");
    expect(payload.runId).toBe("run-auto-1");

-    webchatWs.close();
+    ws.close();
+    await server.close();
  });
 });
@@ -0,0 +1,200 @@
+import fs from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import { describe, expect, test } from "vitest";
+import { emitAgentEvent, registerAgentRunContext } from "../infra/agent-events.js";
+import { GATEWAY_CLIENT_MODES, GATEWAY_CLIENT_NAMES } from "../utils/message-channel.js";
+import {
+  connectOk,
+  installGatewayTestHooks,
+  onceMessage,
+  rpcReq,
+  startServerWithClient,
+  testState,
+  writeSessionStore,
+} from "./test-helpers.js";
+
+installGatewayTestHooks();
+
+const _BASE_IMAGE_PNG =
+  "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAwMCAO+X3mIAAAAASUVORK5CYII=";
+
+function _expectChannels(call: Record<string, unknown>, channel: string) {
+  expect(call.channel).toBe(channel);
+  expect(call.messageChannel).toBe(channel);
+}
+
+describe("gateway server agent", () => {
+  test("agent events include sessionKey and agent.wait covers lifecycle flows", async () => {
+    const dir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-gw-"));
+    testState.sessionStorePath = path.join(dir, "sessions.json");
+    await writeSessionStore({
+      entries: {
+        main: {
+          sessionId: "sess-main",
+          updatedAt: Date.now(),
+          verboseLevel: "off",
+        },
+      },
+    });
+
+    const { server, ws } = await startServerWithClient();
+    await connectOk(ws, {
+      client: {
+        id: GATEWAY_CLIENT_NAMES.WEBCHAT,
+        version: "1.0.0",
+        platform: "test",
+        mode: GATEWAY_CLIENT_MODES.WEBCHAT,
+      },
+    });
+
+    registerAgentRunContext("run-tool-1", {
+      sessionKey: "main",
+      verboseLevel: "on",
+    });
+
+    {
+      const agentEvtP = onceMessage(
+        ws,
+        (o) => o.type === "event" && o.event === "agent" && o.payload?.runId === "run-tool-1",
+        8000,
+      );
+
+      emitAgentEvent({
+        runId: "run-tool-1",
+        stream: "tool",
+        data: { phase: "start", name: "read", toolCallId: "tool-1" },
+      });
+
+      const evt = await agentEvtP;
+      const payload =
+        evt.payload && typeof evt.payload === "object"
+          ? (evt.payload as Record<string, unknown>)
+          : {};
+      expect(payload.sessionKey).toBe("main");
+    }
+
+    {
+      registerAgentRunContext("run-tool-off", { sessionKey: "agent:main:main" });
+
+      emitAgentEvent({
+        runId: "run-tool-off",
+        stream: "tool",
+        data: { phase: "start", name: "read", toolCallId: "tool-1" },
+      });
+      emitAgentEvent({
+        runId: "run-tool-off",
+        stream: "assistant",
+        data: { text: "hello" },
+      });
+
+      const evt = await onceMessage(
+        ws,
+        (o) => o.type === "event" && o.event === "agent" && o.payload?.runId === "run-tool-off",
+        8000,
+      );
+      const payload =
+        evt.payload && typeof evt.payload === "object"
+          ? (evt.payload as Record<string, unknown>)
+          : {};
+      expect(payload.stream).toBe("assistant");
+    }
+
+    {
+      const waitP = rpcReq(ws, "agent.wait", {
+        runId: "run-wait-1",
+        timeoutMs: 1000,
+      });
+
+      setTimeout(() => {
+        emitAgentEvent({
+          runId: "run-wait-1",
+          stream: "lifecycle",
+          data: { phase: "end", startedAt: 200, endedAt: 210 },
+        });
+      }, 5);
+
+      const res = await waitP;
+      expect(res.ok).toBe(true);
+      expect(res.payload.status).toBe("ok");
+      expect(res.payload.startedAt).toBe(200);
+    }
+
+    {
+      emitAgentEvent({
+        runId: "run-wait-early",
+        stream: "lifecycle",
+        data: { phase: "end", startedAt: 50, endedAt: 55 },
+      });
+
+      const res = await rpcReq(ws, "agent.wait", {
+        runId: "run-wait-early",
+        timeoutMs: 1000,
+      });
+      expect(res.ok).toBe(true);
+      expect(res.payload.status).toBe("ok");
+      expect(res.payload.startedAt).toBe(50);
+    }
+
+    {
+      const res = await rpcReq(ws, "agent.wait", {
+        runId: "run-wait-3",
+        timeoutMs: 30,
+      });
+      expect(res.ok).toBe(true);
+      expect(res.payload.status).toBe("timeout");
+    }
+
+    {
+      const waitP = rpcReq(ws, "agent.wait", {
+        runId: "run-wait-err",
+        timeoutMs: 1000,
+      });
+
+      setTimeout(() => {
+        emitAgentEvent({
+          runId: "run-wait-err",
+          stream: "lifecycle",
+          data: { phase: "error", error: "boom" },
+        });
+      }, 5);
+
+      const res = await waitP;
+      expect(res.ok).toBe(true);
+      expect(res.payload.status).toBe("error");
+      expect(res.payload.error).toBe("boom");
+    }
+
+    {
+      const waitP = rpcReq(ws, "agent.wait", {
+        runId: "run-wait-start",
+        timeoutMs: 1000,
+      });
+
+      emitAgentEvent({
+        runId: "run-wait-start",
+        stream: "lifecycle",
+        data: { phase: "start", startedAt: 123 },
+      });
+
+      setTimeout(() => {
+        emitAgentEvent({
+          runId: "run-wait-start",
+          stream: "lifecycle",
+          data: { phase: "end", endedAt: 456 },
+        });
+      }, 5);
+
+      const res = await waitP;
+      expect(res.ok).toBe(true);
+      expect(res.payload.status).toBe("ok");
+      expect(res.payload.startedAt).toBe(123);
+      expect(res.payload.endedAt).toBe(456);
+    }
+
+    ws.close();
+    await server.close();
+    await fs.rm(dir, { recursive: true, force: true });
+    testState.sessionStorePath = undefined;
+  });
+});
@@ -0,0 +1,44 @@
+import { describe, expect, test } from "vitest";
+import {
+  connectOk,
+  installGatewayTestHooks,
+  rpcReq,
+  startServerWithClient,
+  testState,
+} from "./test-helpers.js";
+
+installGatewayTestHooks();
+
+describe("gateway server agents", () => {
+  test("lists configured agents via agents.list RPC", async () => {
+    testState.agentsConfig = {
+      list: [
+        { id: "work", name: "Work", default: true },
+        { id: "home", name: "Home" },
+      ],
+    };
+
+    const { ws } = await startServerWithClient();
+    const hello = await connectOk(ws);
+    expect((hello as unknown as { features?: { methods?: string[] } }).features?.methods).toEqual(
+      expect.arrayContaining(["agents.list"]),
+    );
+
+    const res = await rpcReq<{
+      defaultId: string;
+      mainKey: string;
+      scope: string;
+      agents: Array<{ id: string; name?: string }>;
+    }>(ws, "agents.list", {});
+
+    expect(res.ok).toBe(true);
+    expect(res.payload?.defaultId).toBe("work");
+    expect(res.payload?.mainKey).toBe("main");
+    expect(res.payload?.scope).toBe("per-sender");
+    expect(res.payload?.agents.map((agent) => agent.id)).toEqual(["work", "home", "main"]);
+    const work = res.payload?.agents.find((agent) => agent.id === "work");
+    const home = res.payload?.agents.find((agent) => agent.id === "home");
+    expect(work?.name).toBe("Work");
+    expect(home?.name).toBe("Home");
+  });
+});
@@ -1,4 +1,4 @@
-import { afterAll, beforeAll, describe, expect, test, vi } from "vitest";
+import { describe, expect, test, vi } from "vitest";
 import { WebSocket } from "ws";
 import { PROTOCOL_VERSION } from "./protocol/index.js";
 import { getHandshakeTimeoutMs } from "./server-constants.js";
@@ -13,7 +13,7 @@ import {
 } from "./test-helpers.js";
 import { GATEWAY_CLIENT_MODES, GATEWAY_CLIENT_NAMES } from "../utils/message-channel.js";

-installGatewayTestHooks({ scope: "suite" });
+installGatewayTestHooks();

 async function waitForWsClose(ws: WebSocket, timeoutMs: number): Promise<boolean> {
  if (ws.readyState === WebSocket.CLOSED) return true;
@@ -26,226 +26,129 @@ async function waitForWsClose(ws: WebSocket, timeoutMs: number): Promise<boolean
  });
 }

-const openWs = async (port: number) => {
-  const ws = new WebSocket(`ws://127.0.0.1:${port}`);
-  await new Promise<void>((resolve) => ws.once("open", resolve));
-  return ws;
-};
-
 describe("gateway server auth/connect", () => {
-  describe("default auth", () => {
-    let server: Awaited<ReturnType<typeof startGatewayServer>>;
-    let port: number;
-
-    beforeAll(async () => {
-      port = await getFreePort();
-      server = await startGatewayServer(port);
-    });
-
-    afterAll(async () => {
+  test("closes silent handshakes after timeout", { timeout: 60_000 }, async () => {
+    vi.useRealTimers();
+    const prevHandshakeTimeout = process.env.CLAWDBOT_TEST_HANDSHAKE_TIMEOUT_MS;
+    process.env.CLAWDBOT_TEST_HANDSHAKE_TIMEOUT_MS = "50";
+    try {
+      const { server, ws } = await startServerWithClient();
+      const handshakeTimeoutMs = getHandshakeTimeoutMs();
+      const closed = await waitForWsClose(ws, handshakeTimeoutMs + 250);
+      expect(closed).toBe(true);
      await server.close();
-    });
-
-    test("closes silent handshakes after timeout", { timeout: 60_000 }, async () => {
-      vi.useRealTimers();
-      const prevHandshakeTimeout = process.env.CLAWDBOT_TEST_HANDSHAKE_TIMEOUT_MS;
-      process.env.CLAWDBOT_TEST_HANDSHAKE_TIMEOUT_MS = "50";
-      try {
-        const ws = await openWs(port);
-        const handshakeTimeoutMs = getHandshakeTimeoutMs();
-        const closed = await waitForWsClose(ws, handshakeTimeoutMs + 250);
-        expect(closed).toBe(true);
-      } finally {
-        if (prevHandshakeTimeout === undefined) {
-          delete process.env.CLAWDBOT_TEST_HANDSHAKE_TIMEOUT_MS;
-        } else {
-          process.env.CLAWDBOT_TEST_HANDSHAKE_TIMEOUT_MS = prevHandshakeTimeout;
-        }
-      }
-    });
-
-    test("connect (req) handshake returns hello-ok payload", async () => {
-      const { CONFIG_PATH_CLAWDBOT, STATE_DIR_CLAWDBOT } = await import("../config/config.js");
-      const ws = await openWs(port);
-
-      const res = await connectReq(ws);
-      expect(res.ok).toBe(true);
-      const payload = res.payload as
-        | {
-            type?: unknown;
-            snapshot?: { configPath?: string; stateDir?: string };
-          }
-        | undefined;
-      expect(payload?.type).toBe("hello-ok");
-      expect(payload?.snapshot?.configPath).toBe(CONFIG_PATH_CLAWDBOT);
-      expect(payload?.snapshot?.stateDir).toBe(STATE_DIR_CLAWDBOT);
-
-      ws.close();
-    });
-
-    test("sends connect challenge on open", async () => {
-      const ws = new WebSocket(`ws://127.0.0.1:${port}`);
-      const evtPromise = onceMessage<{ payload?: unknown }>(
-        ws,
-        (o) => o.type === "event" && o.event === "connect.challenge",
-      );
-      await new Promise<void>((resolve) => ws.once("open", resolve));
-      const evt = await evtPromise;
-      const nonce = (evt.payload as { nonce?: unknown } | undefined)?.nonce;
-      expect(typeof nonce).toBe("string");
-      ws.close();
-    });
-
-    test("rejects protocol mismatch", async () => {
-      const ws = await openWs(port);
-      try {
-        const res = await connectReq(ws, {
-          minProtocol: PROTOCOL_VERSION + 1,
-          maxProtocol: PROTOCOL_VERSION + 2,
-        });
-        expect(res.ok).toBe(false);
-      } catch {
-        // If the server closed before we saw the frame, that's acceptable.
-      }
-      ws.close();
-    });
-
-    test("rejects non-connect first request", async () => {
-      const ws = await openWs(port);
-      ws.send(JSON.stringify({ type: "req", id: "h1", method: "health" }));
-      const res = await onceMessage<{ ok: boolean; error?: unknown }>(
-        ws,
-        (o) => o.type === "res" && o.id === "h1",
-      );
-      expect(res.ok).toBe(false);
-      await new Promise<void>((resolve) => ws.once("close", () => resolve()));
-    });
-
-    test(
-      "invalid connect params surface in response and close reason",
-      { timeout: 60_000 },
-      async () => {
-        const ws = await openWs(port);
-        const closeInfoPromise = new Promise<{ code: number; reason: string }>((resolve) => {
-          ws.once("close", (code, reason) => resolve({ code, reason: reason.toString() }));
-        });
-
-        ws.send(
-          JSON.stringify({
-            type: "req",
-            id: "h-bad",
-            method: "connect",
-            params: {
-              minProtocol: PROTOCOL_VERSION,
-              maxProtocol: PROTOCOL_VERSION,
-              client: {
-                id: "bad-client",
-                version: "dev",
-                platform: "web",
-                mode: "webchat",
-              },
-              device: {
-                id: 123,
-                publicKey: "bad",
-                signature: "bad",
-                signedAt: "bad",
-              },
-            },
-          }),
-        );
-
-        const res = await onceMessage<{
-          ok: boolean;
-          error?: { message?: string };
-        }>(
-          ws,
-          (o) => (o as { type?: string }).type === "res" && (o as { id?: string }).id === "h-bad",
-        );
-        expect(res.ok).toBe(false);
-        expect(String(res.error?.message ?? "")).toContain("invalid connect params");
-
-        const closeInfo = await closeInfoPromise;
-        expect(closeInfo.code).toBe(1008);
-        expect(closeInfo.reason).toContain("invalid connect params");
-      },
-    );
-  });
-
-  describe("password auth", () => {
-    let server: Awaited<ReturnType<typeof startGatewayServer>>;
-    let port: number;
-
-    beforeAll(async () => {
-      testState.gatewayAuth = { mode: "password", password: "secret" };
-      port = await getFreePort();
-      server = await startGatewayServer(port);
-    });
-
-    afterAll(async () => {
-      await server.close();
-    });
-
-    test("accepts password auth when configured", async () => {
-      const ws = await openWs(port);
-      const res = await connectReq(ws, { password: "secret" });
-      expect(res.ok).toBe(true);
-      ws.close();
-    });
-
-    test("rejects invalid password", async () => {
-      const ws = await openWs(port);
-      const res = await connectReq(ws, { password: "wrong" });
-      expect(res.ok).toBe(false);
-      expect(res.error?.message ?? "").toContain("unauthorized");
-      ws.close();
-    });
-  });
-
-  describe("token auth", () => {
-    let server: Awaited<ReturnType<typeof startGatewayServer>>;
-    let port: number;
-    let prevToken: string | undefined;
-
-    beforeAll(async () => {
-      prevToken = process.env.CLAWDBOT_GATEWAY_TOKEN;
-      process.env.CLAWDBOT_GATEWAY_TOKEN = "secret";
-      port = await getFreePort();
-      server = await startGatewayServer(port);
-    });
-
-    afterAll(async () => {
-      await server.close();
-      if (prevToken === undefined) {
-        delete process.env.CLAWDBOT_GATEWAY_TOKEN;
+    } finally {
+      if (prevHandshakeTimeout === undefined) {
+        delete process.env.CLAWDBOT_TEST_HANDSHAKE_TIMEOUT_MS;
      } else {
-        process.env.CLAWDBOT_GATEWAY_TOKEN = prevToken;
+        process.env.CLAWDBOT_TEST_HANDSHAKE_TIMEOUT_MS = prevHandshakeTimeout;
      }
-    });
+    }
+  });

-    test("rejects invalid token", async () => {
-      const ws = await openWs(port);
-      const res = await connectReq(ws, { token: "wrong" });
-      expect(res.ok).toBe(false);
-      expect(res.error?.message ?? "").toContain("unauthorized");
-      ws.close();
-    });
+  test("connect (req) handshake returns hello-ok payload", async () => {
+    const { CONFIG_PATH_CLAWDBOT, STATE_DIR_CLAWDBOT } = await import("../config/config.js");
+    const port = await getFreePort();
+    const server = await startGatewayServer(port);
+    const ws = new WebSocket(`ws://127.0.0.1:${port}`);
+    await new Promise<void>((resolve) => ws.once("open", resolve));

-    test("rejects control ui without device identity by default", async () => {
-      const ws = await openWs(port);
+    const res = await connectReq(ws);
+    expect(res.ok).toBe(true);
+    const payload = res.payload as
+      | {
+          type?: unknown;
+          snapshot?: { configPath?: string; stateDir?: string };
+        }
+      | undefined;
+    expect(payload?.type).toBe("hello-ok");
+    expect(payload?.snapshot?.configPath).toBe(CONFIG_PATH_CLAWDBOT);
+    expect(payload?.snapshot?.stateDir).toBe(STATE_DIR_CLAWDBOT);
+
+    ws.close();
+    await server.close();
+  });
+
+  test("sends connect challenge on open", async () => {
+    const port = await getFreePort();
+    const server = await startGatewayServer(port);
+    const ws = new WebSocket(`ws://127.0.0.1:${port}`);
+    const evtPromise = onceMessage<{ payload?: unknown }>(
+      ws,
+      (o) => o.type === "event" && o.event === "connect.challenge",
+    );
+    await new Promise<void>((resolve) => ws.once("open", resolve));
+    const evt = await evtPromise;
+    const nonce = (evt.payload as { nonce?: unknown } | undefined)?.nonce;
+    expect(typeof nonce).toBe("string");
+    ws.close();
+    await server.close();
+  });
+
+  test("rejects protocol mismatch", async () => {
+    const { server, ws } = await startServerWithClient();
+    try {
      const res = await connectReq(ws, {
-        token: "secret",
-        device: null,
-        client: {
-          id: GATEWAY_CLIENT_NAMES.CONTROL_UI,
-          version: "1.0.0",
-          platform: "web",
-          mode: GATEWAY_CLIENT_MODES.WEBCHAT,
-        },
+        minProtocol: PROTOCOL_VERSION + 1,
+        maxProtocol: PROTOCOL_VERSION + 2,
      });
      expect(res.ok).toBe(false);
-      expect(res.error?.message ?? "").toContain("secure context");
-      ws.close();
+    } catch {
+      // If the server closed before we saw the frame, that's acceptable.
+    }
+    ws.close();
+    await server.close();
+  });
+
+  test("rejects invalid token", async () => {
+    const { server, ws, prevToken } = await startServerWithClient("secret");
+    const res = await connectReq(ws, { token: "wrong" });
+    expect(res.ok).toBe(false);
+    expect(res.error?.message ?? "").toContain("unauthorized");
+    ws.close();
+    await server.close();
+    if (prevToken === undefined) {
+      delete process.env.CLAWDBOT_GATEWAY_TOKEN;
+    } else {
+      process.env.CLAWDBOT_GATEWAY_TOKEN = prevToken;
+    }
+  });
+
+  test("accepts password auth when configured", async () => {
+    testState.gatewayAuth = { mode: "password", password: "secret" };
+    const port = await getFreePort();
+    const server = await startGatewayServer(port);
+    const ws = new WebSocket(`ws://127.0.0.1:${port}`);
+    await new Promise<void>((resolve) => ws.once("open", resolve));
+
+    const res = await connectReq(ws, { password: "secret" });
+    expect(res.ok).toBe(true);
+
+    ws.close();
+    await server.close();
+  });
+
+  test("rejects control ui without device identity by default", async () => {
+    const { server, ws, prevToken } = await startServerWithClient("secret");
+    const res = await connectReq(ws, {
+      token: "secret",
+      device: null,
+      client: {
+        id: GATEWAY_CLIENT_NAMES.CONTROL_UI,
+        version: "1.0.0",
+        platform: "web",
+        mode: GATEWAY_CLIENT_MODES.WEBCHAT,
+      },
    });
+    expect(res.ok).toBe(false);
+    expect(res.error?.message ?? "").toContain("secure context");
+    ws.close();
+    await server.close();
+    if (prevToken === undefined) {
+      delete process.env.CLAWDBOT_GATEWAY_TOKEN;
+    } else {
+      process.env.CLAWDBOT_GATEWAY_TOKEN = prevToken;
+    }
  });

  test("allows control ui without device identity when insecure auth is enabled", async () => {
@@ -424,5 +327,81 @@ describe("gateway server auth/connect", () => {
    }
  });

-  // Remaining tests require isolated gateway state.
+  test("rejects invalid password", async () => {
+    testState.gatewayAuth = { mode: "password", password: "secret" };
+    const port = await getFreePort();
+    const server = await startGatewayServer(port);
+    const ws = new WebSocket(`ws://127.0.0.1:${port}`);
+    await new Promise<void>((resolve) => ws.once("open", resolve));
+
+    const res = await connectReq(ws, { password: "wrong" });
+    expect(res.ok).toBe(false);
+    expect(res.error?.message ?? "").toContain("unauthorized");
+
+    ws.close();
+    await server.close();
+  });
+
+  test("rejects non-connect first request", async () => {
+    const { server, ws } = await startServerWithClient();
+    ws.send(JSON.stringify({ type: "req", id: "h1", method: "health" }));
+    const res = await onceMessage<{ ok: boolean; error?: unknown }>(
+      ws,
+      (o) => o.type === "res" && o.id === "h1",
+    );
+    expect(res.ok).toBe(false);
+    await new Promise<void>((resolve) => ws.once("close", () => resolve()));
+    await server.close();
+  });
+
+  test(
+    "invalid connect params surface in response and close reason",
+    { timeout: 60_000 },
+    async () => {
+      const { server, ws } = await startServerWithClient();
+      const closeInfoPromise = new Promise<{ code: number; reason: string }>((resolve) => {
+        ws.once("close", (code, reason) => resolve({ code, reason: reason.toString() }));
+      });
+
+      ws.send(
+        JSON.stringify({
+          type: "req",
+          id: "h-bad",
+          method: "connect",
+          params: {
+            minProtocol: PROTOCOL_VERSION,
+            maxProtocol: PROTOCOL_VERSION,
+            client: {
+              id: "bad-client",
+              version: "dev",
+              platform: "web",
+              mode: "webchat",
+            },
+            device: {
+              id: 123,
+              publicKey: "bad",
+              signature: "bad",
+              signedAt: "bad",
+            },
+          },
+        }),
+      );
+
+      const res = await onceMessage<{
+        ok: boolean;
+        error?: { message?: string };
+      }>(
+        ws,
+        (o) => (o as { type?: string }).type === "res" && (o as { id?: string }).id === "h-bad",
+      );
+      expect(res.ok).toBe(false);
+      expect(String(res.error?.message ?? "")).toContain("invalid connect params");
+
+      const closeInfo = await closeInfoPromise;
+      expect(closeInfo.code).toBe(1008);
+      expect(closeInfo.reason).toContain("invalid connect params");
+
+      await server.close();
+    },
+  );
 });
@@ -1,7 +1,6 @@
-import { afterAll, beforeAll, describe, expect, test, vi } from "vitest";
+import { afterEach, describe, expect, test, vi } from "vitest";
 import type { ChannelPlugin } from "../channels/plugins/types.js";
 import type { PluginRegistry } from "../plugins/registry.js";
-import { setActivePluginRegistry } from "../plugins/runtime.js";
 import {
  connectOk,
  installGatewayTestHooks,
@@ -11,7 +10,7 @@ import {

 const loadConfigHelpers = async () => await import("../config/config.js");

-installGatewayTestHooks({ scope: "suite" });
+installGatewayTestHooks();

 const registryState = vi.hoisted(() => ({
  registry: {
@@ -132,31 +131,30 @@ const defaultRegistry = createRegistry([
  },
 ]);

-let server: Awaited<ReturnType<typeof startServerWithClient>>["server"];
-let ws: Awaited<ReturnType<typeof startServerWithClient>>["ws"];
+const servers: Array<Awaited<ReturnType<typeof startServerWithClient>>> = [];

-beforeAll(async () => {
-  setRegistry(defaultRegistry);
-  const started = await startServerWithClient();
-  server = started.server;
-  ws = started.ws;
-  await connectOk(ws);
+afterEach(async () => {
+  for (const { server, ws } of servers) {
+    try {
+      ws.close();
+      await server.close();
+    } catch {
+      /* ignore */
+    }
+  }
+  servers.length = 0;
+  await new Promise((resolve) => setTimeout(resolve, 50));
 });

-afterAll(async () => {
-  ws.close();
-  await server.close();
-});
-
-function setRegistry(registry: PluginRegistry) {
-  registryState.registry = registry;
-  setActivePluginRegistry(registry);
-}
-
 describe("gateway server channels", () => {
  test("channels.status returns snapshot without probe", async () => {
    vi.stubEnv("TELEGRAM_BOT_TOKEN", undefined);
-    setRegistry(defaultRegistry);
+    registryState.registry = defaultRegistry;
+    const result = await startServerWithClient();
+    servers.push(result);
+    const { ws } = result;
+    await connectOk(ws);
+
    const res = await rpcReq<{
      channels?: Record<
        string,
@@ -183,7 +181,12 @@ describe("gateway server channels", () => {
  });

  test("channels.logout reports no session when missing", async () => {
-    setRegistry(defaultRegistry);
+    registryState.registry = defaultRegistry;
+    const result = await startServerWithClient();
+    servers.push(result);
+    const { ws } = result;
+    await connectOk(ws);
+
    const res = await rpcReq<{ cleared?: boolean; channel?: string }>(ws, "channels.logout", {
      channel: "whatsapp",
    });
@@ -194,7 +197,7 @@ describe("gateway server channels", () => {

  test("channels.logout clears telegram bot token from config", async () => {
    vi.stubEnv("TELEGRAM_BOT_TOKEN", undefined);
-    setRegistry(defaultRegistry);
+    registryState.registry = defaultRegistry;
    const { readConfigFileSnapshot, writeConfigFile } = await loadConfigHelpers();
    await writeConfigFile({
      channels: {
@@ -204,6 +207,12 @@ describe("gateway server channels", () => {
        },
      },
    });
+
+    const result = await startServerWithClient();
+    servers.push(result);
+    const { ws } = result;
+    await connectOk(ws);
+
    const res = await rpcReq<{
      cleared?: boolean;
      envToken?: boolean;
@@ -14,8 +14,7 @@ import {
  testState,
  writeSessionStore,
 } from "./test-helpers.js";
-import { __setMaxChatHistoryMessagesBytesForTest } from "./server-constants.js";
-installGatewayTestHooks({ scope: "suite" });
+installGatewayTestHooks();
 async function waitFor(condition: () => boolean, timeoutMs = 1500) {
  const deadline = Date.now() + timeoutMs;
  while (Date.now() < deadline) {
@@ -39,90 +38,355 @@ const sendReq = (
    }),
  );
 };
+const withSessionStore = async <T>(
+  tempDirs: string[],
+  entries: Record<
+    string,
+    { sessionId: string; updatedAt: number; lastChannel?: string; lastTo?: string }
+  >,
+  fn: (dir: string) => Promise<T>,
+): Promise<T> => {
+  const dir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-gw-"));
+  tempDirs.push(dir);
+  testState.sessionStorePath = path.join(dir, "sessions.json");
+  await writeSessionStore({ entries });
+  try {
+    return await fn(dir);
+  } finally {
+    testState.sessionStorePath = undefined;
+  }
+};
 describe("gateway server chat", () => {
-  const timeoutMs = process.platform === "win32" ? 120_000 : 60_000;
-  test(
-    "handles history, abort, idempotency, and ordering flows",
-    { timeout: timeoutMs },
-    async () => {
-      const tempDirs: string[] = [];
-      const { server, ws } = await startServerWithClient();
-      const spy = vi.mocked(agentCommand);
-      const resetSpy = () => {
-        spy.mockReset();
-        spy.mockResolvedValue(undefined);
-      };
-      try {
-        const historyMaxBytes = 192 * 1024;
-        __setMaxChatHistoryMessagesBytesForTest(historyMaxBytes);
-        await connectOk(ws);
-        const sessionDir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-gw-"));
-        tempDirs.push(sessionDir);
-        testState.sessionStorePath = path.join(sessionDir, "sessions.json");
-        const writeStore = async (
-          entries: Record<
-            string,
-            { sessionId: string; updatedAt: number; lastChannel?: string; lastTo?: string }
-          >,
-        ) => {
-          await writeSessionStore({ entries });
-        };
-
-        await writeStore({ main: { sessionId: "sess-main", updatedAt: Date.now() } });
-        const bigText = "x".repeat(4_000);
-        const largeLines: string[] = [];
-        for (let i = 0; i < 60; i += 1) {
-          largeLines.push(
-            JSON.stringify({
-              message: {
-                role: "user",
-                content: [{ type: "text", text: `${i}:${bigText}` }],
-                timestamp: Date.now() + i,
-              },
-            }),
+  test("handles history, abort, idempotency, and ordering flows", { timeout: 60_000 }, async () => {
+    const tempDirs: string[] = [];
+    const { server, ws } = await startServerWithClient();
+    const spy = vi.mocked(agentCommand);
+    const resetSpy = () => {
+      spy.mockReset();
+      spy.mockResolvedValue(undefined);
+    };
+    try {
+      await connectOk(ws);
+      await withSessionStore(
+        tempDirs,
+        { main: { sessionId: "sess-main", updatedAt: Date.now() } },
+        async (historyDir) => {
+          const bigText = "x".repeat(200_000);
+          const largeLines: string[] = [];
+          for (let i = 0; i < 40; i += 1) {
+            largeLines.push(
+              JSON.stringify({
+                message: {
+                  role: "user",
+                  content: [{ type: "text", text: `${i}:${bigText}` }],
+                  timestamp: Date.now() + i,
+                },
+              }),
+            );
+          }
+          await fs.writeFile(
+            path.join(historyDir, "sess-main.jsonl"),
+            largeLines.join("\n"),
+            "utf-8",
          );
-        }
-        await fs.writeFile(
-          path.join(sessionDir, "sess-main.jsonl"),
-          largeLines.join("\n"),
-          "utf-8",
-        );
-        const cappedRes = await rpcReq<{ messages?: unknown[] }>(ws, "chat.history", {
-          sessionKey: "main",
-          limit: 1000,
-        });
-        expect(cappedRes.ok).toBe(true);
-        const cappedMsgs = cappedRes.payload?.messages ?? [];
-        const bytes = Buffer.byteLength(JSON.stringify(cappedMsgs), "utf8");
-        expect(bytes).toBeLessThanOrEqual(historyMaxBytes);
-        expect(cappedMsgs.length).toBeLessThan(60);
-
-        await writeStore({
+          const cappedRes = await rpcReq<{ messages?: unknown[] }>(ws, "chat.history", {
+            sessionKey: "main",
+            limit: 1000,
+          });
+          expect(cappedRes.ok).toBe(true);
+          const cappedMsgs = cappedRes.payload?.messages ?? [];
+          const bytes = Buffer.byteLength(JSON.stringify(cappedMsgs), "utf8");
+          expect(bytes).toBeLessThanOrEqual(6 * 1024 * 1024);
+          expect(cappedMsgs.length).toBeLessThan(60);
+        },
+      );
+      await withSessionStore(
+        tempDirs,
+        {
          main: {
            sessionId: "sess-main",
            updatedAt: Date.now(),
            lastChannel: "whatsapp",
            lastTo: "+1555",
          },
-        });
-        const routeRes = await rpcReq(ws, "chat.send", {
+        },
+        async () => {
+          const routeRes = await rpcReq(ws, "chat.send", {
+            sessionKey: "main",
+            message: "hello",
+            idempotencyKey: "idem-route",
+          });
+          expect(routeRes.ok).toBe(true);
+          const stored = JSON.parse(
+            await fs.readFile(testState.sessionStorePath as string, "utf-8"),
+          ) as Record<string, { lastChannel?: string; lastTo?: string } | undefined>;
+          expect(stored["agent:main:main"]?.lastChannel).toBe("whatsapp");
+          expect(stored["agent:main:main"]?.lastTo).toBe("+1555");
+        },
+      );
+      await withSessionStore(
+        tempDirs,
+        { main: { sessionId: "sess-main", updatedAt: Date.now() } },
+        async () => {
+          resetSpy();
+          let abortInFlight: Promise<unknown> | undefined;
+          try {
+            const callsBefore = spy.mock.calls.length;
+            spy.mockImplementationOnce(async (opts) => {
+              const signal = (opts as { abortSignal?: AbortSignal }).abortSignal;
+              await new Promise<void>((resolve) => {
+                if (!signal) return resolve();
+                if (signal.aborted) return resolve();
+                signal.addEventListener("abort", () => resolve(), { once: true });
+              });
+            });
+            const sendResP = onceMessage(
+              ws,
+              (o) => o.type === "res" && o.id === "send-abort-1",
+              8000,
+            );
+            const abortResP = onceMessage(ws, (o) => o.type === "res" && o.id === "abort-1", 8000);
+            const abortedEventP = onceMessage(
+              ws,
+              (o) => o.type === "event" && o.event === "chat" && o.payload?.state === "aborted",
+              8000,
+            );
+            abortInFlight = Promise.allSettled([sendResP, abortResP, abortedEventP]);
+            sendReq(ws, "send-abort-1", "chat.send", {
+              sessionKey: "main",
+              message: "hello",
+              idempotencyKey: "idem-abort-1",
+              timeoutMs: 30_000,
+            });
+            const sendRes = await sendResP;
+            expect(sendRes.ok).toBe(true);
+            await new Promise<void>((resolve, reject) => {
+              const deadline = Date.now() + 1000;
+              const tick = () => {
+                if (spy.mock.calls.length > callsBefore) return resolve();
+                if (Date.now() > deadline)
+                  return reject(new Error("timeout waiting for agentCommand"));
+                setTimeout(tick, 5);
+              };
+              tick();
+            });
+            sendReq(ws, "abort-1", "chat.abort", {
+              sessionKey: "main",
+              runId: "idem-abort-1",
+            });
+            const abortRes = await abortResP;
+            expect(abortRes.ok).toBe(true);
+            const evt = await abortedEventP;
+            expect(evt.payload?.runId).toBe("idem-abort-1");
+            expect(evt.payload?.sessionKey).toBe("main");
+          } finally {
+            await abortInFlight;
+          }
+        },
+      );
+      await withSessionStore(
+        tempDirs,
+        { main: { sessionId: "sess-main", updatedAt: Date.now() } },
+        async () => {
+          sessionStoreSaveDelayMs.value = 120;
+          resetSpy();
+          try {
+            spy.mockImplementationOnce(async (opts) => {
+              const signal = (opts as { abortSignal?: AbortSignal }).abortSignal;
+              await new Promise<void>((resolve) => {
+                if (!signal) return resolve();
+                if (signal.aborted) return resolve();
+                signal.addEventListener("abort", () => resolve(), { once: true });
+              });
+            });
+            const abortedEventP = onceMessage(
+              ws,
+              (o) => o.type === "event" && o.event === "chat" && o.payload?.state === "aborted",
+            );
+            const sendResP = onceMessage(
+              ws,
+              (o) => o.type === "res" && o.id === "send-abort-save-1",
+            );
+            sendReq(ws, "send-abort-save-1", "chat.send", {
+              sessionKey: "main",
+              message: "hello",
+              idempotencyKey: "idem-abort-save-1",
+              timeoutMs: 30_000,
+            });
+            const abortResP = onceMessage(ws, (o) => o.type === "res" && o.id === "abort-save-1");
+            sendReq(ws, "abort-save-1", "chat.abort", {
+              sessionKey: "main",
+              runId: "idem-abort-save-1",
+            });
+            const abortRes = await abortResP;
+            expect(abortRes.ok).toBe(true);
+            const sendRes = await sendResP;
+            expect(sendRes.ok).toBe(true);
+            const evt = await abortedEventP;
+            expect(evt.payload?.runId).toBe("idem-abort-save-1");
+            expect(evt.payload?.sessionKey).toBe("main");
+          } finally {
+            sessionStoreSaveDelayMs.value = 0;
+          }
+        },
+      );
+      await withSessionStore(
+        tempDirs,
+        { main: { sessionId: "sess-main", updatedAt: Date.now() } },
+        async () => {
+          resetSpy();
+          const callsBeforeStop = spy.mock.calls.length;
+          spy.mockImplementationOnce(async (opts) => {
+            const signal = (opts as { abortSignal?: AbortSignal }).abortSignal;
+            await new Promise<void>((resolve) => {
+              if (!signal) return resolve();
+              if (signal.aborted) return resolve();
+              signal.addEventListener("abort", () => resolve(), { once: true });
+            });
+          });
+          const stopSendResP = onceMessage(
+            ws,
+            (o) => o.type === "res" && o.id === "send-stop-1",
+            8000,
+          );
+          sendReq(ws, "send-stop-1", "chat.send", {
+            sessionKey: "main",
+            message: "hello",
+            idempotencyKey: "idem-stop-run",
+          });
+          const stopSendRes = await stopSendResP;
+          expect(stopSendRes.ok).toBe(true);
+          await waitFor(() => spy.mock.calls.length > callsBeforeStop);
+          const abortedStopEventP = onceMessage(
+            ws,
+            (o) =>
+              o.type === "event" &&
+              o.event === "chat" &&
+              o.payload?.state === "aborted" &&
+              o.payload?.runId === "idem-stop-run",
+            8000,
+          );
+          const stopResP = onceMessage(ws, (o) => o.type === "res" && o.id === "send-stop-2", 8000);
+          sendReq(ws, "send-stop-2", "chat.send", {
+            sessionKey: "main",
+            message: "/stop",
+            idempotencyKey: "idem-stop-req",
+          });
+          const stopRes = await stopResP;
+          expect(stopRes.ok).toBe(true);
+          const stopEvt = await abortedStopEventP;
+          expect(stopEvt.payload?.sessionKey).toBe("main");
+          expect(spy.mock.calls.length).toBe(callsBeforeStop + 1);
+        },
+      );
+      resetSpy();
+      let resolveRun: (() => void) | undefined;
+      const runDone = new Promise<void>((resolve) => {
+        resolveRun = resolve;
+      });
+      spy.mockImplementationOnce(async () => {
+        await runDone;
+      });
+      const started = await rpcReq<{ runId?: string; status?: string }>(ws, "chat.send", {
+        sessionKey: "main",
+        message: "hello",
+        idempotencyKey: "idem-status-1",
+      });
+      expect(started.ok).toBe(true);
+      expect(started.payload?.status).toBe("started");
+      const inFlightRes = await rpcReq<{ runId?: string; status?: string }>(ws, "chat.send", {
+        sessionKey: "main",
+        message: "hello",
+        idempotencyKey: "idem-status-1",
+      });
+      expect(inFlightRes.ok).toBe(true);
+      expect(inFlightRes.payload?.status).toBe("in_flight");
+      resolveRun?.();
+      let completed = false;
+      for (let i = 0; i < 50; i++) {
+        const again = await rpcReq<{ runId?: string; status?: string }>(ws, "chat.send", {
          sessionKey: "main",
          message: "hello",
-          idempotencyKey: "idem-route",
+          idempotencyKey: "idem-status-1",
        });
-        expect(routeRes.ok).toBe(true);
-        const stored = JSON.parse(
-          await fs.readFile(testState.sessionStorePath as string, "utf-8"),
-        ) as Record<string, { lastChannel?: string; lastTo?: string } | undefined>;
-        expect(stored["agent:main:main"]?.lastChannel).toBe("whatsapp");
-        expect(stored["agent:main:main"]?.lastTo).toBe("+1555");
-
-        await writeStore({ main: { sessionId: "sess-main", updatedAt: Date.now() } });
-        resetSpy();
-        let abortInFlight: Promise<unknown> | undefined;
-        try {
-          const callsBefore = spy.mock.calls.length;
+        if (again.ok && again.payload?.status === "ok") {
+          completed = true;
+          break;
+        }
+        await new Promise((r) => setTimeout(r, 10));
+      }
+      expect(completed).toBe(true);
+      resetSpy();
+      spy.mockImplementationOnce(async (opts) => {
+        const signal = (opts as { abortSignal?: AbortSignal }).abortSignal;
+        await new Promise<void>((resolve) => {
+          if (!signal) return resolve();
+          if (signal.aborted) return resolve();
+          signal.addEventListener("abort", () => resolve(), { once: true });
+        });
+      });
+      const abortedEventP = onceMessage(
+        ws,
+        (o) =>
+          o.type === "event" &&
+          o.event === "chat" &&
+          o.payload?.state === "aborted" &&
+          o.payload?.runId === "idem-abort-all-1",
+      );
+      const startedAbortAll = await rpcReq(ws, "chat.send", {
+        sessionKey: "main",
+        message: "hello",
+        idempotencyKey: "idem-abort-all-1",
+      });
+      expect(startedAbortAll.ok).toBe(true);
+      const abortRes = await rpcReq<{
+        ok?: boolean;
+        aborted?: boolean;
+        runIds?: string[];
+      }>(ws, "chat.abort", { sessionKey: "main" });
+      expect(abortRes.ok).toBe(true);
+      expect(abortRes.payload?.aborted).toBe(true);
+      expect(abortRes.payload?.runIds ?? []).toContain("idem-abort-all-1");
+      await abortedEventP;
+      const noDeltaP = onceMessage(
+        ws,
+        (o) =>
+          o.type === "event" &&
+          o.event === "chat" &&
+          (o.payload?.state === "delta" || o.payload?.state === "final") &&
+          o.payload?.runId === "idem-abort-all-1",
+        250,
+      );
+      emitAgentEvent({
+        runId: "idem-abort-all-1",
+        stream: "assistant",
+        data: { text: "should be suppressed" },
+      });
+      emitAgentEvent({
+        runId: "idem-abort-all-1",
+        stream: "lifecycle",
+        data: { phase: "end" },
+      });
+      await expect(noDeltaP).rejects.toThrow(/timeout/i);
+      await withSessionStore(tempDirs, {}, async () => {
+        const abortUnknown = await rpcReq<{
+          ok?: boolean;
+          aborted?: boolean;
+        }>(ws, "chat.abort", { sessionKey: "main", runId: "missing-run" });
+        expect(abortUnknown.ok).toBe(true);
+        expect(abortUnknown.payload?.aborted).toBe(false);
+      });
+      await withSessionStore(
+        tempDirs,
+        { main: { sessionId: "sess-main", updatedAt: Date.now() } },
+        async () => {
+          resetSpy();
+          let agentStartedResolve: (() => void) | undefined;
+          const agentStartedP = new Promise<void>((resolve) => {
+            agentStartedResolve = resolve;
+          });
          spy.mockImplementationOnce(async (opts) => {
+            agentStartedResolve?.();
            const signal = (opts as { abortSignal?: AbortSignal }).abortSignal;
            await new Promise<void>((resolve) => {
              if (!signal) return resolve();
@@ -132,357 +396,127 @@ describe("gateway server chat", () => {
          });
          const sendResP = onceMessage(
            ws,
-            (o) => o.type === "res" && o.id === "send-abort-1",
-            8000,
+            (o) => o.type === "res" && o.id === "send-mismatch-1",
+            10_000,
          );
-          const abortResP = onceMessage(ws, (o) => o.type === "res" && o.id === "abort-1", 8000);
-          const abortedEventP = onceMessage(
-            ws,
-            (o) => o.type === "event" && o.event === "chat" && o.payload?.state === "aborted",
-            8000,
-          );
-          abortInFlight = Promise.allSettled([sendResP, abortResP, abortedEventP]);
-          sendReq(ws, "send-abort-1", "chat.send", {
+          sendReq(ws, "send-mismatch-1", "chat.send", {
            sessionKey: "main",
            message: "hello",
-            idempotencyKey: "idem-abort-1",
+            idempotencyKey: "idem-mismatch-1",
            timeoutMs: 30_000,
          });
+          await agentStartedP;
+          const abortMismatch = await rpcReq(ws, "chat.abort", {
+            sessionKey: "other",
+            runId: "idem-mismatch-1",
+          });
+          expect(abortMismatch.ok).toBe(false);
+          expect(abortMismatch.error?.code).toBe("INVALID_REQUEST");
+          const abortMismatch2 = await rpcReq(ws, "chat.abort", {
+            sessionKey: "main",
+            runId: "idem-mismatch-1",
+          });
+          expect(abortMismatch2.ok).toBe(true);
          const sendRes = await sendResP;
          expect(sendRes.ok).toBe(true);
-          await new Promise<void>((resolve, reject) => {
-            const deadline = Date.now() + 1000;
-            const tick = () => {
-              if (spy.mock.calls.length > callsBefore) return resolve();
-              if (Date.now() > deadline)
-                return reject(new Error("timeout waiting for agentCommand"));
-              setTimeout(tick, 5);
-            };
-            tick();
-          });
-          sendReq(ws, "abort-1", "chat.abort", {
-            sessionKey: "main",
-            runId: "idem-abort-1",
-          });
-          const abortRes = await abortResP;
-          expect(abortRes.ok).toBe(true);
-          const evt = await abortedEventP;
-          expect(evt.payload?.runId).toBe("idem-abort-1");
-          expect(evt.payload?.sessionKey).toBe("main");
-        } finally {
-          await abortInFlight;
-        }
-
-        await writeStore({ main: { sessionId: "sess-main", updatedAt: Date.now() } });
-        sessionStoreSaveDelayMs.value = 120;
-        resetSpy();
-        try {
-          spy.mockImplementationOnce(async (opts) => {
-            const signal = (opts as { abortSignal?: AbortSignal }).abortSignal;
-            await new Promise<void>((resolve) => {
-              if (!signal) return resolve();
-              if (signal.aborted) return resolve();
-              signal.addEventListener("abort", () => resolve(), { once: true });
-            });
-          });
-          const abortedEventP = onceMessage(
-            ws,
-            (o) => o.type === "event" && o.event === "chat" && o.payload?.state === "aborted",
-          );
-          const sendResP = onceMessage(ws, (o) => o.type === "res" && o.id === "send-abort-save-1");
-          sendReq(ws, "send-abort-save-1", "chat.send", {
-            sessionKey: "main",
-            message: "hello",
-            idempotencyKey: "idem-abort-save-1",
-            timeoutMs: 30_000,
-          });
-          const abortResP = onceMessage(ws, (o) => o.type === "res" && o.id === "abort-save-1");
-          sendReq(ws, "abort-save-1", "chat.abort", {
-            sessionKey: "main",
-            runId: "idem-abort-save-1",
-          });
-          const abortRes = await abortResP;
-          expect(abortRes.ok).toBe(true);
-          const sendRes = await sendResP;
-          expect(sendRes.ok).toBe(true);
-          const evt = await abortedEventP;
-          expect(evt.payload?.runId).toBe("idem-abort-save-1");
-          expect(evt.payload?.sessionKey).toBe("main");
-        } finally {
-          sessionStoreSaveDelayMs.value = 0;
-        }
-
-        await writeStore({ main: { sessionId: "sess-main", updatedAt: Date.now() } });
-        resetSpy();
-        const callsBeforeStop = spy.mock.calls.length;
-        spy.mockImplementationOnce(async (opts) => {
-          const signal = (opts as { abortSignal?: AbortSignal }).abortSignal;
-          await new Promise<void>((resolve) => {
-            if (!signal) return resolve();
-            if (signal.aborted) return resolve();
-            signal.addEventListener("abort", () => resolve(), { once: true });
-          });
-        });
-        const stopSendResP = onceMessage(
-          ws,
-          (o) => o.type === "res" && o.id === "send-stop-1",
-          8000,
-        );
-        sendReq(ws, "send-stop-1", "chat.send", {
-          sessionKey: "main",
-          message: "hello",
-          idempotencyKey: "idem-stop-run",
-        });
-        const stopSendRes = await stopSendResP;
-        expect(stopSendRes.ok).toBe(true);
-        await waitFor(() => spy.mock.calls.length > callsBeforeStop);
-        const abortedStopEventP = onceMessage(
-          ws,
-          (o) =>
-            o.type === "event" &&
-            o.event === "chat" &&
-            o.payload?.state === "aborted" &&
-            o.payload?.runId === "idem-stop-run",
-          8000,
-        );
-        const stopResP = onceMessage(ws, (o) => o.type === "res" && o.id === "send-stop-2", 8000);
-        sendReq(ws, "send-stop-2", "chat.send", {
-          sessionKey: "main",
-          message: "/stop",
-          idempotencyKey: "idem-stop-req",
-        });
-        const stopRes = await stopResP;
-        expect(stopRes.ok).toBe(true);
-        const stopEvt = await abortedStopEventP;
-        expect(stopEvt.payload?.sessionKey).toBe("main");
-        expect(spy.mock.calls.length).toBe(callsBeforeStop + 1);
-        resetSpy();
-        let resolveRun: (() => void) | undefined;
-        const runDone = new Promise<void>((resolve) => {
-          resolveRun = resolve;
-        });
-        spy.mockImplementationOnce(async () => {
-          await runDone;
-        });
-        const started = await rpcReq<{ runId?: string; status?: string }>(ws, "chat.send", {
-          sessionKey: "main",
-          message: "hello",
-          idempotencyKey: "idem-status-1",
-        });
-        expect(started.ok).toBe(true);
-        expect(started.payload?.status).toBe("started");
-        const inFlightRes = await rpcReq<{ runId?: string; status?: string }>(ws, "chat.send", {
-          sessionKey: "main",
-          message: "hello",
-          idempotencyKey: "idem-status-1",
-        });
-        expect(inFlightRes.ok).toBe(true);
-        expect(inFlightRes.payload?.status).toBe("in_flight");
-        resolveRun?.();
-        let completed = false;
-        for (let i = 0; i < 20; i++) {
-          const again = await rpcReq<{ runId?: string; status?: string }>(ws, "chat.send", {
-            sessionKey: "main",
-            message: "hello",
-            idempotencyKey: "idem-status-1",
-          });
-          if (again.ok && again.payload?.status === "ok") {
-            completed = true;
-            break;
-          }
-          await new Promise((r) => setTimeout(r, 10));
-        }
-        expect(completed).toBe(true);
-        resetSpy();
-        spy.mockImplementationOnce(async (opts) => {
-          const signal = (opts as { abortSignal?: AbortSignal }).abortSignal;
-          await new Promise<void>((resolve) => {
-            if (!signal) return resolve();
-            if (signal.aborted) return resolve();
-            signal.addEventListener("abort", () => resolve(), { once: true });
-          });
-        });
-        const abortedEventP = onceMessage(
-          ws,
-          (o) =>
-            o.type === "event" &&
-            o.event === "chat" &&
-            o.payload?.state === "aborted" &&
-            o.payload?.runId === "idem-abort-all-1",
-        );
-        const startedAbortAll = await rpcReq(ws, "chat.send", {
-          sessionKey: "main",
-          message: "hello",
-          idempotencyKey: "idem-abort-all-1",
-        });
-        expect(startedAbortAll.ok).toBe(true);
-        const abortRes = await rpcReq<{
-          ok?: boolean;
-          aborted?: boolean;
-          runIds?: string[];
-        }>(ws, "chat.abort", { sessionKey: "main" });
-        expect(abortRes.ok).toBe(true);
-        expect(abortRes.payload?.aborted).toBe(true);
-        expect(abortRes.payload?.runIds ?? []).toContain("idem-abort-all-1");
-        await abortedEventP;
-        const noDeltaP = onceMessage(
-          ws,
-          (o) =>
-            o.type === "event" &&
-            o.event === "chat" &&
-            (o.payload?.state === "delta" || o.payload?.state === "final") &&
-            o.payload?.runId === "idem-abort-all-1",
-          250,
-        );
-        emitAgentEvent({
-          runId: "idem-abort-all-1",
-          stream: "assistant",
-          data: { text: "should be suppressed" },
-        });
-        emitAgentEvent({
-          runId: "idem-abort-all-1",
-          stream: "lifecycle",
-          data: { phase: "end" },
-        });
-        await expect(noDeltaP).rejects.toThrow(/timeout/i);
-        await writeStore({});
-        const abortUnknown = await rpcReq<{
-          ok?: boolean;
-          aborted?: boolean;
-        }>(ws, "chat.abort", { sessionKey: "main", runId: "missing-run" });
-        expect(abortUnknown.ok).toBe(true);
-        expect(abortUnknown.payload?.aborted).toBe(false);
-
-        await writeStore({ main: { sessionId: "sess-main", updatedAt: Date.now() } });
-        resetSpy();
-        let agentStartedResolve: (() => void) | undefined;
-        const agentStartedP = new Promise<void>((resolve) => {
-          agentStartedResolve = resolve;
-        });
-        spy.mockImplementationOnce(async (opts) => {
-          agentStartedResolve?.();
-          const signal = (opts as { abortSignal?: AbortSignal }).abortSignal;
-          await new Promise<void>((resolve) => {
-            if (!signal) return resolve();
-            if (signal.aborted) return resolve();
-            signal.addEventListener("abort", () => resolve(), { once: true });
-          });
-        });
-        const sendResP = onceMessage(
-          ws,
-          (o) => o.type === "res" && o.id === "send-mismatch-1",
-          10_000,
-        );
-        sendReq(ws, "send-mismatch-1", "chat.send", {
-          sessionKey: "main",
-          message: "hello",
-          idempotencyKey: "idem-mismatch-1",
-          timeoutMs: 30_000,
-        });
-        await agentStartedP;
-        const abortMismatch = await rpcReq(ws, "chat.abort", {
-          sessionKey: "other",
-          runId: "idem-mismatch-1",
-        });
-        expect(abortMismatch.ok).toBe(false);
-        expect(abortMismatch.error?.code).toBe("INVALID_REQUEST");
-        const abortMismatch2 = await rpcReq(ws, "chat.abort", {
-          sessionKey: "main",
-          runId: "idem-mismatch-1",
-        });
-        expect(abortMismatch2.ok).toBe(true);
-        const sendRes = await sendResP;
-        expect(sendRes.ok).toBe(true);
-
-        await writeStore({ main: { sessionId: "sess-main", updatedAt: Date.now() } });
-        resetSpy();
-        spy.mockResolvedValueOnce(undefined);
-        sendReq(ws, "send-complete-1", "chat.send", {
-          sessionKey: "main",
-          message: "hello",
-          idempotencyKey: "idem-complete-1",
-          timeoutMs: 30_000,
-        });
-        const sendCompleteRes = await onceMessage(
-          ws,
-          (o) => o.type === "res" && o.id === "send-complete-1",
-        );
-        expect(sendCompleteRes.ok).toBe(true);
-        let completedRun = false;
-        for (let i = 0; i < 20; i++) {
-          const again = await rpcReq<{ runId?: string; status?: string }>(ws, "chat.send", {
+        },
+      );
+      await withSessionStore(
+        tempDirs,
+        { main: { sessionId: "sess-main", updatedAt: Date.now() } },
+        async () => {
+          resetSpy();
+          spy.mockResolvedValueOnce(undefined);
+          sendReq(ws, "send-complete-1", "chat.send", {
            sessionKey: "main",
            message: "hello",
            idempotencyKey: "idem-complete-1",
            timeoutMs: 30_000,
          });
-          if (again.ok && again.payload?.status === "ok") {
-            completedRun = true;
-            break;
+          const sendCompleteRes = await onceMessage(
+            ws,
+            (o) => o.type === "res" && o.id === "send-complete-1",
+          );
+          expect(sendCompleteRes.ok).toBe(true);
+          let completedRun = false;
+          for (let i = 0; i < 50; i++) {
+            const again = await rpcReq<{ runId?: string; status?: string }>(ws, "chat.send", {
+              sessionKey: "main",
+              message: "hello",
+              idempotencyKey: "idem-complete-1",
+              timeoutMs: 30_000,
+            });
+            if (again.ok && again.payload?.status === "ok") {
+              completedRun = true;
+              break;
+            }
+            await new Promise((r) => setTimeout(r, 10));
          }
-          await new Promise((r) => setTimeout(r, 10));
-        }
-        expect(completedRun).toBe(true);
-        const abortCompleteRes = await rpcReq(ws, "chat.abort", {
-          sessionKey: "main",
-          runId: "idem-complete-1",
-        });
-        expect(abortCompleteRes.ok).toBe(true);
-        expect(abortCompleteRes.payload?.aborted).toBe(false);
-
-        await writeStore({ main: { sessionId: "sess-main", updatedAt: Date.now() } });
-        const res1 = await rpcReq(ws, "chat.send", {
-          sessionKey: "main",
-          message: "first",
-          idempotencyKey: "idem-1",
-        });
-        expect(res1.ok).toBe(true);
-        const res2 = await rpcReq(ws, "chat.send", {
-          sessionKey: "main",
-          message: "second",
-          idempotencyKey: "idem-2",
-        });
-        expect(res2.ok).toBe(true);
-        const final1P = onceMessage(
-          ws,
-          (o) => o.type === "event" && o.event === "chat" && o.payload?.state === "final",
-          8000,
-        );
-        emitAgentEvent({
-          runId: "idem-1",
-          stream: "lifecycle",
-          data: { phase: "end" },
-        });
-        const final1 = await final1P;
-        const run1 =
-          final1.payload && typeof final1.payload === "object"
-            ? (final1.payload as { runId?: string }).runId
-            : undefined;
-        expect(run1).toBe("idem-1");
-        const final2P = onceMessage(
-          ws,
-          (o) => o.type === "event" && o.event === "chat" && o.payload?.state === "final",
-          8000,
-        );
-        emitAgentEvent({
-          runId: "idem-2",
-          stream: "lifecycle",
-          data: { phase: "end" },
-        });
-        const final2 = await final2P;
-        const run2 =
-          final2.payload && typeof final2.payload === "object"
-            ? (final2.payload as { runId?: string }).runId
-            : undefined;
-        expect(run2).toBe("idem-2");
-      } finally {
-        __setMaxChatHistoryMessagesBytesForTest();
-        testState.sessionStorePath = undefined;
-        sessionStoreSaveDelayMs.value = 0;
-        ws.close();
-        await server.close();
-        await Promise.all(tempDirs.map((dir) => fs.rm(dir, { recursive: true, force: true })));
-      }
-    },
-  );
+          expect(completedRun).toBe(true);
+          const abortCompleteRes = await rpcReq(ws, "chat.abort", {
+            sessionKey: "main",
+            runId: "idem-complete-1",
+          });
+          expect(abortCompleteRes.ok).toBe(true);
+          expect(abortCompleteRes.payload?.aborted).toBe(false);
+        },
+      );
+      await withSessionStore(
+        tempDirs,
+        { main: { sessionId: "sess-main", updatedAt: Date.now() } },
+        async () => {
+          const res1 = await rpcReq(ws, "chat.send", {
+            sessionKey: "main",
+            message: "first",
+            idempotencyKey: "idem-1",
+          });
+          expect(res1.ok).toBe(true);
+          const res2 = await rpcReq(ws, "chat.send", {
+            sessionKey: "main",
+            message: "second",
+            idempotencyKey: "idem-2",
+          });
+          expect(res2.ok).toBe(true);
+          const final1P = onceMessage(
+            ws,
+            (o) => o.type === "event" && o.event === "chat" && o.payload?.state === "final",
+            8000,
+          );
+          emitAgentEvent({
+            runId: "idem-1",
+            stream: "lifecycle",
+            data: { phase: "end" },
+          });
+          const final1 = await final1P;
+          const run1 =
+            final1.payload && typeof final1.payload === "object"
+              ? (final1.payload as { runId?: string }).runId
+              : undefined;
+          expect(run1).toBe("idem-1");
+          const final2P = onceMessage(
+            ws,
+            (o) => o.type === "event" && o.event === "chat" && o.payload?.state === "final",
+            8000,
+          );
+          emitAgentEvent({
+            runId: "idem-2",
+            stream: "lifecycle",
+            data: { phase: "end" },
+          });
+          const final2 = await final2P;
+          const run2 =
+            final2.payload && typeof final2.payload === "object"
+              ? (final2.payload as { runId?: string }).runId
+              : undefined;
+          expect(run2).toBe("idem-2");
+        },
+      );
+    } finally {
+      testState.sessionStorePath = undefined;
+      sessionStoreSaveDelayMs.value = 0;
+      ws.close();
+      await server.close();
+      await Promise.all(tempDirs.map((dir) => fs.rm(dir, { recursive: true, force: true })));
+    }
+  });
 });
@@ -1,10 +1,9 @@
 import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
-import { afterAll, beforeAll, describe, expect, test, vi } from "vitest";
+import { describe, expect, test, vi } from "vitest";
 import { WebSocket } from "ws";
 import { GATEWAY_CLIENT_MODES, GATEWAY_CLIENT_NAMES } from "../utils/message-channel.js";
-import { emitAgentEvent, registerAgentRunContext } from "../infra/agent-events.js";
 import {
  agentCommand,
  connectOk,
@@ -16,24 +15,7 @@ import {
  writeSessionStore,
 } from "./test-helpers.js";

-installGatewayTestHooks({ scope: "suite" });
-
-let server: Awaited<ReturnType<typeof startServerWithClient>>["server"];
-let ws: WebSocket;
-let port: number;
-
-beforeAll(async () => {
-  const started = await startServerWithClient();
-  server = started.server;
-  ws = started.ws;
-  port = started.port;
-  await connectOk(ws);
-});
-
-afterAll(async () => {
-  ws.close();
-  await server.close();
-});
+installGatewayTestHooks();

 async function waitFor(condition: () => boolean, timeoutMs = 1500) {
  const deadline = Date.now() + timeoutMs;
@@ -47,9 +29,12 @@ async function waitFor(condition: () => boolean, timeoutMs = 1500) {
 describe("gateway server chat", () => {
  test("handles chat send and history flows", async () => {
    const tempDirs: string[] = [];
+    const { server, ws, port } = await startServerWithClient();
    let webchatWs: WebSocket | undefined;

    try {
+      await connectOk(ws);
+
      webchatWs = new WebSocket(`ws://127.0.0.1:${port}`);
      await new Promise<void>((resolve) => webchatWs?.once("open", resolve));
      await connectOk(webchatWs, {
@@ -255,182 +240,9 @@ describe("gateway server chat", () => {
      testState.sessionStorePath = undefined;
      testState.sessionConfig = undefined;
      if (webchatWs) webchatWs.close();
+      ws.close();
+      await server.close();
      await Promise.all(tempDirs.map((dir) => fs.rm(dir, { recursive: true, force: true })));
    }
  });
-
-  test("agent events include sessionKey and agent.wait covers lifecycle flows", async () => {
-    const dir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-gw-"));
-    testState.sessionStorePath = path.join(dir, "sessions.json");
-    await writeSessionStore({
-      entries: {
-        main: {
-          sessionId: "sess-main",
-          updatedAt: Date.now(),
-          verboseLevel: "off",
-        },
-      },
-    });
-
-    const webchatWs = new WebSocket(`ws://127.0.0.1:${port}`);
-    await new Promise<void>((resolve) => webchatWs.once("open", resolve));
-    await connectOk(webchatWs, {
-      client: {
-        id: GATEWAY_CLIENT_NAMES.WEBCHAT,
-        version: "1.0.0",
-        platform: "test",
-        mode: GATEWAY_CLIENT_MODES.WEBCHAT,
-      },
-    });
-
-    try {
-      registerAgentRunContext("run-tool-1", {
-        sessionKey: "main",
-        verboseLevel: "on",
-      });
-
-      {
-        const agentEvtP = onceMessage(
-          webchatWs,
-          (o) => o.type === "event" && o.event === "agent" && o.payload?.runId === "run-tool-1",
-          8000,
-        );
-
-        emitAgentEvent({
-          runId: "run-tool-1",
-          stream: "tool",
-          data: { phase: "start", name: "read", toolCallId: "tool-1" },
-        });
-
-        const evt = await agentEvtP;
-        const payload =
-          evt.payload && typeof evt.payload === "object"
-            ? (evt.payload as Record<string, unknown>)
-            : {};
-        expect(payload.sessionKey).toBe("main");
-      }
-
-      {
-        registerAgentRunContext("run-tool-off", { sessionKey: "agent:main:main" });
-
-        emitAgentEvent({
-          runId: "run-tool-off",
-          stream: "tool",
-          data: { phase: "start", name: "read", toolCallId: "tool-1" },
-        });
-        emitAgentEvent({
-          runId: "run-tool-off",
-          stream: "assistant",
-          data: { text: "hello" },
-        });
-
-        const evt = await onceMessage(
-          webchatWs,
-          (o) => o.type === "event" && o.event === "agent" && o.payload?.runId === "run-tool-off",
-          8000,
-        );
-        const payload =
-          evt.payload && typeof evt.payload === "object"
-            ? (evt.payload as Record<string, unknown>)
-            : {};
-        expect(payload.stream).toBe("assistant");
-      }
-
-      {
-        const waitP = rpcReq(webchatWs, "agent.wait", {
-          runId: "run-wait-1",
-          timeoutMs: 1000,
-        });
-
-        setTimeout(() => {
-          emitAgentEvent({
-            runId: "run-wait-1",
-            stream: "lifecycle",
-            data: { phase: "end", startedAt: 200, endedAt: 210 },
-          });
-        }, 5);
-
-        const res = await waitP;
-        expect(res.ok).toBe(true);
-        expect(res.payload.status).toBe("ok");
-        expect(res.payload.startedAt).toBe(200);
-      }
-
-      {
-        emitAgentEvent({
-          runId: "run-wait-early",
-          stream: "lifecycle",
-          data: { phase: "end", startedAt: 50, endedAt: 55 },
-        });
-
-        const res = await rpcReq(webchatWs, "agent.wait", {
-          runId: "run-wait-early",
-          timeoutMs: 1000,
-        });
-        expect(res.ok).toBe(true);
-        expect(res.payload.status).toBe("ok");
-        expect(res.payload.startedAt).toBe(50);
-      }
-
-      {
-        const res = await rpcReq(webchatWs, "agent.wait", {
-          runId: "run-wait-3",
-          timeoutMs: 30,
-        });
-        expect(res.ok).toBe(true);
-        expect(res.payload.status).toBe("timeout");
-      }
-
-      {
-        const waitP = rpcReq(webchatWs, "agent.wait", {
-          runId: "run-wait-err",
-          timeoutMs: 1000,
-        });
-
-        setTimeout(() => {
-          emitAgentEvent({
-            runId: "run-wait-err",
-            stream: "lifecycle",
-            data: { phase: "error", error: "boom" },
-          });
-        }, 5);
-
-        const res = await waitP;
-        expect(res.ok).toBe(true);
-        expect(res.payload.status).toBe("error");
-        expect(res.payload.error).toBe("boom");
-      }
-
-      {
-        const waitP = rpcReq(webchatWs, "agent.wait", {
-          runId: "run-wait-start",
-          timeoutMs: 1000,
-        });
-
-        emitAgentEvent({
-          runId: "run-wait-start",
-          stream: "lifecycle",
-          data: { phase: "start", startedAt: 123 },
-        });
-
-        setTimeout(() => {
-          emitAgentEvent({
-            runId: "run-wait-start",
-            stream: "lifecycle",
-            data: { phase: "end", endedAt: 456 },
-          });
-        }, 5);
-
-        const res = await waitP;
-        expect(res.ok).toBe(true);
-        expect(res.payload.status).toBe("ok");
-        expect(res.payload.startedAt).toBe(123);
-        expect(res.payload.endedAt).toBe(456);
-      }
-    } finally {
-      webchatWs.close();
-      await fs.rm(dir, { recursive: true, force: true });
-      testState.sessionStorePath = undefined;
-    }
-  });
 });
@@ -1,7 +1,4 @@
-import fs from "node:fs/promises";
-import os from "node:os";
-import path from "node:path";
-import { afterAll, beforeAll, describe, expect, it } from "vitest";
+import { describe, expect, it } from "vitest";

 import { resolveConfigSnapshotHash } from "../config/config.js";

@@ -9,31 +6,16 @@ import {
  connectOk,
  installGatewayTestHooks,
  onceMessage,
-  rpcReq,
  startServerWithClient,
-  testState,
-  writeSessionStore,
 } from "./test-helpers.js";

-installGatewayTestHooks({ scope: "suite" });
-
-let server: Awaited<ReturnType<typeof startServerWithClient>>["server"];
-let ws: Awaited<ReturnType<typeof startServerWithClient>>["ws"];
-
-beforeAll(async () => {
-  const started = await startServerWithClient();
-  server = started.server;
-  ws = started.ws;
-  await connectOk(ws);
-});
-
-afterAll(async () => {
-  ws.close();
-  await server.close();
-});
+installGatewayTestHooks();

 describe("gateway config.patch", () => {
  it("merges patches without clobbering unrelated config", async () => {
+    const { server, ws } = await startServerWithClient();
+    await connectOk(ws);
+
    const setId = "req-set";
    ws.send(
      JSON.stringify({
@@ -118,9 +100,15 @@ describe("gateway config.patch", () => {
    expect(get2Res.ok).toBe(true);
    expect(get2Res.payload?.config?.gateway?.mode).toBe("local");
    expect(get2Res.payload?.config?.channels?.telegram?.botToken).toBe("token-1");
+
+    ws.close();
+    await server.close();
  });

  it("requires base hash when config exists", async () => {
+    const { server, ws } = await startServerWithClient();
+    await connectOk(ws);
+
    const setId = "req-set-2";
    ws.send(
      JSON.stringify({
@@ -157,9 +145,15 @@ describe("gateway config.patch", () => {
    );
    expect(patchRes.ok).toBe(false);
    expect(patchRes.error?.message).toContain("base hash");
+
+    ws.close();
+    await server.close();
  });

  it("requires base hash for config.set when config exists", async () => {
+    const { server, ws } = await startServerWithClient();
+    await connectOk(ws);
+
    const setId = "req-set-3";
    ws.send(
      JSON.stringify({
@@ -198,108 +192,8 @@ describe("gateway config.patch", () => {
    );
    expect(set2Res.ok).toBe(false);
    expect(set2Res.error?.message).toContain("base hash");
-  });
-});

-describe("gateway server sessions", () => {
-  it("filters sessions by agentId", async () => {
-    const dir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-sessions-agents-"));
-    testState.sessionConfig = {
-      store: path.join(dir, "{agentId}", "sessions.json"),
-    };
-    testState.agentsConfig = {
-      list: [{ id: "home", default: true }, { id: "work" }],
-    };
-    const homeDir = path.join(dir, "home");
-    const workDir = path.join(dir, "work");
-    await fs.mkdir(homeDir, { recursive: true });
-    await fs.mkdir(workDir, { recursive: true });
-    await writeSessionStore({
-      storePath: path.join(homeDir, "sessions.json"),
-      agentId: "home",
-      entries: {
-        main: {
-          sessionId: "sess-home-main",
-          updatedAt: Date.now(),
-        },
-        "discord:group:dev": {
-          sessionId: "sess-home-group",
-          updatedAt: Date.now() - 1000,
-        },
-      },
-    });
-    await writeSessionStore({
-      storePath: path.join(workDir, "sessions.json"),
-      agentId: "work",
-      entries: {
-        main: {
-          sessionId: "sess-work-main",
-          updatedAt: Date.now(),
-        },
-      },
-    });
-
-    const homeSessions = await rpcReq<{
-      sessions: Array<{ key: string }>;
-    }>(ws, "sessions.list", {
-      includeGlobal: false,
-      includeUnknown: false,
-      agentId: "home",
-    });
-    expect(homeSessions.ok).toBe(true);
-    expect(homeSessions.payload?.sessions.map((s) => s.key).sort()).toEqual([
-      "agent:home:discord:group:dev",
-      "agent:home:main",
-    ]);
-
-    const workSessions = await rpcReq<{
-      sessions: Array<{ key: string }>;
-    }>(ws, "sessions.list", {
-      includeGlobal: false,
-      includeUnknown: false,
-      agentId: "work",
-    });
-    expect(workSessions.ok).toBe(true);
-    expect(workSessions.payload?.sessions.map((s) => s.key)).toEqual(["agent:work:main"]);
-  });
-
-  it("resolves and patches main alias to default agent main key", async () => {
-    const dir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-sessions-"));
-    const storePath = path.join(dir, "sessions.json");
-    testState.sessionStorePath = storePath;
-    testState.agentsConfig = { list: [{ id: "ops", default: true }] };
-    testState.sessionConfig = { mainKey: "work" };
-
-    await writeSessionStore({
-      storePath,
-      agentId: "ops",
-      mainKey: "work",
-      entries: {
-        main: {
-          sessionId: "sess-ops-main",
-          updatedAt: Date.now(),
-        },
-      },
-    });
-
-    const resolved = await rpcReq<{ ok: true; key: string }>(ws, "sessions.resolve", {
-      key: "main",
-    });
-    expect(resolved.ok).toBe(true);
-    expect(resolved.payload?.key).toBe("agent:ops:work");
-
-    const patched = await rpcReq<{ ok: true; key: string }>(ws, "sessions.patch", {
-      key: "main",
-      thinkingLevel: "medium",
-    });
-    expect(patched.ok).toBe(true);
-    expect(patched.payload?.key).toBe("agent:ops:work");
-
-    const stored = JSON.parse(await fs.readFile(storePath, "utf-8")) as Record<
-      string,
-      { thinkingLevel?: string }
-    >;
-    expect(stored["agent:ops:work"]?.thinkingLevel).toBe("medium");
-    expect(stored.main).toBeUndefined();
+    ws.close();
+    await server.close();
  });
 });
@@ -1,10 +1,11 @@
 import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
-import { describe, expect, test } from "vitest";
+import { describe, expect, test, vi } from "vitest";
 import {
  connectOk,
  installGatewayTestHooks,
+  onceMessage,
  rpcReq,
  startServerWithClient,
  testState,
@@ -35,23 +36,32 @@ async function rmTempDir(dir: string) {
  await fs.rm(dir, { recursive: true, force: true });
 }

+async function waitForCronFinished(ws: { send: (data: string) => void }, jobId: string) {
+  await onceMessage(
+    ws as never,
+    (o) =>
+      o.type === "event" &&
+      o.event === "cron" &&
+      o.payload?.action === "finished" &&
+      o.payload?.jobId === jobId,
+    10_000,
+  );
+}
+
 async function waitForNonEmptyFile(pathname: string, timeoutMs = 2000) {
-  const startedAt = process.hrtime.bigint();
+  const deadline = Date.now() + timeoutMs;
  for (;;) {
    const raw = await fs.readFile(pathname, "utf-8").catch(() => "");
    if (raw.trim().length > 0) return raw;
-    const elapsedMs = Number(process.hrtime.bigint() - startedAt) / 1e6;
-    if (elapsedMs >= timeoutMs) {
+    if (Date.now() >= deadline) {
      throw new Error(`timeout waiting for file ${pathname}`);
    }
-    await yieldToEventLoop();
+    await new Promise((resolve) => setTimeout(resolve, 10));
  }
 }

 describe("gateway server cron", () => {
  test("handles cron CRUD, normalization, and patch semantics", { timeout: 120_000 }, async () => {
-    const prevSkipCron = process.env.CLAWDBOT_SKIP_CRON;
-    process.env.CLAWDBOT_SKIP_CRON = "0";
    const dir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-gw-cron-"));
    testState.cronStorePath = path.join(dir, "cron", "jobs.json");
    testState.sessionConfig = { mainKey: "primary" };
@@ -255,17 +265,10 @@ describe("gateway server cron", () => {
      testState.cronStorePath = undefined;
      testState.sessionConfig = undefined;
      testState.cronEnabled = undefined;
-      if (prevSkipCron === undefined) {
-        delete process.env.CLAWDBOT_SKIP_CRON;
-      } else {
-        process.env.CLAWDBOT_SKIP_CRON = prevSkipCron;
-      }
    }
  });

  test("writes cron run history and auto-runs due jobs", async () => {
-    const prevSkipCron = process.env.CLAWDBOT_SKIP_CRON;
-    process.env.CLAWDBOT_SKIP_CRON = "0";
    const dir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-gw-cron-log-"));
    testState.cronStorePath = path.join(dir, "cron", "jobs.json");
    testState.cronEnabled = undefined;
@@ -290,10 +293,13 @@ describe("gateway server cron", () => {
      const jobId = typeof jobIdValue === "string" ? jobIdValue : "";
      expect(jobId.length > 0).toBe(true);

+      const finishedP = waitForCronFinished(ws, jobId);
      const runRes = await rpcReq(ws, "cron.run", { id: jobId, mode: "force" }, 20_000);
      expect(runRes.ok).toBe(true);
+      await finishedP;
+
      const logPath = path.join(dir, "cron", "runs", `${jobId}.jsonl`);
-      const raw = await waitForNonEmptyFile(logPath, 5000);
+      const raw = await waitForNonEmptyFile(logPath);
      const line = raw
        .split("\n")
        .map((l) => l.trim())
@@ -339,7 +345,16 @@ describe("gateway server cron", () => {
      const autoJobId = typeof autoJobIdValue === "string" ? autoJobIdValue : "";
      expect(autoJobId.length > 0).toBe(true);

-      await waitForNonEmptyFile(path.join(dir, "cron", "runs", `${autoJobId}.jsonl`), 5000);
+      vi.useFakeTimers();
+      try {
+        const autoFinishedP = waitForCronFinished(ws, autoJobId);
+        await vi.advanceTimersByTimeAsync(1000);
+        await autoFinishedP;
+      } finally {
+        vi.useRealTimers();
+      }
+
+      await waitForNonEmptyFile(path.join(dir, "cron", "runs", `${autoJobId}.jsonl`));
      const autoEntries = (await rpcReq(ws, "cron.runs", { id: autoJobId, limit: 10 })).payload as
        | { entries?: Array<{ jobId?: unknown }> }
        | undefined;
@@ -352,11 +367,6 @@ describe("gateway server cron", () => {
      await rmTempDir(dir);
      testState.cronStorePath = undefined;
      testState.cronEnabled = undefined;
-      if (prevSkipCron === undefined) {
-        delete process.env.CLAWDBOT_SKIP_CRON;
-      } else {
-        process.env.CLAWDBOT_SKIP_CRON = prevSkipCron;
-      }
    }
  }, 45_000);
 });
@@ -10,150 +10,206 @@ import {
  waitForSystemEvent,
 } from "./test-helpers.js";

-installGatewayTestHooks({ scope: "suite" });
+installGatewayTestHooks();

 const resolveMainKey = () => resolveMainSessionKeyFromConfig();

 describe("gateway server hooks", () => {
-  test("handles auth, wake, and agent flows", async () => {
+  test("hooks wake requires auth", async () => {
    testState.hooksConfig = { enabled: true, token: "hook-secret" };
    const port = await getFreePort();
    const server = await startGatewayServer(port);
-    try {
-      const resNoAuth = await fetch(`http://127.0.0.1:${port}/hooks/wake`, {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ text: "Ping" }),
-      });
-      expect(resNoAuth.status).toBe(401);
+    const res = await fetch(`http://127.0.0.1:${port}/hooks/wake`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ text: "Ping" }),
+    });
+    expect(res.status).toBe(401);
+    await server.close();
+  });

-      const resWake = await fetch(`http://127.0.0.1:${port}/hooks/wake`, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: "Bearer hook-secret",
-        },
-        body: JSON.stringify({ text: "Ping", mode: "next-heartbeat" }),
-      });
-      expect(resWake.status).toBe(200);
-      const wakeEvents = await waitForSystemEvent();
-      expect(wakeEvents.some((e) => e.includes("Ping"))).toBe(true);
-      drainSystemEvents(resolveMainKey());
+  test("hooks wake enqueues system event", async () => {
+    testState.hooksConfig = { enabled: true, token: "hook-secret" };
+    const port = await getFreePort();
+    const server = await startGatewayServer(port);
+    const res = await fetch(`http://127.0.0.1:${port}/hooks/wake`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: "Bearer hook-secret",
+      },
+      body: JSON.stringify({ text: "Ping", mode: "next-heartbeat" }),
+    });
+    expect(res.status).toBe(200);
+    const events = await waitForSystemEvent();
+    expect(events.some((e) => e.includes("Ping"))).toBe(true);
+    drainSystemEvents(resolveMainKey());
+    await server.close();
+  });

-      cronIsolatedRun.mockReset();
-      cronIsolatedRun.mockResolvedValueOnce({
-        status: "ok",
-        summary: "done",
-      });
-      const resAgent = await fetch(`http://127.0.0.1:${port}/hooks/agent`, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: "Bearer hook-secret",
-        },
-        body: JSON.stringify({ message: "Do it", name: "Email" }),
-      });
-      expect(resAgent.status).toBe(202);
-      const agentEvents = await waitForSystemEvent();
-      expect(agentEvents.some((e) => e.includes("Hook Email: done"))).toBe(true);
-      drainSystemEvents(resolveMainKey());
+  test("hooks agent posts summary to main", async () => {
+    testState.hooksConfig = { enabled: true, token: "hook-secret" };
+    cronIsolatedRun.mockResolvedValueOnce({
+      status: "ok",
+      summary: "done",
+    });
+    const port = await getFreePort();
+    const server = await startGatewayServer(port);
+    const res = await fetch(`http://127.0.0.1:${port}/hooks/agent`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: "Bearer hook-secret",
+      },
+      body: JSON.stringify({ message: "Do it", name: "Email" }),
+    });
+    expect(res.status).toBe(202);
+    const events = await waitForSystemEvent();
+    expect(events.some((e) => e.includes("Hook Email: done"))).toBe(true);
+    drainSystemEvents(resolveMainKey());
+    await server.close();
+  });

-      cronIsolatedRun.mockReset();
-      cronIsolatedRun.mockResolvedValueOnce({
-        status: "ok",
-        summary: "done",
-      });
-      const resAgentModel = await fetch(`http://127.0.0.1:${port}/hooks/agent`, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: "Bearer hook-secret",
-        },
-        body: JSON.stringify({
-          message: "Do it",
-          name: "Email",
-          model: "openai/gpt-4.1-mini",
-        }),
-      });
-      expect(resAgentModel.status).toBe(202);
-      await waitForSystemEvent();
-      const call = cronIsolatedRun.mock.calls[0]?.[0] as {
-        job?: { payload?: { model?: string } };
-      };
-      expect(call?.job?.payload?.model).toBe("openai/gpt-4.1-mini");
-      drainSystemEvents(resolveMainKey());
+  test("hooks agent forwards model override", async () => {
+    testState.hooksConfig = { enabled: true, token: "hook-secret" };
+    cronIsolatedRun.mockClear();
+    cronIsolatedRun.mockResolvedValueOnce({
+      status: "ok",
+      summary: "done",
+    });
+    const port = await getFreePort();
+    const server = await startGatewayServer(port);
+    const res = await fetch(`http://127.0.0.1:${port}/hooks/agent`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: "Bearer hook-secret",
+      },
+      body: JSON.stringify({
+        message: "Do it",
+        name: "Email",
+        model: "openai/gpt-4.1-mini",
+      }),
+    });
+    expect(res.status).toBe(202);
+    await waitForSystemEvent();
+    const call = cronIsolatedRun.mock.calls[0]?.[0] as {
+      job?: { payload?: { model?: string } };
+    };
+    expect(call?.job?.payload?.model).toBe("openai/gpt-4.1-mini");
+    drainSystemEvents(resolveMainKey());
+    await server.close();
+  });

-      const resQuery = await fetch(`http://127.0.0.1:${port}/hooks/wake?token=hook-secret`, {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ text: "Query auth" }),
-      });
-      expect(resQuery.status).toBe(200);
-      const queryEvents = await waitForSystemEvent();
-      expect(queryEvents.some((e) => e.includes("Query auth"))).toBe(true);
-      drainSystemEvents(resolveMainKey());
+  test("hooks wake accepts query token", async () => {
+    testState.hooksConfig = { enabled: true, token: "hook-secret" };
+    const port = await getFreePort();
+    const server = await startGatewayServer(port);
+    const res = await fetch(`http://127.0.0.1:${port}/hooks/wake?token=hook-secret`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ text: "Query auth" }),
+    });
+    expect(res.status).toBe(200);
+    const events = await waitForSystemEvent();
+    expect(events.some((e) => e.includes("Query auth"))).toBe(true);
+    drainSystemEvents(resolveMainKey());
+    await server.close();
+  });

-      const resBadChannel = await fetch(`http://127.0.0.1:${port}/hooks/agent`, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: "Bearer hook-secret",
-        },
-        body: JSON.stringify({ message: "Nope", channel: "sms" }),
-      });
-      expect(resBadChannel.status).toBe(400);
-      expect(peekSystemEvents(resolveMainKey()).length).toBe(0);
+  test("hooks agent rejects invalid channel", async () => {
+    testState.hooksConfig = { enabled: true, token: "hook-secret" };
+    const port = await getFreePort();
+    const server = await startGatewayServer(port);
+    const res = await fetch(`http://127.0.0.1:${port}/hooks/agent`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: "Bearer hook-secret",
+      },
+      body: JSON.stringify({ message: "Nope", channel: "sms" }),
+    });
+    expect(res.status).toBe(400);
+    expect(peekSystemEvents(resolveMainKey()).length).toBe(0);
+    await server.close();
+  });

-      const resHeader = await fetch(`http://127.0.0.1:${port}/hooks/wake`, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-          "x-clawdbot-token": "hook-secret",
-        },
-        body: JSON.stringify({ text: "Header auth" }),
-      });
-      expect(resHeader.status).toBe(200);
-      const headerEvents = await waitForSystemEvent();
-      expect(headerEvents.some((e) => e.includes("Header auth"))).toBe(true);
-      drainSystemEvents(resolveMainKey());
+  test("hooks wake accepts x-clawdbot-token header", async () => {
+    testState.hooksConfig = { enabled: true, token: "hook-secret" };
+    const port = await getFreePort();
+    const server = await startGatewayServer(port);
+    const res = await fetch(`http://127.0.0.1:${port}/hooks/wake`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        "x-clawdbot-token": "hook-secret",
+      },
+      body: JSON.stringify({ text: "Header auth" }),
+    });
+    expect(res.status).toBe(200);
+    const events = await waitForSystemEvent();
+    expect(events.some((e) => e.includes("Header auth"))).toBe(true);
+    drainSystemEvents(resolveMainKey());
+    await server.close();
+  });

-      const resGet = await fetch(`http://127.0.0.1:${port}/hooks/wake`, {
-        method: "GET",
-        headers: { Authorization: "Bearer hook-secret" },
-      });
-      expect(resGet.status).toBe(405);
+  test("hooks rejects non-post", async () => {
+    testState.hooksConfig = { enabled: true, token: "hook-secret" };
+    const port = await getFreePort();
+    const server = await startGatewayServer(port);
+    const res = await fetch(`http://127.0.0.1:${port}/hooks/wake`, {
+      method: "GET",
+      headers: { Authorization: "Bearer hook-secret" },
+    });
+    expect(res.status).toBe(405);
+    await server.close();
+  });

-      const resBlankText = await fetch(`http://127.0.0.1:${port}/hooks/wake`, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: "Bearer hook-secret",
-        },
-        body: JSON.stringify({ text: " " }),
-      });
-      expect(resBlankText.status).toBe(400);
+  test("hooks wake requires text", async () => {
+    testState.hooksConfig = { enabled: true, token: "hook-secret" };
+    const port = await getFreePort();
+    const server = await startGatewayServer(port);
+    const res = await fetch(`http://127.0.0.1:${port}/hooks/wake`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: "Bearer hook-secret",
+      },
+      body: JSON.stringify({ text: " " }),
+    });
+    expect(res.status).toBe(400);
+    await server.close();
+  });

-      const resBlankMessage = await fetch(`http://127.0.0.1:${port}/hooks/agent`, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: "Bearer hook-secret",
-        },
-        body: JSON.stringify({ message: " " }),
-      });
-      expect(resBlankMessage.status).toBe(400);
+  test("hooks agent requires message", async () => {
+    testState.hooksConfig = { enabled: true, token: "hook-secret" };
+    const port = await getFreePort();
+    const server = await startGatewayServer(port);
+    const res = await fetch(`http://127.0.0.1:${port}/hooks/agent`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: "Bearer hook-secret",
+      },
+      body: JSON.stringify({ message: " " }),
+    });
+    expect(res.status).toBe(400);
+    await server.close();
+  });

-      const resBadJson = await fetch(`http://127.0.0.1:${port}/hooks/wake`, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: "Bearer hook-secret",
-        },
-        body: "{",
-      });
-      expect(resBadJson.status).toBe(400);
-    } finally {
-      await server.close();
-    }
+  test("hooks rejects invalid json", async () => {
+    testState.hooksConfig = { enabled: true, token: "hook-secret" };
+    const port = await getFreePort();
+    const server = await startGatewayServer(port);
+    const res = await fetch(`http://127.0.0.1:${port}/hooks/wake`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: "Bearer hook-secret",
+      },
+      body: "{",
+    });
+    expect(res.status).toBe(400);
+    await server.close();
  });
 });
@@ -0,0 +1,189 @@
+import fs from "node:fs/promises";
+import { createServer } from "node:net";
+import path from "node:path";
+import { describe, expect, test } from "vitest";
+import { resolveCanvasHostUrl } from "../infra/canvas-host-url.js";
+import { getChannelPlugin } from "../channels/plugins/index.js";
+import { GatewayLockError } from "../infra/gateway-lock.js";
+import type { ChannelOutboundAdapter } from "../channels/plugins/types.js";
+import type { PluginRegistry } from "../plugins/registry.js";
+import { getActivePluginRegistry, setActivePluginRegistry } from "../plugins/runtime.js";
+import { createOutboundTestPlugin } from "../test-utils/channel-plugins.js";
+import {
+  connectOk,
+  getFreePort,
+  installGatewayTestHooks,
+  occupyPort,
+  onceMessage,
+  startGatewayServer,
+  startServerWithClient,
+  testState,
+  testTailnetIPv4,
+} from "./test-helpers.js";
+
+installGatewayTestHooks();
+
+const whatsappOutbound: ChannelOutboundAdapter = {
+  deliveryMode: "direct",
+  sendText: async ({ deps, to, text }) => {
+    if (!deps?.sendWhatsApp) {
+      throw new Error("Missing sendWhatsApp dep");
+    }
+    return { channel: "whatsapp", ...(await deps.sendWhatsApp(to, text, {})) };
+  },
+  sendMedia: async ({ deps, to, text, mediaUrl }) => {
+    if (!deps?.sendWhatsApp) {
+      throw new Error("Missing sendWhatsApp dep");
+    }
+    return { channel: "whatsapp", ...(await deps.sendWhatsApp(to, text, { mediaUrl })) };
+  },
+};
+
+const whatsappPlugin = createOutboundTestPlugin({
+  id: "whatsapp",
+  outbound: whatsappOutbound,
+  label: "WhatsApp",
+});
+
+const createRegistry = (channels: PluginRegistry["channels"]): PluginRegistry => ({
+  plugins: [],
+  tools: [],
+  channels,
+  providers: [],
+  gatewayHandlers: {},
+  httpHandlers: [],
+  cliRegistrars: [],
+  services: [],
+  diagnostics: [],
+});
+
+const whatsappRegistry = createRegistry([
+  {
+    pluginId: "whatsapp",
+    source: "test",
+    plugin: whatsappPlugin,
+  },
+]);
+const emptyRegistry = createRegistry([]);
+
+describe("gateway server misc", () => {
+  test("hello-ok advertises the gateway port for canvas host", async () => {
+    const prevToken = process.env.CLAWDBOT_GATEWAY_TOKEN;
+    const prevCanvasPort = process.env.CLAWDBOT_CANVAS_HOST_PORT;
+    process.env.CLAWDBOT_GATEWAY_TOKEN = "secret";
+    testTailnetIPv4.value = "100.64.0.1";
+    testState.gatewayBind = "lan";
+    const canvasPort = await getFreePort();
+    testState.canvasHostPort = canvasPort;
+    process.env.CLAWDBOT_CANVAS_HOST_PORT = String(canvasPort);
+
+    const port = await getFreePort();
+    const canvasHostUrl = resolveCanvasHostUrl({
+      canvasPort,
+      requestHost: `100.64.0.1:${port}`,
+      localAddress: "127.0.0.1",
+    });
+    expect(canvasHostUrl).toBe(`http://100.64.0.1:${canvasPort}`);
+    if (prevToken === undefined) {
+      delete process.env.CLAWDBOT_GATEWAY_TOKEN;
+    } else {
+      process.env.CLAWDBOT_GATEWAY_TOKEN = prevToken;
+    }
+    if (prevCanvasPort === undefined) {
+      delete process.env.CLAWDBOT_CANVAS_HOST_PORT;
+    } else {
+      process.env.CLAWDBOT_CANVAS_HOST_PORT = prevCanvasPort;
+    }
+  });
+
+  test("send dedupes by idempotencyKey", { timeout: 60_000 }, async () => {
+    const prevRegistry = getActivePluginRegistry() ?? emptyRegistry;
+    try {
+      const { server, ws } = await startServerWithClient();
+      await connectOk(ws);
+      setActivePluginRegistry(whatsappRegistry);
+      expect(getChannelPlugin("whatsapp")).toBeDefined();
+
+      const idem = "same-key";
+      const res1P = onceMessage(ws, (o) => o.type === "res" && o.id === "a1");
+      const res2P = onceMessage(ws, (o) => o.type === "res" && o.id === "a2");
+      const sendReq = (id: string) =>
+        ws.send(
+          JSON.stringify({
+            type: "req",
+            id,
+            method: "send",
+            params: { to: "+15550000000", message: "hi", idempotencyKey: idem },
+          }),
+        );
+      sendReq("a1");
+      sendReq("a2");
+
+      const res1 = await res1P;
+      const res2 = await res2P;
+      expect(res1.ok).toBe(true);
+      expect(res2.ok).toBe(true);
+      expect(res1.payload).toEqual(res2.payload);
+      ws.close();
+      await server.close();
+    } finally {
+      setActivePluginRegistry(prevRegistry);
+    }
+  });
+
+  test("auto-enables configured channel plugins on startup", async () => {
+    const configPath = process.env.CLAWDBOT_CONFIG_PATH;
+    if (!configPath) throw new Error("Missing CLAWDBOT_CONFIG_PATH");
+    await fs.mkdir(path.dirname(configPath), { recursive: true });
+    await fs.writeFile(
+      configPath,
+      JSON.stringify(
+        {
+          channels: {
+            discord: {
+              token: "token-123",
+            },
+          },
+        },
+        null,
+        2,
+      ),
+      "utf-8",
+    );
+
+    const port = await getFreePort();
+    const server = await startGatewayServer(port);
+    await server.close();
+
+    const updated = JSON.parse(await fs.readFile(configPath, "utf-8")) as Record<string, unknown>;
+    const plugins = updated.plugins as Record<string, unknown> | undefined;
+    const entries = plugins?.entries as Record<string, unknown> | undefined;
+    const discord = entries?.discord as Record<string, unknown> | undefined;
+    expect(discord?.enabled).toBe(true);
+    expect((updated.channels as Record<string, unknown> | undefined)?.discord).toMatchObject({
+      token: "token-123",
+    });
+  });
+
+  test("refuses to start when port already bound", async () => {
+    const { server: blocker, port } = await occupyPort();
+    await expect(startGatewayServer(port)).rejects.toBeInstanceOf(GatewayLockError);
+    await expect(startGatewayServer(port)).rejects.toThrow(/already listening/i);
+    blocker.close();
+  });
+
+  test("releases port after close", async () => {
+    const port = await getFreePort();
+    const server = await startGatewayServer(port);
+    await server.close();
+
+    const probe = createServer();
+    await new Promise<void>((resolve, reject) => {
+      probe.once("error", reject);
+      probe.listen(port, "127.0.0.1", () => resolve());
+    });
+    await new Promise<void>((resolve, reject) =>
+      probe.close((err) => (err ? reject(err) : resolve())),
+    );
+  });
+});
@@ -1,93 +1,19 @@
 import fs from "node:fs/promises";
-import { createServer } from "node:net";
 import os from "node:os";
 import path from "node:path";
-import { afterAll, beforeAll, describe, expect, test } from "vitest";
+import { describe, expect, test } from "vitest";
 import { WebSocket } from "ws";
-
-import { getChannelPlugin } from "../channels/plugins/index.js";
-import type { ChannelOutboundAdapter } from "../channels/plugins/types.js";
-import { resolveCanvasHostUrl } from "../infra/canvas-host-url.js";
-import { GatewayLockError } from "../infra/gateway-lock.js";
-import type { PluginRegistry } from "../plugins/registry.js";
-import { getActivePluginRegistry, setActivePluginRegistry } from "../plugins/runtime.js";
-import { createOutboundTestPlugin } from "../test-utils/channel-plugins.js";
-import { GATEWAY_CLIENT_MODES, GATEWAY_CLIENT_NAMES } from "../utils/message-channel.js";
 import {
  connectOk,
-  getFreePort,
  installGatewayTestHooks,
-  occupyPort,
  onceMessage,
  piSdkMock,
  rpcReq,
-  startGatewayServer,
  startServerWithClient,
-  testState,
-  testTailnetIPv4,
 } from "./test-helpers.js";
+import { GATEWAY_CLIENT_MODES, GATEWAY_CLIENT_NAMES } from "../utils/message-channel.js";

-installGatewayTestHooks({ scope: "suite" });
-
-let server: Awaited<ReturnType<typeof startServerWithClient>>["server"];
-let ws: WebSocket;
-let port: number;
-
-beforeAll(async () => {
-  const started = await startServerWithClient();
-  server = started.server;
-  ws = started.ws;
-  port = started.port;
-  await connectOk(ws);
-});
-
-afterAll(async () => {
-  ws.close();
-  await server.close();
-});
-
-const whatsappOutbound: ChannelOutboundAdapter = {
-  deliveryMode: "direct",
-  sendText: async ({ deps, to, text }) => {
-    if (!deps?.sendWhatsApp) {
-      throw new Error("Missing sendWhatsApp dep");
-    }
-    return { channel: "whatsapp", ...(await deps.sendWhatsApp(to, text, {})) };
-  },
-  sendMedia: async ({ deps, to, text, mediaUrl }) => {
-    if (!deps?.sendWhatsApp) {
-      throw new Error("Missing sendWhatsApp dep");
-    }
-    return { channel: "whatsapp", ...(await deps.sendWhatsApp(to, text, { mediaUrl })) };
-  },
-};
-
-const whatsappPlugin = createOutboundTestPlugin({
-  id: "whatsapp",
-  outbound: whatsappOutbound,
-  label: "WhatsApp",
-});
-
-const createRegistry = (channels: PluginRegistry["channels"]): PluginRegistry => ({
-  plugins: [],
-  tools: [],
-  channels,
-  providers: [],
-  gatewayHandlers: {},
-  httpHandlers: [],
-  cliRegistrars: [],
-  services: [],
-  diagnostics: [],
-});
-
-const whatsappRegistry = createRegistry([
-  {
-    pluginId: "whatsapp",
-    source: "test",
-    plugin: whatsappPlugin,
-  },
-]);
-const emptyRegistry = createRegistry([]);
+installGatewayTestHooks();

 describe("gateway server models + voicewake", () => {
  const setTempHome = (homeDir: string) => {
@@ -142,6 +68,9 @@ describe("gateway server models + voicewake", () => {
      const homeDir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-home-"));
      const restoreHome = setTempHome(homeDir);

+      const { server, ws } = await startServerWithClient();
+      await connectOk(ws);
+
      const initial = await rpcReq<{ triggers: string[] }>(ws, "voicewake.get");
      expect(initial.ok).toBe(true);
      expect(initial.payload?.triggers).toEqual(["clawd", "claude", "computer"]);
@@ -175,6 +104,9 @@ describe("gateway server models + voicewake", () => {
      expect(onDisk.triggers).toEqual(["hi", "there"]);
      expect(typeof onDisk.updatedAtMs).toBe("number");

+      ws.close();
+      await server.close();
+
      restoreHome();
    },
  );
@@ -183,6 +115,9 @@ describe("gateway server models + voicewake", () => {
    const homeDir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-home-"));
    const restoreHome = setTempHome(homeDir);

+    const { server, ws, port } = await startServerWithClient();
+    await connectOk(ws);
+
    const nodeWs = new WebSocket(`ws://127.0.0.1:${port}`);
    await new Promise<void>((resolve) => nodeWs.once("open", resolve));
    const firstEventP = onceMessage<{ type: "event"; event: string; payload?: unknown }>(
@@ -224,6 +159,9 @@ describe("gateway server models + voicewake", () => {
    ]);

    nodeWs.close();
+    ws.close();
+    await server.close();
+
    restoreHome();
  });

@@ -251,6 +189,9 @@ describe("gateway server models + voicewake", () => {
      },
    ];

+    const { server, ws } = await startServerWithClient();
+    await connectOk(ws);
+
    const res1 = await rpcReq<{
      models: Array<{
        id: string;
@@ -300,132 +241,23 @@ describe("gateway server models + voicewake", () => {
    ]);

    expect(piSdkMock.discoverCalls).toBe(1);
+
+    ws.close();
+    await server.close();
  });

  test("models.list rejects unknown params", async () => {
    piSdkMock.enabled = true;
    piSdkMock.models = [{ id: "gpt-test-a", name: "A", provider: "openai" }];

+    const { server, ws } = await startServerWithClient();
+    await connectOk(ws);
+
    const res = await rpcReq(ws, "models.list", { extra: true });
    expect(res.ok).toBe(false);
    expect(res.error?.message ?? "").toMatch(/invalid models\.list params/i);
-  });
-});

-describe("gateway server misc", () => {
-  test("hello-ok advertises the gateway port for canvas host", async () => {
-    const prevToken = process.env.CLAWDBOT_GATEWAY_TOKEN;
-    const prevCanvasPort = process.env.CLAWDBOT_CANVAS_HOST_PORT;
-    process.env.CLAWDBOT_GATEWAY_TOKEN = "secret";
-    testTailnetIPv4.value = "100.64.0.1";
-    testState.gatewayBind = "lan";
-    const canvasPort = await getFreePort();
-    testState.canvasHostPort = canvasPort;
-    process.env.CLAWDBOT_CANVAS_HOST_PORT = String(canvasPort);
-
-    const testPort = await getFreePort();
-    const canvasHostUrl = resolveCanvasHostUrl({
-      canvasPort,
-      requestHost: `100.64.0.1:${testPort}`,
-      localAddress: "127.0.0.1",
-    });
-    expect(canvasHostUrl).toBe(`http://100.64.0.1:${canvasPort}`);
-    if (prevToken === undefined) {
-      delete process.env.CLAWDBOT_GATEWAY_TOKEN;
-    } else {
-      process.env.CLAWDBOT_GATEWAY_TOKEN = prevToken;
-    }
-    if (prevCanvasPort === undefined) {
-      delete process.env.CLAWDBOT_CANVAS_HOST_PORT;
-    } else {
-      process.env.CLAWDBOT_CANVAS_HOST_PORT = prevCanvasPort;
-    }
-  });
-
-  test("send dedupes by idempotencyKey", { timeout: 60_000 }, async () => {
-    const prevRegistry = getActivePluginRegistry() ?? emptyRegistry;
-    try {
-      setActivePluginRegistry(whatsappRegistry);
-      expect(getChannelPlugin("whatsapp")).toBeDefined();
-
-      const idem = "same-key";
-      const res1P = onceMessage(ws, (o) => o.type === "res" && o.id === "a1");
-      const res2P = onceMessage(ws, (o) => o.type === "res" && o.id === "a2");
-      const sendReq = (id: string) =>
-        ws.send(
-          JSON.stringify({
-            type: "req",
-            id,
-            method: "send",
-            params: { to: "+15550000000", message: "hi", idempotencyKey: idem },
-          }),
-        );
-      sendReq("a1");
-      sendReq("a2");
-
-      const res1 = await res1P;
-      const res2 = await res2P;
-      expect(res1.ok).toBe(true);
-      expect(res2.ok).toBe(true);
-      expect(res1.payload).toEqual(res2.payload);
-    } finally {
-      setActivePluginRegistry(prevRegistry);
-    }
-  });
-
-  test("auto-enables configured channel plugins on startup", async () => {
-    const configPath = process.env.CLAWDBOT_CONFIG_PATH;
-    if (!configPath) throw new Error("Missing CLAWDBOT_CONFIG_PATH");
-    await fs.mkdir(path.dirname(configPath), { recursive: true });
-    await fs.writeFile(
-      configPath,
-      JSON.stringify(
-        {
-          channels: {
-            discord: {
-              token: "token-123",
-            },
-          },
-        },
-        null,
-        2,
-      ),
-      "utf-8",
-    );
-
-    const autoPort = await getFreePort();
-    const autoServer = await startGatewayServer(autoPort);
-    await autoServer.close();
-
-    const updated = JSON.parse(await fs.readFile(configPath, "utf-8")) as Record<string, unknown>;
-    const plugins = updated.plugins as Record<string, unknown> | undefined;
-    const entries = plugins?.entries as Record<string, unknown> | undefined;
-    const discord = entries?.discord as Record<string, unknown> | undefined;
-    expect(discord?.enabled).toBe(true);
-    expect((updated.channels as Record<string, unknown> | undefined)?.discord).toMatchObject({
-      token: "token-123",
-    });
-  });
-
-  test("refuses to start when port already bound", async () => {
-    const { server: blocker, port: blockedPort } = await occupyPort();
-    await expect(startGatewayServer(blockedPort)).rejects.toBeInstanceOf(GatewayLockError);
-    await expect(startGatewayServer(blockedPort)).rejects.toThrow(/already listening/i);
-    blocker.close();
-  });
-
-  test("releases port after close", async () => {
-    const releasePort = await getFreePort();
-    const releaseServer = await startGatewayServer(releasePort);
-    await releaseServer.close();
-
-    const probe = createServer();
-    await new Promise<void>((resolve, reject) => {
-      probe.once("error", reject);
-      probe.listen(releasePort, "127.0.0.1", () => resolve());
-    });
-    await new Promise<void>((resolve, reject) =>
-      probe.close((err) => (err ? reject(err) : resolve())),
-    );
+    ws.close();
+    await server.close();
  });
 });
@@ -1,48 +1,15 @@
-import fs from "node:fs/promises";
-import os from "node:os";
-import path from "node:path";
-import { afterAll, beforeAll, describe, expect, test, vi } from "vitest";
-import { WebSocket } from "ws";
+import { describe, expect, test } from "vitest";

 import { GATEWAY_CLIENT_MODES, GATEWAY_CLIENT_NAMES } from "../utils/message-channel.js";
-import { GatewayClient } from "./client.js";
-
-vi.mock("../infra/update-runner.js", () => ({
-  runGatewayUpdate: vi.fn(async () => ({
-    status: "ok",
-    mode: "git",
-    root: "/repo",
-    steps: [],
-    durationMs: 12,
-  })),
-}));
-
 import {
  connectOk,
  installGatewayTestHooks,
-  onceMessage,
  rpcReq,
  startServerWithClient,
 } from "./test-helpers.js";
+import { GatewayClient } from "./client.js";

-installGatewayTestHooks({ scope: "suite" });
-
-let server: Awaited<ReturnType<typeof startServerWithClient>>["server"];
-let ws: WebSocket;
-let port: number;
-
-beforeAll(async () => {
-  const started = await startServerWithClient();
-  server = started.server;
-  ws = started.ws;
-  port = started.port;
-  await connectOk(ws);
-});
-
-afterAll(async () => {
-  ws.close();
-  await server.close();
-});
+installGatewayTestHooks();

 const sleep = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));

@@ -98,99 +65,11 @@ const connectNodeClient = async (params: {
  return client;
 };

-async function waitForSignal(check: () => boolean, timeoutMs = 2000) {
-  const start = Date.now();
-  while (Date.now() - start < timeoutMs) {
-    if (check()) return;
-    await new Promise((resolve) => setTimeout(resolve, 10));
-  }
-  throw new Error("timeout");
-}
-
-describe("gateway role enforcement", () => {
-  test("enforces operator and node permissions", async () => {
-    const nodeWs = new WebSocket(`ws://127.0.0.1:${port}`);
-    await new Promise<void>((resolve) => nodeWs.once("open", resolve));
-
-    try {
-      const eventRes = await rpcReq(ws, "node.event", { event: "test", payload: { ok: true } });
-      expect(eventRes.ok).toBe(false);
-      expect(eventRes.error?.message ?? "").toContain("unauthorized role");
-
-      const invokeRes = await rpcReq(ws, "node.invoke.result", {
-        id: "invoke-1",
-        nodeId: "node-1",
-        ok: true,
-      });
-      expect(invokeRes.ok).toBe(false);
-      expect(invokeRes.error?.message ?? "").toContain("unauthorized role");
-
-      await connectOk(nodeWs, {
-        role: "node",
-        client: {
-          id: GATEWAY_CLIENT_NAMES.NODE_HOST,
-          version: "1.0.0",
-          platform: "ios",
-          mode: GATEWAY_CLIENT_MODES.NODE,
-        },
-        commands: [],
-      });
-
-      const binsRes = await rpcReq<{ bins?: unknown[] }>(nodeWs, "skills.bins", {});
-      expect(binsRes.ok).toBe(true);
-      expect(Array.isArray(binsRes.payload?.bins)).toBe(true);
-
-      const statusRes = await rpcReq(nodeWs, "status", {});
-      expect(statusRes.ok).toBe(false);
-      expect(statusRes.error?.message ?? "").toContain("unauthorized role");
-    } finally {
-      nodeWs.close();
-    }
-  });
-});
-
-describe("gateway update.run", () => {
-  test("writes sentinel and schedules restart", async () => {
-    const sigusr1 = vi.fn();
-    process.on("SIGUSR1", sigusr1);
-
-    try {
-      const id = "req-update";
-      ws.send(
-        JSON.stringify({
-          type: "req",
-          id,
-          method: "update.run",
-          params: {
-            sessionKey: "agent:main:whatsapp:dm:+15555550123",
-            restartDelayMs: 0,
-          },
-        }),
-      );
-      const res = await onceMessage<{ ok: boolean; payload?: unknown }>(
-        ws,
-        (o) => o.type === "res" && o.id === id,
-      );
-      expect(res.ok).toBe(true);
-
-      await waitForSignal(() => sigusr1.mock.calls.length > 0);
-      expect(sigusr1).toHaveBeenCalled();
-
-      const sentinelPath = path.join(os.homedir(), ".clawdbot", "restart-sentinel.json");
-      const raw = await fs.readFile(sentinelPath, "utf-8");
-      const parsed = JSON.parse(raw) as {
-        payload?: { kind?: string; stats?: { mode?: string } };
-      };
-      expect(parsed.payload?.kind).toBe("update");
-      expect(parsed.payload?.stats?.mode).toBe("git");
-    } finally {
-      process.off("SIGUSR1", sigusr1);
-    }
-  });
-});
-
 describe("gateway node command allowlist", () => {
  test("enforces command allowlists across node clients", async () => {
+    const { server, ws, port } = await startServerWithClient();
+    await connectOk(ws);
+
    const waitForConnectedCount = async (count: number) => {
      await expect
        .poll(
@@ -217,12 +96,8 @@ describe("gateway node command allowlist", () => {
      return nodeId;
    };

-    let systemClient: GatewayClient | undefined;
-    let emptyClient: GatewayClient | undefined;
-    let allowedClient: GatewayClient | undefined;
-
    try {
-      systemClient = await connectNodeClient({
+      const systemClient = await connectNodeClient({
        port,
        commands: ["system.run"],
        instanceId: "node-system-run",
@@ -240,7 +115,7 @@ describe("gateway node command allowlist", () => {
      systemClient.stop();
      await waitForConnectedCount(0);

-      emptyClient = await connectNodeClient({
+      const emptyClient = await connectNodeClient({
        port,
        commands: [],
        instanceId: "node-empty",
@@ -263,7 +138,7 @@ describe("gateway node command allowlist", () => {
        new Promise<{ id?: string; nodeId?: string }>((resolve) => {
          resolveInvoke = resolve;
        });
-      allowedClient = await connectNodeClient({
+      const allowedClient = await connectNodeClient({
        port,
        commands: ["canvas.snapshot"],
        instanceId: "node-allowed",
@@ -312,10 +187,11 @@ describe("gateway node command allowlist", () => {
      });
      const invokeNullRes = await invokeNullResP;
      expect(invokeNullRes.ok).toBe(true);
+
+      allowedClient.stop();
    } finally {
-      systemClient?.stop();
-      emptyClient?.stop();
-      allowedClient?.stop();
+      ws.close();
+      await server.close();
    }
  });
 });
@@ -1,12 +1,5 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import {
-  connectOk,
-  getFreePort,
-  installGatewayTestHooks,
-  rpcReq,
-  startGatewayServer,
-  startServerWithClient,
-} from "./test-helpers.js";
+import { getFreePort, installGatewayTestHooks, startGatewayServer } from "./test-helpers.js";

 const hoisted = vi.hoisted(() => {
  const cronInstances: Array<{
@@ -165,7 +158,7 @@ vi.mock("./config-reload.js", () => ({
  startGatewayConfigReloader: hoisted.startGatewayConfigReloader,
 }));

-installGatewayTestHooks({ scope: "suite" });
+installGatewayTestHooks();

 describe("gateway hot reload", () => {
  let prevSkipChannels: string | undefined;
@@ -191,7 +184,7 @@ describe("gateway hot reload", () => {
    }
  });

-  it("applies hot reload actions and emits restart signal", async () => {
+  it("applies hot reload actions for providers + services", async () => {
    const port = await getFreePort();
    const server = await startGatewayServer(port);

@@ -270,6 +263,13 @@ describe("gateway hot reload", () => {
    expect(hoisted.providerManager.stopChannel).toHaveBeenCalledWith("imessage");
    expect(hoisted.providerManager.startChannel).toHaveBeenCalledWith("imessage");

+    await server.close();
+  });
+
+  it("emits SIGUSR1 on restart plan when listener exists", async () => {
+    const port = await getFreePort();
+    const server = await startGatewayServer(port);
+
    const onRestart = hoisted.getOnRestart();
    expect(onRestart).toBeTypeOf("function");

@@ -298,15 +298,3 @@ describe("gateway hot reload", () => {
    await server.close();
  });
 });
-
-describe("gateway agents", () => {
-  it("lists configured agents via agents.list RPC", async () => {
-    const { server, ws } = await startServerWithClient();
-    await connectOk(ws);
-    const res = await rpcReq<{ agents: Array<{ id: string }> }>(ws, "agents.list", {});
-    expect(res.ok).toBe(true);
-    expect(res.payload?.agents.map((agent) => agent.id)).toContain("main");
-    ws.close();
-    await server.close();
-  });
-});
@@ -0,0 +1,56 @@
+import { describe, expect, test } from "vitest";
+import { WebSocket } from "ws";
+
+import { GATEWAY_CLIENT_MODES, GATEWAY_CLIENT_NAMES } from "../utils/message-channel.js";
+import {
+  connectOk,
+  installGatewayTestHooks,
+  rpcReq,
+  startServerWithClient,
+} from "./test-helpers.js";
+
+installGatewayTestHooks();
+
+describe("gateway role enforcement", () => {
+  test("enforces operator and node permissions", async () => {
+    const { server, ws, port } = await startServerWithClient();
+    await connectOk(ws);
+
+    const eventRes = await rpcReq(ws, "node.event", { event: "test", payload: { ok: true } });
+    expect(eventRes.ok).toBe(false);
+    expect(eventRes.error?.message ?? "").toContain("unauthorized role");
+
+    const invokeRes = await rpcReq(ws, "node.invoke.result", {
+      id: "invoke-1",
+      nodeId: "node-1",
+      ok: true,
+    });
+    expect(invokeRes.ok).toBe(false);
+    expect(invokeRes.error?.message ?? "").toContain("unauthorized role");
+
+    const nodeWs = new WebSocket(`ws://127.0.0.1:${port}`);
+    await new Promise<void>((resolve) => nodeWs.once("open", resolve));
+    await connectOk(nodeWs, {
+      role: "node",
+      client: {
+        id: GATEWAY_CLIENT_NAMES.NODE_HOST,
+        version: "1.0.0",
+        platform: "ios",
+        mode: GATEWAY_CLIENT_MODES.NODE,
+      },
+      commands: [],
+    });
+
+    const binsRes = await rpcReq<{ bins?: unknown[] }>(nodeWs, "skills.bins", {});
+    expect(binsRes.ok).toBe(true);
+    expect(Array.isArray(binsRes.payload?.bins)).toBe(true);
+
+    const statusRes = await rpcReq(nodeWs, "status", {});
+    expect(statusRes.ok).toBe(false);
+    expect(statusRes.error?.message ?? "").toContain("unauthorized role");
+
+    nodeWs.close();
+    ws.close();
+    await server.close();
+  });
+});
@@ -1,6 +1,6 @@
 import fs from "node:fs/promises";
 import path from "node:path";
-import { afterAll, beforeAll, describe, expect, it, vi } from "vitest";
+import { afterEach, describe, expect, it, vi } from "vitest";
 import { createClawdbotTools } from "../agents/clawdbot-tools.js";
 import { resolveSessionTranscriptPath } from "../config/sessions.js";
 import { emitAgentEvent } from "../infra/agent-events.js";
@@ -11,38 +11,30 @@ import {
  startGatewayServer,
 } from "./test-helpers.js";

-installGatewayTestHooks({ scope: "suite" });
+installGatewayTestHooks();

-let server: Awaited<ReturnType<typeof startGatewayServer>>;
-let gatewayPort: number;
-let prevGatewayPort: string | undefined;
-let prevGatewayToken: string | undefined;
+const servers: Array<Awaited<ReturnType<typeof startGatewayServer>>> = [];

-beforeAll(async () => {
-  prevGatewayPort = process.env.CLAWDBOT_GATEWAY_PORT;
-  prevGatewayToken = process.env.CLAWDBOT_GATEWAY_TOKEN;
-  gatewayPort = await getFreePort();
-  process.env.CLAWDBOT_GATEWAY_PORT = String(gatewayPort);
-  process.env.CLAWDBOT_GATEWAY_TOKEN = "test-token";
-  server = await startGatewayServer(gatewayPort);
-});
-
-afterAll(async () => {
-  await server.close();
-  if (prevGatewayPort === undefined) {
-    delete process.env.CLAWDBOT_GATEWAY_PORT;
-  } else {
-    process.env.CLAWDBOT_GATEWAY_PORT = prevGatewayPort;
-  }
-  if (prevGatewayToken === undefined) {
-    delete process.env.CLAWDBOT_GATEWAY_TOKEN;
-  } else {
-    process.env.CLAWDBOT_GATEWAY_TOKEN = prevGatewayToken;
+afterEach(async () => {
+  for (const server of servers) {
+    try {
+      await server.close();
+    } catch {
+      /* ignore */
+    }
  }
+  servers.length = 0;
+  // Add small delay to ensure port is fully released by OS
+  await new Promise((resolve) => setTimeout(resolve, 50));
 });

 describe("sessions_send gateway loopback", () => {
  it("returns reply when lifecycle ends before agent.wait", async () => {
+    const port = await getFreePort();
+    vi.stubEnv("CLAWDBOT_GATEWAY_PORT", String(port));
+    vi.stubEnv("CLAWDBOT_GATEWAY_TOKEN", "test-token");
+
+    const server = await startGatewayServer(port);
    const spy = vi.mocked(agentCommand);
    spy.mockImplementation(async (opts) => {
      const params = opts as {
@@ -86,6 +78,8 @@ describe("sessions_send gateway loopback", () => {
      });
    });

+    servers.push(server);
+
    const tool = createClawdbotTools().find((candidate) => candidate.name === "sessions_send");
    if (!tool) throw new Error("missing sessions_send tool");

@@ -110,6 +104,12 @@ describe("sessions_send gateway loopback", () => {

 describe("sessions_send label lookup", () => {
  it("finds session by label and sends message", { timeout: 60_000 }, async () => {
+    const port = await getFreePort();
+    vi.stubEnv("CLAWDBOT_GATEWAY_PORT", String(port));
+    vi.stubEnv("CLAWDBOT_GATEWAY_TOKEN", "test-token");
+
+    const server = await startGatewayServer(port);
+    servers.push(server);
    const spy = vi.mocked(agentCommand);
    spy.mockImplementation(async (opts) => {
      const params = opts as {
@@ -171,6 +171,13 @@ describe("sessions_send label lookup", () => {
  });

  it("returns error when label not found", { timeout: 60_000 }, async () => {
+    const port = await getFreePort();
+    vi.stubEnv("CLAWDBOT_GATEWAY_PORT", String(port));
+    vi.stubEnv("CLAWDBOT_GATEWAY_TOKEN", "test-token");
+
+    const server = await startGatewayServer(port);
+    servers.push(server);
+
    const tool = createClawdbotTools().find((candidate) => candidate.name === "sessions_send");
    if (!tool) throw new Error("missing sessions_send tool");

@@ -185,6 +192,13 @@ describe("sessions_send label lookup", () => {
  });

  it("returns error when neither sessionKey nor label provided", { timeout: 60_000 }, async () => {
+    const port = await getFreePort();
+    vi.stubEnv("CLAWDBOT_GATEWAY_PORT", String(port));
+    vi.stubEnv("CLAWDBOT_GATEWAY_TOKEN", "test-token");
+
+    const server = await startGatewayServer(port);
+    servers.push(server);
+
    const tool = createClawdbotTools().find((candidate) => candidate.name === "sessions_send");
    if (!tool) throw new Error("missing sessions_send tool");

@@ -0,0 +1,122 @@
+import fs from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import { describe, expect, test } from "vitest";
+import {
+  connectOk,
+  installGatewayTestHooks,
+  rpcReq,
+  startServerWithClient,
+  testState,
+  writeSessionStore,
+} from "./test-helpers.js";
+
+installGatewayTestHooks();
+
+describe("gateway server sessions", () => {
+  test("filters sessions by agentId", async () => {
+    const dir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-sessions-agents-"));
+    testState.sessionConfig = {
+      store: path.join(dir, "{agentId}", "sessions.json"),
+    };
+    testState.agentsConfig = {
+      list: [{ id: "home", default: true }, { id: "work" }],
+    };
+    const homeDir = path.join(dir, "home");
+    const workDir = path.join(dir, "work");
+    await fs.mkdir(homeDir, { recursive: true });
+    await fs.mkdir(workDir, { recursive: true });
+    await writeSessionStore({
+      storePath: path.join(homeDir, "sessions.json"),
+      agentId: "home",
+      entries: {
+        main: {
+          sessionId: "sess-home-main",
+          updatedAt: Date.now(),
+        },
+        "discord:group:dev": {
+          sessionId: "sess-home-group",
+          updatedAt: Date.now() - 1000,
+        },
+      },
+    });
+    await writeSessionStore({
+      storePath: path.join(workDir, "sessions.json"),
+      agentId: "work",
+      entries: {
+        main: {
+          sessionId: "sess-work-main",
+          updatedAt: Date.now(),
+        },
+      },
+    });
+
+    const { ws } = await startServerWithClient();
+    await connectOk(ws);
+
+    const homeSessions = await rpcReq<{
+      sessions: Array<{ key: string }>;
+    }>(ws, "sessions.list", {
+      includeGlobal: false,
+      includeUnknown: false,
+      agentId: "home",
+    });
+    expect(homeSessions.ok).toBe(true);
+    expect(homeSessions.payload?.sessions.map((s) => s.key).sort()).toEqual([
+      "agent:home:discord:group:dev",
+      "agent:home:main",
+    ]);
+
+    const workSessions = await rpcReq<{
+      sessions: Array<{ key: string }>;
+    }>(ws, "sessions.list", {
+      includeGlobal: false,
+      includeUnknown: false,
+      agentId: "work",
+    });
+    expect(workSessions.ok).toBe(true);
+    expect(workSessions.payload?.sessions.map((s) => s.key)).toEqual(["agent:work:main"]);
+  });
+
+  test("resolves and patches main alias to default agent main key", async () => {
+    const dir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-sessions-"));
+    const storePath = path.join(dir, "sessions.json");
+    testState.sessionStorePath = storePath;
+    testState.agentsConfig = { list: [{ id: "ops", default: true }] };
+    testState.sessionConfig = { mainKey: "work" };
+
+    await writeSessionStore({
+      storePath,
+      agentId: "ops",
+      mainKey: "work",
+      entries: {
+        main: {
+          sessionId: "sess-ops-main",
+          updatedAt: Date.now(),
+        },
+      },
+    });
+
+    const { ws } = await startServerWithClient();
+    await connectOk(ws);
+    const resolved = await rpcReq<{ ok: true; key: string }>(ws, "sessions.resolve", {
+      key: "main",
+    });
+    expect(resolved.ok).toBe(true);
+    expect(resolved.payload?.key).toBe("agent:ops:work");
+
+    const patched = await rpcReq<{ ok: true; key: string }>(ws, "sessions.patch", {
+      key: "main",
+      thinkingLevel: "medium",
+    });
+    expect(patched.ok).toBe(true);
+    expect(patched.payload?.key).toBe("agent:ops:work");
+
+    const stored = JSON.parse(await fs.readFile(storePath, "utf-8")) as Record<
+      string,
+      { thinkingLevel?: string }
+    >;
+    expect(stored["agent:ops:work"]?.thinkingLevel).toBe("medium");
+    expect(stored.main).toBeUndefined();
+  });
+});