fix: honor apiKey auth-choice tokens (#1485 ) (thanks @iHildy)

fix: support direct token and provider in auth apply commands
2026-01-23 07:27:34 +00:00 · 2026-01-23 07:12:17 +00:00
156 changed files with 2004 additions and 4243 deletions
@@ -29,6 +29,5 @@ jobs:
          CLAWDBOT_INSTALL_CLI_URL: https://clawd.bot/install-cli.sh
          CLAWDBOT_NO_ONBOARD: "1"
          CLAWDBOT_INSTALL_SMOKE_SKIP_CLI: "1"
-          CLAWDBOT_INSTALL_SMOKE_SKIP_NONROOT: ${{ github.event_name == 'pull_request' && '1' || '0' }}
          CLAWDBOT_INSTALL_SMOKE_PREVIOUS: "2026.1.11-4"
        run: pnpm test:install:smoke
@@ -22,15 +22,6 @@
 - README (GitHub): keep absolute docs URLs (`https://docs.clawd.bot/...`) so links work on GitHub.
 - Docs content must be generic: no personal device names/hostnames/paths; use placeholders like `user@gateway-host` and “gateway host”.

-## exe.dev VM ops (general)
- Access: SSH to the VM directly: `ssh vm-name.exe.xyz` (or use exe.dev web terminal).
- Updates: `sudo npm i -g clawdbot@latest` (global install needs root on `/usr/lib/node_modules`).
- Config: use `clawdbot config set ...`; set `gateway.mode=local` if unset.
- Restart: exe.dev often lacks systemd user bus; stop old gateway and run:
-  `pkill -9 -f clawdbot-gateway || true; nohup clawdbot gateway run --bind loopback --port 18789 --force > /tmp/clawdbot-gateway.log 2>&1 &`
- Verify: `clawdbot --version`, `clawdbot health`, `ss -ltnp | rg 18789`.
- SSH flaky: use exe.dev web terminal or Shelley (web agent) instead of CLI SSH.
-
 ## Build, Test, and Development Commands
 - Runtime baseline: Node **22+** (keep Node + Bun paths working).
 - Install deps: `pnpm install`
@@ -60,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.
@@ -2,24 +2,28 @@

 Docs: https://docs.clawd.bot

-## 2026.1.23
-
-### Changes
- CLI: restart the gateway by default after `clawdbot update`; add `--no-restart` to skip it.
- Markdown: add per-channel table conversion (bullets for Signal/WhatsApp, code blocks elsewhere). (#1495) Thanks @odysseus0.
-
-### Fixes
- Media: preserve PNG alpha when possible; fall back to JPEG when still over size cap. (#1491) Thanks @robbyczgw-cla.
- Agents: treat plugin-only tool allowlists as opt-ins; keep core tools enabled. (#1467)
-
 ## 2026.1.22

 ### Changes
+- Highlight: Lobster optional plugin tool for typed workflows + approval gates. https://docs.clawd.bot/tools/lobster
 - 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.
+- 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.
 - Slack: add chat-type reply threading overrides via `replyToModeByChatType`. (#1442) Thanks @stefangalescu.
+- 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.
@@ -28,7 +32,7 @@ Docs: https://docs.clawd.bot
 - 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.
+- Onboarding: honor `--auth-choice apiKey` token provider + token flags to skip prompts. (#1485) Thanks @iHildy.
 - 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.
@@ -45,9 +49,9 @@ Docs: https://docs.clawd.bot
 - 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.
- Discord: honor accountId across message actions and cron deliveries. (#1492) Thanks @svkozak.
 - 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

@@ -58,8 +62,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.
@@ -69,24 +71,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.
@@ -2,54 +2,6 @@
 <rss xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" version="2.0">
    <channel>
        <title>Clawdbot</title>
-        <item>
-            <title>2026.1.22</title>
-            <pubDate>Fri, 23 Jan 2026 08:58:14 +0000</pubDate>
-            <link>https://raw.githubusercontent.com/clawdbot/clawdbot/main/appcast.xml</link>
-            <sparkle:version>7530</sparkle:version>
-            <sparkle:shortVersionString>2026.1.22</sparkle:shortVersionString>
-            <sparkle:minimumSystemVersion>15.0</sparkle:minimumSystemVersion>
-            <description><![CDATA[<h2>Clawdbot 2026.1.22</h2>
-<h3>Changes</h3>
-<ul>
-<li>Highlight: Compaction safeguard now uses adaptive chunking, progressive fallback, and UI status + retries. (#1466) Thanks @dlauer.</li>
-<li>Providers: add Antigravity usage tracking to status output. (#1490) Thanks @patelhiren.</li>
-<li>Slack: add chat-type reply threading overrides via <code>replyToModeByChatType</code>. (#1442) Thanks @stefangalescu.</li>
-<li>BlueBubbles: add <code>asVoice</code> support for MP3/CAF voice memos in sendAttachment. (#1477, #1482) Thanks @Nicell.</li>
-<li>Onboarding: add hatch choice (TUI/Web/Later), token explainer, background dashboard seed on macOS, and showcase link.</li>
-</ul>
-<h3>Fixes</h3>
-<ul>
-<li>BlueBubbles: stop typing indicator on idle/no-reply. (#1439) Thanks @Nicell.</li>
-<li>Message tool: keep path/filePath as-is for send; hydrate buffers only for sendAttachment. (#1444) Thanks @hopyky.</li>
-<li>Auto-reply: only report a model switch when session state is available. (#1465) Thanks @robbyczgw-cla.</li>
-<li>Control UI: resolve local avatar URLs with basePath across injection + identity RPC. (#1457) Thanks @dlauer.</li>
-<li>Agents: sanitize assistant history text to strip tool-call markers. (#1456) Thanks @zerone0x.</li>
-<li>Discord: clarify Message Content Intent onboarding hint. (#1487) Thanks @kyleok.</li>
-<li>Gateway: stop the service before uninstalling and fail if it remains loaded.</li>
-<li>Agents: surface concrete API error details instead of generic AI service errors.</li>
-<li>Exec: fall back to non-PTY when PTY spawn fails (EBADF). (#1484)</li>
-<li>Exec approvals: allow per-segment allowlists for chained shell commands on gateway + node hosts. (#1458) Thanks @czekaj.</li>
-<li>Agents: make OpenAI sessions image-sanitize-only; gate tool-id/repair sanitization by provider.</li>
-<li>Doctor: honor CLAWDBOT_GATEWAY_TOKEN for auth checks and security audit token reuse. (#1448) Thanks @azade-c.</li>
-<li>Agents: make tool summaries more readable and only show optional params when set.</li>
-<li>Agents: honor SOUL.md guidance even when the file is nested or path-qualified. (#1434) Thanks @neooriginal.</li>
-<li>Matrix (plugin): persist m.direct for resolved DMs and harden room fallback. (#1436, #1486) Thanks @sibbl.</li>
-<li>CLI: prefer <code>~</code> for home paths in output.</li>
-<li>Mattermost (plugin): enforce pairing/allowlist gating, keep @username targets, and clarify plugin-only docs. (#1428) Thanks @damoahdominic.</li>
-<li>Agents: centralize transcript sanitization in the runner; keep <final> tags and error turns intact.</li>
-<li>Auth: skip auth profiles in cooldown during initial selection and rotation. (#1316) Thanks @odrobnik.</li>
-<li>Agents/TUI: honor user-pinned auth profiles during cooldown and preserve search picker ranking. (#1432) Thanks @tobiasbischoff.</li>
-<li>Docs: fix gog auth services example to include docs scope. (#1454) Thanks @zerone0x.</li>
-<li>Slack: reduce WebClient retries to avoid duplicate sends. (#1481)</li>
-<li>Slack: read thread replies for message reads when threadId is provided (replies-only). (#1450) Thanks @rodrigouroz.</li>
-<li>macOS: prefer linked channels in gateway summary to avoid false “not linked” status.</li>
-<li>macOS/tests: fix gateway summary lookup after guard unwrap; prevent browser opens during tests. (ECID-1483)</li>
-</ul>
-<p><a href="https://github.com/clawdbot/clawdbot/blob/main/CHANGELOG.md">View full changelog</a></p>
-]]></description>
-            <enclosure url="https://github.com/clawdbot/clawdbot/releases/download/v2026.1.22/Clawdbot-2026.1.22.zip" length="22302446" type="application/octet-stream" sparkle:edSignature="w/EzfwGBCRRuCg5vz8enIfYujxOZJWRw9PaunQ7gIafKwnBJSTtxcnkvMVwQsnBwB6VN5Tu2MPij7PjDFFX+CA=="/>
-        </item>
        <item>
            <title>2026.1.21</title>
            <pubDate>Thu, 22 Jan 2026 12:22:35 +0000</pubDate>
@@ -314,5 +266,21 @@ Thanks @AlexMikhalev, @CoreyH, @John-Rood, @KrauseFx, @MaudeBot, @Nachx639, @Nic
 ]]></description>
            <enclosure url="https://github.com/clawdbot/clawdbot/releases/download/v2026.1.21/Clawdbot-2026.1.21.zip" length="12208102" type="application/octet-stream" sparkle:edSignature="hU495Eii8O3qmmUnxYFhXyEGv+qan6KL+GpeuBhPIXf+7B5F/gBh5Oz9cHaqaAPoZ4/3Bo6xgvic0HTkbz6gDw=="/>
        </item>
+        <item>
+            <title>2026.1.16-2</title>
+            <pubDate>Sat, 17 Jan 2026 12:46:22 +0000</pubDate>
+            <link>https://raw.githubusercontent.com/clawdbot/clawdbot/main/appcast.xml</link>
+            <sparkle:version>6273</sparkle:version>
+            <sparkle:shortVersionString>2026.1.16-2</sparkle:shortVersionString>
+            <sparkle:minimumSystemVersion>15.0</sparkle:minimumSystemVersion>
+            <description><![CDATA[<h2>Clawdbot 2026.1.16-2</h2>
+<h3>Changes</h3>
+<ul>
+<li>CLI: stamp build commit into dist metadata so banners show the commit in npm installs.</li>
+</ul>
+<p><a href="https://github.com/clawdbot/clawdbot/blob/main/CHANGELOG.md">View full changelog</a></p>
+]]></description>
+            <enclosure url="https://github.com/clawdbot/clawdbot/releases/download/v2026.1.16-2/Clawdbot-2026.1.16-2.zip" length="21399591" type="application/octet-stream" sparkle:edSignature="zelT+KzN32cXsihbFniPF5Heq0hkwFfL3Agrh/AaoKUkr7kJAFarkGSOZRTWZ9y+DvOluzn2wHHjVigRjMzrBA=="/>
+        </item>
    </channel>
 </rss>
@@ -295,8 +295,8 @@ Options:
 - `--mode <local|remote>`
 - `--flow <quickstart|advanced|manual>` (manual is an alias for advanced)
 - `--auth-choice <setup-token|claude-cli|token|openai-codex|openai-api-key|openrouter-api-key|ai-gateway-api-key|moonshot-api-key|kimi-code-api-key|codex-cli|gemini-api-key|zai-api-key|apiKey|minimax-api|opencode-zen|skip>`
- `--token-provider <id>` (non-interactive; used with `--auth-choice token`)
- `--token <token>` (non-interactive; used with `--auth-choice token`)
+- `--token-provider <id>` (non-interactive; used with `--auth-choice token` or `apiKey`)
+- `--token <token>` (non-interactive; used with `--auth-choice token` or `apiKey`)
 - `--token-profile-id <id>` (non-interactive; default: `<provider>:manual`)
 - `--token-expires-in <duration>` (non-interactive; e.g. `365d`, `12h`)
 - `--anthropic-api-key <key>`
@@ -1,5 +1,5 @@
 ---
-summary: "CLI reference for `clawdbot update` (safe-ish source update + gateway auto-restart)"
+summary: "CLI reference for `clawdbot update` (safe-ish source update + optional gateway restart)"
 read_when:
  - You want to update a source checkout safely
  - You need to understand `--update` shorthand behavior
@@ -20,14 +20,14 @@ clawdbot update wizard
 clawdbot update --channel beta
 clawdbot update --channel dev
 clawdbot update --tag beta
-clawdbot update --no-restart
+clawdbot update --restart
 clawdbot update --json
 clawdbot --update
 ```

 ## Options

- `--no-restart`: skip restarting the Gateway service after a successful update.
+- `--restart`: restart the Gateway service after a successful update.
 - `--channel <stable|beta|dev>`: set the update channel (git + npm; persisted in config).
 - `--tag <dist-tag|version>`: override the npm dist-tag or version for this update only.
 - `--json`: print machine-readable `UpdateRunResult` JSON.
@@ -52,8 +52,7 @@ Options:
 ## `update wizard`

 Interactive flow to pick an update channel and confirm whether to restart the Gateway
-after updating (default is to restart). If you select `dev` without a git checkout, it
-offers to create one.
+after updating. If you select `dev` without a git checkout, it offers to create one.

 ## What it does

@@ -25,7 +25,6 @@ stay consistent across channels.
 1. **Parse Markdown -> IR**
   - IR is plain text plus style spans (bold/italic/strike/code/spoiler) and link spans.
   - Offsets are UTF-16 code units so Signal style ranges align with its API.
-   - Tables are parsed only when a channel opts into table conversion.
 2. **Chunk IR (format-first)**
   - Chunking happens on the IR text before rendering.
   - Inline formatting does not split across chunks; spans are sliced per chunk.
@@ -60,30 +59,7 @@ IR (schematic):

 - Slack, Telegram, and Signal outbound adapters render from the IR.
 - Other channels (WhatsApp, iMessage, MS Teams, Discord) still use plain text or
-  their own formatting rules, with Markdown table conversion applied before
-  chunking when enabled.
-
-## Table handling
-
-Markdown tables are not consistently supported across chat clients. Use
-`markdown.tables` to control conversion per channel (and per account).
-
- `code`: render tables as code blocks (default for most channels).
- `bullets`: convert each row into bullet points (default for Signal + WhatsApp).
- `off`: disable table parsing and conversion; raw table text passes through.
-
-Config keys:
-
-```yaml
-channels:
-  discord:
-    markdown:
-      tables: code
-    accounts:
-      work:
-        markdown:
-          tables: off
-```
+  their own formatting rules.

 ## Chunking rules

@@ -7,7 +7,7 @@ read_when:

 # Updating

-Clawdbot is moving fast (pre “1.0”). Treat updates like shipping infra: update → run checks → restart (or use `clawdbot update`, which restarts) → verify.
+Clawdbot is moving fast (pre “1.0”). Treat updates like shipping infra: update → run checks → restart → verify.

 ## Recommended: re-run the website installer (upgrade in place)

@@ -81,7 +81,7 @@ Notes:
 For **source installs** (git checkout), prefer:

 ```bash
-clawdbot update
+clawdbot update --restart
 ```

 It runs a safe-ish update flow:
@@ -89,7 +89,6 @@ It runs a safe-ish update flow:
 - Switches to the selected channel (tag or branch).
 - Fetches + rebases against the configured upstream (dev channel).
 - Installs deps, builds, builds the Control UI, and runs `clawdbot doctor`.
- Restarts the gateway by default (use `--no-restart` to skip).

 If you installed via **npm/pnpm** (no git metadata), `clawdbot update` will try to update via your package manager. If it can’t detect the install, use “Update (global install)” instead.

@@ -11,7 +11,7 @@ This app now ships Sparkle auto-updates. Release builds must be Developer ID–s

 ## Prereqs
 - Developer ID Application cert installed (example: `Developer ID Application: <Developer Name> (<TEAMID>)`).
- Sparkle private key path set in the environment as `SPARKLE_PRIVATE_KEY_FILE` (path to your Sparkle ed25519 private key; public key baked into Info.plist). If it is missing, check `~/.profile`.
+- Sparkle private key path set in the environment as `SPARKLE_PRIVATE_KEY_FILE` (path to your Sparkle ed25519 private key; public key baked into Info.plist).
 - Notary credentials (keychain profile or API key) for `xcrun notarytool` if you want Gatekeeper-safe DMG/zip distribution.
  - We use a Keychain profile named `clawdbot-notary`, created from App Store Connect API key env vars in your shell profile:
    - `APP_STORE_CONNECT_API_KEY_P8`, `APP_STORE_CONNECT_KEY_ID`, `APP_STORE_CONNECT_ISSUER_ID`
@@ -82,8 +82,6 @@ Enable optional tools in `agents.list[].tools.allow` (or global `tools.allow`):
 ```

 Other config knobs that affect tool availability:
- Allowlists that only name plugin tools are treated as plugin opt-ins; core tools remain
-  enabled unless you also include core tools or groups in the allowlist.
 - `tools.profile` / `agents.list[].tools.profile` (base allowlist)
 - `tools.byProvider` / `agents.list[].tools.byProvider` (provider‑specific allow/deny)
 - `tools.sandbox.tools.*` (sandbox tool policy when sandboxed)
@@ -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.
@@ -13,7 +13,7 @@ Use `pnpm` (Node 22+) from the repo root. Keep the working tree clean before tag
 ## Operator trigger
 When the operator says “release”, immediately do this preflight (no extra questions unless blocked):
 - Read this doc and `docs/platforms/mac/release.md`.
- Load env from `~/.profile` and confirm `SPARKLE_PRIVATE_KEY_FILE` + App Store Connect vars are set (SPARKLE_PRIVATE_KEY_FILE should live in `~/.profile`).
+- Load env from `~/.profile` and confirm `SPARKLE_PRIVATE_KEY_FILE` + App Store Connect vars are set.
 - Use Sparkle keys from `~/Library/CloudStorage/Dropbox/Backup/Sparkle` if needed.

 1) **Version & metadata**
@@ -39,9 +39,8 @@ When the operator says “release”, immediately do this preflight (no extra qu
 - [ ] `pnpm test` (or `pnpm test:coverage` if you need coverage output)
 - [ ] `pnpm run build` (last sanity check after tests)
 - [ ] `pnpm release:check` (verifies npm pack contents)
- [ ] `CLAWDBOT_INSTALL_SMOKE_SKIP_NONROOT=1 pnpm test:install:smoke` (Docker install smoke test, fast path; required before release)
+- [ ] `pnpm test:install:smoke` (Docker install smoke test; required before release)
  - If the immediate previous npm release is known broken, set `CLAWDBOT_INSTALL_SMOKE_PREVIOUS=<last-good-version>` or `CLAWDBOT_INSTALL_SMOKE_SKIP_PREVIOUS=1` for the preinstall step.
- [ ] (Optional) Full installer smoke (adds non-root + CLI coverage): `pnpm test:install:smoke`
 - [ ] (Optional) Installer E2E (Docker, runs `curl -fsSL https://clawd.bot/install.sh | bash`, onboards, then runs real tool calls):
  - `pnpm test:install:e2e:openai` (requires `OPENAI_API_KEY`)
  - `pnpm test:install:e2e:anthropic` (requires `ANTHROPIC_API_KEY`)
@@ -121,10 +121,6 @@ Lobster is an **optional** plugin tool (not enabled by default). Allow it per ag

 You can also allow it globally with `tools.allow` if every agent should see it.

-Note: allowlists are opt-in for optional plugins. If your allowlist only names
-plugin tools (like `lobster`), Clawdbot keeps core tools enabled. To restrict core
-tools, include the core tools or groups you want in the allowlist too.
-
 ## Example: Email triage

 Without Lobster:
@@ -1,4 +1,3 @@
-import { MarkdownConfigSchema } from "clawdbot/plugin-sdk";
 import { z } from "zod";

 const allowFromEntry = z.union([z.string(), z.number()]);
@@ -26,7 +25,6 @@ const bluebubblesGroupConfigSchema = z.object({
 const bluebubblesAccountSchema = z.object({
  name: z.string().optional(),
  enabled: z.boolean().optional(),
-  markdown: MarkdownConfigSchema,
  serverUrl: z.string().optional(),
  password: z.string().optional(),
  webhookPath: z.string().optional(),
@@ -99,8 +99,6 @@ function createMockRuntime(): PluginRuntime {
        chunkText: vi.fn() as unknown as PluginRuntime["channel"]["text"]["chunkText"],
        resolveTextChunkLimit: vi.fn(() => 4000) as unknown as PluginRuntime["channel"]["text"]["resolveTextChunkLimit"],
        hasControlCommand: mockHasControlCommand as unknown as PluginRuntime["channel"]["text"]["hasControlCommand"],
-        resolveMarkdownTableMode: vi.fn(() => "code") as unknown as PluginRuntime["channel"]["text"]["resolveMarkdownTableMode"],
-        convertMarkdownTables: vi.fn((text: string) => text) as unknown as PluginRuntime["channel"]["text"]["convertMarkdownTables"],
      },
      reply: {
        dispatchReplyWithBufferedBlockDispatcher: mockDispatchReplyWithBufferedBlockDispatcher as unknown as PluginRuntime["channel"]["reply"]["dispatchReplyWithBufferedBlockDispatcher"],
@@ -1662,15 +1662,9 @@ async function processMessage(
              ? [payload.mediaUrl]
              : [];
          if (mediaList.length > 0) {
-            const tableMode = core.channel.text.resolveMarkdownTableMode({
-              cfg: config,
-              channel: "bluebubbles",
-              accountId: account.accountId,
-            });
-            const text = core.channel.text.convertMarkdownTables(payload.text ?? "", tableMode);
            let first = true;
            for (const mediaUrl of mediaList) {
-              const caption = first ? text : undefined;
+              const caption = first ? payload.text : undefined;
              first = false;
              const result = await sendBlueBubblesMedia({
                cfg: config,
@@ -1692,14 +1686,8 @@ async function processMessage(
            account.config.textChunkLimit && account.config.textChunkLimit > 0
              ? account.config.textChunkLimit
              : DEFAULT_TEXT_LIMIT;
-          const tableMode = core.channel.text.resolveMarkdownTableMode({
-            cfg: config,
-            channel: "bluebubbles",
-            accountId: account.accountId,
-          });
-          const text = core.channel.text.convertMarkdownTables(payload.text ?? "", tableMode);
-          const chunks = core.channel.text.chunkMarkdownText(text, textLimit);
-          if (!chunks.length && text) chunks.push(text);
+          const chunks = core.channel.text.chunkMarkdownText(payload.text ?? "", textLimit);
+          if (!chunks.length && payload.text) chunks.push(payload.text);
          if (!chunks.length) return;
          for (const chunk of chunks) {
            const result = await sendMessageBlueBubbles(outboundTarget, chunk, {
@@ -1,4 +1,3 @@
-import { MarkdownConfigSchema } from "clawdbot/plugin-sdk";
 import { z } from "zod";

 const allowFromEntry = z.union([z.string(), z.number()]);
@@ -36,7 +35,6 @@ const matrixRoomSchema = z
 export const MatrixConfigSchema = z.object({
  name: z.string().optional(),
  enabled: z.boolean().optional(),
-  markdown: MarkdownConfigSchema,
  homeserver: z.string().optional(),
  userId: z.string().optional(),
  accessToken: z.string().optional(),
@@ -548,11 +548,6 @@ export function createMatrixRoomMessageHandler(params: MatrixMonitorHandlerParam
      }

      let didSendReply = false;
-      const tableMode = core.channel.text.resolveMarkdownTableMode({
-        cfg,
-        channel: "matrix",
-        accountId: route.accountId,
-      });
      const { dispatcher, replyOptions, markDispatchIdle } =
        core.channel.reply.createReplyDispatcherWithTyping({
          responsePrefix: core.channel.reply.resolveEffectiveMessagesConfig(cfg, route.agentId)
@@ -567,8 +562,6 @@ export function createMatrixRoomMessageHandler(params: MatrixMonitorHandlerParam
              textLimit,
              replyToMode,
              threadId: threadTarget,
-              accountId: route.accountId,
-              tableMode,
            });
            didSendReply = true;
          },
@@ -1,6 +1,6 @@
 import type { MatrixClient } from "matrix-bot-sdk";

-import type { MarkdownTableMode, ReplyPayload, RuntimeEnv } from "clawdbot/plugin-sdk";
+import type { ReplyPayload, RuntimeEnv } from "clawdbot/plugin-sdk";
 import { sendMessageMatrix } from "../send.js";
 import { getMatrixRuntime } from "../../runtime.js";

@@ -12,17 +12,8 @@ export async function deliverMatrixReplies(params: {
  textLimit: number;
  replyToMode: "off" | "first" | "all";
  threadId?: string;
-  accountId?: string;
-  tableMode?: MarkdownTableMode;
 }): Promise<void> {
  const core = getMatrixRuntime();
-  const tableMode =
-    params.tableMode ??
-    core.channel.text.resolveMarkdownTableMode({
-      cfg: core.config.loadConfig(),
-      channel: "matrix",
-      accountId: params.accountId,
-    });
  const logVerbose = (message: string) => {
    if (core.logging.shouldLogVerbose()) {
      params.runtime.log?.(message);
@@ -42,8 +33,6 @@ export async function deliverMatrixReplies(params: {
    }
    const replyToIdRaw = reply.replyToId?.trim();
    const replyToId = params.threadId || params.replyToMode === "off" ? undefined : replyToIdRaw;
-    const rawText = reply.text ?? "";
-    const text = core.channel.text.convertMarkdownTables(rawText, tableMode);
    const mediaList = reply.mediaUrls?.length
      ? reply.mediaUrls
      : reply.mediaUrl
@@ -54,14 +43,13 @@ export async function deliverMatrixReplies(params: {
      Boolean(id) && (params.replyToMode === "all" || !hasReplied);

    if (mediaList.length === 0) {
-      for (const chunk of core.channel.text.chunkMarkdownText(text, chunkLimit)) {
+      for (const chunk of core.channel.text.chunkMarkdownText(reply.text ?? "", chunkLimit)) {
        const trimmed = chunk.trim();
        if (!trimmed) continue;
        await sendMessageMatrix(params.roomId, trimmed, {
          client: params.client,
          replyToId: shouldIncludeReply(replyToId) ? replyToId : undefined,
          threadId: params.threadId,
-          accountId: params.accountId,
        });
        if (shouldIncludeReply(replyToId)) {
          hasReplied = true;
@@ -72,14 +60,13 @@ export async function deliverMatrixReplies(params: {

    let first = true;
    for (const mediaUrl of mediaList) {
-      const caption = first ? text : "";
+      const caption = first ? (reply.text ?? "") : "";
      await sendMessageMatrix(params.roomId, caption, {
        client: params.client,
        mediaUrl,
        replyToId: shouldIncludeReply(replyToId) ? replyToId : undefined,
        threadId: params.threadId,
        audioAsVoice: reply.audioAsVoice,
-        accountId: params.accountId,
      });
      if (shouldIncludeReply(replyToId)) {
        hasReplied = true;
@@ -43,8 +43,6 @@ const runtimeStub = {
    text: {
      resolveTextChunkLimit: () => 4000,
      chunkMarkdownText: (text: string) => (text ? [text] : []),
-      resolveMarkdownTableMode: () => "code",
-      convertMarkdownTables: (text: string) => text,
    },
  },
 } as unknown as PluginRuntime;
@@ -50,18 +50,9 @@ export async function sendMessageMatrix(
  try {
    const roomId = await resolveMatrixRoomId(client, to);
    const cfg = getCore().config.loadConfig();
-    const tableMode = getCore().channel.text.resolveMarkdownTableMode({
-      cfg,
-      channel: "matrix",
-      accountId: opts.accountId,
-    });
-    const convertedMessage = getCore().channel.text.convertMarkdownTables(
-      trimmedMessage,
-      tableMode,
-    );
    const textLimit = getCore().channel.text.resolveTextChunkLimit(cfg, "matrix");
    const chunkLimit = Math.min(textLimit, MATRIX_TEXT_LIMIT);
-    const chunks = getCore().channel.text.chunkMarkdownText(convertedMessage, chunkLimit);
+    const chunks = getCore().channel.text.chunkMarkdownText(trimmedMessage, chunkLimit);
    const threadId = normalizeThreadId(opts.threadId);
    const relation = threadId
      ? buildThreadRelation(threadId, opts.replyToId)
@@ -87,7 +87,6 @@ export type MatrixSendResult = {
 export type MatrixSendOpts = {
  client?: import("matrix-bot-sdk").MatrixClient;
  mediaUrl?: string;
-  accountId?: string;
  replyToId?: string;
  threadId?: string | number | null;
  timeoutMs?: number;
@@ -1,6 +1,6 @@
 {
  "name": "@clawdbot/mattermost",
-  "version": "2026.1.22",
+  "version": "2026.1.20-2",
  "type": "module",
  "description": "Clawdbot Mattermost channel plugin",
  "clawdbot": {
@@ -4,7 +4,6 @@ import {
  BlockStreamingCoalesceSchema,
  DmPolicySchema,
  GroupPolicySchema,
-  MarkdownConfigSchema,
  requireOpenAllowFrom,
 } from "clawdbot/plugin-sdk";

@@ -12,7 +11,6 @@ const MattermostAccountSchemaBase = z
  .object({
    name: z.string().optional(),
    capabilities: z.array(z.string()).optional(),
-    markdown: MarkdownConfigSchema,
    enabled: z.boolean().optional(),
    configWrites: z.boolean().optional(),
    botToken: z.string().optional(),
@@ -707,11 +707,6 @@ export async function monitorMattermostProvider(opts: MonitorMattermostOpts = {}
    const textLimit = core.channel.text.resolveTextChunkLimit(cfg, "mattermost", account.accountId, {
      fallbackLimit: account.textChunkLimit ?? 4000,
    });
-    const tableMode = core.channel.text.resolveMarkdownTableMode({
-      cfg,
-      channel: "mattermost",
-      accountId: account.accountId,
-    });

    let prefixContext: ResponsePrefixContext = {
      identityName: resolveIdentityName(cfg, route.agentId),
@@ -725,7 +720,7 @@ export async function monitorMattermostProvider(opts: MonitorMattermostOpts = {}
        humanDelay: core.channel.reply.resolveHumanDelayConfig(cfg, route.agentId),
        deliver: async (payload: ReplyPayload) => {
          const mediaUrls = payload.mediaUrls ?? (payload.mediaUrl ? [payload.mediaUrl] : []);
-          const text = core.channel.text.convertMarkdownTables(payload.text ?? "", tableMode);
+          const text = payload.text ?? "";
          if (mediaUrls.length === 0) {
            const chunks = core.channel.text.chunkMarkdownText(text, textLimit);
            for (const chunk of chunks.length > 0 ? chunks : [text]) {
@@ -181,15 +181,6 @@ export async function sendMessageMattermost(
    }
  }

-  if (message) {
-    const tableMode = core.channel.text.resolveMarkdownTableMode({
-      cfg,
-      channel: "mattermost",
-      accountId: account.accountId,
-    });
-    message = core.channel.text.convertMarkdownTables(message, tableMode);
-  }
-
  if (!message && (!fileIds || fileIds.length === 0)) {
    if (uploadError) {
      throw new Error(`Mattermost media upload failed: ${uploadError.message}`);
@@ -214,4 +205,4 @@ export async function sendMessageMattermost(
    messageId: post.id ?? "unknown",
    channelId,
  };
-}
+}
@@ -21,8 +21,6 @@ const runtimeStub = {
        }
        return chunks;
      },
-      resolveMarkdownTableMode: () => "code",
-      convertMarkdownTables: (text: string) => text,
    },
  },
 } as unknown as PluginRuntime;
@@ -36,7 +34,6 @@ describe("msteams messenger", () => {
    it("filters silent replies", () => {
      const messages = renderReplyPayloadsToMessages([{ text: SILENT_REPLY_TOKEN }], {
        textChunkLimit: 4000,
-        tableMode: "code",
      });
      expect(messages).toEqual([]);
    });
@@ -44,7 +41,7 @@ describe("msteams messenger", () => {
    it("filters silent reply prefixes", () => {
      const messages = renderReplyPayloadsToMessages(
        [{ text: `${SILENT_REPLY_TOKEN} -- ignored` }],
-        { textChunkLimit: 4000, tableMode: "code" },
+        { textChunkLimit: 4000 },
      );
      expect(messages).toEqual([]);
    });
@@ -52,7 +49,7 @@ describe("msteams messenger", () => {
    it("splits media into separate messages by default", () => {
      const messages = renderReplyPayloadsToMessages(
        [{ text: "hi", mediaUrl: "https://example.com/a.png" }],
-        { textChunkLimit: 4000, tableMode: "code" },
+        { textChunkLimit: 4000 },
      );
      expect(messages).toEqual([{ text: "hi" }, { mediaUrl: "https://example.com/a.png" }]);
    });
@@ -60,7 +57,7 @@ describe("msteams messenger", () => {
    it("supports inline media mode", () => {
      const messages = renderReplyPayloadsToMessages(
        [{ text: "hi", mediaUrl: "https://example.com/a.png" }],
-        { textChunkLimit: 4000, mediaMode: "inline", tableMode: "code" },
+        { textChunkLimit: 4000, mediaMode: "inline" },
      );
      expect(messages).toEqual([{ text: "hi", mediaUrl: "https://example.com/a.png" }]);
    });
@@ -69,7 +66,6 @@ describe("msteams messenger", () => {
      const long = "hello ".repeat(200);
      const messages = renderReplyPayloadsToMessages([{ text: long }], {
        textChunkLimit: 50,
-        tableMode: "code",
      });
      expect(messages.length).toBeGreaterThan(1);
    });
@@ -1,7 +1,6 @@
 import {
  isSilentReplyText,
  loadWebMedia,
-  type MarkdownTableMode,
  type MSTeamsReplyStyle,
  type ReplyPayload,
  SILENT_REPLY_TOKEN,
@@ -62,7 +61,6 @@ export type MSTeamsReplyRenderOptions = {
  textChunkLimit: number;
  chunkText?: boolean;
  mediaMode?: "split" | "inline";
-  tableMode?: MarkdownTableMode;
 };

 /**
@@ -198,19 +196,10 @@ export function renderReplyPayloadsToMessages(
  const chunkLimit = Math.min(options.textChunkLimit, 4000);
  const chunkText = options.chunkText !== false;
  const mediaMode = options.mediaMode ?? "split";
-  const tableMode =
-    options.tableMode ??
-    getMSTeamsRuntime().channel.text.resolveMarkdownTableMode({
-      cfg: getMSTeamsRuntime().config.loadConfig(),
-      channel: "msteams",
-    });

  for (const payload of replies) {
    const mediaList = payload.mediaUrls ?? (payload.mediaUrl ? [payload.mediaUrl] : []);
-    const text = getMSTeamsRuntime().channel.text.convertMarkdownTables(
-      payload.text ?? "",
-      tableMode,
-    );
+    const text = payload.text ?? "";

    if (!text && mediaList.length === 0) continue;

@@ -53,15 +53,10 @@ export function createMSTeamsReplyDispatcher(params: {
    ).responsePrefix,
    humanDelay: core.channel.reply.resolveHumanDelayConfig(params.cfg, params.agentId),
    deliver: async (payload) => {
-      const tableMode = core.channel.text.resolveMarkdownTableMode({
-        cfg: params.cfg,
-        channel: "msteams",
-      });
      const messages = renderReplyPayloadsToMessages([payload], {
        textChunkLimit: params.textLimit,
        chunkText: true,
        mediaMode: "split",
-        tableMode,
      });
      const mediaMaxBytes = resolveChannelMediaMaxBytes({
        cfg: params.cfg,
@@ -16,7 +16,6 @@ import {
 import { extractFilename, extractMessageId } from "./media-helpers.js";
 import { buildConversationReference, sendMSTeamsMessages } from "./messenger.js";
 import { buildMSTeamsPollCard } from "./polls.js";
-import { getMSTeamsRuntime } from "./runtime.js";
 import { resolveMSTeamsSendContext, type MSTeamsProactiveContext } from "./send-context.js";

 export type SendMSTeamsMessageParams = {
@@ -94,21 +93,13 @@ export async function sendMessageMSTeams(
  params: SendMSTeamsMessageParams,
 ): Promise<SendMSTeamsMessageResult> {
  const { cfg, to, text, mediaUrl } = params;
-  const tableMode = getMSTeamsRuntime().channel.text.resolveMarkdownTableMode({
-    cfg,
-    channel: "msteams",
-  });
-  const messageText = getMSTeamsRuntime().channel.text.convertMarkdownTables(
-    text ?? "",
-    tableMode,
-  );
  const ctx = await resolveMSTeamsSendContext({ cfg, to });
  const { adapter, appId, conversationId, ref, log, conversationType, tokenProvider, sharePointSiteId } = ctx;

  log.debug("sending proactive message", {
    conversationId,
    conversationType,
-    textLength: messageText.length,
+    textLength: text.length,
    hasMedia: Boolean(mediaUrl),
  });

@@ -143,7 +134,7 @@ export async function sendMessageMSTeams(
      const { activity, uploadId } = prepareFileConsentActivity({
        media: { buffer: media.buffer, filename: fileName, contentType: media.contentType },
        conversationId,
-        description: messageText || undefined,
+        description: text || undefined,
      });

      log.debug("sending file consent card", { uploadId, fileName, size: media.buffer.length });
@@ -181,14 +172,14 @@ export async function sendMessageMSTeams(
      const base64 = media.buffer.toString("base64");
      const finalMediaUrl = `data:${media.contentType};base64,${base64}`;

-      return sendTextWithMedia(ctx, messageText, finalMediaUrl);
+      return sendTextWithMedia(ctx, text, finalMediaUrl);
    }

    if (isImage && !sharePointSiteId) {
      // Group chat/channel without SharePoint: send image inline (avoids OneDrive failures)
      const base64 = media.buffer.toString("base64");
      const finalMediaUrl = `data:${media.contentType};base64,${base64}`;
-      return sendTextWithMedia(ctx, messageText, finalMediaUrl);
+      return sendTextWithMedia(ctx, text, finalMediaUrl);
    }

    // Group chat or channel: upload to SharePoint (if siteId configured) or OneDrive
@@ -232,7 +223,7 @@ export async function sendMessageMSTeams(
        const fileCardAttachment = buildTeamsFileInfoCard(driveItem);
        const activity = {
          type: "message",
-          text: messageText || undefined,
+          text: text || undefined,
          attachments: [fileCardAttachment],
        };

@@ -273,7 +264,7 @@ export async function sendMessageMSTeams(
      const fileLink = `📎 [${uploaded.name}](${uploaded.shareUrl})`;
      const activity = {
        type: "message",
-        text: messageText ? `${messageText}\n\n${fileLink}` : fileLink,
+        text: text ? `${text}\n\n${fileLink}` : fileLink,
      };

      const baseRef = buildConversationReference(ref);
@@ -299,7 +290,7 @@ export async function sendMessageMSTeams(
  }

  // No media: send text only
-  return sendTextWithMedia(ctx, messageText, undefined);
+  return sendTextWithMedia(ctx, text, undefined);
 }

 /**
@@ -3,7 +3,6 @@ import {
  DmConfigSchema,
  DmPolicySchema,
  GroupPolicySchema,
-  MarkdownConfigSchema,
  requireOpenAllowFrom,
 } from "clawdbot/plugin-sdk";
 import { z } from "zod";
@@ -22,7 +21,6 @@ export const NextcloudTalkAccountSchemaBase = z
  .object({
    name: z.string().optional(),
    enabled: z.boolean().optional(),
-    markdown: MarkdownConfigSchema,
    baseUrl: z.string().optional(),
    botSecret: z.string().optional(),
    botSecretFile: z.string().optional(),
@@ -71,18 +71,8 @@ export async function sendMessageNextcloudTalk(
    throw new Error("Message must be non-empty for Nextcloud Talk sends");
  }

-  const tableMode = getNextcloudTalkRuntime().channel.text.resolveMarkdownTableMode({
-    cfg,
-    channel: "nextcloud-talk",
-    accountId: account.accountId,
-  });
-  const message = getNextcloudTalkRuntime().channel.text.convertMarkdownTables(
-    text.trim(),
-    tableMode,
-  );
-
  const body: Record<string, unknown> = {
-    message,
+    message: text.trim(),
  };
  if (opts.replyTo) {
    body.replyTo = opts.replyTo;
@@ -133,20 +133,13 @@ export const nostrPlugin: ChannelPlugin<ResolvedNostrAccount> = {
    deliveryMode: "direct",
    textChunkLimit: 4000,
    sendText: async ({ to, text, accountId }) => {
-      const core = getNostrRuntime();
      const aid = accountId ?? DEFAULT_ACCOUNT_ID;
      const bus = activeBuses.get(aid);
      if (!bus) {
        throw new Error(`Nostr bus not running for account ${aid}`);
      }
-      const tableMode = core.channel.text.resolveMarkdownTableMode({
-        cfg: core.config.loadConfig(),
-        channel: "nostr",
-        accountId: aid,
-      });
-      const message = core.channel.text.convertMarkdownTables(text ?? "", tableMode);
      const normalizedTo = normalizePubkey(to);
-      await bus.sendDm(normalizedTo, message);
+      await bus.sendDm(normalizedTo, text);
      return { channel: "nostr", to: normalizedTo };
    },
  },
@@ -1,5 +1,5 @@
-import { MarkdownConfigSchema, buildChannelConfigSchema } from "clawdbot/plugin-sdk";
 import { z } from "zod";
+import { buildChannelConfigSchema } from "clawdbot/plugin-sdk";

 const allowFromEntry = z.union([z.string(), z.number()]);

@@ -63,9 +63,6 @@ export const NostrConfigSchema = z.object({
  /** Whether this channel is enabled */
  enabled: z.boolean().optional(),

-  /** Markdown formatting overrides (tables). */
-  markdown: MarkdownConfigSchema,
-
  /** Private key in hex or nsec bech32 format */
  privateKey: z.string().optional(),

@@ -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": {
@@ -1,4 +1,3 @@
-import { MarkdownConfigSchema } from "clawdbot/plugin-sdk";
 import { z } from "zod";

 const allowFromEntry = z.union([z.string(), z.number()]);
@@ -6,7 +5,6 @@ const allowFromEntry = z.union([z.string(), z.number()]);
 const zaloAccountSchema = z.object({
  name: z.string().optional(),
  enabled: z.boolean().optional(),
-  markdown: MarkdownConfigSchema,
  botToken: z.string().optional(),
  tokenFile: z.string().optional(),
  webhookUrl: z.string().optional(),
@@ -1,6 +1,6 @@
 import type { IncomingMessage, ServerResponse } from "node:http";

-import type { ClawdbotConfig, MarkdownTableMode } from "clawdbot/plugin-sdk";
+import type { ClawdbotConfig } from "clawdbot/plugin-sdk";

 import type { ResolvedZaloAccount } from "./accounts.js";
 import {
@@ -578,12 +578,6 @@ async function processMessageWithPipeline(params: {
    runtime.error?.(`zalo: failed updating session meta: ${String(err)}`);
  });

-  const tableMode = core.channel.text.resolveMarkdownTableMode({
-    cfg: config,
-    channel: "zalo",
-    accountId: account.accountId,
-  });
-
  await core.channel.reply.dispatchReplyWithBufferedBlockDispatcher({
    ctx: ctxPayload,
    cfg: config,
@@ -597,7 +591,6 @@ async function processMessageWithPipeline(params: {
          core,
          statusSink,
          fetcher,
-          tableMode,
        });
      },
      onError: (err, info) => {
@@ -615,11 +608,8 @@ async function deliverZaloReply(params: {
  core: ZaloCoreRuntime;
  statusSink?: (patch: { lastInboundAt?: number; lastOutboundAt?: number }) => void;
  fetcher?: ZaloFetch;
-  tableMode?: MarkdownTableMode;
 }): Promise<void> {
  const { payload, token, chatId, runtime, core, statusSink, fetcher } = params;
-  const tableMode = params.tableMode ?? "code";
-  const text = core.channel.text.convertMarkdownTables(payload.text ?? "", tableMode);

  const mediaList = payload.mediaUrls?.length
    ? payload.mediaUrls
@@ -630,7 +620,7 @@ async function deliverZaloReply(params: {
  if (mediaList.length > 0) {
    let first = true;
    for (const mediaUrl of mediaList) {
-      const caption = first ? text : undefined;
+      const caption = first ? payload.text : undefined;
      first = false;
      try {
        await sendPhoto(token, { chat_id: chatId, photo: mediaUrl, caption }, fetcher);
@@ -642,8 +632,8 @@ async function deliverZaloReply(params: {
    return;
  }

-  if (text) {
-    const chunks = core.channel.text.chunkMarkdownText(text, ZALO_TEXT_LIMIT);
+  if (payload.text) {
+    const chunks = core.channel.text.chunkMarkdownText(payload.text, ZALO_TEXT_LIMIT);
    for (const chunk of chunks) {
      try {
        await sendMessage(token, { chat_id: chatId, text: chunk }, fetcher);
@@ -1,4 +1,3 @@
-import { MarkdownConfigSchema } from "clawdbot/plugin-sdk";
 import { z } from "zod";

 const allowFromEntry = z.union([z.string(), z.number()]);
@@ -11,7 +10,6 @@ const groupConfigSchema = z.object({
 const zalouserAccountSchema = z.object({
  name: z.string().optional(),
  enabled: z.boolean().optional(),
-  markdown: MarkdownConfigSchema,
  profile: z.string().optional(),
  dmPolicy: z.enum(["pairing", "allowlist", "open", "disabled"]).optional(),
  allowFrom: z.array(allowFromEntry).optional(),
@@ -1,6 +1,6 @@
 import type { ChildProcess } from "node:child_process";

-import type { ClawdbotConfig, MarkdownTableMode, RuntimeEnv } from "clawdbot/plugin-sdk";
+import type { ClawdbotConfig, RuntimeEnv } from "clawdbot/plugin-sdk";
 import { mergeAllowlist, summarizeMapping } from "clawdbot/plugin-sdk";
 import { sendMessageZalouser } from "./send.js";
 import type {
@@ -332,11 +332,6 @@ async function processMessage(
          runtime,
          core,
          statusSink,
-          tableMode: core.channel.text.resolveMarkdownTableMode({
-            cfg: config,
-            channel: "zalouser",
-            accountId: account.accountId,
-          }),
        });
      },
      onError: (err, info) => {
@@ -356,11 +351,8 @@ async function deliverZalouserReply(params: {
  runtime: RuntimeEnv;
  core: ZalouserCoreRuntime;
  statusSink?: (patch: { lastInboundAt?: number; lastOutboundAt?: number }) => void;
-  tableMode?: MarkdownTableMode;
 }): Promise<void> {
  const { payload, profile, chatId, isGroup, runtime, core, statusSink } = params;
-  const tableMode = params.tableMode ?? "code";
-  const text = core.channel.text.convertMarkdownTables(payload.text ?? "", tableMode);

  const mediaList = payload.mediaUrls?.length
    ? payload.mediaUrls
@@ -371,7 +363,7 @@ async function deliverZalouserReply(params: {
  if (mediaList.length > 0) {
    let first = true;
    for (const mediaUrl of mediaList) {
-      const caption = first ? text : undefined;
+      const caption = first ? payload.text : undefined;
      first = false;
      try {
        logVerbose(core, runtime, `Sending media to ${chatId}`);
@@ -388,8 +380,8 @@ async function deliverZalouserReply(params: {
    return;
  }

-  if (text) {
-    const chunks = core.channel.text.chunkMarkdownText(text, ZALOUSER_TEXT_LIMIT);
+  if (payload.text) {
+    const chunks = core.channel.text.chunkMarkdownText(payload.text, ZALOUSER_TEXT_LIMIT);
    logVerbose(core, runtime, `Sending ${chunks.length} text chunk(s) to ${chatId}`);
    for (const chunk of chunks) {
      try {
@@ -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",
@@ -19,12 +19,7 @@ echo "==> Verify git installed"
 command -v git >/dev/null

 echo "==> Verify clawdbot installed"
-EXPECTED_VERSION="${CLAWDBOT_INSTALL_EXPECT_VERSION:-}"
-if [[ -n "$EXPECTED_VERSION" ]]; then
-  LATEST_VERSION="$EXPECTED_VERSION"
-else
-  LATEST_VERSION="$(npm view clawdbot version)"
-fi
+LATEST_VERSION="$(npm view clawdbot version)"
 CMD_PATH="$(command -v clawdbot || true)"
 if [[ -z "$CMD_PATH" && -x "$HOME/.npm-global/bin/clawdbot" ]]; then
  CMD_PATH="$HOME/.npm-global/bin/clawdbot"
@@ -6,36 +6,21 @@ SMOKE_PREVIOUS_VERSION="${CLAWDBOT_INSTALL_SMOKE_PREVIOUS:-}"
 SKIP_PREVIOUS="${CLAWDBOT_INSTALL_SMOKE_SKIP_PREVIOUS:-0}"

 echo "==> Resolve npm versions"
+LATEST_VERSION="$(npm view clawdbot version)"
 if [[ -n "$SMOKE_PREVIOUS_VERSION" ]]; then
-  LATEST_VERSION="$(npm view clawdbot version)"
  PREVIOUS_VERSION="$SMOKE_PREVIOUS_VERSION"
 else
-  VERSIONS_JSON="$(npm view clawdbot versions --json)"
-  versions_line="$(node - <<'NODE'
-const raw = process.env.VERSIONS_JSON || "[]";
-let versions;
-try {
-  versions = JSON.parse(raw);
-} catch {
-  versions = raw ? [raw] : [];
-}
-if (!Array.isArray(versions)) {
-  versions = [versions];
-}
-if (versions.length === 0) {
+  PREVIOUS_VERSION="$(node - <<'NODE'
+const { execSync } = require("node:child_process");
+
+const versions = JSON.parse(execSync("npm view clawdbot versions --json", { encoding: "utf8" }));
+if (!Array.isArray(versions) || versions.length === 0) {
  process.exit(1);
 }
-const latest = versions[versions.length - 1];
-const previous = versions.length >= 2 ? versions[versions.length - 2] : latest;
-process.stdout.write(`${latest} ${previous}`);
+const previous = versions.length >= 2 ? versions[versions.length - 2] : versions[0];
+process.stdout.write(previous);
 NODE
 )"
-  LATEST_VERSION="${versions_line%% *}"
-  PREVIOUS_VERSION="${versions_line#* }"
-fi
-
-if [[ -n "${CLAWDBOT_INSTALL_LATEST_OUT:-}" ]]; then
-  printf "%s" "$LATEST_VERSION" > "$CLAWDBOT_INSTALL_LATEST_OUT"
 fi

 echo "latest=$LATEST_VERSION previous=$PREVIOUS_VERSION"
@@ -6,9 +6,6 @@ SMOKE_IMAGE="${CLAWDBOT_INSTALL_SMOKE_IMAGE:-clawdbot-install-smoke:local}"
 NONROOT_IMAGE="${CLAWDBOT_INSTALL_NONROOT_IMAGE:-clawdbot-install-nonroot:local}"
 INSTALL_URL="${CLAWDBOT_INSTALL_URL:-https://clawd.bot/install.sh}"
 CLI_INSTALL_URL="${CLAWDBOT_INSTALL_CLI_URL:-https://clawd.bot/install-cli.sh}"
-SKIP_NONROOT="${CLAWDBOT_INSTALL_SMOKE_SKIP_NONROOT:-0}"
-LATEST_DIR="$(mktemp -d)"
-LATEST_FILE="${LATEST_DIR}/latest"

 echo "==> Build smoke image (upgrade, root): $SMOKE_IMAGE"
 docker build \
@@ -18,48 +15,31 @@ docker build \

 echo "==> Run installer smoke test (root): $INSTALL_URL"
 docker run --rm -t \
-  -v "${LATEST_DIR}:/out" \
  -e CLAWDBOT_INSTALL_URL="$INSTALL_URL" \
-  -e CLAWDBOT_INSTALL_LATEST_OUT="/out/latest" \
  -e CLAWDBOT_INSTALL_SMOKE_PREVIOUS="${CLAWDBOT_INSTALL_SMOKE_PREVIOUS:-}" \
  -e CLAWDBOT_INSTALL_SMOKE_SKIP_PREVIOUS="${CLAWDBOT_INSTALL_SMOKE_SKIP_PREVIOUS:-0}" \
  -e CLAWDBOT_NO_ONBOARD=1 \
  -e DEBIAN_FRONTEND=noninteractive \
  "$SMOKE_IMAGE"

-LATEST_VERSION=""
-if [[ -f "$LATEST_FILE" ]]; then
-  LATEST_VERSION="$(cat "$LATEST_FILE")"
-fi
+echo "==> Build non-root image: $NONROOT_IMAGE"
+docker build \
+  -t "$NONROOT_IMAGE" \
+  -f "$ROOT_DIR/scripts/docker/install-sh-nonroot/Dockerfile" \
+  "$ROOT_DIR/scripts/docker/install-sh-nonroot"

-if [[ "$SKIP_NONROOT" == "1" ]]; then
-  echo "==> Skip non-root installer smoke (CLAWDBOT_INSTALL_SMOKE_SKIP_NONROOT=1)"
-else
-  echo "==> Build non-root image: $NONROOT_IMAGE"
-  docker build \
-    -t "$NONROOT_IMAGE" \
-    -f "$ROOT_DIR/scripts/docker/install-sh-nonroot/Dockerfile" \
-    "$ROOT_DIR/scripts/docker/install-sh-nonroot"
-
-  echo "==> Run installer non-root test: $INSTALL_URL"
-  docker run --rm -t \
-    -e CLAWDBOT_INSTALL_URL="$INSTALL_URL" \
-    -e CLAWDBOT_INSTALL_EXPECT_VERSION="$LATEST_VERSION" \
-    -e CLAWDBOT_NO_ONBOARD=1 \
-    -e DEBIAN_FRONTEND=noninteractive \
-    "$NONROOT_IMAGE"
-fi
+echo "==> Run installer non-root test: $INSTALL_URL"
+docker run --rm -t \
+  -e CLAWDBOT_INSTALL_URL="$INSTALL_URL" \
+  -e CLAWDBOT_NO_ONBOARD=1 \
+  -e DEBIAN_FRONTEND=noninteractive \
+  "$NONROOT_IMAGE"

 if [[ "${CLAWDBOT_INSTALL_SMOKE_SKIP_CLI:-0}" == "1" ]]; then
  echo "==> Skip CLI installer smoke (CLAWDBOT_INSTALL_SMOKE_SKIP_CLI=1)"
  exit 0
 fi

-if [[ "$SKIP_NONROOT" == "1" ]]; then
-  echo "==> Skip CLI installer smoke (non-root image skipped)"
-  exit 0
-fi
-
 echo "==> Run CLI installer non-root test (same image)"
 docker run --rm -t \
  --entrypoint /bin/bash \
@@ -1,70 +0,0 @@
-import { spawn } from "node:child_process";
-import os from "node:os";
-
-const pnpm = process.platform === "win32" ? "pnpm.cmd" : "pnpm";
-
-const runs = [
-  {
-    name: "unit",
-    args: ["vitest", "run", "--config", "vitest.unit.config.ts"],
-  },
-  {
-    name: "extensions",
-    args: ["vitest", "run", "--config", "vitest.extensions.config.ts"],
-  },
-  {
-    name: "gateway",
-    args: ["vitest", "run", "--config", "vitest.gateway.config.ts"],
-  },
-];
-
-const parallelRuns = runs.filter((entry) => entry.name !== "gateway");
-const serialRuns = runs.filter((entry) => entry.name === "gateway");
-
-const children = new Set();
-const isCI = process.env.CI === "true" || process.env.GITHUB_ACTIONS === "true";
-const overrideWorkers = Number.parseInt(process.env.CLAWDBOT_TEST_WORKERS ?? "", 10);
-const resolvedOverride = Number.isFinite(overrideWorkers) && overrideWorkers > 0 ? overrideWorkers : null;
-const localWorkers = Math.max(4, Math.min(16, os.cpus().length));
-const perRunWorkers = Math.max(1, Math.floor(localWorkers / parallelRuns.length));
-const maxWorkers = isCI ? null : resolvedOverride ?? perRunWorkers;
-
-const run = (entry) =>
-  new Promise((resolve) => {
-    const args = maxWorkers ? [...entry.args, "--maxWorkers", String(maxWorkers)] : entry.args;
-    const child = spawn(pnpm, 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 parallelCodes = await Promise.all(parallelRuns.map(run));
-const failedParallel = parallelCodes.find((code) => code !== 0);
-if (failedParallel !== undefined) {
-  process.exit(failedParallel);
-}
-
-for (const entry of serialRuns) {
-  // eslint-disable-next-line no-await-in-loop
-  const code = await run(entry);
-  if (code !== 0) {
-    process.exit(code);
-  }
-}
-
-process.exit(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;
 };

@@ -66,10 +66,6 @@ export function isModernModelRef(ref: ModelRef): boolean {
    return matchesPrefix(id, XAI_PREFIXES);
  }

-  if (provider === "opencode" && id.endsWith("-free")) {
-    return false;
-  }
-
  if (provider === "openrouter" || provider === "opencode") {
    return matchesAny(id, [
      ...ANTHROPIC_PREFIXES,
@@ -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");

@@ -41,11 +41,12 @@ describe("resolveOpencodeZenAlias", () => {
 describe("resolveOpencodeZenModelApi", () => {
  it("maps APIs by model family", () => {
    expect(resolveOpencodeZenModelApi("claude-opus-4-5")).toBe("anthropic-messages");
+    expect(resolveOpencodeZenModelApi("minimax-m2.1-free")).toBe("anthropic-messages");
    expect(resolveOpencodeZenModelApi("gemini-3-pro")).toBe("google-generative-ai");
    expect(resolveOpencodeZenModelApi("gpt-5.2")).toBe("openai-responses");
    expect(resolveOpencodeZenModelApi("alpha-gd4")).toBe("openai-completions");
    expect(resolveOpencodeZenModelApi("big-pickle")).toBe("openai-completions");
-    expect(resolveOpencodeZenModelApi("glm-4.7")).toBe("openai-completions");
+    expect(resolveOpencodeZenModelApi("glm-4.7-free")).toBe("openai-completions");
    expect(resolveOpencodeZenModelApi("some-unknown-model")).toBe("openai-completions");
  });
 });
@@ -54,10 +55,10 @@ describe("getOpencodeZenStaticFallbackModels", () => {
  it("returns an array of models", () => {
    const models = getOpencodeZenStaticFallbackModels();
    expect(Array.isArray(models)).toBe(true);
-    expect(models.length).toBe(10);
+    expect(models.length).toBe(11);
  });

-  it("includes Claude, GPT, Gemini, and GLM models", () => {
+  it("includes Claude, GPT, Gemini, GLM, and MiniMax models", () => {
    const models = getOpencodeZenStaticFallbackModels();
    const ids = models.map((m) => m.id);

@@ -65,7 +66,8 @@ describe("getOpencodeZenStaticFallbackModels", () => {
    expect(ids).toContain("gpt-5.2");
    expect(ids).toContain("gpt-5.1-codex");
    expect(ids).toContain("gemini-3-pro");
-    expect(ids).toContain("glm-4.7");
+    expect(ids).toContain("glm-4.7-free");
+    expect(ids).toContain("minimax-m2.1-free");
  });

  it("returns valid ModelDefinitionConfig objects", () => {
@@ -88,7 +90,8 @@ describe("OPENCODE_ZEN_MODEL_ALIASES", () => {
    expect(OPENCODE_ZEN_MODEL_ALIASES.codex).toBe("gpt-5.1-codex");
    expect(OPENCODE_ZEN_MODEL_ALIASES.gpt5).toBe("gpt-5.2");
    expect(OPENCODE_ZEN_MODEL_ALIASES.gemini).toBe("gemini-3-pro");
-    expect(OPENCODE_ZEN_MODEL_ALIASES.glm).toBe("glm-4.7");
+    expect(OPENCODE_ZEN_MODEL_ALIASES.glm).toBe("glm-4.7-free");
+    expect(OPENCODE_ZEN_MODEL_ALIASES.minimax).toBe("minimax-m2.1-free");

    // Legacy aliases (kept for backward compatibility).
    expect(OPENCODE_ZEN_MODEL_ALIASES.sonnet).toBe("claude-opus-4-5");
@@ -68,9 +68,13 @@ export const OPENCODE_ZEN_MODEL_ALIASES: Record<string, string> = {
  "gemini-2.5-flash": "gemini-3-flash",

  // GLM (free + alpha)
-  glm: "glm-4.7",
-  "glm-free": "glm-4.7",
+  glm: "glm-4.7-free",
+  "glm-free": "glm-4.7-free",
  "alpha-glm": "alpha-glm-4.7",
+
+  // MiniMax
+  minimax: "minimax-m2.1-free",
+  "minimax-free": "minimax-m2.1-free",
 };

 /**
@@ -130,7 +134,7 @@ const MODEL_COSTS: Record<
    cacheWrite: 0,
  },
  "gpt-5.1": { input: 1.07, output: 8.5, cacheRead: 0.107, cacheWrite: 0 },
-  "glm-4.7": { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
+  "glm-4.7-free": { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
  "gemini-3-flash": { input: 0.5, output: 3, cacheRead: 0.05, cacheWrite: 0 },
  "gpt-5.1-codex-max": {
    input: 1.25,
@@ -138,6 +142,7 @@ const MODEL_COSTS: Record<
    cacheRead: 0.125,
    cacheWrite: 0,
  },
+  "minimax-m2.1-free": { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
  "gpt-5.2": { input: 1.75, output: 14, cacheRead: 0.175, cacheWrite: 0 },
 };

@@ -150,9 +155,10 @@ const MODEL_CONTEXT_WINDOWS: Record<string, number> = {
  "alpha-glm-4.7": 204800,
  "gpt-5.1-codex-mini": 400000,
  "gpt-5.1": 400000,
-  "glm-4.7": 204800,
+  "glm-4.7-free": 204800,
  "gemini-3-flash": 1048576,
  "gpt-5.1-codex-max": 400000,
+  "minimax-m2.1-free": 204800,
  "gpt-5.2": 400000,
 };

@@ -167,9 +173,10 @@ const MODEL_MAX_TOKENS: Record<string, number> = {
  "alpha-glm-4.7": 131072,
  "gpt-5.1-codex-mini": 128000,
  "gpt-5.1": 128000,
-  "glm-4.7": 131072,
+  "glm-4.7-free": 131072,
  "gemini-3-flash": 65536,
  "gpt-5.1-codex-max": 128000,
+  "minimax-m2.1-free": 131072,
  "gpt-5.2": 128000,
 };

@@ -204,9 +211,10 @@ const MODEL_NAMES: Record<string, string> = {
  "alpha-glm-4.7": "Alpha GLM-4.7",
  "gpt-5.1-codex-mini": "GPT-5.1 Codex Mini",
  "gpt-5.1": "GPT-5.1",
-  "glm-4.7": "GLM-4.7",
+  "glm-4.7-free": "GLM-4.7",
  "gemini-3-flash": "Gemini 3 Flash",
  "gpt-5.1-codex-max": "GPT-5.1 Codex Max",
+  "minimax-m2.1-free": "MiniMax M2.1",
  "gpt-5.2": "GPT-5.2",
 };

@@ -232,9 +240,10 @@ export function getOpencodeZenStaticFallbackModels(): ModelDefinitionConfig[] {
    "alpha-glm-4.7",
    "gpt-5.1-codex-mini",
    "gpt-5.1",
-    "glm-4.7",
+    "glm-4.7-free",
    "gemini-3-flash",
    "gpt-5.1-codex-max",
+    "minimax-m2.1-free",
    "gpt-5.2",
  ];

@@ -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);
        }
@@ -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> => {
@@ -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 });
-    }
-  });
 });
@@ -44,7 +44,6 @@ import {
  collectExplicitAllowlist,
  expandPolicyWithPluginGroups,
  resolveToolProfilePolicy,
-  stripPluginOnlyAllowlist,
 } from "./tool-policy.js";
 import { getPluginToolMeta } from "../plugins/tools.js";

@@ -299,30 +298,12 @@ export function createClawdbotCodingTools(options?: {
    tools,
    toolMeta: (tool) => getPluginToolMeta(tool as AnyAgentTool),
  });
-  const profilePolicyExpanded = expandPolicyWithPluginGroups(
-    stripPluginOnlyAllowlist(profilePolicy, pluginGroups),
-    pluginGroups,
-  );
-  const providerProfileExpanded = expandPolicyWithPluginGroups(
-    stripPluginOnlyAllowlist(providerProfilePolicy, pluginGroups),
-    pluginGroups,
-  );
-  const globalPolicyExpanded = expandPolicyWithPluginGroups(
-    stripPluginOnlyAllowlist(globalPolicy, pluginGroups),
-    pluginGroups,
-  );
-  const globalProviderExpanded = expandPolicyWithPluginGroups(
-    stripPluginOnlyAllowlist(globalProviderPolicy, pluginGroups),
-    pluginGroups,
-  );
-  const agentPolicyExpanded = expandPolicyWithPluginGroups(
-    stripPluginOnlyAllowlist(agentPolicy, pluginGroups),
-    pluginGroups,
-  );
-  const agentProviderExpanded = expandPolicyWithPluginGroups(
-    stripPluginOnlyAllowlist(agentProviderPolicy, pluginGroups),
-    pluginGroups,
-  );
+  const profilePolicyExpanded = expandPolicyWithPluginGroups(profilePolicy, pluginGroups);
+  const providerProfileExpanded = expandPolicyWithPluginGroups(providerProfilePolicy, pluginGroups);
+  const globalPolicyExpanded = expandPolicyWithPluginGroups(globalPolicy, pluginGroups);
+  const globalProviderExpanded = expandPolicyWithPluginGroups(globalProviderPolicy, pluginGroups);
+  const agentPolicyExpanded = expandPolicyWithPluginGroups(agentPolicy, pluginGroups);
+  const agentProviderExpanded = expandPolicyWithPluginGroups(agentProviderPolicy, pluginGroups);
  const sandboxPolicyExpanded = expandPolicyWithPluginGroups(sandbox?.tools, pluginGroups);
  const subagentPolicyExpanded = expandPolicyWithPluginGroups(subagentPolicy, pluginGroups);

@@ -1,25 +0,0 @@
-import { describe, expect, it } from "vitest";
-
-import { stripPluginOnlyAllowlist, type PluginToolGroups } from "./tool-policy.js";
-
-const pluginGroups: PluginToolGroups = {
-  all: ["lobster", "workflow_tool"],
-  byPlugin: new Map([["lobster", ["lobster", "workflow_tool"]]]),
-};
-
-describe("stripPluginOnlyAllowlist", () => {
-  it("strips allowlist when it only targets plugin tools", () => {
-    const policy = stripPluginOnlyAllowlist({ allow: ["lobster"] }, pluginGroups);
-    expect(policy?.allow).toBeUndefined();
-  });
-
-  it("strips allowlist when it only targets plugin groups", () => {
-    const policy = stripPluginOnlyAllowlist({ allow: ["group:plugins"] }, pluginGroups);
-    expect(policy?.allow).toBeUndefined();
-  });
-
-  it("keeps allowlist when it mixes plugin and core entries", () => {
-    const policy = stripPluginOnlyAllowlist({ allow: ["lobster", "read"] }, pluginGroups);
-    expect(policy?.allow).toEqual(["lobster", "read"]);
-  });
-});
@@ -178,22 +178,6 @@ export function expandPolicyWithPluginGroups(
  };
 }

-export function stripPluginOnlyAllowlist(
-  policy: ToolPolicyLike | undefined,
-  groups: PluginToolGroups,
-): ToolPolicyLike | undefined {
-  if (!policy?.allow || policy.allow.length === 0) return policy;
-  const normalized = normalizeToolList(policy.allow);
-  if (normalized.length === 0) return policy;
-  const pluginIds = new Set(groups.byPlugin.keys());
-  const pluginTools = new Set(groups.all);
-  const isPluginEntry = (entry: string) =>
-    entry === "group:plugins" || pluginIds.has(entry) || pluginTools.has(entry);
-  const isPluginOnly = normalized.every((entry) => isPluginEntry(entry));
-  if (!isPluginOnly) return policy;
-  return { ...policy, allow: undefined };
-}
-
 export function resolveToolProfilePolicy(profile?: string): ToolProfilePolicy | undefined {
  if (!profile) return undefined;
  const resolved = TOOL_PROFILES[profile as ToolProfileId];
@@ -5,10 +5,6 @@ vi.mock("../../gateway/call.js", () => ({
  callGateway: (opts: unknown) => callGatewayMock(opts),
 }));

-vi.mock("../agent-scope.js", () => ({
-  resolveSessionAgentId: () => "agent-123",
-}));
-
 import { createCronTool } from "./cron-tool.js";

 describe("cron tool", () => {
@@ -89,23 +85,6 @@ describe("cron tool", () => {
    });
  });

-  it("does not default agentId when job.agentId is null", async () => {
-    const tool = createCronTool({ agentSessionKey: "main" });
-    await tool.execute("call-null", {
-      action: "add",
-      job: {
-        name: "wake-up",
-        schedule: { atMs: 123 },
-        agentId: null,
-      },
-    });
-
-    const call = callGatewayMock.mock.calls[0]?.[0] as {
-      params?: { agentId?: unknown };
-    };
-    expect(call?.params?.agentId).toBeNull();
-  });
-
  it("adds recent context for systemEvent reminders when contextMessages > 0", async () => {
    callGatewayMock
      .mockResolvedValueOnce({
@@ -209,26 +188,4 @@ describe("cron tool", () => {
    const text = cronCall.params?.payload?.text ?? "";
    expect(text).not.toContain("Recent context:");
  });
-
-  it("preserves explicit agentId null on add", async () => {
-    callGatewayMock.mockResolvedValueOnce({ ok: true });
-
-    const tool = createCronTool({ agentSessionKey: "main" });
-    await tool.execute("call6", {
-      action: "add",
-      job: {
-        name: "reminder",
-        schedule: { atMs: 123 },
-        agentId: null,
-        payload: { kind: "systemEvent", text: "Reminder: the thing." },
-      },
-    });
-
-    const call = callGatewayMock.mock.calls[0]?.[0] as {
-      method?: string;
-      params?: { agentId?: string | null };
-    };
-    expect(call.method).toBe("cron.add");
-    expect(call.params?.agentId).toBeNull();
-  });
 });
@@ -3,7 +3,6 @@ import { normalizeCronJobCreate, normalizeCronJobPatch } from "../../cron/normal
 import { loadConfig } from "../../config/config.js";
 import { truncateUtf16Safe } from "../../utils.js";
 import { optionalStringEnum, stringEnum } from "../schema/typebox.js";
-import { resolveSessionAgentId } from "../agent-scope.js";
 import { type AnyAgentTool, jsonResult, readStringParam } from "./common.js";
 import { callGatewayTool, type GatewayCallOptions } from "./gateway.js";
 import { resolveInternalSessionKey, resolveMainSessionAlias } from "./sessions-helpers.js";
@@ -159,15 +158,6 @@ export function createCronTool(opts?: CronToolOptions): AnyAgentTool {
            throw new Error("job required");
          }
          const job = normalizeCronJobCreate(params.job) ?? params.job;
-          if (job && typeof job === "object" && !("agentId" in job)) {
-            const cfg = loadConfig();
-            const agentId = opts?.agentSessionKey
-              ? resolveSessionAgentId({ sessionKey: opts.agentSessionKey, config: cfg })
-              : undefined;
-            if (agentId) {
-              (job as { agentId?: string }).agentId = agentId;
-            }
-          }
          const contextMessages =
            typeof params.contextMessages === "number" && Number.isFinite(params.contextMessages)
              ? params.contextMessages
@@ -39,7 +39,6 @@ export async function handleDiscordGuildAction(
  params: Record<string, unknown>,
  isActionEnabled: ActionGate<DiscordActionConfig>,
 ): Promise<AgentToolResult<unknown>> {
-  const accountId = readStringParam(params, "accountId");
  switch (action) {
    case "memberInfo": {
      if (!isActionEnabled("memberInfo")) {
@@ -51,9 +50,7 @@ export async function handleDiscordGuildAction(
      const userId = readStringParam(params, "userId", {
        required: true,
      });
-      const member = accountId
-        ? await fetchMemberInfoDiscord(guildId, userId, { accountId })
-        : await fetchMemberInfoDiscord(guildId, userId);
+      const member = await fetchMemberInfoDiscord(guildId, userId);
      return jsonResult({ ok: true, member });
    }
    case "roleInfo": {
@@ -63,9 +60,7 @@ export async function handleDiscordGuildAction(
      const guildId = readStringParam(params, "guildId", {
        required: true,
      });
-      const roles = accountId
-        ? await fetchRoleInfoDiscord(guildId, { accountId })
-        : await fetchRoleInfoDiscord(guildId);
+      const roles = await fetchRoleInfoDiscord(guildId);
      return jsonResult({ ok: true, roles });
    }
    case "emojiList": {
@@ -75,9 +70,7 @@ export async function handleDiscordGuildAction(
      const guildId = readStringParam(params, "guildId", {
        required: true,
      });
-      const emojis = accountId
-        ? await listGuildEmojisDiscord(guildId, { accountId })
-        : await listGuildEmojisDiscord(guildId);
+      const emojis = await listGuildEmojisDiscord(guildId);
      return jsonResult({ ok: true, emojis });
    }
    case "emojiUpload": {
@@ -92,22 +85,12 @@ export async function handleDiscordGuildAction(
        required: true,
      });
      const roleIds = readStringArrayParam(params, "roleIds");
-      const emoji = accountId
-        ? await uploadEmojiDiscord(
-            {
-              guildId,
-              name,
-              mediaUrl,
-              roleIds: roleIds?.length ? roleIds : undefined,
-            },
-            { accountId },
-          )
-        : await uploadEmojiDiscord({
-            guildId,
-            name,
-            mediaUrl,
-            roleIds: roleIds?.length ? roleIds : undefined,
-          });
+      const emoji = await uploadEmojiDiscord({
+        guildId,
+        name,
+        mediaUrl,
+        roleIds: roleIds?.length ? roleIds : undefined,
+      });
      return jsonResult({ ok: true, emoji });
    }
    case "stickerUpload": {
@@ -125,24 +108,13 @@ export async function handleDiscordGuildAction(
      const mediaUrl = readStringParam(params, "mediaUrl", {
        required: true,
      });
-      const sticker = accountId
-        ? await uploadStickerDiscord(
-            {
-              guildId,
-              name,
-              description,
-              tags,
-              mediaUrl,
-            },
-            { accountId },
-          )
-        : await uploadStickerDiscord({
-            guildId,
-            name,
-            description,
-            tags,
-            mediaUrl,
-          });
+      const sticker = await uploadStickerDiscord({
+        guildId,
+        name,
+        description,
+        tags,
+        mediaUrl,
+      });
      return jsonResult({ ok: true, sticker });
    }
    case "roleAdd": {
@@ -156,11 +128,7 @@ export async function handleDiscordGuildAction(
        required: true,
      });
      const roleId = readStringParam(params, "roleId", { required: true });
-      if (accountId) {
-        await addRoleDiscord({ guildId, userId, roleId }, { accountId });
-      } else {
-        await addRoleDiscord({ guildId, userId, roleId });
-      }
+      await addRoleDiscord({ guildId, userId, roleId });
      return jsonResult({ ok: true });
    }
    case "roleRemove": {
@@ -174,11 +142,7 @@ export async function handleDiscordGuildAction(
        required: true,
      });
      const roleId = readStringParam(params, "roleId", { required: true });
-      if (accountId) {
-        await removeRoleDiscord({ guildId, userId, roleId }, { accountId });
-      } else {
-        await removeRoleDiscord({ guildId, userId, roleId });
-      }
+      await removeRoleDiscord({ guildId, userId, roleId });
      return jsonResult({ ok: true });
    }
    case "channelInfo": {
@@ -188,9 +152,7 @@ export async function handleDiscordGuildAction(
      const channelId = readStringParam(params, "channelId", {
        required: true,
      });
-      const channel = accountId
-        ? await fetchChannelInfoDiscord(channelId, { accountId })
-        : await fetchChannelInfoDiscord(channelId);
+      const channel = await fetchChannelInfoDiscord(channelId);
      return jsonResult({ ok: true, channel });
    }
    case "channelList": {
@@ -200,9 +162,7 @@ export async function handleDiscordGuildAction(
      const guildId = readStringParam(params, "guildId", {
        required: true,
      });
-      const channels = accountId
-        ? await listGuildChannelsDiscord(guildId, { accountId })
-        : await listGuildChannelsDiscord(guildId);
+      const channels = await listGuildChannelsDiscord(guildId);
      return jsonResult({ ok: true, channels });
    }
    case "voiceStatus": {
@@ -215,9 +175,7 @@ export async function handleDiscordGuildAction(
      const userId = readStringParam(params, "userId", {
        required: true,
      });
-      const voice = accountId
-        ? await fetchVoiceStatusDiscord(guildId, userId, { accountId })
-        : await fetchVoiceStatusDiscord(guildId, userId);
+      const voice = await fetchVoiceStatusDiscord(guildId, userId);
      return jsonResult({ ok: true, voice });
    }
    case "eventList": {
@@ -227,9 +185,7 @@ export async function handleDiscordGuildAction(
      const guildId = readStringParam(params, "guildId", {
        required: true,
      });
-      const events = accountId
-        ? await listScheduledEventsDiscord(guildId, { accountId })
-        : await listScheduledEventsDiscord(guildId);
+      const events = await listScheduledEventsDiscord(guildId);
      return jsonResult({ ok: true, events });
    }
    case "eventCreate": {
@@ -259,9 +215,7 @@ export async function handleDiscordGuildAction(
        entity_metadata: entityType === 3 && location ? { location } : undefined,
        privacy_level: 2,
      };
-      const event = accountId
-        ? await createScheduledEventDiscord(guildId, payload, { accountId })
-        : await createScheduledEventDiscord(guildId, payload);
+      const event = await createScheduledEventDiscord(guildId, payload);
      return jsonResult({ ok: true, event });
    }
    case "channelCreate": {
@@ -275,28 +229,15 @@ export async function handleDiscordGuildAction(
      const topic = readStringParam(params, "topic");
      const position = readNumberParam(params, "position", { integer: true });
      const nsfw = params.nsfw as boolean | undefined;
-      const channel = accountId
-        ? await createChannelDiscord(
-            {
-              guildId,
-              name,
-              type: type ?? undefined,
-              parentId: parentId ?? undefined,
-              topic: topic ?? undefined,
-              position: position ?? undefined,
-              nsfw,
-            },
-            { accountId },
-          )
-        : await createChannelDiscord({
-            guildId,
-            name,
-            type: type ?? undefined,
-            parentId: parentId ?? undefined,
-            topic: topic ?? undefined,
-            position: position ?? undefined,
-            nsfw,
-          });
+      const channel = await createChannelDiscord({
+        guildId,
+        name,
+        type: type ?? undefined,
+        parentId: parentId ?? undefined,
+        topic: topic ?? undefined,
+        position: position ?? undefined,
+        nsfw,
+      });
      return jsonResult({ ok: true, channel });
    }
    case "channelEdit": {
@@ -314,28 +255,15 @@ export async function handleDiscordGuildAction(
      const rateLimitPerUser = readNumberParam(params, "rateLimitPerUser", {
        integer: true,
      });
-      const channel = accountId
-        ? await editChannelDiscord(
-            {
-              channelId,
-              name: name ?? undefined,
-              topic: topic ?? undefined,
-              position: position ?? undefined,
-              parentId,
-              nsfw,
-              rateLimitPerUser: rateLimitPerUser ?? undefined,
-            },
-            { accountId },
-          )
-        : await editChannelDiscord({
-            channelId,
-            name: name ?? undefined,
-            topic: topic ?? undefined,
-            position: position ?? undefined,
-            parentId,
-            nsfw,
-            rateLimitPerUser: rateLimitPerUser ?? undefined,
-          });
+      const channel = await editChannelDiscord({
+        channelId,
+        name: name ?? undefined,
+        topic: topic ?? undefined,
+        position: position ?? undefined,
+        parentId,
+        nsfw,
+        rateLimitPerUser: rateLimitPerUser ?? undefined,
+      });
      return jsonResult({ ok: true, channel });
    }
    case "channelDelete": {
@@ -345,9 +273,7 @@ export async function handleDiscordGuildAction(
      const channelId = readStringParam(params, "channelId", {
        required: true,
      });
-      const result = accountId
-        ? await deleteChannelDiscord(channelId, { accountId })
-        : await deleteChannelDiscord(channelId);
+      const result = await deleteChannelDiscord(channelId);
      return jsonResult(result);
    }
    case "channelMove": {
@@ -360,24 +286,12 @@ export async function handleDiscordGuildAction(
      });
      const parentId = readParentIdParam(params);
      const position = readNumberParam(params, "position", { integer: true });
-      if (accountId) {
-        await moveChannelDiscord(
-          {
-            guildId,
-            channelId,
-            parentId,
-            position: position ?? undefined,
-          },
-          { accountId },
-        );
-      } else {
-        await moveChannelDiscord({
-          guildId,
-          channelId,
-          parentId,
-          position: position ?? undefined,
-        });
-      }
+      await moveChannelDiscord({
+        guildId,
+        channelId,
+        parentId,
+        position: position ?? undefined,
+      });
      return jsonResult({ ok: true });
    }
    case "categoryCreate": {
@@ -387,22 +301,12 @@ export async function handleDiscordGuildAction(
      const guildId = readStringParam(params, "guildId", { required: true });
      const name = readStringParam(params, "name", { required: true });
      const position = readNumberParam(params, "position", { integer: true });
-      const channel = accountId
-        ? await createChannelDiscord(
-            {
-              guildId,
-              name,
-              type: 4,
-              position: position ?? undefined,
-            },
-            { accountId },
-          )
-        : await createChannelDiscord({
-            guildId,
-            name,
-            type: 4,
-            position: position ?? undefined,
-          });
+      const channel = await createChannelDiscord({
+        guildId,
+        name,
+        type: 4,
+        position: position ?? undefined,
+      });
      return jsonResult({ ok: true, category: channel });
    }
    case "categoryEdit": {
@@ -414,20 +318,11 @@ export async function handleDiscordGuildAction(
      });
      const name = readStringParam(params, "name");
      const position = readNumberParam(params, "position", { integer: true });
-      const channel = accountId
-        ? await editChannelDiscord(
-            {
-              channelId: categoryId,
-              name: name ?? undefined,
-              position: position ?? undefined,
-            },
-            { accountId },
-          )
-        : await editChannelDiscord({
-            channelId: categoryId,
-            name: name ?? undefined,
-            position: position ?? undefined,
-          });
+      const channel = await editChannelDiscord({
+        channelId: categoryId,
+        name: name ?? undefined,
+        position: position ?? undefined,
+      });
      return jsonResult({ ok: true, category: channel });
    }
    case "categoryDelete": {
@@ -437,9 +332,7 @@ export async function handleDiscordGuildAction(
      const categoryId = readStringParam(params, "categoryId", {
        required: true,
      });
-      const result = accountId
-        ? await deleteChannelDiscord(categoryId, { accountId })
-        : await deleteChannelDiscord(categoryId);
+      const result = await deleteChannelDiscord(categoryId);
      return jsonResult(result);
    }
    case "channelPermissionSet": {
@@ -456,26 +349,13 @@ export async function handleDiscordGuildAction(
      const targetType = targetTypeRaw === "member" ? 1 : 0;
      const allow = readStringParam(params, "allow");
      const deny = readStringParam(params, "deny");
-      if (accountId) {
-        await setChannelPermissionDiscord(
-          {
-            channelId,
-            targetId,
-            targetType,
-            allow: allow ?? undefined,
-            deny: deny ?? undefined,
-          },
-          { accountId },
-        );
-      } else {
-        await setChannelPermissionDiscord({
-          channelId,
-          targetId,
-          targetType,
-          allow: allow ?? undefined,
-          deny: deny ?? undefined,
-        });
-      }
+      await setChannelPermissionDiscord({
+        channelId,
+        targetId,
+        targetType,
+        allow: allow ?? undefined,
+        deny: deny ?? undefined,
+      });
      return jsonResult({ ok: true });
    }
    case "channelPermissionRemove": {
@@ -486,11 +366,7 @@ export async function handleDiscordGuildAction(
        required: true,
      });
      const targetId = readStringParam(params, "targetId", { required: true });
-      if (accountId) {
-        await removeChannelPermissionDiscord(channelId, targetId, { accountId });
-      } else {
-        await removeChannelPermissionDiscord(channelId, targetId);
-      }
+      await removeChannelPermissionDiscord(channelId, targetId);
      return jsonResult({ ok: true });
    }
    default:
@@ -58,7 +58,6 @@ export async function handleDiscordMessagingAction(
        required: true,
      }),
    );
-  const accountId = readStringParam(params, "accountId");
  const normalizeMessage = (message: unknown) => {
    if (!message || typeof message !== "object") return message;
    return withNormalizedTimestamp(
@@ -79,24 +78,14 @@ export async function handleDiscordMessagingAction(
        removeErrorMessage: "Emoji is required to remove a Discord reaction.",
      });
      if (remove) {
-        if (accountId) {
-          await removeReactionDiscord(channelId, messageId, emoji, { accountId });
-        } else {
-          await removeReactionDiscord(channelId, messageId, emoji);
-        }
+        await removeReactionDiscord(channelId, messageId, emoji);
        return jsonResult({ ok: true, removed: emoji });
      }
      if (isEmpty) {
-        const removed = accountId
-          ? await removeOwnReactionsDiscord(channelId, messageId, { accountId })
-          : await removeOwnReactionsDiscord(channelId, messageId);
+        const removed = await removeOwnReactionsDiscord(channelId, messageId);
        return jsonResult({ ok: true, removed: removed.removed });
      }
-      if (accountId) {
-        await reactMessageDiscord(channelId, messageId, emoji, { accountId });
-      } else {
-        await reactMessageDiscord(channelId, messageId, emoji);
-      }
+      await reactMessageDiscord(channelId, messageId, emoji);
      return jsonResult({ ok: true, added: emoji });
    }
    case "reactions": {
@@ -111,7 +100,6 @@ export async function handleDiscordMessagingAction(
      const limit =
        typeof limitRaw === "number" && Number.isFinite(limitRaw) ? limitRaw : undefined;
      const reactions = await fetchReactionsDiscord(channelId, messageId, {
-        ...(accountId ? { accountId } : {}),
        limit,
      });
      return jsonResult({ ok: true, reactions });
@@ -126,10 +114,7 @@ export async function handleDiscordMessagingAction(
        required: true,
        label: "stickerIds",
      });
-      await sendStickerDiscord(to, stickerIds, {
-        ...(accountId ? { accountId } : {}),
-        content,
-      });
+      await sendStickerDiscord(to, stickerIds, { content });
      return jsonResult({ ok: true });
    }
    case "poll": {
@@ -155,7 +140,7 @@ export async function handleDiscordMessagingAction(
      await sendPollDiscord(
        to,
        { question, options: answers, maxSelections, durationHours },
-        { ...(accountId ? { accountId } : {}), content },
+        { content },
      );
      return jsonResult({ ok: true });
    }
@@ -164,9 +149,7 @@ export async function handleDiscordMessagingAction(
        throw new Error("Discord permissions are disabled.");
      }
      const channelId = resolveChannelId();
-      const permissions = accountId
-        ? await fetchChannelPermissionsDiscord(channelId, { accountId })
-        : await fetchChannelPermissionsDiscord(channelId);
+      const permissions = await fetchChannelPermissionsDiscord(channelId);
      return jsonResult({ ok: true, permissions });
    }
    case "fetchMessage": {
@@ -188,9 +171,7 @@ export async function handleDiscordMessagingAction(
          "Discord message fetch requires guildId, channelId, and messageId (or a valid messageLink).",
        );
      }
-      const message = accountId
-        ? await fetchMessageDiscord(channelId, messageId, { accountId })
-        : await fetchMessageDiscord(channelId, messageId);
+      const message = await fetchMessageDiscord(channelId, messageId);
      return jsonResult({
        ok: true,
        message: normalizeMessage(message),
@@ -204,7 +185,7 @@ export async function handleDiscordMessagingAction(
        throw new Error("Discord message reads are disabled.");
      }
      const channelId = resolveChannelId();
-      const query = {
+      const messages = await readMessagesDiscord(channelId, {
        limit:
          typeof params.limit === "number" && Number.isFinite(params.limit)
            ? params.limit
@@ -212,10 +193,7 @@ export async function handleDiscordMessagingAction(
        before: readStringParam(params, "before"),
        after: readStringParam(params, "after"),
        around: readStringParam(params, "around"),
-      };
-      const messages = accountId
-        ? await readMessagesDiscord(channelId, query, { accountId })
-        : await readMessagesDiscord(channelId, query);
+      });
      return jsonResult({
        ok: true,
        messages: messages.map((message) => normalizeMessage(message)),
@@ -234,7 +212,6 @@ export async function handleDiscordMessagingAction(
      const embeds =
        Array.isArray(params.embeds) && params.embeds.length > 0 ? params.embeds : undefined;
      const result = await sendMessageDiscord(to, content, {
-        ...(accountId ? { accountId } : {}),
        mediaUrl,
        replyTo,
        embeds,
@@ -252,9 +229,9 @@ export async function handleDiscordMessagingAction(
      const content = readStringParam(params, "content", {
        required: true,
      });
-      const message = accountId
-        ? await editMessageDiscord(channelId, messageId, { content }, { accountId })
-        : await editMessageDiscord(channelId, messageId, { content });
+      const message = await editMessageDiscord(channelId, messageId, {
+        content,
+      });
      return jsonResult({ ok: true, message });
    }
    case "deleteMessage": {
@@ -265,11 +242,7 @@ export async function handleDiscordMessagingAction(
      const messageId = readStringParam(params, "messageId", {
        required: true,
      });
-      if (accountId) {
-        await deleteMessageDiscord(channelId, messageId, { accountId });
-      } else {
-        await deleteMessageDiscord(channelId, messageId);
-      }
+      await deleteMessageDiscord(channelId, messageId);
      return jsonResult({ ok: true });
    }
    case "threadCreate": {
@@ -284,13 +257,11 @@ export async function handleDiscordMessagingAction(
        typeof autoArchiveMinutesRaw === "number" && Number.isFinite(autoArchiveMinutesRaw)
          ? autoArchiveMinutesRaw
          : undefined;
-      const thread = accountId
-        ? await createThreadDiscord(
-            channelId,
-            { name, messageId, autoArchiveMinutes },
-            { accountId },
-          )
-        : await createThreadDiscord(channelId, { name, messageId, autoArchiveMinutes });
+      const thread = await createThreadDiscord(channelId, {
+        name,
+        messageId,
+        autoArchiveMinutes,
+      });
      return jsonResult({ ok: true, thread });
    }
    case "threadList": {
@@ -308,24 +279,13 @@ export async function handleDiscordMessagingAction(
        typeof params.limit === "number" && Number.isFinite(params.limit)
          ? params.limit
          : undefined;
-      const threads = accountId
-        ? await listThreadsDiscord(
-            {
-              guildId,
-              channelId,
-              includeArchived,
-              before,
-              limit,
-            },
-            { accountId },
-          )
-        : await listThreadsDiscord({
-            guildId,
-            channelId,
-            includeArchived,
-            before,
-            limit,
-          });
+      const threads = await listThreadsDiscord({
+        guildId,
+        channelId,
+        includeArchived,
+        before,
+        limit,
+      });
      return jsonResult({ ok: true, threads });
    }
    case "threadReply": {
@@ -339,7 +299,6 @@ export async function handleDiscordMessagingAction(
      const mediaUrl = readStringParam(params, "mediaUrl");
      const replyTo = readStringParam(params, "replyTo");
      const result = await sendMessageDiscord(`channel:${channelId}`, content, {
-        ...(accountId ? { accountId } : {}),
        mediaUrl,
        replyTo,
      });
@@ -353,11 +312,7 @@ export async function handleDiscordMessagingAction(
      const messageId = readStringParam(params, "messageId", {
        required: true,
      });
-      if (accountId) {
-        await pinMessageDiscord(channelId, messageId, { accountId });
-      } else {
-        await pinMessageDiscord(channelId, messageId);
-      }
+      await pinMessageDiscord(channelId, messageId);
      return jsonResult({ ok: true });
    }
    case "unpinMessage": {
@@ -368,11 +323,7 @@ export async function handleDiscordMessagingAction(
      const messageId = readStringParam(params, "messageId", {
        required: true,
      });
-      if (accountId) {
-        await unpinMessageDiscord(channelId, messageId, { accountId });
-      } else {
-        await unpinMessageDiscord(channelId, messageId);
-      }
+      await unpinMessageDiscord(channelId, messageId);
      return jsonResult({ ok: true });
    }
    case "listPins": {
@@ -380,9 +331,7 @@ export async function handleDiscordMessagingAction(
        throw new Error("Discord pins are disabled.");
      }
      const channelId = resolveChannelId();
-      const pins = accountId
-        ? await listPinsDiscord(channelId, { accountId })
-        : await listPinsDiscord(channelId);
+      const pins = await listPinsDiscord(channelId);
      return jsonResult({ ok: true, pins: pins.map((pin) => normalizeMessage(pin)) });
    }
    case "searchMessages": {
@@ -405,24 +354,13 @@ export async function handleDiscordMessagingAction(
          : undefined;
      const channelIdList = [...(channelIds ?? []), ...(channelId ? [channelId] : [])];
      const authorIdList = [...(authorIds ?? []), ...(authorId ? [authorId] : [])];
-      const results = accountId
-        ? await searchMessagesDiscord(
-            {
-              guildId,
-              content,
-              channelIds: channelIdList.length ? channelIdList : undefined,
-              authorIds: authorIdList.length ? authorIdList : undefined,
-              limit,
-            },
-            { accountId },
-          )
-        : await searchMessagesDiscord({
-            guildId,
-            content,
-            channelIds: channelIdList.length ? channelIdList : undefined,
-            authorIds: authorIdList.length ? authorIdList : undefined,
-            limit,
-          });
+      const results = await searchMessagesDiscord({
+        guildId,
+        content,
+        channelIds: channelIdList.length ? channelIdList : undefined,
+        authorIds: authorIdList.length ? authorIdList : undefined,
+        limit,
+      });
      if (!results || typeof results !== "object") {
        return jsonResult({ ok: true, results });
      }
@@ -8,7 +8,6 @@ export async function handleDiscordModerationAction(
  params: Record<string, unknown>,
  isActionEnabled: ActionGate<DiscordActionConfig>,
 ): Promise<AgentToolResult<unknown>> {
-  const accountId = readStringParam(params, "accountId");
  switch (action) {
    case "timeout": {
      if (!isActionEnabled("moderation", false)) {
@@ -26,24 +25,13 @@ export async function handleDiscordModerationAction(
          : undefined;
      const until = readStringParam(params, "until");
      const reason = readStringParam(params, "reason");
-      const member = accountId
-        ? await timeoutMemberDiscord(
-            {
-              guildId,
-              userId,
-              durationMinutes,
-              until,
-              reason,
-            },
-            { accountId },
-          )
-        : await timeoutMemberDiscord({
-            guildId,
-            userId,
-            durationMinutes,
-            until,
-            reason,
-          });
+      const member = await timeoutMemberDiscord({
+        guildId,
+        userId,
+        durationMinutes,
+        until,
+        reason,
+      });
      return jsonResult({ ok: true, member });
    }
    case "kick": {
@@ -57,11 +45,7 @@ export async function handleDiscordModerationAction(
        required: true,
      });
      const reason = readStringParam(params, "reason");
-      if (accountId) {
-        await kickMemberDiscord({ guildId, userId, reason }, { accountId });
-      } else {
-        await kickMemberDiscord({ guildId, userId, reason });
-      }
+      await kickMemberDiscord({ guildId, userId, reason });
      return jsonResult({ ok: true });
    }
    case "ban": {
@@ -79,24 +63,12 @@ export async function handleDiscordModerationAction(
        typeof params.deleteMessageDays === "number" && Number.isFinite(params.deleteMessageDays)
          ? params.deleteMessageDays
          : undefined;
-      if (accountId) {
-        await banMemberDiscord(
-          {
-            guildId,
-            userId,
-            reason,
-            deleteMessageDays,
-          },
-          { accountId },
-        );
-      } else {
-        await banMemberDiscord({
-          guildId,
-          userId,
-          reason,
-          deleteMessageDays,
-        });
-      }
+      await banMemberDiscord({
+        guildId,
+        userId,
+        reason,
+        deleteMessageDays,
+      });
      return jsonResult({ ok: true });
    }
    default:
@@ -3,7 +3,6 @@ import { describe, expect, it, vi } from "vitest";
 import type { DiscordActionConfig } from "../../config/config.js";
 import { handleDiscordGuildAction } from "./discord-actions-guild.js";
 import { handleDiscordMessagingAction } from "./discord-actions-messaging.js";
-import { handleDiscordModerationAction } from "./discord-actions-moderation.js";

 const createChannelDiscord = vi.fn(async () => ({
  id: "new-channel",
@@ -21,7 +20,6 @@ const editMessageDiscord = vi.fn(async () => ({}));
 const fetchMessageDiscord = vi.fn(async () => ({}));
 const fetchChannelPermissionsDiscord = vi.fn(async () => ({}));
 const fetchReactionsDiscord = vi.fn(async () => ({}));
-const listGuildChannelsDiscord = vi.fn(async () => []);
 const listPinsDiscord = vi.fn(async () => ({}));
 const listThreadsDiscord = vi.fn(async () => ({}));
 const moveChannelDiscord = vi.fn(async () => ({ ok: true }));
@@ -37,12 +35,8 @@ const sendPollDiscord = vi.fn(async () => ({}));
 const sendStickerDiscord = vi.fn(async () => ({}));
 const setChannelPermissionDiscord = vi.fn(async () => ({ ok: true }));
 const unpinMessageDiscord = vi.fn(async () => ({}));
-const timeoutMemberDiscord = vi.fn(async () => ({}));
-const kickMemberDiscord = vi.fn(async () => ({}));
-const banMemberDiscord = vi.fn(async () => ({}));

 vi.mock("../../discord/send.js", () => ({
-  banMemberDiscord: (...args: unknown[]) => banMemberDiscord(...args),
  createChannelDiscord: (...args: unknown[]) => createChannelDiscord(...args),
  createThreadDiscord: (...args: unknown[]) => createThreadDiscord(...args),
  deleteChannelDiscord: (...args: unknown[]) => deleteChannelDiscord(...args),
@@ -52,8 +46,6 @@ vi.mock("../../discord/send.js", () => ({
  fetchMessageDiscord: (...args: unknown[]) => fetchMessageDiscord(...args),
  fetchChannelPermissionsDiscord: (...args: unknown[]) => fetchChannelPermissionsDiscord(...args),
  fetchReactionsDiscord: (...args: unknown[]) => fetchReactionsDiscord(...args),
-  kickMemberDiscord: (...args: unknown[]) => kickMemberDiscord(...args),
-  listGuildChannelsDiscord: (...args: unknown[]) => listGuildChannelsDiscord(...args),
  listPinsDiscord: (...args: unknown[]) => listPinsDiscord(...args),
  listThreadsDiscord: (...args: unknown[]) => listThreadsDiscord(...args),
  moveChannelDiscord: (...args: unknown[]) => moveChannelDiscord(...args),
@@ -68,15 +60,12 @@ vi.mock("../../discord/send.js", () => ({
  sendPollDiscord: (...args: unknown[]) => sendPollDiscord(...args),
  sendStickerDiscord: (...args: unknown[]) => sendStickerDiscord(...args),
  setChannelPermissionDiscord: (...args: unknown[]) => setChannelPermissionDiscord(...args),
-  timeoutMemberDiscord: (...args: unknown[]) => timeoutMemberDiscord(...args),
  unpinMessageDiscord: (...args: unknown[]) => unpinMessageDiscord(...args),
 }));

 const enableAllActions = () => true;

 const disabledActions = (key: keyof DiscordActionConfig) => key !== "reactions";
-const channelInfoEnabled = (key: keyof DiscordActionConfig) => key === "channelInfo";
-const moderationEnabled = (key: keyof DiscordActionConfig) => key === "moderation";

 describe("handleDiscordMessagingAction", () => {
  it("adds reactions", async () => {
@@ -92,20 +81,6 @@ describe("handleDiscordMessagingAction", () => {
    expect(reactMessageDiscord).toHaveBeenCalledWith("C1", "M1", "✅");
  });

-  it("forwards accountId for reactions", async () => {
-    await handleDiscordMessagingAction(
-      "react",
-      {
-        channelId: "C1",
-        messageId: "M1",
-        emoji: "✅",
-        accountId: "ops",
-      },
-      enableAllActions,
-    );
-    expect(reactMessageDiscord).toHaveBeenCalledWith("C1", "M1", "✅", { accountId: "ops" });
-  });
-
  it("removes reactions on empty emoji", async () => {
    await handleDiscordMessagingAction(
      "react",
@@ -270,15 +245,6 @@ describe("handleDiscordGuildAction - channel management", () => {
    ).rejects.toThrow(/Discord channel management is disabled/);
  });

-  it("forwards accountId for channelList", async () => {
-    await handleDiscordGuildAction(
-      "channelList",
-      { guildId: "G1", accountId: "ops" },
-      channelInfoEnabled,
-    );
-    expect(listGuildChannelsDiscord).toHaveBeenCalledWith("G1", { accountId: "ops" });
-  });
-
  it("edits a channel", async () => {
    await handleDiscordGuildAction(
      "channelEdit",
@@ -482,26 +448,3 @@ describe("handleDiscordGuildAction - channel management", () => {
    expect(removeChannelPermissionDiscord).toHaveBeenCalledWith("C1", "R1");
  });
 });
-
-describe("handleDiscordModerationAction", () => {
-  it("forwards accountId for timeout", async () => {
-    await handleDiscordModerationAction(
-      "timeout",
-      {
-        guildId: "G1",
-        userId: "U1",
-        durationMinutes: 5,
-        accountId: "ops",
-      },
-      moderationEnabled,
-    );
-    expect(timeoutMemberDiscord).toHaveBeenCalledWith(
-      expect.objectContaining({
-        guildId: "G1",
-        userId: "U1",
-        durationMinutes: 5,
-      }),
-      { accountId: "ops" },
-    );
-  });
-});
@@ -342,9 +342,6 @@ export function createMessageTool(options?: MessageToolOptions): AnyAgentTool {
      }) as ChannelMessageActionName;

      const accountId = readStringParam(params, "accountId") ?? agentAccountId;
-      if (accountId) {
-        params.accountId = accountId;
-      }

      const gateway = {
        url: readStringParam(params, "gatewayUrl", { trim: false }),
@@ -1,41 +1,11 @@
-import { describe, expect, it, vi } from "vitest";
+import { describe, expect, it } from "vitest";

 import type { ClawdbotConfig } from "../../../config/config.js";
-type SendMessageDiscord = typeof import("../../../discord/send.js").sendMessageDiscord;
-type SendPollDiscord = typeof import("../../../discord/send.js").sendPollDiscord;
-
-const sendMessageDiscord = vi.fn<Parameters<SendMessageDiscord>, ReturnType<SendMessageDiscord>>(
-  async () => ({ ok: true }) as Awaited<ReturnType<SendMessageDiscord>>,
-);
-const sendPollDiscord = vi.fn<Parameters<SendPollDiscord>, ReturnType<SendPollDiscord>>(
-  async () => ({ ok: true }) as Awaited<ReturnType<SendPollDiscord>>,
-);
-
-vi.mock("../../../discord/send.js", async () => {
-  const actual = await vi.importActual<typeof import("../../../discord/send.js")>(
-    "../../../discord/send.js",
-  );
-  return {
-    ...actual,
-    sendMessageDiscord: (...args: Parameters<SendMessageDiscord>) => sendMessageDiscord(...args),
-    sendPollDiscord: (...args: Parameters<SendPollDiscord>) => sendPollDiscord(...args),
-  };
-});
-
-const loadHandleDiscordMessageAction = async () => {
-  const mod = await import("./discord/handle-action.js");
-  return mod.handleDiscordMessageAction;
-};
-
-const loadDiscordMessageActions = async () => {
-  const mod = await import("./discord.js");
-  return mod.discordMessageActions;
-};
+import { discordMessageActions } from "./discord.js";

 describe("discord message actions", () => {
-  it("lists channel and upload actions by default", async () => {
+  it("lists channel and upload actions by default", () => {
    const cfg = { channels: { discord: { token: "d0" } } } as ClawdbotConfig;
-    const discordMessageActions = await loadDiscordMessageActions();
    const actions = discordMessageActions.listActions?.({ cfg }) ?? [];

    expect(actions).toContain("emoji-upload");
@@ -43,88 +13,12 @@ describe("discord message actions", () => {
    expect(actions).toContain("channel-create");
  });

-  it("respects disabled channel actions", async () => {
+  it("respects disabled channel actions", () => {
    const cfg = {
      channels: { discord: { token: "d0", actions: { channels: false } } },
    } as ClawdbotConfig;
-    const discordMessageActions = await loadDiscordMessageActions();
    const actions = discordMessageActions.listActions?.({ cfg }) ?? [];

    expect(actions).not.toContain("channel-create");
  });
 });
-
-describe("handleDiscordMessageAction", () => {
-  it("forwards context accountId for send", async () => {
-    sendMessageDiscord.mockClear();
-    const handleDiscordMessageAction = await loadHandleDiscordMessageAction();
-
-    await handleDiscordMessageAction({
-      action: "send",
-      params: {
-        to: "channel:123",
-        message: "hi",
-      },
-      cfg: {} as ClawdbotConfig,
-      accountId: "ops",
-    });
-
-    expect(sendMessageDiscord).toHaveBeenCalledWith(
-      "channel:123",
-      "hi",
-      expect.objectContaining({
-        accountId: "ops",
-      }),
-    );
-  });
-
-  it("falls back to params accountId when context missing", async () => {
-    sendPollDiscord.mockClear();
-    const handleDiscordMessageAction = await loadHandleDiscordMessageAction();
-
-    await handleDiscordMessageAction({
-      action: "poll",
-      params: {
-        to: "channel:123",
-        pollQuestion: "Ready?",
-        pollOption: ["Yes", "No"],
-        accountId: "marve",
-      },
-      cfg: {} as ClawdbotConfig,
-    });
-
-    expect(sendPollDiscord).toHaveBeenCalledWith(
-      "channel:123",
-      expect.objectContaining({
-        question: "Ready?",
-        options: ["Yes", "No"],
-      }),
-      expect.objectContaining({
-        accountId: "marve",
-      }),
-    );
-  });
-
-  it("forwards accountId for thread replies", async () => {
-    sendMessageDiscord.mockClear();
-    const handleDiscordMessageAction = await loadHandleDiscordMessageAction();
-
-    await handleDiscordMessageAction({
-      action: "thread-reply",
-      params: {
-        channelId: "123",
-        message: "hi",
-      },
-      cfg: {} as ClawdbotConfig,
-      accountId: "ops",
-    });
-
-    expect(sendMessageDiscord).toHaveBeenCalledWith(
-      "channel:123",
-      "hi",
-      expect.objectContaining({
-        accountId: "ops",
-      }),
-    );
-  });
-});
@@ -80,7 +80,7 @@ export const discordMessageActions: ChannelMessageActionAdapter = {
    }
    return null;
  },
-  handleAction: async ({ action, params, cfg, accountId }) => {
-    return await handleDiscordMessageAction({ action, params, cfg, accountId });
+  handleAction: async ({ action, params, cfg }) => {
+    return await handleDiscordMessageAction({ action, params, cfg });
  },
 };
@@ -7,7 +7,7 @@ import {
 import { handleDiscordAction } from "../../../../agents/tools/discord-actions.js";
 import type { ChannelMessageActionContext } from "../../types.js";

-type Ctx = Pick<ChannelMessageActionContext, "action" | "params" | "cfg" | "accountId">;
+type Ctx = Pick<ChannelMessageActionContext, "action" | "params" | "cfg">;

 export async function tryHandleDiscordMessageActionGuildAdmin(params: {
  ctx: Ctx;
@@ -16,37 +16,27 @@ export async function tryHandleDiscordMessageActionGuildAdmin(params: {
 }): Promise<AgentToolResult<unknown> | undefined> {
  const { ctx, resolveChannelId, readParentIdParam } = params;
  const { action, params: actionParams, cfg } = ctx;
-  const accountId = ctx.accountId ?? readStringParam(actionParams, "accountId");

  if (action === "member-info") {
    const userId = readStringParam(actionParams, "userId", { required: true });
    const guildId = readStringParam(actionParams, "guildId", {
      required: true,
    });
-    return await handleDiscordAction(
-      { action: "memberInfo", accountId: accountId ?? undefined, guildId, userId },
-      cfg,
-    );
+    return await handleDiscordAction({ action: "memberInfo", guildId, userId }, cfg);
  }

  if (action === "role-info") {
    const guildId = readStringParam(actionParams, "guildId", {
      required: true,
    });
-    return await handleDiscordAction(
-      { action: "roleInfo", accountId: accountId ?? undefined, guildId },
-      cfg,
-    );
+    return await handleDiscordAction({ action: "roleInfo", guildId }, cfg);
  }

  if (action === "emoji-list") {
    const guildId = readStringParam(actionParams, "guildId", {
      required: true,
    });
-    return await handleDiscordAction(
-      { action: "emojiList", accountId: accountId ?? undefined, guildId },
-      cfg,
-    );
+    return await handleDiscordAction({ action: "emojiList", guildId }, cfg);
  }

  if (action === "emoji-upload") {
@@ -60,14 +50,7 @@ export async function tryHandleDiscordMessageActionGuildAdmin(params: {
    });
    const roleIds = readStringArrayParam(actionParams, "roleIds");
    return await handleDiscordAction(
-      {
-        action: "emojiUpload",
-        accountId: accountId ?? undefined,
-        guildId,
-        name,
-        mediaUrl,
-        roleIds,
-      },
+      { action: "emojiUpload", guildId, name, mediaUrl, roleIds },
      cfg,
    );
  }
@@ -90,15 +73,7 @@ export async function tryHandleDiscordMessageActionGuildAdmin(params: {
      trim: false,
    });
    return await handleDiscordAction(
-      {
-        action: "stickerUpload",
-        accountId: accountId ?? undefined,
-        guildId,
-        name,
-        description,
-        tags,
-        mediaUrl,
-      },
+      { action: "stickerUpload", guildId, name, description, tags, mediaUrl },
      cfg,
    );
  }
@@ -112,7 +87,6 @@ export async function tryHandleDiscordMessageActionGuildAdmin(params: {
    return await handleDiscordAction(
      {
        action: action === "role-add" ? "roleAdd" : "roleRemove",
-        accountId: accountId ?? undefined,
        guildId,
        userId,
        roleId,
@@ -125,20 +99,14 @@ export async function tryHandleDiscordMessageActionGuildAdmin(params: {
    const channelId = readStringParam(actionParams, "channelId", {
      required: true,
    });
-    return await handleDiscordAction(
-      { action: "channelInfo", accountId: accountId ?? undefined, channelId },
-      cfg,
-    );
+    return await handleDiscordAction({ action: "channelInfo", channelId }, cfg);
  }

  if (action === "channel-list") {
    const guildId = readStringParam(actionParams, "guildId", {
      required: true,
    });
-    return await handleDiscordAction(
-      { action: "channelList", accountId: accountId ?? undefined, guildId },
-      cfg,
-    );
+    return await handleDiscordAction({ action: "channelList", guildId }, cfg);
  }

  if (action === "channel-create") {
@@ -156,7 +124,6 @@ export async function tryHandleDiscordMessageActionGuildAdmin(params: {
    return await handleDiscordAction(
      {
        action: "channelCreate",
-        accountId: accountId ?? undefined,
        guildId,
        name,
        type: type ?? undefined,
@@ -186,7 +153,6 @@ export async function tryHandleDiscordMessageActionGuildAdmin(params: {
    return await handleDiscordAction(
      {
        action: "channelEdit",
-        accountId: accountId ?? undefined,
        channelId,
        name: name ?? undefined,
        topic: topic ?? undefined,
@@ -203,10 +169,7 @@ export async function tryHandleDiscordMessageActionGuildAdmin(params: {
    const channelId = readStringParam(actionParams, "channelId", {
      required: true,
    });
-    return await handleDiscordAction(
-      { action: "channelDelete", accountId: accountId ?? undefined, channelId },
-      cfg,
-    );
+    return await handleDiscordAction({ action: "channelDelete", channelId }, cfg);
  }

  if (action === "channel-move") {
@@ -223,7 +186,6 @@ export async function tryHandleDiscordMessageActionGuildAdmin(params: {
    return await handleDiscordAction(
      {
        action: "channelMove",
-        accountId: accountId ?? undefined,
        guildId,
        channelId,
        parentId: parentId === undefined ? undefined : parentId,
@@ -244,7 +206,6 @@ export async function tryHandleDiscordMessageActionGuildAdmin(params: {
    return await handleDiscordAction(
      {
        action: "categoryCreate",
-        accountId: accountId ?? undefined,
        guildId,
        name,
        position: position ?? undefined,
@@ -264,7 +225,6 @@ export async function tryHandleDiscordMessageActionGuildAdmin(params: {
    return await handleDiscordAction(
      {
        action: "categoryEdit",
-        accountId: accountId ?? undefined,
        categoryId,
        name: name ?? undefined,
        position: position ?? undefined,
@@ -277,10 +237,7 @@ export async function tryHandleDiscordMessageActionGuildAdmin(params: {
    const categoryId = readStringParam(actionParams, "categoryId", {
      required: true,
    });
-    return await handleDiscordAction(
-      { action: "categoryDelete", accountId: accountId ?? undefined, categoryId },
-      cfg,
-    );
+    return await handleDiscordAction({ action: "categoryDelete", categoryId }, cfg);
  }

  if (action === "voice-status") {
@@ -288,20 +245,14 @@ export async function tryHandleDiscordMessageActionGuildAdmin(params: {
      required: true,
    });
    const userId = readStringParam(actionParams, "userId", { required: true });
-    return await handleDiscordAction(
-      { action: "voiceStatus", accountId: accountId ?? undefined, guildId, userId },
-      cfg,
-    );
+    return await handleDiscordAction({ action: "voiceStatus", guildId, userId }, cfg);
  }

  if (action === "event-list") {
    const guildId = readStringParam(actionParams, "guildId", {
      required: true,
    });
-    return await handleDiscordAction(
-      { action: "eventList", accountId: accountId ?? undefined, guildId },
-      cfg,
-    );
+    return await handleDiscordAction({ action: "eventList", guildId }, cfg);
  }

  if (action === "event-create") {
@@ -320,7 +271,6 @@ export async function tryHandleDiscordMessageActionGuildAdmin(params: {
    return await handleDiscordAction(
      {
        action: "eventCreate",
-        accountId: accountId ?? undefined,
        guildId,
        name,
        startTime,
@@ -351,7 +301,6 @@ export async function tryHandleDiscordMessageActionGuildAdmin(params: {
    return await handleDiscordAction(
      {
        action: discordAction,
-        accountId: accountId ?? undefined,
        guildId,
        userId,
        durationMinutes,
@@ -376,7 +325,6 @@ export async function tryHandleDiscordMessageActionGuildAdmin(params: {
    return await handleDiscordAction(
      {
        action: "threadList",
-        accountId: accountId ?? undefined,
        guildId,
        channelId,
        includeArchived,
@@ -396,7 +344,6 @@ export async function tryHandleDiscordMessageActionGuildAdmin(params: {
    return await handleDiscordAction(
      {
        action: "threadReply",
-        accountId: accountId ?? undefined,
        channelId: resolveChannelId(),
        content,
        mediaUrl: mediaUrl ?? undefined,
@@ -414,7 +361,6 @@ export async function tryHandleDiscordMessageActionGuildAdmin(params: {
    return await handleDiscordAction(
      {
        action: "searchMessages",
-        accountId: accountId ?? undefined,
        guildId,
        content: query,
        channelId: readStringParam(actionParams, "channelId"),
@@ -18,10 +18,9 @@ function readParentIdParam(params: Record<string, unknown>): string | null | und
 }

 export async function handleDiscordMessageAction(
-  ctx: Pick<ChannelMessageActionContext, "action" | "params" | "cfg" | "accountId">,
+  ctx: Pick<ChannelMessageActionContext, "action" | "params" | "cfg">,
 ): Promise<AgentToolResult<unknown>> {
  const { action, params, cfg } = ctx;
-  const accountId = ctx.accountId ?? readStringParam(params, "accountId");

  const resolveChannelId = () =>
    resolveDiscordChannelId(
@@ -40,7 +39,6 @@ export async function handleDiscordMessageAction(
    return await handleDiscordAction(
      {
        action: "sendMessage",
-        accountId: accountId ?? undefined,
        to,
        content,
        mediaUrl: mediaUrl ?? undefined,
@@ -64,7 +62,6 @@ export async function handleDiscordMessageAction(
    return await handleDiscordAction(
      {
        action: "poll",
-        accountId: accountId ?? undefined,
        to,
        question,
        answers,
@@ -83,7 +80,6 @@ export async function handleDiscordMessageAction(
    return await handleDiscordAction(
      {
        action: "react",
-        accountId: accountId ?? undefined,
        channelId: resolveChannelId(),
        messageId,
        emoji,
@@ -97,13 +93,7 @@ export async function handleDiscordMessageAction(
    const messageId = readStringParam(params, "messageId", { required: true });
    const limit = readNumberParam(params, "limit", { integer: true });
    return await handleDiscordAction(
-      {
-        action: "reactions",
-        accountId: accountId ?? undefined,
-        channelId: resolveChannelId(),
-        messageId,
-        limit,
-      },
+      { action: "reactions", channelId: resolveChannelId(), messageId, limit },
      cfg,
    );
  }
@@ -113,7 +103,6 @@ export async function handleDiscordMessageAction(
    return await handleDiscordAction(
      {
        action: "readMessages",
-        accountId: accountId ?? undefined,
        channelId: resolveChannelId(),
        limit,
        before: readStringParam(params, "before"),
@@ -130,7 +119,6 @@ export async function handleDiscordMessageAction(
    return await handleDiscordAction(
      {
        action: "editMessage",
-        accountId: accountId ?? undefined,
        channelId: resolveChannelId(),
        messageId,
        content,
@@ -142,12 +130,7 @@ export async function handleDiscordMessageAction(
  if (action === "delete") {
    const messageId = readStringParam(params, "messageId", { required: true });
    return await handleDiscordAction(
-      {
-        action: "deleteMessage",
-        accountId: accountId ?? undefined,
-        channelId: resolveChannelId(),
-        messageId,
-      },
+      { action: "deleteMessage", channelId: resolveChannelId(), messageId },
      cfg,
    );
  }
@@ -158,7 +141,6 @@ export async function handleDiscordMessageAction(
    return await handleDiscordAction(
      {
        action: action === "pin" ? "pinMessage" : action === "unpin" ? "unpinMessage" : "listPins",
-        accountId: accountId ?? undefined,
        channelId: resolveChannelId(),
        messageId,
      },
@@ -167,14 +149,7 @@ export async function handleDiscordMessageAction(
  }

  if (action === "permissions") {
-    return await handleDiscordAction(
-      {
-        action: "permissions",
-        accountId: accountId ?? undefined,
-        channelId: resolveChannelId(),
-      },
-      cfg,
-    );
+    return await handleDiscordAction({ action: "permissions", channelId: resolveChannelId() }, cfg);
  }

  if (action === "thread-create") {
@@ -186,7 +161,6 @@ export async function handleDiscordMessageAction(
    return await handleDiscordAction(
      {
        action: "threadCreate",
-        accountId: accountId ?? undefined,
        channelId: resolveChannelId(),
        name,
        messageId,
@@ -205,7 +179,6 @@ export async function handleDiscordMessageAction(
    return await handleDiscordAction(
      {
        action: "sticker",
-        accountId: accountId ?? undefined,
        to: readStringParam(params, "to", { required: true }),
        stickerIds,
        content: readStringParam(params, "message"),
@@ -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",
@@ -56,9 +56,12 @@ export function registerOnboardCommand(program: Command) {
    )
    .option(
      "--token-provider <id>",
-      "Token provider id (non-interactive; used with --auth-choice token)",
+      "Token provider id (non-interactive; used with --auth-choice token or apiKey)",
+    )
+    .option(
+      "--token <token>",
+      "Token value (non-interactive; used with --auth-choice token or apiKey)",
    )
-    .option("--token <token>", "Token value (non-interactive; used with --auth-choice token)")
    .option(
      "--token-profile-id <id>",
      "Auth profile id (non-interactive; default: <provider>:manual)",
@@ -415,7 +415,7 @@ describe("update-cli", () => {
    expect(defaultRuntime.exit).toHaveBeenCalledWith(1);
  });

-  it("updateCommand restarts daemon by default", async () => {
+  it("updateCommand restarts daemon when --restart is set", async () => {
    const { runGatewayUpdate } = await import("../infra/update-runner.js");
    const { runDaemonRestart } = await import("./daemon-cli.js");
    const { updateCommand } = await import("./update-cli.js");
@@ -430,30 +430,11 @@ describe("update-cli", () => {
    vi.mocked(runGatewayUpdate).mockResolvedValue(mockResult);
    vi.mocked(runDaemonRestart).mockResolvedValue(true);

-    await updateCommand({});
+    await updateCommand({ restart: true });

    expect(runDaemonRestart).toHaveBeenCalled();
  });

-  it("updateCommand skips restart when --no-restart is set", async () => {
-    const { runGatewayUpdate } = await import("../infra/update-runner.js");
-    const { runDaemonRestart } = await import("./daemon-cli.js");
-    const { updateCommand } = await import("./update-cli.js");
-
-    const mockResult: UpdateRunResult = {
-      status: "ok",
-      mode: "git",
-      steps: [],
-      durationMs: 100,
-    };
-
-    vi.mocked(runGatewayUpdate).mockResolvedValue(mockResult);
-
-    await updateCommand({ restart: false });
-
-    expect(runDaemonRestart).not.toHaveBeenCalled();
-  });
-
  it("updateCommand skips success message when restart does not run", async () => {
    const { runGatewayUpdate } = await import("../infra/update-runner.js");
    const { runDaemonRestart } = await import("./daemon-cli.js");
@@ -553,7 +553,6 @@ export async function updateCommand(opts: UpdateCommandOptions): Promise<void> {
  process.noDeprecation = true;
  process.env.NODE_NO_WARNINGS = "1";
  const timeoutMs = opts.timeout ? Number.parseInt(opts.timeout, 10) * 1000 : undefined;
-  const shouldRestart = opts.restart !== false;

  if (timeoutMs !== undefined && (Number.isNaN(timeoutMs) || timeoutMs <= 0)) {
    defaultRuntime.error("--timeout must be a positive integer (seconds)");
@@ -899,7 +898,7 @@ export async function updateCommand(opts: UpdateCommandOptions): Promise<void> {
  }

  // Restart service if requested
-  if (shouldRestart) {
+  if (opts.restart) {
    if (!opts.json) {
      defaultRuntime.log("");
      defaultRuntime.log(theme.heading("Restarting service..."));
@@ -1069,7 +1068,7 @@ export async function updateWizardCommand(opts: UpdateWizardOptions = {}): Promi

  const restart = await confirm({
    message: stylePromptMessage("Restart the gateway service after update?"),
-    initialValue: true,
+    initialValue: false,
  });
  if (isCancel(restart)) {
    defaultRuntime.log(theme.muted("Update cancelled."));
@@ -1094,7 +1093,7 @@ export function registerUpdateCli(program: Command) {
    .command("update")
    .description("Update Clawdbot to the latest version")
    .option("--json", "Output result as JSON", false)
-    .option("--no-restart", "Skip restarting the gateway service after a successful update")
+    .option("--restart", "Restart the gateway service after a successful update", false)
    .option("--channel <stable|beta|dev>", "Persist update channel (git + npm)")
    .option("--tag <dist-tag|version>", "Override npm dist-tag or version for this update")
    .option("--timeout <seconds>", "Timeout for each update step in seconds (default: 1200)")
@@ -1105,7 +1104,7 @@ export function registerUpdateCli(program: Command) {
        ["clawdbot update --channel beta", "Switch to beta channel (git + npm)"],
        ["clawdbot update --channel dev", "Switch to dev channel (git + npm)"],
        ["clawdbot update --tag beta", "One-off update to a dist-tag or version"],
-        ["clawdbot update --no-restart", "Update without restarting the service"],
+        ["clawdbot update --restart", "Update and restart the service"],
        ["clawdbot update --json", "Output result as JSON"],
        ["clawdbot update --yes", "Non-interactive (accept downgrade prompts)"],
        ["clawdbot update wizard", "Interactive update wizard"],
@@ -0,0 +1,183 @@
+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 { RuntimeEnv } from "../runtime.js";
+import type { WizardPrompter } from "../wizard/prompts.js";
+import { AUTH_STORE_VERSION } from "../agents/auth-profiles/constants.js";
+import { applyAuthChoice } from "./auth-choice.js";
+
+const noopAsync = async () => {};
+const noop = () => {};
+const authProfilePathFor = (agentDir: string) => path.join(agentDir, "auth-profiles.json");
+
+const previousStateDir = process.env.CLAWDBOT_STATE_DIR;
+const previousAgentDir = process.env.CLAWDBOT_AGENT_DIR;
+const previousPiAgentDir = process.env.PI_CODING_AGENT_DIR;
+const previousAnthropicKey = process.env.ANTHROPIC_API_KEY;
+const previousOpenaiKey = process.env.OPENAI_API_KEY;
+let tempStateDir: string | null = null;
+
+async function setupTempState() {
+  tempStateDir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-auth-"));
+  process.env.CLAWDBOT_STATE_DIR = tempStateDir;
+  process.env.CLAWDBOT_AGENT_DIR = path.join(tempStateDir, "agent");
+  process.env.PI_CODING_AGENT_DIR = process.env.CLAWDBOT_AGENT_DIR;
+  await fs.mkdir(process.env.CLAWDBOT_AGENT_DIR, { recursive: true });
+}
+
+function buildPrompter() {
+  const text = vi.fn(async () => "");
+  const confirm = vi.fn(async () => false);
+  const prompter: WizardPrompter = {
+    intro: vi.fn(noopAsync),
+    outro: vi.fn(noopAsync),
+    note: vi.fn(noopAsync),
+    select: vi.fn(async () => "" as never),
+    multiselect: vi.fn(async () => []),
+    text,
+    confirm,
+    progress: vi.fn(() => ({ update: noop, stop: noop })),
+  };
+  return { prompter, text, confirm };
+}
+
+const runtime: RuntimeEnv = {
+  log: vi.fn(),
+  error: vi.fn(),
+  exit: vi.fn((code: number) => {
+    throw new Error(`exit:${code}`);
+  }),
+};
+
+afterEach(async () => {
+  if (tempStateDir) {
+    await fs.rm(tempStateDir, { recursive: true, force: true });
+    tempStateDir = 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;
+  }
+  if (previousAnthropicKey === undefined) {
+    delete process.env.ANTHROPIC_API_KEY;
+  } else {
+    process.env.ANTHROPIC_API_KEY = previousAnthropicKey;
+  }
+  if (previousOpenaiKey === undefined) {
+    delete process.env.OPENAI_API_KEY;
+  } else {
+    process.env.OPENAI_API_KEY = previousOpenaiKey;
+  }
+});
+
+describe("applyAuthChoice with apiKey flags", () => {
+  it("uses provided openrouter token when authChoice=apiKey", async () => {
+    await setupTempState();
+    const agentDir = process.env.CLAWDBOT_AGENT_DIR ?? "";
+    const authProfilePath = authProfilePathFor(agentDir);
+    await fs.writeFile(
+      authProfilePath,
+      JSON.stringify({
+        version: AUTH_STORE_VERSION,
+        profiles: {
+          "openrouter:legacy": {
+            type: "oauth",
+            provider: "openrouter",
+            access: "access",
+            refresh: "refresh",
+            expires: Date.now() + 60_000,
+          },
+        },
+      }),
+      "utf8",
+    );
+
+    const { prompter, text, confirm } = buildPrompter();
+    const result = await applyAuthChoice({
+      authChoice: "apiKey",
+      config: {},
+      prompter,
+      runtime,
+      setDefaultModel: true,
+      opts: {
+        tokenProvider: "openrouter",
+        token: "sk-openrouter-flag",
+      },
+    });
+
+    expect(text).not.toHaveBeenCalled();
+    expect(confirm).not.toHaveBeenCalled();
+    expect(result.config.auth?.profiles?.["openrouter:default"]).toMatchObject({
+      provider: "openrouter",
+      mode: "api_key",
+    });
+
+    const raw = await fs.readFile(authProfilePath, "utf8");
+    const parsed = JSON.parse(raw) as { profiles?: Record<string, { key?: string }> };
+    expect(parsed.profiles?.["openrouter:default"]?.key).toBe("sk-openrouter-flag");
+  });
+
+  it("uses provided openai token when authChoice=apiKey", async () => {
+    await setupTempState();
+    const { prompter, text, confirm } = buildPrompter();
+
+    await applyAuthChoice({
+      authChoice: "apiKey",
+      config: {},
+      prompter,
+      runtime,
+      setDefaultModel: true,
+      opts: {
+        tokenProvider: "openai",
+        token: "sk-openai-flag",
+      },
+    });
+
+    expect(text).not.toHaveBeenCalled();
+    expect(confirm).not.toHaveBeenCalled();
+    expect(process.env.OPENAI_API_KEY).toBe("sk-openai-flag");
+    const envPath = path.join(process.env.CLAWDBOT_STATE_DIR ?? "", ".env");
+    const envContents = await fs.readFile(envPath, "utf8");
+    expect(envContents).toContain("OPENAI_API_KEY=sk-openai-flag");
+  });
+
+  it("uses provided anthropic token when authChoice=apiKey", async () => {
+    await setupTempState();
+    process.env.ANTHROPIC_API_KEY = "sk-env-test";
+    const { prompter, text, confirm } = buildPrompter();
+
+    await applyAuthChoice({
+      authChoice: "apiKey",
+      config: {},
+      prompter,
+      runtime,
+      setDefaultModel: true,
+      opts: {
+        tokenProvider: "anthropic",
+        token: "sk-anthropic-flag",
+      },
+    });
+
+    expect(text).not.toHaveBeenCalled();
+    expect(confirm).not.toHaveBeenCalled();
+
+    const authProfilePath = authProfilePathFor(process.env.CLAWDBOT_AGENT_DIR ?? "");
+    const raw = await fs.readFile(authProfilePath, "utf8");
+    const parsed = JSON.parse(raw) as { profiles?: Record<string, { key?: string }> };
+    expect(parsed.profiles?.["anthropic:default"]?.key).toBe("sk-anthropic-flag");
+  });
+});
@@ -8,6 +8,7 @@ import {
  normalizeApiKeyInput,
  validateApiKeyInput,
 } from "./auth-choice.api-key.js";
+import { normalizeProviderId } from "../agents/model-selection.js";
 import type { ApplyAuthChoiceParams, ApplyAuthChoiceResult } from "./auth-choice.apply.js";
 import { buildTokenProfileId, validateAnthropicSetupToken } from "./auth-token.js";
 import { applyAuthProfileConfig, setAnthropicApiKey } from "./onboard-auth.js";
@@ -198,19 +199,22 @@ export async function applyAuthChoiceAnthropic(
  }

  if (params.authChoice === "apiKey") {
-    if (params.opts?.tokenProvider && params.opts.tokenProvider !== "anthropic") {
+    const tokenProvider = params.opts?.tokenProvider
+      ? normalizeProviderId(params.opts.tokenProvider)
+      : undefined;
+    const explicitToken =
+      tokenProvider === "anthropic" ? normalizeApiKeyInput(params.opts?.token ?? "") : "";
+    if (tokenProvider && 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);
+    if (explicitToken) {
+      await setAnthropicApiKey(explicitToken, params.agentDir);
      hasCredential = true;
    }
-
    if (!hasCredential && envKey) {
      const useExisting = await params.prompter.confirm({
        message: `Use existing ANTHROPIC_API_KEY (env, ${formatApiKeyPreview(envKey)})?`,
@@ -1,4 +1,5 @@
 import { ensureAuthProfileStore, resolveAuthProfileOrder } from "../agents/auth-profiles.js";
+import { normalizeProviderId } from "../agents/model-selection.js";
 import { resolveEnvApiKey } from "../agents/model-auth.js";
 import {
  formatApiKeyPreview,
@@ -6,6 +7,7 @@ import {
  validateApiKeyInput,
 } from "./auth-choice.api-key.js";
 import type { ApplyAuthChoiceParams, ApplyAuthChoiceResult } from "./auth-choice.apply.js";
+import type { AuthChoice } from "./onboard-types.js";
 import { applyDefaultModelChoice } from "./auth-choice.default-model.js";
 import {
  applyGoogleGeminiModelDefault,
@@ -56,84 +58,86 @@ export async function applyAuthChoiceApiProviders(
    );
  };

+  const tokenProvider = params.opts?.tokenProvider
+    ? normalizeProviderId(params.opts.tokenProvider)
+    : undefined;
+  const tokenValue = params.opts?.token;
  let authChoice = params.authChoice;
  if (
    authChoice === "apiKey" &&
-    params.opts?.tokenProvider &&
-    params.opts.tokenProvider !== "anthropic" &&
-    params.opts.tokenProvider !== "openai"
+    tokenProvider &&
+    tokenProvider !== "anthropic" &&
+    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";
-    }
+    const mapped: Partial<Record<string, AuthChoice>> = {
+      openrouter: "openrouter-api-key",
+      "vercel-ai-gateway": "ai-gateway-api-key",
+      moonshot: "moonshot-api-key",
+      "kimi-code": "kimi-code-api-key",
+      google: "gemini-api-key",
+      zai: "zai-api-key",
+      synthetic: "synthetic-api-key",
+      opencode: "opencode-zen",
+    };
+    authChoice = mapped[tokenProvider] ?? authChoice;
  }

  if (authChoice === "openrouter-api-key") {
-    const store = ensureAuthProfileStore(params.agentDir, {
-      allowKeychainPrompt: false,
-    });
-    const profileOrder = resolveAuthProfileOrder({
-      cfg: nextConfig,
-      store,
-      provider: "openrouter",
-    });
-    const existingProfileId = profileOrder.find((profileId) => Boolean(store.profiles[profileId]));
-    const existingCred = existingProfileId ? store.profiles[existingProfileId] : undefined;
    let profileId = "openrouter:default";
    let mode: "api_key" | "oauth" | "token" = "api_key";
    let hasCredential = false;
+    const explicitToken =
+      tokenProvider === "openrouter" ? normalizeApiKeyInput(tokenValue ?? "") : "";

-    if (existingProfileId && existingCred?.type) {
-      profileId = existingProfileId;
-      mode =
-        existingCred.type === "oauth"
-          ? "oauth"
-          : existingCred.type === "token"
-            ? "token"
-            : "api_key";
+    if (explicitToken) {
+      await setOpenrouterApiKey(explicitToken, params.agentDir);
      hasCredential = true;
-    }
+    } else {
+      const store = ensureAuthProfileStore(params.agentDir, {
+        allowKeychainPrompt: false,
+      });
+      const profileOrder = resolveAuthProfileOrder({
+        cfg: nextConfig,
+        store,
+        provider: "openrouter",
+      });
+      const existingProfileId = profileOrder.find((profileId) =>
+        Boolean(store.profiles[profileId]),
+      );
+      const existingCred = existingProfileId ? store.profiles[existingProfileId] : undefined;
+      if (existingProfileId && existingCred?.type) {
+        profileId = existingProfileId;
+        mode =
+          existingCred.type === "oauth"
+            ? "oauth"
+            : existingCred.type === "token"
+              ? "token"
+              : "api_key";
+        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) {
-        const useExisting = await params.prompter.confirm({
-          message: `Use existing OPENROUTER_API_KEY (${envKey.source}, ${formatApiKeyPreview(envKey.apiKey)})?`,
-          initialValue: true,
-        });
-        if (useExisting) {
-          await setOpenrouterApiKey(envKey.apiKey, params.agentDir);
-          hasCredential = true;
+      if (!hasCredential) {
+        const envKey = resolveEnvApiKey("openrouter");
+        if (envKey) {
+          const useExisting = await params.prompter.confirm({
+            message: `Use existing OPENROUTER_API_KEY (${envKey.source}, ${formatApiKeyPreview(envKey.apiKey)})?`,
+            initialValue: true,
+          });
+          if (useExisting) {
+            await setOpenrouterApiKey(envKey.apiKey, params.agentDir);
+            hasCredential = true;
+          }
        }
      }
-    }

-    if (!hasCredential) {
-      const key = await params.prompter.text({
-        message: "Enter OpenRouter API key",
-        validate: validateApiKeyInput,
-      });
-      await setOpenrouterApiKey(normalizeApiKeyInput(String(key)), params.agentDir);
-      hasCredential = true;
+      if (!hasCredential) {
+        const key = await params.prompter.text({
+          message: "Enter OpenRouter API key",
+          validate: validateApiKeyInput,
+        });
+        await setOpenrouterApiKey(normalizeApiKeyInput(String(key)), params.agentDir);
+        hasCredential = true;
+      }
    }

    if (hasCredential) {
@@ -162,18 +166,14 @@ export async function applyAuthChoiceApiProviders(

  if (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);
+    const explicitToken =
+      tokenProvider === "vercel-ai-gateway" ? normalizeApiKeyInput(tokenValue ?? "") : "";
+    if (explicitToken) {
+      await setVercelAiGatewayApiKey(explicitToken, params.agentDir);
      hasCredential = true;
    }
-
    const envKey = resolveEnvApiKey("vercel-ai-gateway");
-    if (envKey) {
+    if (!hasCredential && envKey) {
      const useExisting = await params.prompter.confirm({
        message: `Use existing AI_GATEWAY_API_KEY (${envKey.source}, ${formatApiKeyPreview(envKey.apiKey)})?`,
        initialValue: true,
@@ -214,14 +214,14 @@ export async function applyAuthChoiceApiProviders(

  if (authChoice === "moonshot-api-key") {
    let hasCredential = false;
-
-    if (!hasCredential && params.opts?.token && params.opts?.tokenProvider === "moonshot") {
-      await setMoonshotApiKey(normalizeApiKeyInput(params.opts.token), params.agentDir);
+    const explicitToken =
+      tokenProvider === "moonshot" ? normalizeApiKeyInput(tokenValue ?? "") : "";
+    if (explicitToken) {
+      await setMoonshotApiKey(explicitToken, params.agentDir);
      hasCredential = true;
    }
-
    const envKey = resolveEnvApiKey("moonshot");
-    if (envKey) {
+    if (!hasCredential && envKey) {
      const useExisting = await params.prompter.confirm({
        message: `Use existing MOONSHOT_API_KEY (${envKey.source}, ${formatApiKeyPreview(envKey.apiKey)})?`,
        initialValue: true,
@@ -261,11 +261,12 @@ export async function applyAuthChoiceApiProviders(

  if (authChoice === "kimi-code-api-key") {
    let hasCredential = false;
-    if (!hasCredential && params.opts?.token && params.opts?.tokenProvider === "kimi-code") {
-      await setKimiCodeApiKey(normalizeApiKeyInput(params.opts.token), params.agentDir);
+    const explicitToken =
+      tokenProvider === "kimi-code" ? normalizeApiKeyInput(tokenValue ?? "") : "";
+    if (explicitToken) {
+      await setKimiCodeApiKey(explicitToken, params.agentDir);
      hasCredential = true;
    }
-
    if (!hasCredential) {
      await params.prompter.note(
        [
@@ -276,7 +277,7 @@ export async function applyAuthChoiceApiProviders(
      );
    }
    const envKey = resolveEnvApiKey("kimi-code");
-    if (envKey) {
+    if (!hasCredential && envKey) {
      const useExisting = await params.prompter.confirm({
        message: `Use existing KIMICODE_API_KEY (${envKey.source}, ${formatApiKeyPreview(envKey.apiKey)})?`,
        initialValue: true,
@@ -317,14 +318,13 @@ export async function applyAuthChoiceApiProviders(

  if (authChoice === "gemini-api-key") {
    let hasCredential = false;
-
-    if (!hasCredential && params.opts?.token && params.opts?.tokenProvider === "google") {
-      await setGeminiApiKey(normalizeApiKeyInput(params.opts.token), params.agentDir);
+    const explicitToken = tokenProvider === "google" ? normalizeApiKeyInput(tokenValue ?? "") : "";
+    if (explicitToken) {
+      await setGeminiApiKey(explicitToken, params.agentDir);
      hasCredential = true;
    }
-
    const envKey = resolveEnvApiKey("google");
-    if (envKey) {
+    if (!hasCredential && envKey) {
      const useExisting = await params.prompter.confirm({
        message: `Use existing GEMINI_API_KEY (${envKey.source}, ${formatApiKeyPreview(envKey.apiKey)})?`,
        initialValue: true,
@@ -364,14 +364,13 @@ export async function applyAuthChoiceApiProviders(

  if (authChoice === "zai-api-key") {
    let hasCredential = false;
-
-    if (!hasCredential && params.opts?.token && params.opts?.tokenProvider === "zai") {
-      await setZaiApiKey(normalizeApiKeyInput(params.opts.token), params.agentDir);
+    const explicitToken = tokenProvider === "zai" ? normalizeApiKeyInput(tokenValue ?? "") : "";
+    if (explicitToken) {
+      await setZaiApiKey(explicitToken, params.agentDir);
      hasCredential = true;
    }
-
    const envKey = resolveEnvApiKey("zai");
-    if (envKey) {
+    if (!hasCredential && envKey) {
      const useExisting = await params.prompter.confirm({
        message: `Use existing ZAI_API_KEY (${envKey.source}, ${formatApiKeyPreview(envKey.apiKey)})?`,
        initialValue: true,
@@ -426,8 +425,10 @@ export async function applyAuthChoiceApiProviders(
  }

  if (authChoice === "synthetic-api-key") {
-    if (params.opts?.token && params.opts?.tokenProvider === "synthetic") {
-      await setSyntheticApiKey(String(params.opts.token).trim(), params.agentDir);
+    const explicitToken =
+      tokenProvider === "synthetic" ? normalizeApiKeyInput(tokenValue ?? "") : "";
+    if (explicitToken) {
+      await setSyntheticApiKey(explicitToken, params.agentDir);
    } else {
      const key = await params.prompter.text({
        message: "Enter Synthetic API key",
@@ -459,11 +460,12 @@ export async function applyAuthChoiceApiProviders(

  if (authChoice === "opencode-zen") {
    let hasCredential = false;
-    if (!hasCredential && params.opts?.token && params.opts?.tokenProvider === "opencode") {
-      await setOpencodeZenApiKey(normalizeApiKeyInput(params.opts.token), params.agentDir);
+    const explicitToken =
+      tokenProvider === "opencode" ? normalizeApiKeyInput(tokenValue ?? "") : "";
+    if (explicitToken) {
+      await setOpencodeZenApiKey(explicitToken, params.agentDir);
      hasCredential = true;
    }
-
    if (!hasCredential) {
      await params.prompter.note(
        [
@@ -475,7 +477,7 @@ export async function applyAuthChoiceApiProviders(
      );
    }
    const envKey = resolveEnvApiKey("opencode");
-    if (envKey) {
+    if (!hasCredential && envKey) {
      const useExisting = await params.prompter.confirm({
        message: `Use existing OPENCODE_API_KEY (${envKey.source}, ${formatApiKeyPreview(envKey.apiKey)})?`,
        initialValue: true,
@@ -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) {
@@ -1,5 +1,6 @@
 import { loginOpenAICodex } from "@mariozechner/pi-ai";
 import { CODEX_CLI_PROFILE_ID, ensureAuthProfileStore } from "../agents/auth-profiles.js";
+import { normalizeProviderId } from "../agents/model-selection.js";
 import { resolveEnvApiKey } from "../agents/model-auth.js";
 import { upsertSharedEnvVar } from "../infra/env-file.js";
 import { isRemoteEnvironment } from "./oauth-env.js";
@@ -20,44 +21,47 @@ import {
 export async function applyAuthChoiceOpenAI(
  params: ApplyAuthChoiceParams,
 ): Promise<ApplyAuthChoiceResult | null> {
+  const tokenProvider = params.opts?.tokenProvider
+    ? normalizeProviderId(params.opts.tokenProvider)
+    : undefined;
+  const explicitToken =
+    tokenProvider === "openai" ? normalizeApiKeyInput(params.opts?.token ?? "") : "";
  let authChoice = params.authChoice;
-  if (authChoice === "apiKey" && params.opts?.tokenProvider === "openai") {
+  if (authChoice === "apiKey" && tokenProvider === "openai") {
    authChoice = "openai-api-key";
  }

  if (authChoice === "openai-api-key") {
-    const envKey = resolveEnvApiKey("openai");
-    if (envKey) {
-      const useExisting = await params.prompter.confirm({
-        message: `Use existing OPENAI_API_KEY (${envKey.source}, ${formatApiKeyPreview(envKey.apiKey)})?`,
-        initialValue: true,
-      });
-      if (useExisting) {
-        const result = upsertSharedEnvVar({
-          key: "OPENAI_API_KEY",
-          value: envKey.apiKey,
+    if (!explicitToken) {
+      const envKey = resolveEnvApiKey("openai");
+      if (envKey) {
+        const useExisting = await params.prompter.confirm({
+          message: `Use existing OPENAI_API_KEY (${envKey.source}, ${formatApiKeyPreview(envKey.apiKey)})?`,
+          initialValue: true,
        });
-        if (!process.env.OPENAI_API_KEY) {
-          process.env.OPENAI_API_KEY = envKey.apiKey;
+        if (useExisting) {
+          const result = upsertSharedEnvVar({
+            key: "OPENAI_API_KEY",
+            value: envKey.apiKey,
+          });
+          if (!process.env.OPENAI_API_KEY) {
+            process.env.OPENAI_API_KEY = envKey.apiKey;
+          }
+          await params.prompter.note(
+            `Copied OPENAI_API_KEY to ${result.path} for launchd compatibility.`,
+            "OpenAI API key",
+          );
+          return { config: params.config };
        }
-        await params.prompter.note(
-          `Copied OPENAI_API_KEY to ${result.path} for launchd compatibility.`,
-          "OpenAI API key",
-        );
-        return { config: params.config };
      }
    }

-    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 = explicitToken
+      ? explicitToken
+      : await params.prompter.text({
+          message: "Enter OpenAI API key",
+          validate: validateApiKeyInput,
+        });
    const trimmed = normalizeApiKeyInput(String(key));
    const result = upsertSharedEnvVar({
      key: "OPENAI_API_KEY",
@@ -50,9 +50,9 @@ export type OnboardOptions = {
  acceptRisk?: boolean;
  reset?: boolean;
  authChoice?: AuthChoice;
-  /** Used when `authChoice=token` in non-interactive mode. */
+  /** Used when `authChoice=token` in non-interactive mode, or `authChoice=apiKey` in wizard mode. */
  tokenProvider?: string;
-  /** Used when `authChoice=token` in non-interactive mode. */
+  /** Used when `authChoice=token` in non-interactive mode, or `authChoice=apiKey` in wizard mode. */
  token?: string;
  /** Used when `authChoice=token` in non-interactive mode. */
  tokenProfileId?: string;
@@ -1,60 +0,0 @@
-import { normalizeChannelId } from "../channels/plugins/index.js";
-import { normalizeAccountId } from "../routing/session-key.js";
-import type { ClawdbotConfig } from "./config.js";
-import type { MarkdownTableMode } from "./types.base.js";
-
-type MarkdownConfigEntry = {
-  markdown?: {
-    tables?: MarkdownTableMode;
-  };
-};
-
-type MarkdownConfigSection = MarkdownConfigEntry & {
-  accounts?: Record<string, MarkdownConfigEntry>;
-};
-
-const DEFAULT_TABLE_MODES = new Map<string, MarkdownTableMode>([
-  ["signal", "bullets"],
-  ["whatsapp", "bullets"],
-]);
-
-const isMarkdownTableMode = (value: unknown): value is MarkdownTableMode =>
-  value === "off" || value === "bullets" || value === "code";
-
-function resolveMarkdownModeFromSection(
-  section: MarkdownConfigSection | undefined,
-  accountId?: string | null,
-): MarkdownTableMode | undefined {
-  if (!section) return undefined;
-  const normalizedAccountId = normalizeAccountId(accountId);
-  const accounts = section.accounts;
-  if (accounts && typeof accounts === "object") {
-    const direct = accounts[normalizedAccountId];
-    const directMode = direct?.markdown?.tables;
-    if (isMarkdownTableMode(directMode)) return directMode;
-    const matchKey = Object.keys(accounts).find(
-      (key) => key.toLowerCase() === normalizedAccountId.toLowerCase(),
-    );
-    const match = matchKey ? accounts[matchKey] : undefined;
-    const matchMode = match?.markdown?.tables;
-    if (isMarkdownTableMode(matchMode)) return matchMode;
-  }
-  const sectionMode = section.markdown?.tables;
-  return isMarkdownTableMode(sectionMode) ? sectionMode : undefined;
-}
-
-export function resolveMarkdownTableMode(params: {
-  cfg?: Partial<ClawdbotConfig>;
-  channel?: string | null;
-  accountId?: string | null;
-}): MarkdownTableMode {
-  const channel = normalizeChannelId(params.channel);
-  const defaultMode = channel ? (DEFAULT_TABLE_MODES.get(channel) ?? "code") : "code";
-  if (!channel || !params.cfg) return defaultMode;
-  const channelsConfig = params.cfg.channels as Record<string, unknown> | undefined;
-  const section = (channelsConfig?.[channel] ??
-    (params.cfg as Record<string, unknown> | undefined)?.[channel]) as
-    | MarkdownConfigSection
-    | undefined;
-  return resolveMarkdownModeFromSection(section, params.accountId) ?? defaultMode;
-}
@@ -31,13 +31,6 @@ export type BlockStreamingChunkConfig = {
  breakPreference?: "paragraph" | "newline" | "sentence";
 };

-export type MarkdownTableMode = "off" | "bullets" | "code";
-
-export type MarkdownConfig = {
-  /** Table rendering mode (off|bullets|code). */
-  tables?: MarkdownTableMode;
-};
-
 export type HumanDelayConfig = {
  /** Delay style for block replies (off|natural|custom). */
  mode?: "off" | "natural" | "custom";
@@ -2,7 +2,6 @@ import type {
  BlockStreamingCoalesceConfig,
  DmPolicy,
  GroupPolicy,
-  MarkdownConfig,
  OutboundRetryConfig,
  ReplyToMode,
 } from "./types.base.js";
@@ -71,8 +70,6 @@ export type DiscordAccountConfig = {
  name?: string;
  /** Optional provider capability tags used for agent/runtime guidance. */
  capabilities?: string[];
-  /** Markdown formatting overrides (tables). */
-  markdown?: MarkdownConfig;
  /** Override native command registration for Discord (bool or "auto"). */
  commands?: ProviderCommandsConfig;
  /** Allow channel-initiated config writes (default: true). */
@@ -1,9 +1,4 @@
-import type {
-  BlockStreamingCoalesceConfig,
-  DmPolicy,
-  GroupPolicy,
-  MarkdownConfig,
-} from "./types.base.js";
+import type { BlockStreamingCoalesceConfig, DmPolicy, GroupPolicy } from "./types.base.js";
 import type { DmConfig } from "./types.messages.js";

 export type IMessageAccountConfig = {
@@ -11,8 +6,6 @@ export type IMessageAccountConfig = {
  name?: string;
  /** Optional provider capability tags used for agent/runtime guidance. */
  capabilities?: string[];
-  /** Markdown formatting overrides (tables). */
-  markdown?: MarkdownConfig;
  /** Allow channel-initiated config writes (default: true). */
  configWrites?: boolean;
  /** If false, do not start this iMessage account. Default: true. */
@@ -1,9 +1,4 @@
-import type {
-  BlockStreamingCoalesceConfig,
-  DmPolicy,
-  GroupPolicy,
-  MarkdownConfig,
-} from "./types.base.js";
+import type { BlockStreamingCoalesceConfig, DmPolicy, GroupPolicy } from "./types.base.js";
 import type { DmConfig } from "./types.messages.js";

 export type MSTeamsWebhookConfig = {
@@ -39,8 +34,6 @@ export type MSTeamsConfig = {
  enabled?: boolean;
  /** Optional provider capability tags used for agent/runtime guidance. */
  capabilities?: string[];
-  /** Markdown formatting overrides (tables). */
-  markdown?: MarkdownConfig;
  /** Allow channel-initiated config writes (default: true). */
  configWrites?: boolean;
  /** Azure Bot App ID (from Azure Bot registration). */
@@ -1,9 +1,4 @@
-import type {
-  BlockStreamingCoalesceConfig,
-  DmPolicy,
-  GroupPolicy,
-  MarkdownConfig,
-} from "./types.base.js";
+import type { BlockStreamingCoalesceConfig, DmPolicy, GroupPolicy } from "./types.base.js";
 import type { DmConfig } from "./types.messages.js";

 export type SignalReactionNotificationMode = "off" | "own" | "all" | "allowlist";
@@ -13,8 +8,6 @@ export type SignalAccountConfig = {
  name?: string;
  /** Optional provider capability tags used for agent/runtime guidance. */
  capabilities?: string[];
-  /** Markdown formatting overrides (tables). */
-  markdown?: MarkdownConfig;
  /** Allow channel-initiated config writes (default: true). */
  configWrites?: boolean;
  /** If false, do not start this Signal account. Default: true. */
@@ -2,7 +2,6 @@ import type {
  BlockStreamingCoalesceConfig,
  DmPolicy,
  GroupPolicy,
-  MarkdownConfig,
  ReplyToMode,
 } from "./types.base.js";
 import type { DmConfig, ProviderCommandsConfig } from "./types.messages.js";
@@ -81,8 +80,6 @@ export type SlackAccountConfig = {
  webhookPath?: string;
  /** Optional provider capability tags used for agent/runtime guidance. */
  capabilities?: string[];
-  /** Markdown formatting overrides (tables). */
-  markdown?: MarkdownConfig;
  /** Override native command registration for Slack (bool or "auto"). */
  commands?: ProviderCommandsConfig;
  /** Allow channel-initiated config writes (default: true). */
@@ -3,7 +3,6 @@ import type {
  BlockStreamingCoalesceConfig,
  DmPolicy,
  GroupPolicy,
-  MarkdownConfig,
  OutboundRetryConfig,
  ReplyToMode,
 } from "./types.base.js";
@@ -36,8 +35,6 @@ export type TelegramAccountConfig = {
  name?: string;
  /** Optional provider capability tags used for agent/runtime guidance. */
  capabilities?: TelegramCapabilitiesConfig;
-  /** Markdown formatting overrides (tables). */
-  markdown?: MarkdownConfig;
  /** Override native command registration for Telegram (bool or "auto"). */
  commands?: ProviderCommandsConfig;
  /** Custom commands to register in Telegram's command menu (merged with native). */
@@ -1,9 +1,4 @@
-import type {
-  BlockStreamingCoalesceConfig,
-  DmPolicy,
-  GroupPolicy,
-  MarkdownConfig,
-} from "./types.base.js";
+import type { BlockStreamingCoalesceConfig, DmPolicy, GroupPolicy } from "./types.base.js";
 import type { DmConfig } from "./types.messages.js";

 export type WhatsAppActionConfig = {
@@ -17,8 +12,6 @@ export type WhatsAppConfig = {
  accounts?: Record<string, WhatsAppAccountConfig>;
  /** Optional provider capability tags used for agent/runtime guidance. */
  capabilities?: string[];
-  /** Markdown formatting overrides (tables). */
-  markdown?: MarkdownConfig;
  /** Allow channel-initiated config writes (default: true). */
  configWrites?: boolean;
  /** Send read receipts for incoming messages (default true). */
@@ -91,8 +84,6 @@ export type WhatsAppAccountConfig = {
  name?: string;
  /** Optional provider capability tags used for agent/runtime guidance. */
  capabilities?: string[];
-  /** Markdown formatting overrides (tables). */
-  markdown?: MarkdownConfig;
  /** Allow channel-initiated config writes (default: true). */
  configWrites?: boolean;
  /** If false, do not start this WhatsApp account provider. Default: true. */
@@ -133,15 +133,6 @@ export const BlockStreamingChunkSchema = z
  })
  .strict();

-export const MarkdownTableModeSchema = z.enum(["off", "bullets", "code"]);
-
-export const MarkdownConfigSchema = z
-  .object({
-    tables: MarkdownTableModeSchema.optional(),
-  })
-  .strict()
-  .optional();
-
 export const HumanDelaySchema = z
  .object({
    mode: z.union([z.literal("off"), z.literal("natural"), z.literal("custom")]).optional(),
@@ -7,7 +7,6 @@ import {
  DmPolicySchema,
  ExecutableTokenSchema,
  GroupPolicySchema,
-  MarkdownConfigSchema,
  MSTeamsReplyStyleSchema,
  ProviderCommandsSchema,
  ReplyToModeSchema,
@@ -82,7 +81,6 @@ export const TelegramAccountSchemaBase = z
  .object({
    name: z.string().optional(),
    capabilities: TelegramCapabilitiesSchema.optional(),
-    markdown: MarkdownConfigSchema,
    enabled: z.boolean().optional(),
    commands: ProviderCommandsSchema,
    customCommands: z.array(TelegramCustomCommandSchema).optional(),
@@ -195,7 +193,6 @@ export const DiscordAccountSchema = z
  .object({
    name: z.string().optional(),
    capabilities: z.array(z.string()).optional(),
-    markdown: MarkdownConfigSchema,
    enabled: z.boolean().optional(),
    commands: ProviderCommandsSchema,
    configWrites: z.boolean().optional(),
@@ -299,7 +296,6 @@ export const SlackAccountSchema = z
    signingSecret: z.string().optional(),
    webhookPath: z.string().optional(),
    capabilities: z.array(z.string()).optional(),
-    markdown: MarkdownConfigSchema,
    enabled: z.boolean().optional(),
    commands: ProviderCommandsSchema,
    configWrites: z.boolean().optional(),
@@ -385,7 +381,6 @@ export const SignalAccountSchemaBase = z
  .object({
    name: z.string().optional(),
    capabilities: z.array(z.string()).optional(),
-    markdown: MarkdownConfigSchema,
    enabled: z.boolean().optional(),
    configWrites: z.boolean().optional(),
    account: z.string().optional(),
@@ -440,7 +435,6 @@ export const IMessageAccountSchemaBase = z
  .object({
    name: z.string().optional(),
    capabilities: z.array(z.string()).optional(),
-    markdown: MarkdownConfigSchema,
    enabled: z.boolean().optional(),
    configWrites: z.boolean().optional(),
    cliPath: ExecutableTokenSchema.optional(),
@@ -527,7 +521,6 @@ export const BlueBubblesAccountSchemaBase = z
  .object({
    name: z.string().optional(),
    capabilities: z.array(z.string()).optional(),
-    markdown: MarkdownConfigSchema,
    configWrites: z.boolean().optional(),
    enabled: z.boolean().optional(),
    serverUrl: z.string().optional(),
@@ -592,7 +585,6 @@ export const MSTeamsConfigSchema = z
  .object({
    enabled: z.boolean().optional(),
    capabilities: z.array(z.string()).optional(),
-    markdown: MarkdownConfigSchema,
    configWrites: z.boolean().optional(),
    appId: z.string().optional(),
    appPassword: z.string().optional(),
Author	SHA1	Message	Date
Peter Steinberger	7c9a839ff6	fix: honor apiKey auth-choice tokens (#1485 ) (thanks @iHildy)	2026-01-23 07:27:34 +00:00
iHildy	15c865f340	fix: support direct token and provider in auth apply commands	2026-01-23 07:12:17 +00:00