docs: expand Slack scope notes

The manifest was missing scopes required for conversations.open API,
which is used to get DM channel IDs for replies.

Added scopes:
- im:write (required for DM replies)
- im:read (list DM conversations)
- mpim:write (reply to multi-person DMs)
- mpim:read (list MPDMs)
- groups:write (private channel interactions)
- groups:read (list private channels)

Without im:write, the example config (dm.enabled: true) cannot
actually reply to DMs - fails with missing_scope error.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,28 +0,0 @@
----
-name: Bug report
-about: Report a problem or unexpected behavior in Clawdbot.
-title: "[Bug]: "
-labels: bug
----
-
-## Summary
-What went wrong?
-
-## Steps to reproduce
-1.
-2.
-3.
-
-## Expected behavior
-What did you expect to happen?
-
-## Actual behavior
-What actually happened?
-
-## Environment
-- Clawdbot version:
-- OS:
-- Install method (pnpm/npx/docker/etc):
-
-## Logs or screenshots
-Paste relevant logs or add screenshots (redact secrets).

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +0,0 @@
-blank_issues_enabled: true
-contact_links:
-  - name: Onboarding
-    url: https://discord.gg/clawd
-    about: New to Clawdbot? Join Discord for setup guidance from Krill in #help.
-  - name: Support
-    url: https://discord.gg/clawd
-    about: Get help from Krill and the community on Discord in #help.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,18 +0,0 @@
----
-name: Feature request
-about: Suggest an idea or improvement for Clawdbot.
-title: "[Feature]: "
-labels: enhancement
----
-
-## Summary
-Describe the problem you are trying to solve or the opportunity you see.
-
-## Proposed solution
-What would you like Clawdbot to do?
-
-## Alternatives considered
-Any other approaches you have considered?
-
-## Additional context
-Links, screenshots, or related issues.

.github/workflows/ci.yml

@@ -52,21 +52,32 @@ jobs:
           exit 1
 
       - name: Setup Node.js
+        if: matrix.runtime == 'node'
         uses: actions/setup-node@v4
         with:
           node-version: 24
           check-latest: true
 
       - name: Setup Bun
+        if: matrix.runtime == 'bun'
         uses: oven-sh/setup-bun@v2
         with:
-          bun-version: latest
+          # bun.sh downloads currently fail with:
+          # "Failed to list releases from GitHub: 401" -> "Unexpected HTTP response: 400"
+          bun-download-url: "https://github.com/oven-sh/bun/releases/latest/download/bun-linux-x64.zip"
+
+      - name: Setup Node.js (tooling for bun)
+        if: matrix.runtime == 'bun'
+        uses: actions/setup-node@v4
+        with:
+          node-version: 24
+          check-latest: true
 
       - name: Runtime versions
         run: |
           node -v
           npm -v
-          bun -v
+          if [ "${{ matrix.runtime }}" = "bun" ]; then bun -v; fi
 
       - name: Capture node path
         run: echo "NODE_BIN=$(dirname \"$(node -p \"process.execPath\")\")" >> "$GITHUB_ENV"

.gitignore

@@ -3,8 +3,6 @@ node_modules
 dist
 *.bun-build
 pnpm-lock.yaml
-bun.lock
-bun.lockb
 coverage
 .pnpm-store
 .worktrees/

AGENTS.md

@@ -7,9 +7,7 @@
 
 ## Build, Test, and Development Commands
 - Install deps: `pnpm install`
-- Prefer Bun for TypeScript execution (scripts, dev, tests): `bun <file.ts>` / `bunx <tool>`.
-- Run CLI in dev: `pnpm clawdbot ...` (bun) or `pnpm dev`.
-- Node remains supported for running built output (`dist/*`) and production installs.
+- Run CLI in dev: `pnpm clawdbot ...` (tsx entry) or `pnpm dev` for `src/index.ts`.
 - Type-check/build: `pnpm build` (tsc)
 - Lint/format: `pnpm lint` (biome check), `pnpm format` (biome format)
 - Tests: `pnpm test` (vitest); coverage: `pnpm test:coverage`
@@ -32,10 +30,6 @@
 - Follow concise, action-oriented commit messages (e.g., `CLI: add verbose flag to send`).
 - Group related changes; avoid bundling unrelated refactors.
 - PRs should summarize scope, note testing performed, and mention any user-facing changes or new flags.
-- When working on a PR: add a changelog entry with the PR ID and thank the contributor.
-- When working on an issue: reference the issue in the changelog entry.
-- When merging a PR: leave a PR comment that explains exactly what we did.
-- When merging a PR from a new contributor: add their avatar to the README “Thanks to all clawtributors” thumbnail list.
 
 ## Security & Configuration Tips
 - Web provider stores creds at `~/.clawdbot/credentials/`; rerun `clawdbot login` if logged out.

CHANGELOG.md

@@ -6,40 +6,11 @@
 
 ### Breaking
 - Timestamps in agent envelopes are now UTC (compact `YYYY-MM-DDTHH:mmZ`); removed `messages.timestampPrefix`. Add `agent.userTimezone` to tell the model the user’s local time (system prompt only).
-- Model config schema changes (auth profiles + model lists); doctor auto-migrates and the gateway rewrites legacy configs on startup.
-- Commands: gate all slash commands to authorized senders; add `/compact` to manually compact session context.
-- Groups: `whatsapp.groups`, `telegram.groups`, and `imessage.groups` now act as allowlists when set. Add `"*"` to keep allow-all behavior.
 
 ### Fixes
-- Messages: stop defaulting ack reactions to 👀 when identity emoji is missing.
-- Auto-reply: require slash for control commands to avoid false triggers in normal text.
-- Auto-reply: treat steer during compaction as a follow-up, queued until compaction completes.
-- Auth: lock auth profile refreshes to avoid multi-instance OAuth logouts; keep credentials on refresh failure.
-- Onboarding: prompt immediately for OpenAI Codex redirect URL on remote/headless logins.
-- Configure: add OpenAI Codex (ChatGPT OAuth) auth choice (align with onboarding).
-- Doctor: suggest adding the workspace memory system when missing (opt-out via `--no-workspace-suggestions`).
-- Build: fix duplicate protocol export, align Codex OAuth options, and add proper-lockfile typings.
-- Build: install Bun in the Dockerfile so `pnpm build` can run Bun scripts. Thanks @loukotal for PR #284.
-- Typing indicators: stop typing once the reply dispatcher drains to prevent stuck typing across Discord/Telegram/WhatsApp.
-- Typing indicators: fix a race that could keep the typing indicator stuck after quick replies. Thanks @thewilloftheshadow for PR #270.
-- Google: merge consecutive messages to satisfy strict role alternation for Google provider models. Thanks @Asleep123 for PR #266.
-- Postinstall: handle targetDir symlinks in the install script. Thanks @obviyus for PR #272.
-- WhatsApp/Telegram: add groupPolicy handling for group messages and normalize allowFrom matching (tg/telegram prefixes). Thanks @mneves75.
-- Auto-reply: add configurable ack reactions for inbound messages (default 👀 or `identity.emoji`) with scope controls. Thanks @obviyus for PR #178.
-- Polls: unify WhatsApp + Discord poll sends via the gateway + CLI (`clawdbot poll`). (#123) — thanks @dbhurley
 - Onboarding: resolve CLI entrypoint when running via `npx` so gateway daemon install works without a build step.
-- Onboarding: when OpenAI Codex OAuth is used, default to `openai-codex/gpt-5.2` and warn if the selected model lacks auth.
-- CLI: auto-migrate legacy config entries on command start (same behavior as gateway startup).
-- Gateway: add `gateway stop|restart` helpers and surface launchd/systemd/schtasks stop hints when the gateway is already running.
-- Gateway: honor `agent.timeoutSeconds` for `chat.send` and share timeout defaults across chat/cron/auto-reply. Thanks @MSch for PR #229.
-- Auth: prioritize OAuth profiles but fall back to API keys when refresh fails; stored profiles now load without explicit auth order.
-- Control UI: harden config Form view with schema normalization, map editing, and guardrails to prevent data loss on save.
-- Cron: normalize cron.add/update inputs, align channel enums/status fields across gateway/CLI/UI/macOS, and add protocol conformance tests. Thanks @mneves75 for PR #256.
-- Docs: add group chat participation guidance to the AGENTS template.
-- Gmail: stop restart loop when `gog gmail watch serve` fails to bind (address already in use).
 - Linux: auto-attempt lingering during onboarding (try without sudo, fallback to sudo) and prompt on install/restart to keep the gateway alive after logout/idle. Thanks @tobiasbischoff for PR #237.
 - TUI: migrate key handling to the updated pi-tui Key matcher API.
-- TUI: add `/elev` alias for `/elevated`.
 - Logging: redact sensitive tokens in verbose tool summaries by default (configurable patterns).
 - macOS: prefer gateway config reads/writes in local mode (fall back to disk if the gateway is unavailable).
 - macOS: local gateway now connects via tailnet IP when bind mode is `tailnet`/`auto`.
@@ -50,50 +21,28 @@
 - Model: `/model list` is an alias for `/model`.
 - Model: `/model` output now includes auth source location (env/auth.json/models.json).
 - Model: avoid duplicate `missing (missing)` auth labels in `/model` list output.
-- Auth: when `openai` has no API key but Codex OAuth exists, suggest `openai-codex/gpt-5.2` vs `OPENAI_API_KEY`.
 - Docs: clarify auth storage, migration, and OpenAI Codex OAuth onboarding.
 - Sandbox: copy inbound media into sandbox workspaces so agent tools can read attachments.
-- Sandbox: enable session tools in sandboxed sessions with spawned-only visibility by default (opt-in `agent.sandbox.sessionToolsVisibility = "all"`).
 - Control UI: show a reading indicator bubble while the assistant is responding.
 - Control UI: animate reading indicator dots (honors reduced-motion).
 - Control UI: stabilize chat streaming during tool runs (no flicker/vanishing text; correct run scoping).
-- Control UI: let config-form enums select empty-string values. Thanks @sreekaransrinath for PR #268.
-- Control UI: scroll chat to bottom on initial load. Thanks @kiranjd for PR #274.
-- Control UI: add Chat focus mode toggle to collapse header + sidebar.
-- Control UI: standardize UI build instructions on `bun run ui:*` (fallback supported).
 - Status: show runtime (docker/direct) and move shortcuts to `/help`.
 - Status: show model auth source (api-key/oauth).
 - Block streaming: avoid splitting Markdown fenced blocks and reopen fences when forced to split.
 - Block streaming: preserve leading indentation in block replies (lists, indented fences).
 - Docs: document systemd lingering and logged-in session requirements on macOS/Windows.
-- Auto-reply: centralize tool/block/final dispatch across providers for consistent streaming + heartbeat/prefix handling. Thanks @MSch for PR #225.
+- Auto-reply: unify tool/block/final delivery across providers and apply consistent heartbeat/prefix handling. Thanks @MSch for PR #225 (superseded commit 92c953d0749143eb2a3f31f3cd6ad0e8eabf48c3).
 - Heartbeat: make HEARTBEAT_OK ack padding configurable across heartbeat and cron delivery. (#238) — thanks @jalehman
-- Skills: emit MEDIA token after Nano Banana Pro image generation. Thanks @Iamadig for PR #271.
 - WhatsApp: set sender E.164 for direct chats so owner commands work in DMs.
 - Slack: keep auto-replies in the original thread when responding to thread messages. Thanks @scald for PR #251.
-- Discord: surface missing-permission hints (muted/role overrides) when replies fail.
-- Discord: use channel IDs for DMs instead of user IDs. Thanks @VACInc for PR #261.
 - Docs: clarify Slack manifest scopes (current vs optional) with references. Thanks @jarvis-medmatic for PR #235.
 - Control UI: avoid Slack config ReferenceError by reading slack config snapshots. Thanks @sreekaransrinath for PR #249.
-- Auth: rotate across multiple OAuth profiles with cooldown tracking and email-based profile IDs. Thanks @mukhtharcm for PR #269.
-- Auth: fix multi-account OAuth rotation so round-robin alternates instead of pinning to lastGood. Thanks @mukhtharcm for PR #281.
-- Configure: stop auto-writing `auth.order` for newly added auth profiles (round-robin default unless explicitly pinned).
-- Telegram: honor routing.groupChat.mentionPatterns for group mention gating. Thanks Kevin Kern (@regenrek) for PR #242.
-- Telegram: gate groups via `telegram.groups` allowlist (align with WhatsApp/iMessage). Thanks @kitze for PR #241.
-- Telegram: support media groups (multi-image messages). Thanks @obviyus for PR #220.
-- Telegram/WhatsApp: parse shared locations (pins, places, live) and expose structured ctx fields. Thanks @nachoiacovino for PR #194.
-- Auto-reply: block unauthorized `/reset` and infer WhatsApp senders from E.164 inputs.
-- Auto-reply: track compaction count in session status; verbose mode announces auto-compactions.
-- Telegram: send GIF media as animations (auto-play) and improve filename sniffing.
-- Bash tool: inherit gateway PATH so Nix-provided tools resolve during commands. Thanks @joshp123 for PR #202.
 
 ### Maintenance
-- Tooling: replace tsx with bun for TypeScript execution. Thanks @obviyus for PR #278.
 - Deps: bump pi-* stack, Slack SDK, discord-api-types, file-type, zod, and Biome.
 - Skills: add CodexBar model usage helper with macOS requirement metadata.
 - Skills: add 1Password CLI skill with op examples.
 - Lint: organize imports and wrap long lines in reply commands.
-- Refactor: centralize group allowlist/mention policy across providers.
 - Deps: update to latest across the repo.
 
 ## 2026.1.5-3
@@ -120,7 +69,6 @@
 - Agent tools: new `image` tool routed to the image model (when configured).
 - Config: default model shorthands (`opus`, `sonnet`, `gpt`, `gpt-mini`, `gemini`, `gemini-flash`).
 - Docs: document built-in model shorthands + precedence (user config wins).
-- Bun: optional local install/build workflow without maintaining a Bun lockfile (see `docs/bun.md`).
 
 ### Fixes
 - Control UI: render Markdown in tool result cards.
@@ -139,16 +87,11 @@
 - Env: load global `$CLAWDBOT_STATE_DIR/.env` (`~/.clawdbot/.env`) as a fallback after CWD `.env`.
 - Env: optional login-shell env fallback (opt-in; imports expected keys without overriding existing env).
 - Agent tools: OpenAI-compatible tool JSON Schemas (fix `browser`, normalize union schemas).
-- Onboarding: when running from source, auto-build missing Control UI assets (`bun run ui:build`).
+- Onboarding: when running from source, auto-build missing Control UI assets (`pnpm ui:build`).
 - Discord/Slack: route reaction + system notifications to the correct session (no main-session bleed).
 - Agent tools: honor `agent.tools` allow/deny policy even when sandbox is off.
 - Discord: avoid duplicate replies when OpenAI emits repeated `message_end` events.
 - Commands: unify /status (inline) and command auth across providers; group bypass for authorized control commands; remove Discord /clawd slash handler.
-- CLI: run `clawdbot agent` via the Gateway by default; use `--local` to force embedded mode.
-
-## 2026.1.5
-
-### Fixes
 - Control UI: render Markdown in chat messages (sanitized).
 
 

Dockerfile

@@ -1,9 +1,5 @@
 FROM node:22-bookworm
 
-# Install Bun (required for build scripts)
-RUN curl -fsSL https://bun.sh/install | bash
-ENV PATH="/root/.bun/bin:${PATH}"
-
 RUN corepack enable
 
 WORKDIR /app

README.md

@@ -20,7 +20,7 @@ It answers you on the surfaces you already use (WhatsApp, Telegram, Slack, Disco
 
 If you want a personal, single-user assistant that feels local, fast, and always-on, this is it.
 
-[Website](https://clawdbot.com) · [Docs](https://github.com/clawdbot/clawdbot/blob/main/docs/index.md) · Showcase: [https://github.com/clawdbot/clawdbot/blob/main/docs/showcase.md](https://github.com/clawdbot/clawdbot/blob/main/docs/showcase.md) · FAQ: [https://github.com/clawdbot/clawdbot/blob/main/docs/faq.md](https://github.com/clawdbot/clawdbot/blob/main/docs/faq.md) · Wizard: [https://github.com/clawdbot/clawdbot/blob/main/docs/wizard.md](https://github.com/clawdbot/clawdbot/blob/main/docs/wizard.md) · Nix: [https://github.com/clawdbot/nix-clawdbot](https://github.com/clawdbot/nix-clawdbot) · Docker: [https://github.com/clawdbot/clawdbot/blob/main/docs/docker.md](https://github.com/clawdbot/clawdbot/blob/main/docs/docker.md) · Discord: [https://discord.gg/clawd](https://discord.gg/clawd)
+Website: [https://clawdbot.com](https://clawdbot.com) · Docs: [https://docs.clawdbot.com](https://docs.clawdbot.com/) · Showcase: [https://docs.clawdbot.com/showcase](https://docs.clawdbot.com/showcase) · FAQ: [https://docs.clawdbot.com/faq](https://docs.clawdbot.com/faq) · Wizard: [https://docs.clawdbot.com/wizard](https://docs.clawdbot.com/wizard) · Nix: [https://github.com/clawdbot/nix-clawdbot](https://github.com/clawdbot/nix-clawdbot) · Docker: [https://docs.clawdbot.com/docker](https://docs.clawdbot.com/docker) · Discord: [https://discord.gg/clawd](https://discord.gg/clawd)
 
 Preferred setup: run the onboarding wizard (`clawdbot onboard`). It walks through gateway, workspace, providers, and skills. The CLI wizard is the recommended path and works on **macOS, Windows, and Linux**.
 Works with npm, pnpm, or bun.
@@ -29,7 +29,7 @@ Works with npm, pnpm, or bun.
 - **Anthropic** (Claude Pro/Max)
 - **OpenAI** (ChatGPT/Codex)
 
-Model note: while any model is supported, I strongly recommend **Anthropic Pro/Max (100/200) + Opus 4.5** for long‑context strength and better prompt‑injection resistance. See [Onboarding](https://github.com/clawdbot/clawdbot/blob/main/docs/onboarding.md).
+Model note: while any model is supported, I strongly recommend **Anthropic Pro/Max (100/200) + Opus 4.5** for long‑context strength and better prompt‑injection resistance. See [Onboarding](https://docs.clawdbot.com/onboarding).
 
 ## Recommended setup (from source)
 
@@ -40,93 +40,85 @@ Do **not** download prebuilt binaries. Build from source.
 git clone https://github.com/clawdbot/clawdbot.git
 cd clawdbot
 
-bun install
-bun run build
-bun run ui:build
-bun run clawdbot onboard
+pnpm install
+pnpm build
+pnpm ui:build
+pnpm clawdbot onboard
 ```
 
 ## Quick start (from source)
 
-Runtime: **Node ≥22**.
-
-From source, **pnpm** is the default workflow. Bun is supported as an optional local workflow; see [`docs/bun.md`](docs/bun.md).
+Runtime: **Node ≥22** + **pnpm**.
 
 ```bash
-# Install deps (no Bun lockfile)
-bun install --no-save
-
-# Build TypeScript
-bun run build
-
-# Build Control UI
-bun install --cwd ui --no-save
-bun run --cwd ui build
+pnpm install
+pnpm build
+pnpm ui:build
 
 # Recommended: run the onboarding wizard
-bun run clawdbot onboard
+pnpm clawdbot onboard
 
 # Link WhatsApp (stores creds in ~/.clawdbot/credentials)
-bun run clawdbot login
+pnpm clawdbot login
 
 # Start the gateway
-bun run clawdbot gateway --port 18789 --verbose
+pnpm clawdbot gateway --port 18789 --verbose
 
 # Dev loop (auto-reload on TS changes)
-bun run gateway:watch
+pnpm gateway:watch
 
 # Send a message
-bun run clawdbot send --to +1234567890 --message "Hello from Clawdbot"
+pnpm clawdbot send --to +1234567890 --message "Hello from Clawdbot"
 
 # Talk to the assistant (optionally deliver back to WhatsApp/Telegram/Slack/Discord)
-bun run clawdbot agent --message "Ship checklist" --thinking high
+pnpm clawdbot agent --message "Ship checklist" --thinking high
 ```
 
 Upgrading? `clawdbot doctor`.
 
-If you run from source, prefer `bun run clawdbot …` or `pnpm clawdbot …` (not global `clawdbot`).
+If you run from source, prefer `pnpm clawdbot …` (not global `clawdbot`).
 
 ## Highlights
 
-- **[Local-first Gateway](https://github.com/clawdbot/clawdbot/blob/main/docs/gateway.md)** — single control plane for sessions, providers, tools, and events.
-- **[Multi-surface inbox](https://github.com/clawdbot/clawdbot/blob/main/docs/surface.md)** — WhatsApp, Telegram, Slack, Discord, Signal, iMessage, WebChat, macOS, iOS/Android.
-- **[Voice Wake](https://github.com/clawdbot/clawdbot/blob/main/docs/voicewake.md) + [Talk Mode](https://github.com/clawdbot/clawdbot/blob/main/docs/talk.md)** — always-on speech for macOS/iOS/Android with ElevenLabs.
-- **[Live Canvas](https://github.com/clawdbot/clawdbot/blob/main/docs/mac/canvas.md)** — agent-driven visual workspace with [A2UI](https://github.com/clawdbot/clawdbot/blob/main/docs/mac/canvas.md#canvas-a2ui).
-- **[First-class tools](https://github.com/clawdbot/clawdbot/blob/main/docs/tools.md)** — browser, canvas, nodes, cron, sessions, and Discord/Slack actions.
-- **[Companion apps](https://github.com/clawdbot/clawdbot/blob/main/docs/macos.md)** — macOS menu bar app + iOS/Android [nodes](https://github.com/clawdbot/clawdbot/blob/main/docs/nodes.md).
-- **[Onboarding](https://github.com/clawdbot/clawdbot/blob/main/docs/wizard.md) + [skills](https://github.com/clawdbot/clawdbot/blob/main/docs/skills.md)** — wizard-driven setup with bundled/managed/workspace skills.
+- **[Local-first Gateway](https://docs.clawdbot.com/gateway)** — single control plane for sessions, providers, tools, and events.
+- **[Multi-surface inbox](https://docs.clawdbot.com/surface)** — WhatsApp, Telegram, Slack, Discord, Signal, iMessage, WebChat, macOS, iOS/Android.
+- **[Voice Wake](https://docs.clawdbot.com/voicewake) + [Talk Mode](https://docs.clawdbot.com/talk)** — always-on speech for macOS/iOS/Android with ElevenLabs.
+- **[Live Canvas](https://docs.clawdbot.com/mac/canvas)** — agent-driven visual workspace with [A2UI](https://docs.clawdbot.com/refactor/canvas-a2ui).
+- **[First-class tools](https://docs.clawdbot.com/tools)** — browser, canvas, nodes, cron, sessions, and Discord/Slack actions.
+- **[Companion apps](https://docs.clawdbot.com/macos)** — macOS menu bar app + iOS/Android [nodes](https://docs.clawdbot.com/nodes).
+- **[Onboarding](https://docs.clawdbot.com/wizard) + [skills](https://docs.clawdbot.com/skills)** — wizard-driven setup with bundled/managed/workspace skills.
 
 ## Everything we built so far
 
 ### Core platform
-- [Gateway WS control plane](https://github.com/clawdbot/clawdbot/blob/main/docs/gateway.md) with sessions, presence, config, cron, webhooks, [Control UI](https://github.com/clawdbot/clawdbot/blob/main/docs/web.md), and [Canvas host](https://github.com/clawdbot/clawdbot/blob/main/docs/mac/canvas.md#canvas-a2ui).
-- [CLI surface](https://github.com/clawdbot/clawdbot/blob/main/docs/agent-send.md): gateway, agent, send, [wizard](https://github.com/clawdbot/clawdbot/blob/main/docs/wizard.md), and [doctor](https://github.com/clawdbot/clawdbot/blob/main/docs/doctor.md).
-- [Pi agent runtime](https://github.com/clawdbot/clawdbot/blob/main/docs/agent.md) in RPC mode with tool streaming and block streaming.
-- [Session model](https://github.com/clawdbot/clawdbot/blob/main/docs/session.md): `main` for direct chats, group isolation, activation modes, queue modes, reply-back. Group rules: [Groups](https://github.com/clawdbot/clawdbot/blob/main/docs/groups.md).
-- [Media pipeline](https://github.com/clawdbot/clawdbot/blob/main/docs/images.md): images/audio/video, transcription hooks, size caps, temp file lifecycle. Audio details: [Audio](https://github.com/clawdbot/clawdbot/blob/main/docs/audio.md).
+- [Gateway WS control plane](https://docs.clawdbot.com/gateway) with sessions, presence, config, cron, webhooks, [Control UI](https://docs.clawdbot.com/web), and [Canvas host](https://docs.clawdbot.com/refactor/canvas-a2ui).
+- [CLI surface](https://docs.clawdbot.com/agent-send): gateway, agent, send, [wizard](https://docs.clawdbot.com/wizard), and [doctor](https://docs.clawdbot.com/doctor).
+- [Pi agent runtime](https://docs.clawdbot.com/agent) in RPC mode with tool streaming and block streaming.
+- [Session model](https://docs.clawdbot.com/session): `main` for direct chats, group isolation, activation modes, queue modes, reply-back. Group rules: [Groups](https://docs.clawdbot.com/groups).
+- [Media pipeline](https://docs.clawdbot.com/images): images/audio/video, transcription hooks, size caps, temp file lifecycle. Audio details: [Audio](https://docs.clawdbot.com/audio).
 
 ### Surfaces + providers
-- [Providers](https://github.com/clawdbot/clawdbot/blob/main/docs/surface.md): [WhatsApp](https://github.com/clawdbot/clawdbot/blob/main/docs/whatsapp.md) (Baileys), [Telegram](https://github.com/clawdbot/clawdbot/blob/main/docs/telegram.md) (grammY), [Slack](https://github.com/clawdbot/clawdbot/blob/main/docs/slack.md) (Bolt), [Discord](https://github.com/clawdbot/clawdbot/blob/main/docs/discord.md) (discord.js), [Signal](https://github.com/clawdbot/clawdbot/blob/main/docs/signal.md) (signal-cli), [iMessage](https://github.com/clawdbot/clawdbot/blob/main/docs/imessage.md) (imsg), [WebChat](https://github.com/clawdbot/clawdbot/blob/main/docs/webchat.md).
-- [Group routing](https://github.com/clawdbot/clawdbot/blob/main/docs/group-messages.md): mention gating, reply tags, per-surface chunking and routing. Surface rules: [Surface routing](https://github.com/clawdbot/clawdbot/blob/main/docs/surface.md).
+- [Providers](https://docs.clawdbot.com/surface): [WhatsApp](https://docs.clawdbot.com/whatsapp) (Baileys), [Telegram](https://docs.clawdbot.com/telegram) (grammY), [Slack](https://docs.clawdbot.com/slack) (Bolt), [Discord](https://docs.clawdbot.com/discord) (discord.js), [Signal](https://docs.clawdbot.com/signal) (signal-cli), [iMessage](https://docs.clawdbot.com/imessage) (imsg), [WebChat](https://docs.clawdbot.com/webchat).
+- [Group routing](https://docs.clawdbot.com/group-messages): mention gating, reply tags, per-surface chunking and routing. Surface rules: [Surface routing](https://docs.clawdbot.com/surface).
 
 ### Apps + nodes
-- [macOS app](https://github.com/clawdbot/clawdbot/blob/main/docs/macos.md): menu bar control plane, [Voice Wake](https://github.com/clawdbot/clawdbot/blob/main/docs/voicewake.md)/PTT, [Talk Mode](https://github.com/clawdbot/clawdbot/blob/main/docs/talk.md) overlay, [WebChat](https://github.com/clawdbot/clawdbot/blob/main/docs/webchat.md), debug tools, [remote gateway](https://github.com/clawdbot/clawdbot/blob/main/docs/remote.md) control.
-- [iOS node](https://github.com/clawdbot/clawdbot/blob/main/docs/ios.md): [Canvas](https://github.com/clawdbot/clawdbot/blob/main/docs/mac/canvas.md), [Voice Wake](https://github.com/clawdbot/clawdbot/blob/main/docs/voicewake.md), [Talk Mode](https://github.com/clawdbot/clawdbot/blob/main/docs/talk.md), camera, screen recording, Bonjour pairing.
-- [Android node](https://github.com/clawdbot/clawdbot/blob/main/docs/android.md): [Canvas](https://github.com/clawdbot/clawdbot/blob/main/docs/mac/canvas.md), [Talk Mode](https://github.com/clawdbot/clawdbot/blob/main/docs/talk.md), camera, screen recording, optional SMS.
-- [macOS node mode](https://github.com/clawdbot/clawdbot/blob/main/docs/nodes.md): system.run/notify + canvas/camera exposure.
+- [macOS app](https://docs.clawdbot.com/macos): menu bar control plane, [Voice Wake](https://docs.clawdbot.com/voicewake)/PTT, [Talk Mode](https://docs.clawdbot.com/talk) overlay, [WebChat](https://docs.clawdbot.com/webchat), debug tools, [remote gateway](https://docs.clawdbot.com/remote) control.
+- [iOS node](https://docs.clawdbot.com/ios): [Canvas](https://docs.clawdbot.com/mac/canvas), [Voice Wake](https://docs.clawdbot.com/voicewake), [Talk Mode](https://docs.clawdbot.com/talk), camera, screen recording, Bonjour pairing.
+- [Android node](https://docs.clawdbot.com/android): [Canvas](https://docs.clawdbot.com/mac/canvas), [Talk Mode](https://docs.clawdbot.com/talk), camera, screen recording, optional SMS.
+- [macOS node mode](https://docs.clawdbot.com/nodes): system.run/notify + canvas/camera exposure.
 
 ### Tools + automation
-- [Browser control](https://github.com/clawdbot/clawdbot/blob/main/docs/browser.md): dedicated clawd Chrome/Chromium, snapshots, actions, uploads, profiles.
-- [Canvas](https://github.com/clawdbot/clawdbot/blob/main/docs/mac/canvas.md): [A2UI](https://github.com/clawdbot/clawdbot/blob/main/docs/mac/canvas.md#canvas-a2ui) push/reset, eval, snapshot.
-- [Nodes](https://github.com/clawdbot/clawdbot/blob/main/docs/nodes.md): camera snap/clip, screen record, [location.get](https://github.com/clawdbot/clawdbot/blob/main/docs/location-command.md), notifications.
-- [Cron + wakeups](https://github.com/clawdbot/clawdbot/blob/main/docs/cron.md); [webhooks](https://github.com/clawdbot/clawdbot/blob/main/docs/webhook.md); [Gmail Pub/Sub](https://github.com/clawdbot/clawdbot/blob/main/docs/gmail-pubsub.md).
-- [Skills platform](https://github.com/clawdbot/clawdbot/blob/main/docs/skills.md): bundled, managed, and workspace skills with install gating + UI.
+- [Browser control](https://docs.clawdbot.com/browser): dedicated clawd Chrome/Chromium, snapshots, actions, uploads, profiles.
+- [Canvas](https://docs.clawdbot.com/mac/canvas): [A2UI](https://docs.clawdbot.com/refactor/canvas-a2ui) push/reset, eval, snapshot.
+- [Nodes](https://docs.clawdbot.com/nodes): camera snap/clip, screen record, [location.get](https://docs.clawdbot.com/location-command), notifications.
+- [Cron + wakeups](https://docs.clawdbot.com/cron); [webhooks](https://docs.clawdbot.com/webhook); [Gmail Pub/Sub](https://docs.clawdbot.com/gmail-pubsub).
+- [Skills platform](https://docs.clawdbot.com/skills): bundled, managed, and workspace skills with install gating + UI.
 
 ### Ops + packaging
-- [Control UI](https://github.com/clawdbot/clawdbot/blob/main/docs/web.md) + [WebChat](https://github.com/clawdbot/clawdbot/blob/main/docs/webchat.md) served directly from the Gateway.
-- [Tailscale Serve/Funnel](https://github.com/clawdbot/clawdbot/blob/main/docs/tailscale.md) or [SSH tunnels](https://github.com/clawdbot/clawdbot/blob/main/docs/remote.md) with token/password auth.
-- [Nix mode](https://github.com/clawdbot/clawdbot/blob/main/docs/nix.md) for declarative config; [Docker](https://github.com/clawdbot/clawdbot/blob/main/docs/docker.md)-based installs.
-- [Doctor](https://github.com/clawdbot/clawdbot/blob/main/docs/doctor.md) migrations, [logging](https://github.com/clawdbot/clawdbot/blob/main/docs/logging.md).
+- [Control UI](https://docs.clawdbot.com/web) + [WebChat](https://docs.clawdbot.com/webchat) served directly from the Gateway.
+- [Tailscale Serve/Funnel](https://docs.clawdbot.com/tailscale) or [SSH tunnels](https://docs.clawdbot.com/remote) with token/password auth.
+- [Nix mode](https://docs.clawdbot.com/nix) for declarative config; [Docker](https://docs.clawdbot.com/docker)-based installs.
+- [Doctor](https://docs.clawdbot.com/doctor) migrations, [logging](https://docs.clawdbot.com/logging).
 
 ## How it works (short)
 
@@ -148,12 +140,12 @@ WhatsApp / Telegram / Slack / Discord / Signal / iMessage / WebChat
 
 ## Key subsystems
 
-- **[Gateway WebSocket network](https://github.com/clawdbot/clawdbot/blob/main/docs/architecture.md)** — single WS control plane for clients, tools, and events (plus ops: [Gateway runbook](https://github.com/clawdbot/clawdbot/blob/main/docs/gateway.md)).
-- **[Tailscale exposure](https://github.com/clawdbot/clawdbot/blob/main/docs/tailscale.md)** — Serve/Funnel for the Gateway dashboard + WS (remote access: [Remote](https://github.com/clawdbot/clawdbot/blob/main/docs/remote.md)).
-- **[Browser control](https://github.com/clawdbot/clawdbot/blob/main/docs/browser.md)** — clawd‑managed Chrome/Chromium with CDP control.
-- **[Canvas + A2UI](https://github.com/clawdbot/clawdbot/blob/main/docs/mac/canvas.md)** — agent‑driven visual workspace (A2UI host: [Canvas/A2UI](https://github.com/clawdbot/clawdbot/blob/main/docs/mac/canvas.md#canvas-a2ui)).
-- **[Voice Wake](https://github.com/clawdbot/clawdbot/blob/main/docs/voicewake.md) + [Talk Mode](https://github.com/clawdbot/clawdbot/blob/main/docs/talk.md)** — always‑on speech and continuous conversation.
-- **[Nodes](https://github.com/clawdbot/clawdbot/blob/main/docs/nodes.md)** — Canvas, camera snap/clip, screen record, `location.get`, notifications, plus macOS‑only `system.run`/`system.notify`.
+- **[Gateway WebSocket network](https://docs.clawdbot.com/architecture)** — single WS control plane for clients, tools, and events (plus ops: [Gateway runbook](https://docs.clawdbot.com/gateway)).
+- **[Tailscale exposure](https://docs.clawdbot.com/tailscale)** — Serve/Funnel for the Gateway dashboard + WS (remote access: [Remote](https://docs.clawdbot.com/remote)).
+- **[Browser control](https://docs.clawdbot.com/browser)** — clawd‑managed Chrome/Chromium with CDP control.
+- **[Canvas + A2UI](https://docs.clawdbot.com/mac/canvas)** — agent‑driven visual workspace (A2UI host: [Canvas/A2UI](https://docs.clawdbot.com/refactor/canvas-a2ui)).
+- **[Voice Wake](https://docs.clawdbot.com/voicewake) + [Talk Mode](https://docs.clawdbot.com/talk)** — always‑on speech and continuous conversation.
+- **[Nodes](https://docs.clawdbot.com/nodes)** — Canvas, camera snap/clip, screen record, `location.get`, notifications, plus macOS‑only `system.run`/`system.notify`.
 
 ## Tailscale access (Gateway dashboard)
 
@@ -169,7 +161,7 @@ Notes:
 - Funnel refuses to start unless `gateway.auth.mode: "password"` is set.
 - Optional: `gateway.tailscale.resetOnExit` to undo Serve/Funnel on shutdown.
 
-Details: [Tailscale guide](https://github.com/clawdbot/clawdbot/blob/main/docs/tailscale.md) · [Web surfaces](https://github.com/clawdbot/clawdbot/blob/main/docs/web.md)
+Details: [Tailscale guide](https://docs.clawdbot.com/tailscale) · [Web surfaces](https://docs.clawdbot.com/web)
 
 ## Remote Gateway (Linux is great)
 
@@ -179,7 +171,7 @@ It’s perfectly fine to run the Gateway on a small Linux instance. Clients (mac
 - **Device nodes** run device‑local actions (`system.run`, camera, screen recording, notifications) via `node.invoke`.
 In short: bash runs where the Gateway lives; device actions run where the device lives.
 
-Details: [Remote access](https://github.com/clawdbot/clawdbot/blob/main/docs/remote.md) · [Nodes](https://github.com/clawdbot/clawdbot/blob/main/docs/nodes.md) · [Security](https://github.com/clawdbot/clawdbot/blob/main/docs/security.md)
+Details: [Remote access](https://docs.clawdbot.com/remote) · [Nodes](https://docs.clawdbot.com/nodes) · [Security](https://docs.clawdbot.com/security)
 
 ## macOS permissions via the Gateway protocol
 
@@ -194,7 +186,7 @@ Elevated bash (host permissions) is separate from macOS TCC:
 - Use `/elevated on|off` to toggle per‑session elevated access when enabled + allowlisted.
 - Gateway persists the per‑session toggle via `sessions.patch` (WS method) alongside `thinkingLevel`, `verboseLevel`, `model`, `sendPolicy`, and `groupActivation`.
 
-Details: [Nodes](https://github.com/clawdbot/clawdbot/blob/main/docs/nodes.md) · [macOS app](https://github.com/clawdbot/clawdbot/blob/main/docs/macos.md) · [Gateway protocol](https://github.com/clawdbot/clawdbot/blob/main/docs/architecture.md)
+Details: [Nodes](https://docs.clawdbot.com/nodes) · [macOS app](https://docs.clawdbot.com/macos) · [Gateway protocol](https://docs.clawdbot.com/architecture)
 
 ## Agent to Agent (sessions_* tools)
 
@@ -203,7 +195,7 @@ Details: [Nodes](https://github.com/clawdbot/clawdbot/blob/main/docs/nodes.md)
 - `sessions_history` — fetch transcript logs for a session.
 - `sessions_send` — message another session; optional reply‑back ping‑pong + announce step (`REPLY_SKIP`, `ANNOUNCE_SKIP`).
 
-Details: [Session tools](https://github.com/clawdbot/clawdbot/blob/main/docs/session-tool.md)
+Details: [Session tools](https://docs.clawdbot.com/session-tool)
 
 ## Skills registry (ClawdHub)
 
@@ -217,7 +209,6 @@ Send these in WhatsApp/Telegram/Slack/WebChat (group commands are owner-only):
 
 - `/status` — health + session info (group shows activation mode)
 - `/new` or `/reset` — reset the session
-- `/compact` — compact session context (summary)
 - `/think <level>` — off|minimal|low|medium|high
 - `/verbose on|off`
 - `/restart` — restart the gateway (owner-only in groups)
@@ -249,13 +240,13 @@ Note: signed builds required for macOS permissions to stick across rebuilds (see
 - Voice trigger forwarding + Canvas surface.
 - Controlled via `clawdbot nodes …`.
 
-Runbook: [iOS connect](https://github.com/clawdbot/clawdbot/blob/main/docs/ios.md).
+Runbook: [iOS connect](https://docs.clawdbot.com/ios).
 
 ### Android node (optional)
 
 - Pairs via the same Bridge + pairing flow as iOS.
 - Exposes Canvas, Camera, and Screen capture commands.
-- Runbook: [Android connect](https://github.com/clawdbot/clawdbot/blob/main/docs/android.md).
+- Runbook: [Android connect](https://docs.clawdbot.com/android).
 
 ## Agent workspace + skills
 
@@ -275,7 +266,7 @@ Minimal `~/.clawdbot/clawdbot.json` (model + defaults):
 }
 ```
 
-[Full configuration reference (all keys + examples).](https://github.com/clawdbot/clawdbot/blob/main/docs/configuration.md)
+[Full configuration reference (all keys + examples).](https://docs.clawdbot.com/configuration)
 
 ## Security model (important)
 
@@ -283,18 +274,17 @@ Minimal `~/.clawdbot/clawdbot.json` (model + defaults):
 - **Group/channel safety:** set `agent.sandbox.mode: "non-main"` to run **non‑main sessions** (groups/channels) inside per‑session Docker sandboxes; bash then runs in Docker for those sessions.
 - **Sandbox defaults:** allowlist `bash`, `process`, `read`, `write`, `edit`; denylist `browser`, `canvas`, `nodes`, `cron`, `discord`, `gateway`.
 
-Details: [Security guide](https://github.com/clawdbot/clawdbot/blob/main/docs/security.md) · [Docker + sandboxing](https://github.com/clawdbot/clawdbot/blob/main/docs/docker.md) · [Sandbox config](https://github.com/clawdbot/clawdbot/blob/main/docs/configuration.md)
+Details: [Security guide](https://docs.clawdbot.com/security) · [Docker + sandboxing](https://docs.clawdbot.com/docker) · [Sandbox config](https://docs.clawdbot.com/configuration)
 
-### [WhatsApp](https://github.com/clawdbot/clawdbot/blob/main/docs/whatsapp.md)
+### [WhatsApp](https://docs.clawdbot.com/whatsapp)
 
 - Link the device: `pnpm clawdbot login` (stores creds in `~/.clawdbot/credentials`).
 - Allowlist who can talk to the assistant via `whatsapp.allowFrom`.
-- If `whatsapp.groups` is set, it becomes a group allowlist; include `"*"` to allow all.
 
-### [Telegram](https://github.com/clawdbot/clawdbot/blob/main/docs/telegram.md)
+### [Telegram](https://docs.clawdbot.com/telegram)
 
 - Set `TELEGRAM_BOT_TOKEN` or `telegram.botToken` (env wins).
-- Optional: set `telegram.groups` (with `telegram.groups."*".requireMention`); when set, it is a group allowlist (include `"*"` to allow all). Also `telegram.allowFrom` or `telegram.webhookUrl` as needed.
+- Optional: set `telegram.groups` (with `telegram.groups."*".requireMention`), `telegram.allowFrom`, or `telegram.webhookUrl` as needed.
 
 ```json5
 {
@@ -304,11 +294,11 @@ Details: [Security guide](https://github.com/clawdbot/clawdbot/blob/main/docs/se
 }
 ```
 
-### [Slack](https://github.com/clawdbot/clawdbot/blob/main/docs/slack.md)
+### [Slack](https://docs.clawdbot.com/slack)
 
 - Set `SLACK_BOT_TOKEN` + `SLACK_APP_TOKEN` (or `slack.botToken` + `slack.appToken`).
 
-### [Discord](https://github.com/clawdbot/clawdbot/blob/main/docs/discord.md)
+### [Discord](https://docs.clawdbot.com/discord)
 
 - Set `DISCORD_BOT_TOKEN` or `discord.token` (env wins).
 - Optional: set `discord.slashCommand`, `discord.dm.allowFrom`, `discord.guilds`, or `discord.mediaMaxMb` as needed.
@@ -321,16 +311,15 @@ Details: [Security guide](https://github.com/clawdbot/clawdbot/blob/main/docs/se
 }
 ```
 
-### [Signal](https://github.com/clawdbot/clawdbot/blob/main/docs/signal.md)
+### [Signal](https://docs.clawdbot.com/signal)
 
 - Requires `signal-cli` and a `signal` config section.
 
-### [iMessage](https://github.com/clawdbot/clawdbot/blob/main/docs/imessage.md)
+### [iMessage](https://docs.clawdbot.com/imessage)
 
 - macOS only; Messages must be signed in.
-- If `imessage.groups` is set, it becomes a group allowlist; include `"*"` to allow all.
 
-### [WebChat](https://github.com/clawdbot/clawdbot/blob/main/docs/webchat.md)
+### [WebChat](https://docs.clawdbot.com/webchat)
 
 - Uses the Gateway WebSocket; no separate WebChat port/config.
 
@@ -349,69 +338,69 @@ Browser control (optional):
 ## Docs
 
 Use these when you’re past the onboarding flow and want the deeper reference.
-- [Start with the docs index for navigation and “what’s where.”](https://github.com/clawdbot/clawdbot/blob/main/docs/index.md)
-- [Read the architecture overview for the gateway + protocol model.](https://github.com/clawdbot/clawdbot/blob/main/docs/architecture.md)
-- [Use the full configuration reference when you need every key and example.](https://github.com/clawdbot/clawdbot/blob/main/docs/configuration.md)
-- [Run the Gateway by the book with the operational runbook.](https://github.com/clawdbot/clawdbot/blob/main/docs/gateway.md)
-- [Learn how the Control UI/Web surfaces work and how to expose them safely.](https://github.com/clawdbot/clawdbot/blob/main/docs/web.md)
-- [Understand remote access over SSH tunnels or tailnets.](https://github.com/clawdbot/clawdbot/blob/main/docs/remote.md)
-- [Follow the onboarding wizard flow for a guided setup.](https://github.com/clawdbot/clawdbot/blob/main/docs/wizard.md)
-- [Wire external triggers via the webhook surface.](https://github.com/clawdbot/clawdbot/blob/main/docs/webhook.md)
-- [Set up Gmail Pub/Sub triggers.](https://github.com/clawdbot/clawdbot/blob/main/docs/gmail-pubsub.md)
-- [Learn the macOS menu bar companion details.](https://github.com/clawdbot/clawdbot/blob/main/docs/mac/menu-bar.md)
-- [Platform guides: Windows](https://github.com/clawdbot/clawdbot/blob/main/docs/windows.md), [Linux](https://github.com/clawdbot/clawdbot/blob/main/docs/linux.md), [macOS](https://github.com/clawdbot/clawdbot/blob/main/docs/macos.md), [iOS](https://github.com/clawdbot/clawdbot/blob/main/docs/ios.md), [Android](https://github.com/clawdbot/clawdbot/blob/main/docs/android.md)
-- [Debug common failures with the troubleshooting guide.](https://github.com/clawdbot/clawdbot/blob/main/docs/troubleshooting.md)
-- [Review security guidance before exposing anything.](https://github.com/clawdbot/clawdbot/blob/main/docs/security.md)
+- [Start with the docs index for navigation and “what’s where.”](https://docs.clawdbot.com/)
+- [Read the architecture overview for the gateway + protocol model.](https://docs.clawdbot.com/architecture)
+- [Use the full configuration reference when you need every key and example.](https://docs.clawdbot.com/configuration)
+- [Run the Gateway by the book with the operational runbook.](https://docs.clawdbot.com/gateway)
+- [Learn how the Control UI/Web surfaces work and how to expose them safely.](https://docs.clawdbot.com/web)
+- [Understand remote access over SSH tunnels or tailnets.](https://docs.clawdbot.com/remote)
+- [Follow the onboarding wizard flow for a guided setup.](https://docs.clawdbot.com/wizard)
+- [Wire external triggers via the webhook surface.](https://docs.clawdbot.com/webhook)
+- [Set up Gmail Pub/Sub triggers.](https://docs.clawdbot.com/gmail-pubsub)
+- [Learn the macOS menu bar companion details.](https://docs.clawdbot.com/mac/menu-bar)
+- [Platform guides: Windows](https://docs.clawdbot.com/windows), [Linux](https://docs.clawdbot.com/linux), [macOS](https://docs.clawdbot.com/macos), [iOS](https://docs.clawdbot.com/ios), [Android](https://docs.clawdbot.com/android)
+- [Debug common failures with the troubleshooting guide.](https://docs.clawdbot.com/troubleshooting)
+- [Review security guidance before exposing anything.](https://docs.clawdbot.com/security)
 
 ## Advanced docs (discovery + control)
 
-- [Discovery + transports](https://github.com/clawdbot/clawdbot/blob/main/docs/discovery.md)
-- [Bonjour/mDNS](https://github.com/clawdbot/clawdbot/blob/main/docs/bonjour.md)
-- [Gateway pairing](https://github.com/clawdbot/clawdbot/blob/main/docs/gateway/pairing.md)
-- [Remote gateway README](https://github.com/clawdbot/clawdbot/blob/main/docs/remote-gateway-readme.md)
-- [Control UI](https://github.com/clawdbot/clawdbot/blob/main/docs/control-ui.md)
-- [Dashboard](https://github.com/clawdbot/clawdbot/blob/main/docs/dashboard.md)
+- [Discovery + transports](https://docs.clawdbot.com/discovery)
+- [Bonjour/mDNS](https://docs.clawdbot.com/bonjour)
+- [Gateway pairing](https://docs.clawdbot.com/gateway/pairing)
+- [Remote gateway README](https://docs.clawdbot.com/remote-gateway-readme)
+- [Control UI](https://docs.clawdbot.com/control-ui)
+- [Dashboard](https://docs.clawdbot.com/dashboard)
 
 ## Operations & troubleshooting
 
-- [Health checks](https://github.com/clawdbot/clawdbot/blob/main/docs/health.md)
-- [Gateway lock](https://github.com/clawdbot/clawdbot/blob/main/docs/gateway-lock.md)
-- [Background process](https://github.com/clawdbot/clawdbot/blob/main/docs/background-process.md)
-- [Browser troubleshooting (Linux)](https://github.com/clawdbot/clawdbot/blob/main/docs/browser-linux-troubleshooting.md)
-- [Logging](https://github.com/clawdbot/clawdbot/blob/main/docs/logging.md)
+- [Health checks](https://docs.clawdbot.com/health)
+- [Gateway lock](https://docs.clawdbot.com/gateway-lock)
+- [Background process](https://docs.clawdbot.com/background-process)
+- [Browser troubleshooting (Linux)](https://docs.clawdbot.com/browser-linux-troubleshooting)
+- [Logging](https://docs.clawdbot.com/logging)
 
 ## Deep dives
 
-- [Agent loop](https://github.com/clawdbot/clawdbot/blob/main/docs/agent-loop.md)
-- [Presence](https://github.com/clawdbot/clawdbot/blob/main/docs/presence.md)
-- [TypeBox schemas](https://github.com/clawdbot/clawdbot/blob/main/docs/typebox.md)
-- [RPC adapters](https://github.com/clawdbot/clawdbot/blob/main/docs/rpc.md)
-- [Queue](https://github.com/clawdbot/clawdbot/blob/main/docs/queue.md)
+- [Agent loop](https://docs.clawdbot.com/agent-loop)
+- [Presence](https://docs.clawdbot.com/presence)
+- [TypeBox schemas](https://docs.clawdbot.com/typebox)
+- [RPC adapters](https://docs.clawdbot.com/rpc)
+- [Queue](https://docs.clawdbot.com/queue)
 
 ## Workspace & skills
 
-- [Skills config](https://github.com/clawdbot/clawdbot/blob/main/docs/skills-config.md)
-- [Default AGENTS](https://github.com/clawdbot/clawdbot/blob/main/docs/AGENTS.default.md)
-- [Templates: AGENTS](https://github.com/clawdbot/clawdbot/blob/main/docs/templates/AGENTS.md)
-- [Templates: BOOTSTRAP](https://github.com/clawdbot/clawdbot/blob/main/docs/templates/BOOTSTRAP.md)
-- [Templates: IDENTITY](https://github.com/clawdbot/clawdbot/blob/main/docs/templates/IDENTITY.md)
-- [Templates: SOUL](https://github.com/clawdbot/clawdbot/blob/main/docs/templates/SOUL.md)
-- [Templates: TOOLS](https://github.com/clawdbot/clawdbot/blob/main/docs/templates/TOOLS.md)
-- [Templates: USER](https://github.com/clawdbot/clawdbot/blob/main/docs/templates/USER.md)
+- [Skills config](https://docs.clawdbot.com/skills-config)
+- [Default AGENTS](https://docs.clawdbot.com/AGENTS.default)
+- [Templates: AGENTS](https://docs.clawdbot.com/templates/AGENTS)
+- [Templates: BOOTSTRAP](https://docs.clawdbot.com/templates/BOOTSTRAP)
+- [Templates: IDENTITY](https://docs.clawdbot.com/templates/IDENTITY)
+- [Templates: SOUL](https://docs.clawdbot.com/templates/SOUL)
+- [Templates: TOOLS](https://docs.clawdbot.com/templates/TOOLS)
+- [Templates: USER](https://docs.clawdbot.com/templates/USER)
 
 ## Platform internals
 
-- [macOS dev setup](https://github.com/clawdbot/clawdbot/blob/main/docs/mac/dev-setup.md)
-- [macOS menu bar](https://github.com/clawdbot/clawdbot/blob/main/docs/mac/menu-bar.md)
-- [macOS voice wake](https://github.com/clawdbot/clawdbot/blob/main/docs/mac/voicewake.md)
-- [iOS node](https://github.com/clawdbot/clawdbot/blob/main/docs/ios.md)
-- [Android node](https://github.com/clawdbot/clawdbot/blob/main/docs/android.md)
-- [Windows app](https://github.com/clawdbot/clawdbot/blob/main/docs/windows.md)
-- [Linux app](https://github.com/clawdbot/clawdbot/blob/main/docs/linux.md)
+- [macOS dev setup](https://docs.clawdbot.com/mac/dev-setup)
+- [macOS menu bar](https://docs.clawdbot.com/mac/menu-bar)
+- [macOS voice wake](https://docs.clawdbot.com/mac/voicewake)
+- [iOS node](https://docs.clawdbot.com/ios)
+- [Android node](https://docs.clawdbot.com/android)
+- [Windows app](https://docs.clawdbot.com/windows)
+- [Linux app](https://docs.clawdbot.com/linux)
 
 ## Email hooks (Gmail)
 
-[Gmail Pub/Sub wiring (gcloud + gogcli), hook tokens, and auto-watch behavior are documented here.](https://github.com/clawdbot/clawdbot/blob/main/docs/gmail-pubsub.md)
+[Gmail Pub/Sub wiring (gcloud + gogcli), hook tokens, and auto-watch behavior are documented here.](https://docs.clawdbot.com/gmail-pubsub)
 
 Gateway auto-starts the watcher when `hooks.enabled=true` and `hooks.gmail.account` is set; `clawdbot hooks gmail run` is the manual daemon wrapper if you don’t want auto-start.
 
@@ -441,6 +430,4 @@ Thanks to all clawtributors:
   <a href="https://github.com/mbelinky"><img src="https://avatars.githubusercontent.com/u/132747814?v=4&s=48" width="48" height="48" alt="mbelinky" title="mbelinky"/></a> <a href="https://github.com/julianengel"><img src="https://avatars.githubusercontent.com/u/10634231?v=4&s=48" width="48" height="48" alt="julianengel" title="julianengel"/></a> <a href="https://github.com/CashWilliams"><img src="https://avatars.githubusercontent.com/u/613573?v=4&s=48" width="48" height="48" alt="CashWilliams" title="CashWilliams"/></a> <a href="https://github.com/omniwired"><img src="https://avatars.githubusercontent.com/u/322761?v=4&s=48" width="48" height="48" alt="omniwired" title="omniwired"/></a> <a href="https://github.com/jverdi"><img src="https://avatars.githubusercontent.com/u/345050?v=4&s=48" width="48" height="48" alt="jverdi" title="jverdi"/></a> <a href="https://github.com/Syhids"><img src="https://avatars.githubusercontent.com/u/671202?v=4&s=48" width="48" height="48" alt="Syhids" title="Syhids"/></a> <a href="https://github.com/meaningfool"><img src="https://avatars.githubusercontent.com/u/2862331?v=4&s=48" width="48" height="48" alt="meaningfool" title="meaningfool"/></a> <a href="https://github.com/rafaelreis-r"><img src="https://avatars.githubusercontent.com/u/57492577?v=4&s=48" width="48" height="48" alt="rafaelreis-r" title="rafaelreis-r"/></a> <a href="https://github.com/wstock"><img src="https://avatars.githubusercontent.com/u/1394687?v=4&s=48" width="48" height="48" alt="wstock" title="wstock"/></a> <a href="https://github.com/vsabavat"><img src="https://avatars.githubusercontent.com/u/50385532?v=4&s=48" width="48" height="48" alt="vsabavat" title="vsabavat"/></a>
   <a href="https://github.com/scald"><img src="https://avatars.githubusercontent.com/u/1215913?v=4&s=48" width="48" height="48" alt="scald" title="scald"/></a> <a href="https://github.com/sreekaransrinath"><img src="https://avatars.githubusercontent.com/u/50989977?v=4&s=48" width="48" height="48" alt="sreekaransrinath" title="sreekaransrinath"/></a> <a href="https://github.com/ratulsarna"><img src="https://avatars.githubusercontent.com/u/105903728?v=4&s=48" width="48" height="48" alt="ratulsarna" title="ratulsarna"/></a> <a href="https://github.com/osolmaz"><img src="https://avatars.githubusercontent.com/u/2453968?v=4&s=48" width="48" height="48" alt="osolmaz" title="osolmaz"/></a> <a href="https://github.com/conhecendocontato"><img src="https://avatars.githubusercontent.com/u/82890727?v=4&s=48" width="48" height="48" alt="conhecendocontato" title="conhecendocontato"/></a> <a href="https://github.com/hrdwdmrbl"><img src="https://avatars.githubusercontent.com/u/554881?v=4&s=48" width="48" height="48" alt="hrdwdmrbl" title="hrdwdmrbl"/></a> <a href="https://github.com/jayhickey"><img src="https://avatars.githubusercontent.com/u/1676460?v=4&s=48" width="48" height="48" alt="jayhickey" title="jayhickey"/></a> <a href="https://github.com/jamesgroat"><img src="https://avatars.githubusercontent.com/u/2634024?v=4&s=48" width="48" height="48" alt="jamesgroat" title="jamesgroat"/></a> <a href="https://github.com/gtsifrikas"><img src="https://avatars.githubusercontent.com/u/8904378?v=4&s=48" width="48" height="48" alt="gtsifrikas" title="gtsifrikas"/></a> <a href="https://github.com/djangonavarro220"><img src="https://avatars.githubusercontent.com/u/251162586?v=4&s=48" width="48" height="48" alt="djangonavarro220" title="djangonavarro220"/></a>
   <a href="https://github.com/azade-c"><img src="https://avatars.githubusercontent.com/u/252790079?v=4&s=48" width="48" height="48" alt="azade-c" title="azade-c"/></a> <a href="https://github.com/andranik-sahakyan"><img src="https://avatars.githubusercontent.com/u/8908029?v=4&s=48" width="48" height="48" alt="andranik-sahakyan" title="andranik-sahakyan"/></a>
-  <a href="https://github.com/adamgall"><img src="https://avatars.githubusercontent.com/u/706929?v=4&s=48" width="48" height="48" alt="adamgall" title="adamgall"/></a> <a href="https://github.com/jalehman"><img src="https://avatars.githubusercontent.com/u/550978?v=4&s=48" width="48" height="48" alt="jalehman" title="jalehman"/></a> <a href="https://github.com/jarvis-medmatic"><img src="https://avatars.githubusercontent.com/u/252428873?v=4&s=48" width="48" height="48" alt="jarvis-medmatic" title="jarvis-medmatic"/></a> <a href="https://github.com/mneves75"><img src="https://avatars.githubusercontent.com/u/2423436?v=4&s=48" width="48" height="48" alt="mneves75" title="mneves75"/></a> <a href="https://github.com/regenrek"><img src="https://avatars.githubusercontent.com/u/5182020?v=4&s=48" width="48" height="48" alt="regenrek" title="regenrek"/></a> <a href="https://github.com/tobiasbischoff"><img src="https://avatars.githubusercontent.com/u/711564?v=4&s=48" width="48" height="48" alt="tobiasbischoff" title="tobiasbischoff"/></a> <a href="https://github.com/MSch"><img src="https://avatars.githubusercontent.com/u/7475?v=4&s=48" width="48" height="48" alt="MSch" title="MSch"/></a> <a href="https://github.com/obviyus"><img src="https://avatars.githubusercontent.com/u/22031114?v=4&s=48" width="48" height="48" alt="obviyus" title="obviyus"/></a> <a href="https://github.com/dbhurley"><img src="https://avatars.githubusercontent.com/u/5251425?v=4&s=48" width="48" height="48" alt="dbhurley" title="dbhurley"/></a>
-  <a href="https://github.com/Asleep123"><img src="https://avatars.githubusercontent.com/u/122379135?v=4&s=48" width="48" height="48" alt="Asleep123" title="Asleep123"/></a> <a href="https://github.com/Iamadig"><img src="https://avatars.githubusercontent.com/u/102129234?v=4&s=48" width="48" height="48" alt="Iamadig" title="Iamadig"/></a> <a href="https://github.com/imfing"><img src="https://avatars.githubusercontent.com/u/5097752?v=4&s=48" width="48" height="48" alt="imfing" title="imfing"/></a> <a href="https://github.com/kitze"><img src="https://avatars.githubusercontent.com/u/1160594?v=4&s=48" width="48" height="48" alt="kitze" title="kitze"/></a> <a href="https://github.com/nachoiacovino"><img src="https://avatars.githubusercontent.com/u/50103937?v=4&s=48" width="48" height="48" alt="nachoiacovino" title="nachoiacovino"/></a> <a href="https://github.com/VACInc"><img src="https://avatars.githubusercontent.com/u/3279061?v=4&s=48" width="48" height="48" alt="VACInc" title="VACInc"/></a> <a href="https://github.com/cash-echo-bot"><img src="https://avatars.githubusercontent.com/u/252747386?v=4&s=48" width="48" height="48" alt="cash-echo-bot" title="cash-echo-bot"/></a> <a href="https://github.com/claude"><img src="https://avatars.githubusercontent.com/u/81847?v=4&s=48" width="48" height="48" alt="claude" title="claude"/></a> <a href="https://github.com/kiranjd"><img src="https://avatars.githubusercontent.com/u/25822851?v=4&s=48" width="48" height="48" alt="kiranjd" title="kiranjd"/></a> <a href="https://github.com/pcty-nextgen-service-account"><img src="https://avatars.githubusercontent.com/u/112553441?v=4&s=48" width="48" height="48" alt="pcty-nextgen-service-account" title="pcty-nextgen-service-account"/></a>
 </p>

apps/android/app/src/main/assets/tool-display.json

@@ -12,7 +12,7 @@
       "element",
       "node",
       "nodeId",
-      "id",
+      "jobId",
       "requestId",
       "to",
       "channelId",
@@ -136,10 +136,10 @@
           "label": "add",
           "detailKeys": ["job.name", "job.id", "job.schedule", "job.cron"]
         },
-        "update": { "label": "update", "detailKeys": ["id"] },
-        "remove": { "label": "remove", "detailKeys": ["id"] },
-        "run": { "label": "run", "detailKeys": ["id"] },
-        "runs": { "label": "runs", "detailKeys": ["id"] },
+        "update": { "label": "update", "detailKeys": ["jobId"] },
+        "remove": { "label": "remove", "detailKeys": ["jobId"] },
+        "run": { "label": "run", "detailKeys": ["jobId"] },
+        "runs": { "label": "runs", "detailKeys": ["jobId"] },
         "wake": { "label": "wake", "detailKeys": ["text", "mode"] }
       }
     },

apps/macos/Sources/Clawdbot/CronJobEditor.swift

@@ -323,9 +323,6 @@ struct CronJobEditor: View {
                             Text("whatsapp").tag(GatewayAgentChannel.whatsapp)
                             Text("telegram").tag(GatewayAgentChannel.telegram)
                             Text("discord").tag(GatewayAgentChannel.discord)
-                            Text("slack").tag(GatewayAgentChannel.slack)
-                            Text("signal").tag(GatewayAgentChannel.signal)
-                            Text("imessage").tag(GatewayAgentChannel.imessage)
                         }
                         .labelsHidden()
                         .pickerStyle(.segmented)

apps/macos/Sources/Clawdbot/GatewayConnection.swift

@@ -10,9 +10,6 @@ enum GatewayAgentChannel: String, Codable, CaseIterable, Sendable {
     case whatsapp
     case telegram
     case discord
-    case slack
-    case signal
-    case imessage
     case webchat
 
     init(raw: String?) {

apps/macos/Sources/ClawdbotProtocol/GatewayModels.swift

@@ -369,43 +369,6 @@ public struct SendParams: Codable, Sendable {
     }
 }
 
-public struct PollParams: Codable, Sendable {
-    public let to: String
-    public let question: String
-    public let options: [String]
-    public let maxselections: Int?
-    public let durationhours: Int?
-    public let provider: String?
-    public let idempotencykey: String
-
-    public init(
-        to: String,
-        question: String,
-        options: [String],
-        maxselections: Int?,
-        durationhours: Int?,
-        provider: String?,
-        idempotencykey: String
-    ) {
-        self.to = to
-        self.question = question
-        self.options = options
-        self.maxselections = maxselections
-        self.durationhours = durationhours
-        self.provider = provider
-        self.idempotencykey = idempotencykey
-    }
-    private enum CodingKeys: String, CodingKey {
-        case to
-        case question
-        case options
-        case maxselections = "maxSelections"
-        case durationhours = "durationHours"
-        case provider
-        case idempotencykey = "idempotencyKey"
-    }
-}
-
 public struct AgentParams: Codable, Sendable {
     public let message: String
     public let to: String?
@@ -655,27 +618,23 @@ public struct SessionsListParams: Codable, Sendable {
     public let activeminutes: Int?
     public let includeglobal: Bool?
     public let includeunknown: Bool?
-    public let spawnedby: String?
 
     public init(
         limit: Int?,
         activeminutes: Int?,
         includeglobal: Bool?,
-        includeunknown: Bool?,
-        spawnedby: String?
+        includeunknown: Bool?
     ) {
         self.limit = limit
         self.activeminutes = activeminutes
         self.includeglobal = includeglobal
         self.includeunknown = includeunknown
-        self.spawnedby = spawnedby
     }
     private enum CodingKeys: String, CodingKey {
         case limit
         case activeminutes = "activeMinutes"
         case includeglobal = "includeGlobal"
         case includeunknown = "includeUnknown"
-        case spawnedby = "spawnedBy"
     }
 }
 
@@ -685,7 +644,6 @@ public struct SessionsPatchParams: Codable, Sendable {
     public let verboselevel: AnyCodable?
     public let elevatedlevel: AnyCodable?
     public let model: AnyCodable?
-    public let spawnedby: AnyCodable?
     public let sendpolicy: AnyCodable?
     public let groupactivation: AnyCodable?
 
@@ -695,7 +653,6 @@ public struct SessionsPatchParams: Codable, Sendable {
         verboselevel: AnyCodable?,
         elevatedlevel: AnyCodable?,
         model: AnyCodable?,
-        spawnedby: AnyCodable?,
         sendpolicy: AnyCodable?,
         groupactivation: AnyCodable?
     ) {
@@ -704,7 +661,6 @@ public struct SessionsPatchParams: Codable, Sendable {
         self.verboselevel = verboselevel
         self.elevatedlevel = elevatedlevel
         self.model = model
-        self.spawnedby = spawnedby
         self.sendpolicy = sendpolicy
         self.groupactivation = groupactivation
     }
@@ -714,7 +670,6 @@ public struct SessionsPatchParams: Codable, Sendable {
         case verboselevel = "verboseLevel"
         case elevatedlevel = "elevatedLevel"
         case model
-        case spawnedby = "spawnedBy"
         case sendpolicy = "sendPolicy"
         case groupactivation = "groupActivation"
     }

apps/shared/ClawdbotKit/Resources/tool-display.json

@@ -12,7 +12,7 @@
       "element",
       "node",
       "nodeId",
-      "id",
+      "jobId",
       "requestId",
       "to",
       "channelId",
@@ -136,10 +136,10 @@
           "label": "add",
           "detailKeys": ["job.name", "job.id", "job.schedule", "job.cron"]
         },
-        "update": { "label": "update", "detailKeys": ["id"] },
-        "remove": { "label": "remove", "detailKeys": ["id"] },
-        "run": { "label": "run", "detailKeys": ["id"] },
-        "runs": { "label": "runs", "detailKeys": ["id"] },
+        "update": { "label": "update", "detailKeys": ["jobId"] },
+        "remove": { "label": "remove", "detailKeys": ["jobId"] },
+        "run": { "label": "run", "detailKeys": ["jobId"] },
+        "runs": { "label": "runs", "detailKeys": ["jobId"] },
         "wake": { "label": "wake", "detailKeys": ["text", "mode"] }
       }
     },

docs/assets/terminal.css

@@ -70,12 +70,9 @@ html[data-theme="dark"] {
   box-sizing: border-box;
 }
 
-html {
-  height: 100%;
-}
-
+html,
 body {
-  min-height: 100%;
+  height: 100%;
 }
 
 body {

docs/bun.md

@@ -1,56 +0,0 @@
-# Bun (optional)
-
-Goal: allow running this repo with Bun without maintaining a Bun lockfile or losing pnpm patch behavior.
-
-## Status
-
-- pnpm remains the primary package manager/runtime for this repo.
-- Bun can be used for local installs/builds/tests, but Bun currently **cannot use** `pnpm-lock.yaml` and will ignore it.
-
-## Install (no Bun lockfile)
-
-Use Bun without writing `bun.lock`/`bun.lockb`:
-
-```sh
-bun install --no-save
-```
-
-This avoids maintaining two lockfiles. (`bun.lock`/`bun.lockb` are gitignored.)
-
-## Build / Test (Bun)
-
-```sh
-bun run build
-bun run vitest run
-```
-
-## pnpm patchedDependencies under Bun
-
-pnpm supports `package.json#pnpm.patchedDependencies` and records it in `pnpm-lock.yaml`.
-Bun does not support pnpm patches, so we apply them in `postinstall` when Bun is detected:
-
-- `scripts/postinstall.js` runs only for Bun installs and applies every entry from `package.json#pnpm.patchedDependencies` into `node_modules/...` using `git apply` (idempotent).
-
-To add a new patch that works in both pnpm + Bun:
-
-1. Add an entry to `package.json#pnpm.patchedDependencies`
-2. Add the patch file under `patches/`
-3. Run `pnpm install` (updates `pnpm-lock.yaml` patch hash)
-
-## Bun lifecycle scripts (blocked by default)
-
-Bun may block dependency lifecycle scripts unless explicitly trusted (`bun pm untrusted` / `bun pm trust`).
-For this repo, the commonly blocked scripts are not required:
-
-- `@whiskeysockets/baileys` `preinstall`: checks Node major >= 20 (we run Node 22+).
-- `protobufjs` `postinstall`: emits warnings about incompatible version schemes (no build artifacts).
-
-If you hit a real runtime issue that requires these scripts, trust them explicitly:
-
-```sh
-bun pm trust @whiskeysockets/baileys protobufjs
-```
-
-## Caveats
-
-- Some scripts still hardcode pnpm (e.g. `docs:build`, `ui:*`, `protocol:check`). Run those via pnpm for now.

docs/clawd.md

@@ -147,7 +147,6 @@ Example:
 - Session files: `~/.clawdbot/sessions/{{SessionId}}.jsonl`
 - Session metadata (token usage, last route, etc): `~/.clawdbot/sessions/sessions.json` (legacy: `~/.clawdbot/sessions.json`)
 - `/new` or `/reset` starts a fresh session for that chat (configurable via `resetTriggers`). If sent alone, the agent replies with a short hello to confirm the reset.
-- `/compact [instructions]` compacts the session context and reports the remaining context budget.
 
 ## Heartbeats (proactive mode)
 

docs/configuration.md

@@ -9,7 +9,7 @@ CLAWDBOT reads an optional **JSON5** config from `~/.clawdbot/clawdbot.json` (co
 
 If the file is missing, CLAWDBOT uses safe-ish defaults (embedded Pi agent + per-sender sessions + workspace `~/clawd`). You usually only need a config to:
 - restrict who can trigger the bot (`whatsapp.allowFrom`, `telegram.allowFrom`, etc.)
-- control group allowlists + mention behavior (`whatsapp.groups`, `telegram.groups`, `discord.guilds`, `routing.groupChat`)
+- control group mention behavior (`whatsapp.groups`, `telegram.groups`, `discord.guilds`, `routing.groupChat`)
 - customize message prefixes (`messages`)
 - set the agent's workspace (`agent.workspace`)
 - tune the embedded agent (`agent`) and session behavior (`session`)
@@ -91,48 +91,26 @@ Env var equivalent:
 
 ### Auth storage (OAuth + API keys)
 
-Clawdbot stores **auth profiles** (OAuth + API keys) in:
-- `~/.clawdbot/agent/auth-profiles.json`
-
-Legacy OAuth imports:
+Clawdbot stores **OAuth credentials** in:
 - `~/.clawdbot/credentials/oauth.json` (or `$CLAWDBOT_STATE_DIR/credentials/oauth.json`)
 
-The embedded Pi agent maintains a runtime cache at:
-- `~/.clawdbot/agent/auth.json` (managed automatically; don’t edit manually)
+Clawdbot stores **API keys** in the agent auth store:
+- `~/.clawdbot/agent/auth.json`
 
 Overrides:
-- OAuth dir (legacy import only): `CLAWDBOT_OAUTH_DIR`
+- OAuth dir: `CLAWDBOT_OAUTH_DIR`
 - Agent dir: `CLAWDBOT_AGENT_DIR` (preferred), `PI_CODING_AGENT_DIR` (legacy)
 
-On first use, Clawdbot imports `oauth.json` entries into `auth-profiles.json`.
-
-### `auth`
-
-Optional metadata for auth profiles. This does **not** store secrets; it maps
-profile IDs to a provider + mode (and optional email) and defines the provider
-rotation order used for failover.
-
-```json5
-{
-  auth: {
-    profiles: {
-      "anthropic:default": { provider: "anthropic", mode: "oauth", email: "me@example.com" },
-      "anthropic:work": { provider: "anthropic", mode: "api_key" }
-    },
-    order: {
-      anthropic: ["anthropic:default", "anthropic:work"]
-    }
-  }
-}
-```
+On first use, Clawdbot imports `oauth.json` entries into `auth.json` so the embedded
+agent can use them. `oauth.json` remains the source of truth for OAuth refresh.
 
 ### `identity`
 
 Optional agent identity used for defaults and UX. This is written by the macOS onboarding assistant.
 
 If set, CLAWDBOT derives defaults (only when you haven’t set them explicitly):
-- `messages.ackReaction` from `identity.emoji` (falls back to 👀)
-- `routing.groupChat.mentionPatterns` from `identity.name` (so “@Samantha” works in groups across Telegram/Slack/Discord/iMessage/WhatsApp)
+- `messages.responsePrefix` from `identity.emoji`
+- `routing.groupChat.mentionPatterns` from `identity.name` (so “@Samantha” works in groups)
 
 ```json5
 {
@@ -186,9 +164,8 @@ Metadata written by CLI wizards (`onboard`, `configure`, `doctor`, `update`).
 
 ### `whatsapp.allowFrom`
 
-Allowlist of E.164 phone numbers that may trigger WhatsApp auto-replies (**DMs only**).
+Allowlist of E.164 phone numbers that may trigger WhatsApp auto-replies (DMs only).
 If empty, the default allowlist is your own WhatsApp number (self-chat mode).
-For groups, use `whatsapp.groupPolicy` + `whatsapp.groupAllowFrom`.
 
 ```json5
 {
@@ -206,7 +183,6 @@ Group messages default to **require mention** (either metadata mention or regex
 **Mention types:**
 - **Metadata mentions**: Native platform @-mentions (e.g., WhatsApp tap-to-mention). Ignored in WhatsApp self-chat mode (see `whatsapp.allowFrom`).
 - **Text patterns**: Regex patterns defined in `mentionPatterns`. Always checked regardless of self-chat mode.
-- Mention gating is enforced only when mention detection is possible (native mentions or at least one `mentionPattern`).
 
 ```json5
 {
@@ -219,7 +195,7 @@ Group messages default to **require mention** (either metadata mention or regex
 }
 ```
 
-Mention gating defaults live per provider (`whatsapp.groups`, `telegram.groups`, `imessage.groups`, `discord.guilds`). When `*.groups` is set, it also acts as a group allowlist; include `"*"` to allow all groups.
+Mention gating defaults live per provider (`whatsapp.groups`, `telegram.groups`, `imessage.groups`, `discord.guilds`).
 
 To respond **only** to specific text triggers (ignoring native @-mentions):
 ```json5
@@ -238,51 +214,6 @@ To respond **only** to specific text triggers (ignoring native @-mentions):
 }
 ```
 
-### Group policy (per provider)
-
-Use `*.groupPolicy` to control whether group/room messages are accepted at all:
-
-```json5
-{
-  whatsapp: {
-    groupPolicy: "allowlist",
-    groupAllowFrom: ["+15551234567"]
-  },
-  telegram: {
-    groupPolicy: "allowlist",
-    groupAllowFrom: ["tg:123456789", "@alice"]
-  },
-  signal: {
-    groupPolicy: "allowlist",
-    groupAllowFrom: ["+15551234567"]
-  },
-  imessage: {
-    groupPolicy: "allowlist",
-    groupAllowFrom: ["chat_id:123"]
-  },
-  discord: {
-    groupPolicy: "allowlist",
-    guilds: {
-      "GUILD_ID": {
-        channels: { help: { allow: true } }
-      }
-    }
-  },
-  slack: {
-    groupPolicy: "allowlist",
-    channels: { "#general": { allow: true } }
-  }
-}
-```
-
-Notes:
-- `"open"` (default): groups bypass allowlists; mention-gating still applies.
-- `"disabled"`: block all group/room messages.
-- `"allowlist"`: only allow groups/rooms that match the configured allowlist.
-- WhatsApp/Telegram/Signal/iMessage use `groupAllowFrom` (fallback: explicit `allowFrom`).
-- Discord/Slack use channel allowlists (`discord.guilds.*.channels`, `slack.channels`).
-- Group DMs (Discord/Slack) are still controlled by `dm.groupEnabled` + `dm.groupChannels`.
-
 ### `routing.queue`
 
 Controls how inbound messages behave when an agent run is already active.
@@ -523,15 +454,13 @@ message envelopes). If unset, Clawdbot uses the host timezone at runtime.
 
 ### `messages`
 
-Controls inbound/outbound prefixes and optional ack reactions.
+Controls inbound/outbound prefixes.
 
 ```json5
 {
   messages: {
     messagePrefix: "[clawdbot]",
-    responsePrefix: "🦞",
-    ackReaction: "👀",
-    ackReactionScope: "group-mentions"
+    responsePrefix: "🦞"
   }
 }
 ```
@@ -539,16 +468,6 @@ Controls inbound/outbound prefixes and optional ack reactions.
 `responsePrefix` is applied to **all outbound replies** (tool summaries, block
 streaming, final replies) across providers unless already present.
 
-`ackReaction` sends a best-effort emoji reaction to acknowledge inbound messages
-on providers that support reactions (Slack/Discord/Telegram). Defaults to the
-configured `identity.emoji` when set, otherwise `"👀"`. Set it to `""` to disable.
-
-`ackReactionScope` controls when reactions fire:
-- `group-mentions` (default): only when a group/room requires mentions **and** the bot was mentioned
-- `group-all`: all group/room messages
-- `direct`: direct messages only
-- `all`: all messages
-
 ### `talk`
 
 Defaults for Talk mode (macOS/iOS/Android). Voice IDs fall back to `ELEVENLABS_VOICE_ID` or `SAG_VOICE_ID` when unset.
@@ -574,12 +493,14 @@ Defaults for Talk mode (macOS/iOS/Android). Voice IDs fall back to `ELEVENLABS_V
 ### `agent`
 
 Controls the embedded agent runtime (model/thinking/verbose/timeouts).
-`agent.models` defines the configured model catalog (and acts as the allowlist for `/model`).
-`agent.model.primary` sets the default model; `agent.model.fallbacks` are global failovers.
-`agent.imageModel` is optional and is **only used if the primary model lacks image input**.
+`allowedModels` lets `/model` list/filter and enforce a per-session allowlist
+(omit to show the full catalog).
+`modelAliases` adds short names for `/model` (alias -> provider/model).
+`modelFallbacks` lists ordered fallback models to try when the default fails.
+`imageModel` selects an image-capable model for the `image` tool.
+`imageModelFallbacks` lists ordered fallback image models for the `image` tool.
 
-Clawdbot also ships a few built-in alias shorthands. Defaults only apply when the model
-is already present in `agent.models`:
+Clawdbot also ships a few built-in `modelAliases` shorthands (when an `agent` section exists):
 
 - `opus` -> `anthropic/claude-opus-4-5`
 - `sonnet` -> `anthropic/claude-sonnet-4-5`
@@ -593,24 +514,23 @@ If you configure the same alias name (case-insensitive) yourself, your value win
 ```json5
 {
   agent: {
-    models: {
-      "anthropic/claude-opus-4-5": { alias: "Opus" },
-      "anthropic/claude-sonnet-4-1": { alias: "Sonnet" },
-      "openrouter/deepseek/deepseek-r1:free": {}
-    },
-    model: {
-      primary: "anthropic/claude-opus-4-5",
-      fallbacks: [
-        "openrouter/deepseek/deepseek-r1:free",
-        "openrouter/meta-llama/llama-3.3-70b-instruct:free"
-      ]
-    },
-    imageModel: {
-      primary: "openrouter/qwen/qwen-2.5-vl-72b-instruct:free",
-      fallbacks: [
-        "openrouter/google/gemini-2.0-flash-vision:free"
-      ]
+    model: "anthropic/claude-opus-4-5",
+    allowedModels: [
+      "anthropic/claude-opus-4-5",
+      "anthropic/claude-sonnet-4-1"
+    ],
+    modelAliases: {
+      Opus: "anthropic/claude-opus-4-5",
+      Sonnet: "anthropic/claude-sonnet-4-1"
     },
+    modelFallbacks: [
+      "openrouter/deepseek/deepseek-r1:free",
+      "openrouter/meta-llama/llama-3.3-70b-instruct:free"
+    ],
+    imageModel: "openrouter/qwen/qwen-2.5-vl-72b-instruct:free",
+    imageModelFallbacks: [
+      "openrouter/google/gemini-2.0-flash-vision:free"
+    ],
     thinkingDefault: "low",
     verboseDefault: "off",
     elevatedDefault: "on",
@@ -645,8 +565,8 @@ Block streaming:
   }
   ```
 
-`agent.model.primary` should be set as `provider/model` (e.g. `anthropic/claude-opus-4-5`).
-Aliases come from `agent.models.*.alias` (e.g. `Opus`).
+`agent.model` should be set as `provider/model` (e.g. `anthropic/claude-opus-4-5`).
+If `modelAliases` is configured, you may also use the alias key (e.g. `Opus`).
 If you omit the provider, CLAWDBOT currently assumes `anthropic` as a temporary
 deprecation fallback.
 Z.AI models are available as `zai/<model>` (e.g. `zai/glm-4.7`) and require
@@ -808,16 +728,11 @@ When `models.providers` is present, Clawdbot writes/merges a `models.json` into
 - default behavior: **merge** (keeps existing providers, overrides on name)
 - set `models.mode: "replace"` to overwrite the file contents
 
-Select the model via `agent.model.primary` (provider/model).
+Select the model via `agent.model` (provider/model).
 
 ```json5
 {
-  agent: {
-    model: { primary: "custom-proxy/llama-3.1-8b" },
-    models: {
-      "custom-proxy/llama-3.1-8b": {}
-    }
-  },
+  agent: { model: "custom-proxy/llama-3.1-8b" },
   models: {
     mode: "merge",
     providers: {
@@ -850,10 +765,14 @@ via **LM Studio** using the **Responses API**.
 ```json5
 {
   agent: {
-    model: { primary: "lmstudio/minimax-m2.1-gs32" },
-    models: {
-      "anthropic/claude-opus-4-5": { alias: "Opus" },
-      "lmstudio/minimax-m2.1-gs32": { alias: "Minimax" }
+    model: "Minimax",
+    allowedModels: [
+      "anthropic/claude-opus-4-5",
+      "lmstudio/minimax-m2.1-gs32"
+    ],
+    modelAliases: {
+      Opus: "anthropic/claude-opus-4-5",
+      Minimax: "lmstudio/minimax-m2.1-gs32"
     }
   },
   models: {

docs/control-ui.md

@@ -63,21 +63,21 @@ Paste the token into the UI settings (sent as `connect.params.auth.token`).
 The Gateway serves static files from `dist/control-ui`. Build them with:
 
 ```bash
-bun run ui:install
-bun run ui:build
+pnpm ui:install
+pnpm ui:build
 ```
 
 Optional absolute base (when you want fixed asset URLs):
 
 ```bash
-CLAWDBOT_CONTROL_UI_BASE_PATH=/clawdbot/ bun run ui:build
+CLAWDBOT_CONTROL_UI_BASE_PATH=/clawdbot/ pnpm ui:build
 ```
 
 For local development (separate dev server):
 
 ```bash
-bun run ui:install
-bun run ui:dev
+pnpm ui:install
+pnpm ui:dev
 ```
 
 Then point the UI at your Gateway WS URL (e.g. `ws://127.0.0.1:18789`).

docs/cron.md

@@ -216,17 +216,6 @@ Retention:
 
 Each log line includes (at minimum) job id, status/error, timing, and a `summary` string (systemEvent text for main jobs, and the last agent text output for isolated jobs).
 
-## Compatibility policy (cron.add/cron.update)
-
-To keep older clients working, the Gateway applies **best-effort normalization** for `cron.add` and `cron.update`:
-- Accepts wrapped payloads under `data` or `job` and unwraps them.
-- Infers `schedule.kind` from `atMs`, `everyMs`, or `expr` if missing.
-- Infers `payload.kind` from `text` (systemEvent) or `message` (agentTurn) if missing.
-- Defaults `wakeMode` to `"next-heartbeat"` when omitted.
-- Defaults `sessionTarget` based on payload kind (`systemEvent` → `"main"`, `agentTurn` → `"isolated"`).
-
-Normalization is **compat-only**. New clients should send the full schema (including `kind`, `sessionTarget`, and `wakeMode`) to avoid ambiguity. Unknown fields are still rejected by schema validation.
-
 ## Gateway API
 
 New methods (names can be bikeshed; `cron.*` is suggested):
@@ -275,7 +264,7 @@ Add a `cron` command group (all commands should also support `--json` where sens
     - `--wake now|next-heartbeat`
   - payload flags (choose one):
     - `--system-event "<text>"`
-    - `--message "<agent message>" [--deliver] [--channel last|whatsapp|telegram|discord|slack|signal|imessage] [--to <dest>]`
+    - `--message "<agent message>" [--deliver] [--channel last|whatsapp|telegram|discord|signal|imessage] [--to <dest>]`
 
 - `clawdbot cron edit <id> ...` (patch-by-flags, non-interactive)
 - `clawdbot cron rm <id>`

docs/discord.md

@@ -123,7 +123,6 @@ Example “single server, only allow me, only allow #help”:
 
 Notes:
 - `requireMention: true` means the bot only replies when mentioned (recommended for shared channels).
-- `routing.groupChat.mentionPatterns` also count as mentions for guild messages.
 - If `channels` is present, any channel not listed is denied by default.
 
 ### 6) Verify it works
@@ -155,7 +154,6 @@ Notes:
   discord: {
     enabled: true,
     token: "abc.123",
-    groupPolicy: "open",
     mediaMaxMb: 8,
     actions: {
       reactions: true,
@@ -204,14 +202,10 @@ Notes:
 }
 ```
 
-Ack reactions are controlled globally via `messages.ackReaction` +
-`messages.ackReactionScope`.
-
 - `dm.enabled`: set `false` to ignore all DMs (default `true`).
 - `dm.allowFrom`: DM allowlist (user ids or names). Omit or set to `["*"]` to allow any DM sender.
 - `dm.groupEnabled`: enable group DMs (default `false`).
 - `dm.groupChannels`: optional allowlist for group DM channel ids or slugs.
-- `groupPolicy`: controls guild channel handling (`open|disabled|allowlist`); `allowlist` requires channel allowlists.
 - `guilds`: per-guild rules keyed by guild id (preferred) or slug.
 - `guilds."*"`: default per-guild settings applied when no explicit entry exists.
 - `guilds.<id>.slug`: optional friendly slug used for display names.

docs/docker.md

@@ -59,12 +59,6 @@ docker compose exec clawdbot-gateway node dist/index.js health --token "$CLAWDBO
 scripts/e2e/onboard-docker.sh
 ```
 
-### QR import smoke test (Docker)
-
-```bash
-pnpm test:docker:qr
-```
-
 ### Notes
 
 - Gateway bind defaults to `lan` for container use.

docs/doctor.md

@@ -27,13 +27,8 @@ Doctor will:
 - Show the migration it applied.
 - Rewrite `~/.clawdbot/clawdbot.json` with the updated schema.
 
-The Gateway also auto-runs doctor migrations on startup when it detects a legacy
-config format, so stale configs are repaired without manual intervention.
-
 Current migrations:
 - `routing.allowFrom` → `whatsapp.allowFrom`
-- `agent.model`/`allowedModels`/`modelAliases`/`modelFallbacks`/`imageModelFallbacks`
-  → `agent.models` + `agent.model.primary/fallbacks` + `agent.imageModel.primary/fallbacks`
 
 ## Usage
 

docs/faq.md

@@ -15,8 +15,7 @@ Everything lives under `~/.clawdbot/`:
 |------|---------|
 | `~/.clawdbot/clawdbot.json` | Main config (JSON5) |
 | `~/.clawdbot/credentials/oauth.json` | OAuth credentials (Anthropic/OpenAI, etc.) |
-| `~/.clawdbot/agent/auth-profiles.json` | Auth profiles (OAuth + API keys) |
-| `~/.clawdbot/agent/auth.json` | Runtime API key cache (managed automatically) |
+| `~/.clawdbot/agent/auth.json` | API key store |
 | `~/.clawdbot/credentials/` | WhatsApp/Telegram auth tokens |
 | `~/.clawdbot/sessions/` | Conversation history & state |
 | `~/.clawdbot/sessions/sessions.json` | Session metadata |
@@ -302,7 +301,7 @@ Claude Opus has a 200k token context window, and Clawdbot uses **autocompaction*
 
 Practical tips:
 - Keep `AGENTS.md` focused, not bloated.
-- Use `/compact` to shrink older context or `/new` to reset when it gets stale.
+- Use `/new` to reset the session when context gets stale.
 - For large memory/notes collections, use search tools like `qmd` rather than loading everything.
 
 ### Where are my memory files?
@@ -492,9 +491,6 @@ The gateway runs under a supervisor that auto-restarts it. You need to stop the
 # Check if running
 launchctl list | grep clawdbot
 
-# Stop (disable does NOT stop a running job)
-clawdbot gateway stop
-
 # Stop and disable
 launchctl disable gui/$UID/com.clawdbot.gateway
 launchctl bootout gui/$UID/com.clawdbot.gateway
@@ -502,9 +498,6 @@ launchctl bootout gui/$UID/com.clawdbot.gateway
 # Re-enable later
 launchctl enable gui/$UID/com.clawdbot.gateway
 launchctl bootstrap gui/$UID ~/Library/LaunchAgents/com.clawdbot.gateway.plist
-
-# Or just restart
-clawdbot gateway restart
 ```
 
 **Linux (systemd)**
@@ -514,11 +507,7 @@ clawdbot gateway restart
 systemctl list-units | grep -i clawdbot
 
 # Stop and disable
-clawdbot gateway stop
-systemctl --user disable --now clawdbot-gateway.service
-
-# Or just restart
-clawdbot gateway restart
+sudo systemctl disable --now clawdbot
 ```
 
 **pm2 (if used)**
@@ -561,9 +550,6 @@ Quick reference (send these in chat):
 |---------|--------|
 | `/status` | Health + session info |
 | `/new` or `/reset` | Reset the session |
-| `/compact` | Compact session context |
-
-Slash commands are owner-only (gated by `whatsapp.allowFrom` and command authorization on other surfaces).
 | `/think <level>` | Set thinking level (off\|minimal\|low\|medium\|high) |
 | `/verbose on\|off` | Toggle verbose mode |
 | `/elevated on\|off` | Toggle elevated bash mode (approved senders only) |
@@ -590,16 +576,21 @@ List available models with `/model`, `/model list`, or `/model status`.
 Clawdbot ships a few default model shorthands (you can override them in config):
 `opus`, `sonnet`, `gpt`, `gpt-mini`, `gemini`, `gemini-flash`.
 
-**Setup:** Configure models and aliases in `clawdbot.json`:
+**Setup:** Configure allowed models and aliases in `clawdbot.json`:
 
 ```json
 {
   "agent": {
-    "model": { "primary": "anthropic/claude-opus-4-5" },
-    "models": {
-      "anthropic/claude-opus-4-5": { "alias": "opus" },
-      "anthropic/claude-sonnet-4-5": { "alias": "sonnet" },
-      "anthropic/claude-haiku-4-5": { "alias": "haiku" }
+    "model": "anthropic/claude-opus-4-5",
+    "allowedModels": [
+      "anthropic/claude-opus-4-5",
+      "anthropic/claude-sonnet-4-5",
+      "anthropic/claude-haiku-4-5"
+    ],
+    "modelAliases": {
+      "opus": "anthropic/claude-opus-4-5",
+      "sonnet": "anthropic/claude-sonnet-4-5",
+      "haiku": "anthropic/claude-haiku-4-5"
     }
   }
 }
@@ -615,8 +606,7 @@ If you don't want to use Anthropic directly, you can use alternative providers:
 ```json5
 {
   agent: {
-    model: { primary: "openrouter/anthropic/claude-sonnet-4" },
-    models: { "openrouter/anthropic/claude-sonnet-4": {} },
+    model: "openrouter/anthropic/claude-sonnet-4",
     env: { OPENROUTER_API_KEY: "sk-or-..." }
   }
 }
@@ -626,8 +616,7 @@ If you don't want to use Anthropic directly, you can use alternative providers:
 ```json5
 {
   agent: {
-    model: { primary: "zai/glm-4.7" },
-    models: { "zai/glm-4.7": {} },
+    model: "zai/glm-4.7",
     env: { ZAI_API_KEY: "..." }
   }
 }

docs/gateway.md

@@ -159,8 +159,6 @@ See also: `docs/presence.md` for how presence is produced/deduped and why `insta
 
 Bundled mac app:
 - Clawdbot.app can bundle a bun-compiled gateway binary and install a per-user LaunchAgent labeled `com.clawdbot.gateway`.
-- To stop it cleanly, use `clawdbot gateway stop` (or `launchctl bootout gui/$UID/com.clawdbot.gateway`).
-- To restart, use `clawdbot gateway restart` (or `launchctl kickstart -k gui/$UID/com.clawdbot.gateway`).
 
 ## Supervision (systemd user unit)
 Create `~/.config/systemd/user/clawdbot-gateway.service`:
@@ -219,7 +217,6 @@ sudo systemctl enable --now clawdbot-gateway.service
 - `clawdbot gateway send --to <num> --message "hi" [--media-url ...]` — send via Gateway (idempotent).
 - `clawdbot gateway agent --message "hi" [--to ...]` — run an agent turn (waits for final by default).
 - `clawdbot gateway call <method> --params '{"k":"v"}'` — raw method invoker for debugging.
-- `clawdbot gateway stop|restart` — stop/restart the supervised gateway service (launchd/systemd/schtasks).
 - Gateway helper subcommands assume a running gateway on `--url`; they no longer auto-spawn one.
 
 ## Migration guidance

docs/grammy.md

@@ -18,7 +18,7 @@ Updated: 2025-12-07
 - **Proxy:** optional `telegram.proxy` uses `undici.ProxyAgent` through grammY’s `client.baseFetch`.
 - **Webhook support:** `webhook-set.ts` wraps `setWebhook/deleteWebhook`; `webhook.ts` hosts the callback with health + graceful shutdown. Gateway enables webhook mode when `telegram.webhookUrl` is set (otherwise it long-polls).
 - **Sessions:** direct chats map to `main`; groups map to `telegram:group:<chatId>`; replies route back to the same surface.
-- **Config knobs:** `telegram.botToken`, `telegram.groups` (allowlist + mention defaults), `telegram.allowFrom`, `telegram.mediaMaxMb`, `telegram.proxy`, `telegram.webhookSecret`, `telegram.webhookUrl`.
+- **Config knobs:** `telegram.botToken`, `telegram.groups`, `telegram.allowFrom`, `telegram.mediaMaxMb`, `telegram.proxy`, `telegram.webhookSecret`, `telegram.webhookUrl`.
 - **Tests:** grammy mocks cover DM + group mention gating and outbound send; more media/webhook fixtures still welcome.
 
 Open questions

docs/group-messages.md

@@ -1,5 +1,5 @@
 ---
-summary: "Behavior and config for WhatsApp group message handling (mentionPatterns are shared across surfaces)"
+summary: "Behavior and config for WhatsApp group message handling"
 read_when:
   - Changing group message rules or mentions
 ---
@@ -7,11 +7,9 @@ read_when:
 
 Goal: let Clawd sit in WhatsApp groups, wake up only when pinged, and keep that thread separate from the personal DM session.
 
-Note: `routing.groupChat.mentionPatterns` is now used by Telegram/Discord/Slack/iMessage as well; this doc focuses on WhatsApp-specific behavior.
-
 ## What’s implemented (2025-12-03)
-- Activation modes: `mention` (default) or `always`. `mention` requires a ping (real WhatsApp @-mentions via `mentionedJids`, regex patterns, or the bot’s E.164 anywhere in the text). `always` wakes the agent on every message but it should reply only when it can add meaningful value; otherwise it returns the silent token `NO_REPLY`. Defaults can be set in config (`whatsapp.groups`) and overridden per group via `/activation`. When `whatsapp.groups` is set, it also acts as a group allowlist (include `"*"` to allow all).
-- Group policy: `whatsapp.groupPolicy` controls whether group messages are accepted (`open|disabled|allowlist`). `allowlist` uses `whatsapp.groupAllowFrom` (fallback: explicit `whatsapp.allowFrom`).
+- Activation modes: `mention` (default) or `always`. `mention` requires a ping (real WhatsApp @-mentions via `mentionedJids`, regex patterns, or the bot’s E.164 anywhere in the text). `always` wakes the agent on every message but it should reply only when it can add meaningful value; otherwise it returns the silent token `NO_REPLY`. Defaults can be set in config (`whatsapp.groups`) and overridden per group via `/activation`.
+- Group allowlist bypass: we still enforce `whatsapp.allowFrom` on the participant at inbox ingest, but group JIDs themselves no longer block replies.
 - Per-group sessions: session keys look like `whatsapp:group:<jid>` so commands such as `/verbose on` or `/think:high` are scoped to that group; personal DM state is untouched. Heartbeats are skipped for group threads.
 - Context injection: last N (default 50) group messages are prefixed under `[Chat messages since your last reply - for context]`, with the triggering line under `[Current message - respond to this]`.
 - Sender surfacing: every group batch now ends with `[from: Sender Name (+E164)]` so Pi knows who is speaking.
@@ -58,7 +56,7 @@ Only the owner number (from `whatsapp.allowFrom`, defaulting to the bot’s own
 1) Add Clawd UK (`+447700900123`) to the group.
 2) Say `@clawd …` (or `@clawd uk`, `@clawdbot`, or include the number). Anyone in the group can trigger it.
 3) The agent prompt will include recent group context plus the trailing `[from: …]` marker so it can address the right person.
-4) Session-level directives (`/verbose on`, `/think:high`, `/new` or `/reset`, `/compact`) apply only to that group’s session; your personal DM session remains independent.
+4) Session-level directives (`/verbose on`, `/think:high`, `/new` or `/reset`) apply only to that group’s session; your personal DM session remains independent.
 
 ## Testing / verification
 - Automated: `pnpm test -- src/web/auto-reply.test.ts --runInBand` (covers mention gating, history injection, sender suffix).

docs/groups.md

@@ -1,11 +1,11 @@
 ---
-summary: "Group chat behavior across surfaces (WhatsApp/Telegram/Discord/Slack/Signal/iMessage)"
+summary: "Group chat behavior across surfaces (WhatsApp/Telegram/Discord/iMessage)"
 read_when:
   - Changing group chat behavior or mention gating
 ---
 # Groups
 
-Clawdbot treats group chats consistently across surfaces: WhatsApp, Telegram, Discord, Slack, Signal, iMessage.
+Clawdbot treats group chats consistently across surfaces: WhatsApp, Telegram, Discord, iMessage.
 
 ## Session keys
 - Group sessions use `surface:group:<id>` session keys (rooms/channels use `surface:channel:<id>`).
@@ -16,54 +16,6 @@ Clawdbot treats group chats consistently across surfaces: WhatsApp, Telegram, Di
 - UI labels use `displayName` when available, formatted as `surface:<token>`.
 - `#room` is reserved for rooms/channels; group chats use `g-<slug>` (lowercase, spaces -> `-`, keep `#@+._-`).
 
-## Group policy
-Control how group/room messages are handled per provider:
-
-```json5
-{
-  whatsapp: {
-    groupPolicy: "disabled", // "open" | "disabled" | "allowlist"
-    groupAllowFrom: ["+15551234567"]
-  },
-  telegram: {
-    groupPolicy: "disabled",
-    groupAllowFrom: ["123456789", "@username"]
-  },
-  signal: {
-    groupPolicy: "disabled",
-    groupAllowFrom: ["+15551234567"]
-  },
-  imessage: {
-    groupPolicy: "disabled",
-    groupAllowFrom: ["chat_id:123"]
-  },
-  discord: {
-    groupPolicy: "allowlist",
-    guilds: {
-      "GUILD_ID": { channels: { help: { allow: true } } }
-    }
-  },
-  slack: {
-    groupPolicy: "allowlist",
-    channels: { "#general": { allow: true } }
-  }
-}
-```
-
-| Policy | Behavior |
-|--------|----------|
-| `"open"` | Default. Groups bypass allowlists; mention-gating still applies. |
-| `"disabled"` | Block all group messages entirely. |
-| `"allowlist"` | Only allow groups/rooms that match the configured allowlist. |
-
-Notes:
-- `groupPolicy` is separate from mention-gating (which requires @mentions).
-- WhatsApp/Telegram/Signal/iMessage: use `groupAllowFrom` (fallback: explicit `allowFrom`).
-- Discord: allowlist uses `discord.guilds.<id>.channels`.
-- Slack: allowlist uses `slack.channels`.
-- Group DMs are controlled separately (`discord.dm.*`, `slack.dm.*`).
-- Telegram allowlist can match user IDs (`"123456789"`, `"telegram:123456789"`, `"tg:123456789"`) or usernames (`"@alice"` or `"alice"`); prefixes are case-insensitive.
-
 ## Mention gating (default)
 Group messages require a mention unless overridden per group. Defaults live per subsystem under `*.groups."*"`.
 
@@ -99,12 +51,8 @@ Group messages require a mention unless overridden per group. Defaults live per
 Notes:
 - `mentionPatterns` are case-insensitive regexes.
 - Surfaces that provide explicit mentions still pass; patterns are a fallback.
-- Mention gating is only enforced when mention detection is possible (native mentions or `mentionPatterns` are configured).
 - Discord defaults live in `discord.guilds."*"` (overridable per guild/channel).
 
-## Group allowlists
-When `whatsapp.groups`, `telegram.groups`, or `imessage.groups` is configured, the keys act as a group allowlist. Use `"*"` to allow all groups while still setting default mention behavior.
-
 ## Activation (owner-only)
 Group owners can toggle per-group activation:
 - `/activation mention`

docs/health.md

@@ -22,7 +22,7 @@ Short guide to verify the WhatsApp Web / Baileys stack without guessing.
 ## When something fails
 - `logged out` or status 409–515 → relink with `clawdbot logout` then `clawdbot login`.
 - Gateway unreachable → start it: `clawdbot gateway --port 18789` (use `--force` if the port is busy).
-- No inbound messages → confirm linked phone is online and the sender is allowed (`whatsapp.allowFrom`); for group chats, ensure allowlist + mention rules match (`whatsapp.groups`, `routing.groupChat.mentionPatterns`).
+- No inbound messages → confirm linked phone is online and the sender is allowed (`whatsapp.allowFrom`); for group chats, ensure mention rules match (`routing.groupChat.mentionPatterns` and `whatsapp.groups`).
 
 ## Dedicated "health" command
 `clawdbot health --json` asks the running Gateway for its health snapshot (no direct Baileys socket from the CLI). It reports linked creds, auth age, Baileys connect result/status code, session-store summary, and a probe duration. It exits non-zero if the Gateway is unreachable or the probe fails/timeouts. Use `--timeout <ms>` to override the 10s default.

docs/imessage.md

@@ -27,8 +27,6 @@ Status: external CLI integration. No daemon.
     cliPath: "imsg",
     dbPath: "~/Library/Messages/chat.db",
     allowFrom: ["+15555550123", "user@example.com", "chat_id:123"],
-    groupPolicy: "open",
-    groupAllowFrom: ["chat_id:123"],
     includeAttachments: false,
     mediaMaxMb: 16,
     service: "auto",
@@ -39,8 +37,6 @@ Status: external CLI integration. No daemon.
 
 Notes:
 - `allowFrom` accepts handles (phone/email) or `chat_id:<id>` entries.
-- `groupPolicy` controls group handling (`open|disabled|allowlist`).
-- `groupAllowFrom` accepts the same entries as `allowFrom`.
 - `service` defaults to `auto` (use `imessage` or `sms` to pin).
 - `region` is only used for SMS targeting.
 
@@ -59,7 +55,7 @@ imsg chats --limit 20
 
 ## Group chat behavior
 - Group messages set `ChatType=group`, `GroupSubject`, and `GroupMembers`.
-- Group activation respects `imessage.groups."*".requireMention` and `routing.groupChat.mentionPatterns` (patterns are required to detect mentions on iMessage). When `imessage.groups` is set, it also acts as a group allowlist; include `"*"` to allow all groups.
+- Group activation respects `imessage.groups."*".requireMention` and `routing.groupChat.mentionPatterns`.
 - Replies go back to the same `chat_id` (group or direct).
 
 ## Troubleshooting

docs/index.md

@@ -19,7 +19,7 @@ read_when:
 <p align="center">
   <a href="https://github.com/clawdbot/clawdbot">GitHub</a> ·
   <a href="https://github.com/clawdbot/clawdbot/releases">Releases</a> ·
-  <a href="https://github.com/clawdbot/clawdbot/blob/main/docs/index.md">Docs</a> ·
+  <a href="https://docs.clawdbot.com/">Docs</a> ·
   <a href="./clawd.md">Clawd setup</a>
 </p>
 
@@ -181,7 +181,6 @@ Example:
 ## Core Contributors
 
 - **Maxim Vovshin** (@Hyaxia, 36747317+Hyaxia@users.noreply.github.com) — Blogwatcher skill
-- **Nacho Iacovino** (@nachoiacovino, nacho.iacovino@gmail.com) — Location parsing (Telegram + WhatsApp)
 
 ## License
 

docs/location.md

@@ -1,46 +0,0 @@
----
-summary: "Inbound provider location parsing (Telegram + WhatsApp) and context fields"
-read_when:
-  - Adding or modifying provider location parsing
-  - Using location context fields in agent prompts or tools
----
-
-# Provider location parsing
-
-Clawdbot normalizes shared locations from chat providers into:
-- human-readable text appended to the inbound body, and
-- structured fields in the auto-reply context payload.
-
-Currently supported:
-- **Telegram** (location pins + venues + live locations)
-- **WhatsApp** (locationMessage + liveLocationMessage)
-
-## Text formatting
-Locations are rendered as friendly lines without brackets:
-
-- Pin:
-  - `📍 48.858844, 2.294351 ±12m`
-- Named place:
-  - `📍 Eiffel Tower — Champ de Mars, Paris (48.858844, 2.294351 ±12m)`
-- Live share:
-  - `🛰 Live location: 48.858844, 2.294351 ±12m`
-
-If the provider includes a caption/comment, it is appended on the next line:
-```
-📍 48.858844, 2.294351 ±12m
-Meet here
-```
-
-## Context fields
-When a location is present, these fields are added to `ctx`:
-- `LocationLat` (number)
-- `LocationLon` (number)
-- `LocationAccuracy` (number, meters; optional)
-- `LocationName` (string; optional)
-- `LocationAddress` (string; optional)
-- `LocationSource` (`pin | place | live`)
-- `LocationIsLive` (boolean)
-
-## Provider notes
-- **Telegram**: venues map to `LocationName/LocationAddress`; live locations use `live_period`.
-- **WhatsApp**: `locationMessage.comment` and `liveLocationMessage.caption` are appended as the caption line.

docs/model-failover.md

@@ -1,75 +0,0 @@
----
-summary: "How Clawdbot rotates auth profiles and falls back across models"
-read_when:
-  - Diagnosing auth profile rotation, cooldowns, or model fallback behavior
-  - Updating failover rules for auth profiles or models
----
-
-# Model failover
-
-Clawdbot handles failures in two stages:
-1) **Auth profile rotation** within the current provider.
-2) **Model fallback** to the next model in `agent.model.fallbacks`.
-
-This doc explains the runtime rules and the data that backs them.
-
-## Profile IDs
-
-OAuth logins create distinct profiles so multiple accounts can coexist.
-- Default: `provider:default` when no email is available.
-- OAuth with email: `provider:<email>` (for example `google-antigravity:user@gmail.com`).
-
-Profiles live in `~/.clawdbot/agent/auth-profiles.json` under `profiles`.
-
-## Rotation order
-
-When a provider has multiple profiles, Clawdbot chooses an order like this:
-
-1) **Explicit config**: `auth.order[provider]` (if set).
-2) **Configured profiles**: `auth.profiles` filtered by provider.
-3) **Stored profiles**: entries in `auth-profiles.json` for the provider.
-
-If no explicit order is configured, Clawdbot uses a round‑robin order:
-- **Primary key:** `usageStats.lastUsed` (oldest first).
-- **Secondary key:** profile type (OAuth before API keys).
-- **Cooldown profiles** are moved to the end, ordered by soonest cooldown expiry.
-
-## Cooldowns
-
-When a profile fails due to auth/rate‑limit errors (or a timeout that looks
-like rate limiting), Clawdbot marks it in cooldown and moves to the next profile.
-
-Cooldowns use exponential backoff:
-- 1 minute
-- 5 minutes
-- 25 minutes
-- 1 hour (cap)
-
-State is stored in `auth-profiles.json` under `usageStats`:
-
-```json
-{
-  "usageStats": {
-    "provider:profile": {
-      "lastUsed": 1736160000000,
-      "cooldownUntil": 1736160600000,
-      "errorCount": 2
-    }
-  }
-}
-```
-
-## Model fallback
-
-If all profiles for a provider fail, Clawdbot moves to the next model in
-`agent.model.fallbacks`. This applies to auth failures, rate limits, and
-timeouts that exhausted profile rotation.
-
-## Related config
-
-See `docs/configuration.md` for:
-- `auth.profiles` / `auth.order`
-- `agent.model.primary` / `agent.model.fallbacks`
-- `agent.imageModel` routing
-
-See `docs/models.md` for the broader model selection and fallback overview.

docs/models.md

@@ -16,32 +16,35 @@ that prefers tool-call + image-capable models and maintains ordered fallbacks.
   - default: configured models only
   - flags: `--all` (full catalog), `--local`, `--provider <name>`, `--json`, `--plain`
 - `clawdbot models status`
-  - show default model + aliases + fallbacks + configured models
+  - show default model + aliases + fallbacks + allowlist
 - `clawdbot models set <modelOrAlias>`
-  - writes `agent.model.primary` and ensures `agent.models` entry
+  - writes `agent.model` in config
 - `clawdbot models set-image <modelOrAlias>`
-  - writes `agent.imageModel.primary` and ensures `agent.models` entry
+  - writes `agent.imageModel` in config
 - `clawdbot models aliases list|add|remove`
-  - writes `agent.models.*.alias`
+  - writes `agent.modelAliases`
 - `clawdbot models fallbacks list|add|remove|clear`
-  - writes `agent.model.fallbacks`
+  - writes `agent.modelFallbacks`
 - `clawdbot models image-fallbacks list|add|remove|clear`
-  - writes `agent.imageModel.fallbacks`
+  - writes `agent.imageModelFallbacks`
 - `clawdbot models scan`
   - OpenRouter :free scan; probe tool-call + image; interactive selection
 
 ## Config changes
 
-- `agent.models` (configured model catalog + aliases).
-- `agent.model.primary` + `agent.model.fallbacks`.
-- `agent.imageModel.primary` + `agent.imageModel.fallbacks` (optional).
-- `auth.profiles` + `auth.order` for per-provider auth failover.
+- Add `agent.modelFallbacks: string[]` (ordered list of provider/model IDs).
+- Add `agent.imageModel?: string` (optional image-capable model for image tool).
+- Add `agent.imageModelFallbacks?: string[]` (ordered list for image tool).
+- Keep existing:
+  - `agent.model` (default)
+  - `agent.allowedModels` (list filter)
+  - `agent.modelAliases` (shortcut names)
 
 ## Scan behavior (models scan)
 
 Input
 - OpenRouter `/models` list (filter `:free`)
-- Requires OpenRouter API key from auth profiles or `OPENROUTER_API_KEY`
+- Requires `OPENROUTER_API_KEY` (or stored OpenRouter key in auth storage)
 - Optional filters: `--max-age-days`, `--min-params`, `--provider`, `--max-candidates`
 - Probe controls: `--timeout`, `--concurrency`
 
@@ -63,21 +66,17 @@ Interactive selection (TTY)
 - Non-TTY: auto-select; require `--yes`/`--no-input` to apply.
 
 Output
-- Writes `agent.model.fallbacks` ordered.
-- Writes `agent.imageModel.fallbacks` ordered (image-capable models).
-- Ensures `agent.models` entries exist for selected models.
-- Optional `--set-default` to set `agent.model.primary`.
-- Optional `--set-image` to set `agent.imageModel.primary`.
+- Writes `agent.modelFallbacks` ordered.
+- Writes `agent.imageModelFallbacks` ordered (image-capable models).
+- Optional `--set-default` to set `agent.model`.
+- Optional `--set-image` to set `agent.imageModel`.
 
 ## Runtime fallback
 
-- On model failure: try `agent.model.fallbacks` in order.
-- Per-provider auth failover uses `auth.order` (or stored profile order) **before**
-  moving to the next model.
-- Image routing uses `agent.imageModel` **only when configured** and the primary
-  model lacks image input.
-- Persist last successful provider/model to session entry; auth profile success is global.
-- See `docs/model-failover.md` for auth profile rotation, cooldowns, and timeout handling.
+- On model failure: try `agent.modelFallbacks` in order.
+- Ignore fallback entries not in `agent.allowedModels` (if allowlist set).
+- Persist last successful provider/model to session entry.
+- `/status` shows last used model (not just default).
 
 ## Tests
 
@@ -87,5 +86,5 @@ Output
 
 ## Docs
 
-- Update `docs/configuration.md` with `agent.models` + `agent.model` + `agent.imageModel`.
+- Update `docs/configuration.md` with `agent.modelFallbacks`.
 - Keep this doc current when CLI surface or scan logic changes.

docs/onboarding.md

@@ -41,7 +41,7 @@ The macOS app should:
   - `~/.clawdbot/credentials/oauth.json` (file mode `0600`, directory mode `0700`)
 
 Why this location matters: it’s the Clawdbot-owned OAuth store.
-Clawdbot also imports `oauth.json` into the agent auth profile store (`~/.clawdbot/agent/auth-profiles.json`) on first use.
+Clawdbot also imports `oauth.json` into the agent auth store (`~/.clawdbot/agent/auth.json`) on first use.
 
 ### Recommended: OAuth (OpenAI Codex)
 
@@ -50,7 +50,6 @@ The macOS app should:
 - Auto-capture the callback on `http://127.0.0.1:1455/auth/callback` when possible.
 - If the callback fails, prompt the user to paste the redirect URL or code.
 - Store credentials in `~/.clawdbot/credentials/oauth.json` (same OAuth store as Anthropic).
-- Set `agent.model` to `openai-codex/gpt-5.2` when the model is unset or `openai/*`.
 
 ### Alternative: API key (instructions only)
 
@@ -149,7 +148,7 @@ If the Gateway runs on another machine, OAuth credentials must be created/stored
 
 For now, remote onboarding should:
 - explain why OAuth isn't shown
-- point the user at the credential location (`~/.clawdbot/credentials/oauth.json`) and the auth profile store (`~/.clawdbot/agent/auth-profiles.json`) on the gateway host
+- point the user at the credential location (`~/.clawdbot/credentials/oauth.json`) and the workspace location on the gateway host
 - mention that the **bootstrap ritual happens on the gateway host** (same BOOTSTRAP/IDENTITY/USER files)
 
 ### Manual credential setup

docs/plans/cron-add-hardening.md

@@ -1,72 +0,0 @@
----
-summary: "Harden cron.add input handling, align schemas, and improve cron UI/agent tooling"
-owner: "clawdbot"
-status: "complete"
-last_updated: "2026-01-05"
----
-
-# Cron Add Hardening & Schema Alignment
-
-## Context
-Recent gateway logs show repeated `cron.add` failures with invalid parameters (missing `sessionTarget`, `wakeMode`, `payload`, and malformed `schedule`). This indicates that at least one client (likely the agent tool call path) is sending wrapped or partially specified job payloads. Separately, there is drift between cron channel enums in TypeScript, gateway schema, CLI flags, and UI form types, plus a UI mismatch for `cron.status` (expects `jobCount` while gateway returns `jobs`).
-
-## Goals
-- Stop `cron.add` INVALID_REQUEST spam by normalizing common wrapper payloads and inferring missing `kind` fields.
-- Align cron channel lists across gateway schema, cron types, CLI docs, and UI forms.
-- Make agent cron tool schema explicit so the LLM produces correct job payloads.
-- Fix the Control UI cron status job count display.
-- Add tests to cover normalization and tool behavior.
-
-## Non-goals
-- Change cron scheduling semantics or job execution behavior.
-- Add new schedule kinds or cron expression parsing.
-- Overhaul the UI/UX for cron beyond the necessary field fixes.
-
-## Findings (current gaps)
-- `CronPayloadSchema` in gateway excludes `signal` + `imessage`, while TS types include them.
-- Control UI CronStatus expects `jobCount`, but gateway returns `jobs`.
-- Agent cron tool schema allows arbitrary `job` objects, enabling malformed inputs.
-- Gateway strictly validates `cron.add` with no normalization, so wrapped payloads fail.
-
-## Proposed Approach
-1. **Normalize** incoming `cron.add` payloads (unwrap `data`/`job`, infer `schedule.kind` and `payload.kind`, default `wakeMode` + `sessionTarget` when safe).
-2. **Harden** the agent cron tool schema using the canonical gateway `CronAddParamsSchema` and normalize before sending to the gateway.
-3. **Align** channel enums and cron status fields across gateway schema, TS types, CLI descriptions, and UI form controls.
-4. **Test** normalization in gateway tests and tool behavior in agent tests.
-
-## Multi-phase Execution Plan
-
-### Phase 1 — Schema + type alignment
-- [x] Expand gateway `CronPayloadSchema` channel enum to include `signal` and `imessage`.
-- [x] Update CLI `--channel` descriptions to include `slack` (already supported by gateway).
-- [x] Update UI Cron payload/channel union types to include all supported channels.
-- [x] Fix UI CronStatus type to match gateway (`jobs` instead of `jobCount`).
-- [x] Update cron UI channel select to include Discord/Slack/Signal/iMessage.
-- [x] Update macOS CronJobEditor channel picker + enum to include Slack/Signal/iMessage.
-- [x] Document cron compatibility normalization policy in `docs/cron.md`.
-
-### Phase 2 — Input normalization + tooling hardening
-- [x] Add shared cron input normalization helpers (`normalizeCronJobCreate`/`normalizeCronJobPatch`).
-- [x] Apply normalization in gateway `cron.add` (and patch normalization in `cron.update`).
-- [x] Tighten agent cron tool schema to `CronAddParamsSchema` and normalize job/patch before sending.
-
-### Phase 3 — Tests
-- [x] Add gateway test covering wrapped `cron.add` payload normalization.
-- [x] Add cron tool test to assert normalization and defaulting for `cron.add`.
-- [x] Add gateway test covering `cron.update` normalization.
-- [x] Add UI + Swift conformance test for cron channels + status fields.
-
-### Phase 4 — Verification
-- [x] Run tests (full suite executed via `pnpm test -- cron-tool`).
-
-## Rollout/Monitoring
-- Watch gateway logs for reduced `cron.add` INVALID_REQUEST errors.
-- Confirm Control UI cron status shows job count after refresh.
-- If errors persist, extend normalization for additional common shapes (e.g., `schedule.at`, `payload.message` without `kind`).
-
-## Optional Follow-ups
-- Manual Control UI smoke: add cron job per channel + verify status job count.
-
-## Open Questions
-- Should `cron.add` accept explicit `state` from clients (currently disallowed by schema)?
-- Should we allow `webchat` as an explicit delivery channel (currently filtered in delivery resolution)?

docs/plans/group-policy-hardening.md

@@ -1,121 +0,0 @@
-# Engineering Execution Spec: groupPolicy Hardening (Telegram Allowlist Parity)
-
-**Date**: 2026-01-05  
-**Status**: Complete  
-**PR**: #216 (feat/whatsapp-group-policy)
-
----
-
-## Executive Summary
-
-Follow-up hardening work ensures Telegram allowlists behave consistently across inbound group/DM filtering and outbound send normalization. The focus is on prefix parity (`telegram:` / `tg:`), case-insensitive matching for prefixes, and resilience to accidental whitespace in config entries. Documentation and tests were updated to reflect and lock in this behavior.
-
----
-
-## Findings Analysis
-
-### [MED] F1: Telegram Allowlist Prefix Handling Is Case-Sensitive and Excludes `tg:`
-
-**Location**: `src/telegram/bot.ts`
-
-**Problem**: Inbound allowlist normalization only stripped a lowercase `telegram:` prefix. This rejected `TG:123` / `Telegram:123` and did not accept the `tg:` shorthand even though outbound send normalization already accepts `tg:` and case-insensitive prefixes.
-
-**Impact**:
-- DMs and group allowlists fail when users copy/paste prefixed IDs from logs or existing send format.
-- Behavior is inconsistent between inbound filtering and outbound send normalization.
-
-**Fix**: Normalize allowlist entries by trimming whitespace and stripping `telegram:` / `tg:` prefixes case-insensitively at pre-compute time.
-
----
-
-### [LOW] F2: Allowlist Entries Are Not Trimmed
-
-**Location**: `src/telegram/bot.ts`
-
-**Problem**: Allowlist entries are not trimmed; accidental whitespace causes mismatches.
-
-**Fix**: Trim and drop empty entries while normalizing allowlist inputs.
-
----
-
-## Implementation Phases
-
-### Phase 1: Normalize Telegram Allowlist Inputs
-
-**File**: `src/telegram/bot.ts`
-
-**Changes**:
-1. Trim allowlist entries and drop empty values.
-2. Strip `telegram:` / `tg:` prefixes case-insensitively.
-3. Simplify DM allowlist check to rely on normalized values.
-
----
-
-### Phase 2: Add Coverage for Prefix + Whitespace
-
-**File**: `src/telegram/bot.test.ts`
-
-**Add Tests**:
-- DM allowlist accepts `TG:` prefix with surrounding whitespace.
-- Group allowlist accepts `TG:` prefix case-insensitively.
-
----
-
-### Phase 3: Documentation Updates
-
-**Files**:
-- `docs/groups.md`
-- `docs/telegram.md`
-
-**Changes**:
-- Document `tg:` alias and case-insensitive prefixes for Telegram allowlists.
-
----
-
-### Phase 4: Verification
-
-1. Run targeted Telegram tests (`pnpm test -- src/telegram/bot.test.ts`).
-2. If time allows, run full suite (`pnpm test`).
-
----
-
-## Files Modified
-
-| File | Change Type | Description |
-|------|-------------|-------------|
-| `src/telegram/bot.ts` | Fix | Trim allowlist values; strip `telegram:` / `tg:` prefixes case-insensitively |
-| `src/telegram/bot.test.ts` | Test | Add DM + group allowlist coverage for `TG:` prefix + whitespace |
-| `docs/groups.md` | Docs | Mention `tg:` alias + case-insensitive prefixes |
-| `docs/telegram.md` | Docs | Mention `tg:` alias + case-insensitive prefixes |
-
----
-
-## Success Criteria
-
-- [x] Telegram allowlist accepts `telegram:` / `tg:` prefixes case-insensitively.
-- [x] Telegram allowlist tolerates whitespace in config entries.
-- [x] DM and group allowlist tests cover prefixed cases.
-- [x] Docs updated to reflect allowlist formats.
-- [x] Targeted tests pass.
-- [x] Full test suite passes.
-
----
-
-## Risk Assessment
-
-| Risk | Severity | Mitigation |
-|------|----------|------------|
-| Behavior change for malformed entries | Low | Normalization is additive and trims only whitespace |
-| Test fragility | Low | Isolated unit tests; no external dependencies |
-| Doc drift | Low | Updated docs alongside code |
-
----
-
-## Estimated Complexity
-
-- **Phase 1**: Low (normalization helpers)
-- **Phase 2**: Low (2 new tests)
-- **Phase 3**: Low (doc edits)
-- **Phase 4**: Low (verification)
-
-**Total**: ~20 minutes

docs/poll.md

@@ -1,52 +0,0 @@
----
-summary: "Poll sending via gateway + CLI"
-read_when:
-  - Adding or modifying poll support
-  - Debugging poll sends from the CLI or gateway
----
-# Polls
-
-Updated: 2026-01-06
-
-## Supported providers
-- WhatsApp (web provider)
-- Discord
-
-## CLI
-
-```bash
-# WhatsApp
-clawdbot poll --to +15555550123 -q "Lunch today?" -o "Yes" -o "No" -o "Maybe"
-clawdbot poll --to 123456789@g.us -q "Meeting time?" -o "10am" -o "2pm" -o "4pm" -s 2
-
-# Discord
-clawdbot poll --to channel:123456789 -q "Snack?" -o "Pizza" -o "Sushi" --provider discord
-clawdbot poll --to channel:123456789 -q "Plan?" -o "A" -o "B" --provider discord --duration-hours 48
-```
-
-Options:
-- `--provider`: `whatsapp` (default) or `discord`
-- `--max-selections`: how many choices a voter can select (default: 1)
-- `--duration-hours`: Discord-only (defaults to 24 when omitted)
-
-## Gateway RPC
-
-Method: `poll`
-
-Params:
-- `to` (string, required)
-- `question` (string, required)
-- `options` (string[], required)
-- `maxSelections` (number, optional)
-- `durationHours` (number, optional)
-- `provider` (string, optional, default: `whatsapp`)
-- `idempotencyKey` (string, required)
-
-## Provider differences
-- WhatsApp: 2-12 options, `maxSelections` must be within option count, ignores `durationHours`.
-- Discord: 2-10 options, `durationHours` clamped to 1-768 hours (default 24). `maxSelections > 1` enables multi-select; Discord does not support a strict selection count.
-
-## Agent tool (Discord)
-The Discord tool action `poll` still uses `question`, `answers`, optional `allowMultiselect`, `durationHours`, and `content`. The gateway/CLI poll model maps `allowMultiselect` to `maxSelections > 1`.
-
-Note: Discord has no “pick exactly N” mode; `maxSelections` is treated as a boolean (`> 1` = multiselect).

docs/proposals/model-config.md

@@ -87,7 +87,7 @@ Model listing
   - alias
   - provider
   - auth order (from `auth.order`)
-  - auth source for the current provider (auth-profiles.json/env/shell env/models.json)
+  - auth source for the current provider (env/auth.json/models.json)
 
 ## Fallback behavior (global)
 
@@ -121,20 +121,19 @@ Support detection
 ## Migration (doctor + gateway auto-run)
 
 Inputs
-- Legacy keys (pre-migration):
-  - `agent.model` (string)
-  - `agent.modelFallbacks` (string[])
-  - `agent.imageModel` (string)
-  - `agent.imageModelFallbacks` (string[])
-  - `agent.allowedModels` (string[])
-  - `agent.modelAliases` (record)
+- `agent.model` (string)
+- `agent.modelFallbacks` (string[])
+- `agent.imageModel` (string)
+- `agent.imageModelFallbacks` (string[])
+- `agent.allowedModels` (string[])
+- `agent.modelAliases` (record)
 
 Outputs
 - `agent.models` map with keys for all referenced models
 - `agent.model.primary/fallbacks`
 - `agent.imageModel.primary/fallbacks`
-- Auth profile store seeded from current auth-profiles.json/auth.json + oauth.json + env (as `provider:default`)
-- `auth.order` seeded with `["provider:default"]` when config is updated
+- `auth.profiles` seeded from current auth.json + env (as `provider:default`)
+- `auth.order` seeded with `["provider:default"]`
 
 Auto-run
 - Gateway start detects legacy keys and runs doctor migration.

docs/session-tool.md

@@ -12,7 +12,6 @@ Goal: small, hard-to-misuse tool surface so agents can list sessions, fetch hist
 - `sessions_list`
 - `sessions_history`
 - `sessions_send`
-- `sessions_spawn`
 
 ## Key Model
 - Main direct chat bucket is always the literal key `"main"`.
@@ -35,7 +34,6 @@ Parameters:
 Behavior:
 - `messageLimit > 0` fetches `chat.history` per session and includes the last N messages.
 - Tool results are filtered out in list output; use `sessions_history` for tool messages.
-- When running in a **sandboxed** agent session, session tools default to **spawned-only visibility** (see below).
 
 Row shape (JSON):
 - `key`: session key (string)
@@ -119,36 +117,3 @@ Runtime override (per session entry):
 Enforcement points:
 - `chat.send` / `agent` (gateway)
 - auto-reply delivery logic
-
-## sessions_spawn
-Spawn a sub-agent run in an isolated session and announce the result back to the requester chat surface.
-
-Parameters:
-- `task` (required)
-- `label?` (optional; used for logs/UI)
-- `timeoutSeconds?` (default 0; 0 = fire-and-forget)
-- `cleanup?` (`delete|keep`, default `delete`)
-
-Behavior:
-- Starts a new `subagent:<uuid>` session with `deliver: false`.
-- Sub-agents default to the full tool surface **minus session tools** (configurable via `agent.subagents.tools`).
-- Sub-agents are not allowed to call `sessions_spawn` (no sub-agent → sub-agent spawning).
-- After completion (or best-effort wait), Clawdbot runs a sub-agent **announce step** and posts the result to the requester chat surface.
-- Reply exactly `ANNOUNCE_SKIP` during the announce step to stay silent.
-
-## Sandbox Session Visibility
-
-Sandboxed sessions can use session tools, but by default they only see sessions they spawned via `sessions_spawn`.
-
-Config:
-
-```json5
-{
-  agent: {
-    sandbox: {
-      // default: "spawned"
-      sessionToolsVisibility: "spawned" // or "all"
-    }
-  }
-}
-```

docs/session.md

@@ -77,7 +77,6 @@ Runtime override (owner only):
 - `pnpm clawdbot sessions --json` — dumps every entry (filter with `--active <minutes>`).
 - `pnpm clawdbot gateway call sessions.list --params '{}'` — fetch sessions from the running gateway (use `--url`/`--token` for remote gateway access).
 - Send `/status` in chat to see whether the agent is reachable, how much of the session context is used, current thinking/verbose toggles, and when your WhatsApp web creds were last refreshed (helps spot relink needs).
-- Send `/compact` (optional instructions) to summarize older context and free up window space.
 - JSONL transcripts can be opened directly to review full turns.
 
 ## Tips

docs/signal.md

@@ -50,12 +50,8 @@ You can still run Clawdbot on your own Signal account if your goal is “respond
     httpHost: "127.0.0.1",
     httpPort: 8080,
 
-    // Who is allowed to talk to the bot (DMs)
-    allowFrom: ["+15557654321"], // your personal number (or "*")
-
-    // Group policy + allowlist
-    groupPolicy: "open",
-    groupAllowFrom: ["+15557654321"]
+    // Who is allowed to talk to the bot
+    allowFrom: ["+15557654321"] // your personal number (or "*")
   }
 }
 ```

docs/slack.md

@@ -145,7 +145,6 @@ Slack uses Socket Mode only (no HTTP webhook server). Provide both tokens:
     "enabled": true,
     "botToken": "xoxb-...",
     "appToken": "xapp-...",
-    "groupPolicy": "open",
     "dm": {
       "enabled": true,
       "allowFrom": ["U123", "U456", "*"],
@@ -181,18 +180,11 @@ Tokens can also be supplied via env vars:
 - `SLACK_BOT_TOKEN`
 - `SLACK_APP_TOKEN`
 
-Ack reactions are controlled globally via `messages.ackReaction` +
-`messages.ackReactionScope`.
-
 ## Sessions + routing
 - DMs share the `main` session (like WhatsApp/Telegram).
 - Channels map to `slack:channel:<channelId>` sessions.
 - Slash commands use `slack:slash:<userId>` sessions.
 
-## Group policy
-- `slack.groupPolicy` controls channel handling (`open|disabled|allowlist`).
-- `allowlist` requires channels to be listed in `slack.channels`.
-
 ## Delivery targets
 Use these with cron/CLI sends:
 - `user:<id>` for DMs
@@ -210,6 +202,6 @@ Slack tool actions can be gated with `slack.actions.*`:
 | emojiList | enabled | Custom emoji list |
 
 ## Notes
-- Mention gating is controlled via `slack.channels` (set `requireMention` to `true`); `routing.groupChat.mentionPatterns` also count as mentions.
+- Mention gating is controlled via `slack.channels` (set `requireMention` to `true`).
 - Reaction notifications follow `slack.reactionNotifications` (use `reactionAllowlist` with mode `allowlist`).
 - Attachments are downloaded to the media store when permitted and under the size limit.

docs/subagents.md

@@ -1,72 +0,0 @@
----
-summary: "Sub-agents: spawning isolated agent runs that announce results back to the requester chat"
-read_when:
-  - You want background/parallel work via the agent
-  - You are changing sessions_spawn or sub-agent tool policy
----
-
-# Sub-agents
-
-Sub-agents are background agent runs spawned from an existing agent run. They run in their own session (`subagent:<uuid>`) and, when finished, **announce** their result back to the requester chat surface.
-
-Primary goals:
-- Parallelize “research / long task / slow tool” work without blocking the main run.
-- Keep sub-agents isolated by default (session separation + optional sandboxing).
-- Keep the tool surface hard to misuse: sub-agents do **not** get session tools by default.
-- Avoid nested fan-out: sub-agents cannot spawn sub-agents.
-
-## Tool
-
-Use `sessions_spawn`:
-- Starts a sub-agent run (`deliver: false`, global lane: `subagent`)
-- Then runs an announce step and posts the announce reply to the requester chat surface
-
-Tool params:
-- `task` (required)
-- `label?` (optional)
-- `timeoutSeconds?` (default `0`; `0` = fire-and-forget)
-- `cleanup?` (`delete|keep`, default `delete`)
-
-## Announce
-
-Sub-agents report back via an announce step:
-- The announce step runs inside the sub-agent session (not the requester session).
-- If the sub-agent replies exactly `ANNOUNCE_SKIP`, nothing is posted.
-- Otherwise the announce reply is posted to the requester chat surface via the gateway `send` method.
-
-## Tool Policy (sub-agent tools)
-
-By default, sub-agents get **all tools except session tools**:
-- `sessions_list`
-- `sessions_history`
-- `sessions_send`
-- `sessions_spawn`
-
-Override via config:
-
-```json5
-{
-  agent: {
-    subagents: {
-      maxConcurrent: 1,
-      tools: {
-        // deny wins
-        deny: ["gateway", "cron"],
-        // if allow is set, it becomes allow-only (deny still wins)
-        // allow: ["read", "bash", "process"]
-      }
-    }
-  }
-}
-```
-
-## Concurrency
-
-Sub-agents use a dedicated in-process queue lane:
-- Lane name: `subagent`
-- Concurrency: `agent.subagents.maxConcurrent` (default `1`)
-
-## Limitations
-
-- Sub-agent announce is **best-effort**. If the gateway restarts, pending “announce back” work is lost.
-- Sub-agents still share the same gateway process resources; treat `maxConcurrent` as a safety valve.

docs/telegram.md

@@ -24,10 +24,8 @@ Status: ready for bot-mode use with grammY (long-polling by default; webhook sup
      - The webhook listener currently binds to `0.0.0.0:8787` and serves `POST /telegram-webhook` by default.
      - If you need a different public port/host, set `telegram.webhookUrl` to the externally reachable URL and use a reverse proxy to forward to `:8787`.
 4) Direct chats: user sends the first message; all subsequent turns land in the shared `main` session (default, no extra config).
-5) Groups: add the bot, disable privacy mode (or make it admin) so it can read messages; group threads stay on `telegram:group:<chatId>`. When `telegram.groups` is set, it becomes a group allowlist (use `"*"` to allow all). Mention/command gating defaults come from `telegram.groups`.
-6) Optional allowlist:
-   - Direct chats: `telegram.allowFrom` by chat id (`123456789`, `telegram:123456789`, or `tg:123456789`; prefixes are case-insensitive).
-   - Groups: set `telegram.groupPolicy = "allowlist"` and list senders in `telegram.groupAllowFrom` (fallback: explicit `telegram.allowFrom`).
+5) Groups: add the bot, disable privacy mode (or make it admin) so it can read messages; group threads stay on `telegram:group:<chatId>` and require mention/command by default (override via `telegram.groups`).
+6) Optional allowlist: use `telegram.allowFrom` for direct chats by chat id (`123456789` or `telegram:123456789`).
 
 ## Capabilities & limits (Bot API)
 - Sees only messages sent after it’s added to a chat; no pre-history access.
@@ -37,10 +35,9 @@ Status: ready for bot-mode use with grammY (long-polling by default; webhook sup
 
 ## Planned implementation details
 - Library: grammY is the only client for send + gateway (fetch fallback removed); grammY throttler is enabled by default to stay under Bot API limits.
-- Inbound normalization: maps Bot API updates to `MsgContext` with `Surface: "telegram"`, `ChatType: direct|group`, `SenderName`, `MediaPath`/`MediaType` when attachments arrive, `Timestamp`, and reply-to metadata (`ReplyToId`, `ReplyToBody`, `ReplyToSender`) when the user replies; reply context is appended to `Body` as a `[Replying to ...]` block (includes `id:` when available); groups require @bot mention or a `routing.groupChat.mentionPatterns` match by default (override per chat in config).
+- Inbound normalization: maps Bot API updates to `MsgContext` with `Surface: "telegram"`, `ChatType: direct|group`, `SenderName`, `MediaPath`/`MediaType` when attachments arrive, `Timestamp`, and reply-to metadata (`ReplyToId`, `ReplyToBody`, `ReplyToSender`) when the user replies; reply context is appended to `Body` as a `[Replying to ...]` block (includes `id:` when available); groups require @bot mention by default (override per chat in config).
 - Outbound: text and media (photo/video/audio/document) with optional caption; chunked to limits. Typing cue sent best-effort.
-- Config: `TELEGRAM_BOT_TOKEN` env or `telegram.botToken` required; `telegram.groups` (group allowlist + mention defaults), `telegram.allowFrom`, `telegram.groupAllowFrom`, `telegram.groupPolicy`, `telegram.mediaMaxMb`, `telegram.replyToMode`, `telegram.proxy`, `telegram.webhookSecret`, `telegram.webhookUrl`, `telegram.webhookPath` supported.
-  - Ack reactions are controlled globally via `messages.ackReaction` + `messages.ackReactionScope`.
+- Config: `TELEGRAM_BOT_TOKEN` env or `telegram.botToken` required; `telegram.groups`, `telegram.allowFrom`, `telegram.mediaMaxMb`, `telegram.replyToMode`, `telegram.proxy`, `telegram.webhookSecret`, `telegram.webhookUrl`, `telegram.webhookPath` supported.
   - Mention gating precedence (most specific wins): `telegram.groups.<chatId>.requireMention` → `telegram.groups."*".requireMention` → default `true`.
 
 Example config:
@@ -51,12 +48,10 @@ Example config:
     botToken: "123:abc",
     replyToMode: "off",
     groups: {
-      "*": { requireMention: true }, // allow all groups
+      "*": { requireMention: true },
       "123456789": { requireMention: false } // group chat id
     },
     allowFrom: ["123456789"], // direct chat ids allowed (or "*")
-    groupPolicy: "allowlist",
-    groupAllowFrom: ["tg:123456789", "@alice"],
     mediaMaxMb: 5,
     proxy: "socks5://localhost:9050",
     webhookSecret: "mysecret",
@@ -70,7 +65,7 @@ Example config:
 ## Group etiquette
 - Keep privacy mode off if you expect the bot to read all messages; with privacy on, it only sees commands/mentions.
 - Make the bot an admin if you need it to send in restricted groups or channels.
-- Mention the bot (`@yourbot`) or use a `routing.groupChat.mentionPatterns` trigger; per-group overrides live in `telegram.groups` if you want always-on behavior. If `telegram.groups` is set, add `"*"` to keep existing allow-all behavior.
+- Mention the bot (`@yourbot`) or use commands to trigger; per-group overrides live in `telegram.groups` if you want always-on behavior.
 
 ## Reply tags
 To request a threaded reply, the model can include one tag in its output:

docs/templates/AGENTS.md

@@ -16,28 +16,18 @@ If `BOOTSTRAP.md` exists, that's your birth certificate. Follow it, figure out w
 Before doing anything else:
 1. Read `SOUL.md` — this is who you are
 2. Read `USER.md` — this is who you're helping
-3. Read `memory/YYYY-MM-DD.md` (today + yesterday) for recent context
-4. **If in MAIN SESSION** (direct chat with your human): Also read `MEMORY.md`
+3. Read `memory.md` + today's and yesterday's files in `memory/`
 
 Don't ask permission. Just do it.
 
 ## Memory
 
 You wake up fresh each session. These files are your continuity:
-- **Daily notes:** `memory/YYYY-MM-DD.md` (create `memory/` if needed) — raw logs of what happened
-- **Long-term:** `MEMORY.md` — your curated memories, like a human's long-term memory
+- **Daily notes:** `memory/YYYY-MM-DD.md` (create `memory/` if needed)
+- **Long-term:** `memory.md` for durable facts, preferences, open loops
 
 Capture what matters. Decisions, context, things to remember. Skip the secrets unless asked to keep them.
 
-### 🧠 MEMORY.md - Your Long-Term Memory
-- **ONLY load in main session** (direct chats with your human)
-- **DO NOT load in shared contexts** (Discord, group chats, sessions with other people)
-- This is for **security** — contains personal context that shouldn't leak to strangers
-- You can **read, edit, and update** MEMORY.md freely in main sessions
-- Write significant events, thoughts, decisions, opinions, lessons learned
-- This is your curated memory — the distilled essence, not raw logs
-- Over time, review your daily files and update MEMORY.md with what's worth keeping
-
 ### 📝 Write It Down - No "Mental Notes"!
 - **Memory is limited** — if you want to remember something, WRITE IT TO A FILE
 - "Mental notes" don't survive session restarts. Files do.
@@ -79,29 +69,6 @@ Vectors + BM25 + reranking finds things even with different wording.
 
 You have access to your human's stuff. That doesn't mean you *share* their stuff. In groups, you're a participant — not their voice, not their proxy. Think before you speak.
 
-### 💬 Know When to Speak!
-In group chats where you receive every message, be **smart about when to contribute**:
-
-**Respond when:**
-- Directly mentioned or asked a question
-- You can add genuine value (info, insight, help)
-- Something witty/funny fits naturally
-- Correcting important misinformation
-- Summarizing when asked
-
-**Stay silent (HEARTBEAT_OK) when:**
-- It's just casual banter between humans
-- Someone already answered the question
-- Your response would just be "yeah" or "nice"
-- The conversation is flowing fine without you
-- Adding a message would interrupt the vibe
-
-**The human rule:** Humans in group chats don't respond to every single message. Neither should you. Quality > quantity. If you wouldn't send it in a real group chat with friends, don't send it.
-
-**Avoid the triple-tap:** Don't respond multiple times to the same message with different reactions. One thoughtful response beats three fragments.
-
-Participate, don't dominate.
-
 ## Tools
 
 Skills provide your tools. When you need one, check its `SKILL.md`. Keep local notes (camera names, SSH details, voice preferences) in `TOOLS.md`.
@@ -151,16 +118,6 @@ When you receive a `HEARTBEAT` message, don't just reply `HEARTBEAT_OK` every ti
 - Check on projects (git status, etc.)
 - Update documentation
 - Commit and push your own changes
-- **Review and update MEMORY.md** (see below)
-
-### 🔄 Memory Maintenance (During Heartbeats)
-Periodically (every few days), use a heartbeat to:
-1. Read through recent `memory/YYYY-MM-DD.md` files
-2. Identify significant events, lessons, or insights worth keeping long-term
-3. Update `MEMORY.md` with distilled learnings
-4. Remove outdated info from MEMORY.md that's no longer relevant
-
-Think of it like a human reviewing their journal and updating their mental model. Daily files are raw notes; MEMORY.md is curated wisdom.
 
 The goal: Be helpful without being annoying. Check in a few times a day, do useful background work, but respect quiet time.
 

docs/test.md

@@ -14,7 +14,7 @@ read_when:
 Script: `scripts/bench-model.ts`
 
 Usage:
-- `source ~/.profile && bun scripts/bench-model.ts --runs 10`
+- `source ~/.profile && pnpm tsx scripts/bench-model.ts --runs 10`
 - Optional env: `MINIMAX_API_KEY`, `MINIMAX_BASE_URL`, `MINIMAX_MODEL`, `ANTHROPIC_API_KEY`
 - Default prompt: “Reply with a single word: ok. No punctuation or extra text.”
 
@@ -33,11 +33,3 @@ scripts/e2e/onboard-docker.sh
 ```
 
 This script drives the interactive wizard via a pseudo-tty, verifies config/workspace/session files, then starts the gateway and runs `clawdbot health`.
-
-## QR import smoke (Docker)
-
-Ensures `qrcode-terminal` loads under Node 22+ in Docker:
-
-```bash
-pnpm test:docker:qr
-```

docs/tools.md

@@ -126,7 +126,7 @@ Core parameters:
 - `maxBytesMb` (optional size cap)
 
 Notes:
-- Only available when `agent.imageModel` is configured (primary or fallbacks).
+- Only available when `agent.imageModel` or `agent.imageModelFallbacks` is set.
 - Uses the image model directly (independent of the main chat model).
 
 ### `cron`
@@ -139,7 +139,7 @@ Core actions:
 
 Notes:
 - `add` expects a full cron job object (same schema as `cron.add` RPC).
-- `update` uses `{ id, patch }`.
+- `update` uses `{ jobId, patch }`.
 
 ### `gateway`
 Restart the running Gateway process (in-place).

docs/troubleshooting.md

@@ -29,8 +29,8 @@ cat ~/.clawdbot/clawdbot.json | jq '.whatsapp.allowFrom'
 
 **Check 2:** For group chats, is mention required?
 ```bash
-# The message must match mentionPatterns or explicit mentions; defaults live in provider groups/guilds.
-cat ~/.clawdbot/clawdbot.json | jq '.routing.groupChat, .whatsapp.groups, .telegram.groups, .imessage.groups, .discord.guilds'
+# The message must match mentionPatterns or explicit mentions; defaults live in whatsapp.groups
+cat ~/.clawdbot/clawdbot.json | jq '.routing.groupChat, .whatsapp.groups'
 ```
 
 **Check 3:** Check the logs
@@ -160,13 +160,6 @@ lsof -nP -i :18789
 kill -9 <PID>
 ```
 
-If the gateway is supervised by launchd, killing the PID will just respawn it.
-Stop the supervisor instead:
-```bash
-clawdbot gateway stop
-# Or: launchctl bootout gui/$UID/com.clawdbot.gateway
-```
-
 **Fix 2: Check embedded gateway**
 Ensure the gateway relay was properly bundled. Run `./scripts/package-mac-app.sh` and ensure `bun` is installed.
 

docs/tui.md

@@ -48,15 +48,13 @@ Use SSH tunneling or Tailscale to reach the Gateway WS.
 - `/help`
 - `/status`
 - `/session <key>` (or `/sessions`)
-- `/model <provider/model>` (or `/model list`, `/models`)
+- `/model <provider/model>` (or `/models`)
 - `/think <off|minimal|low|medium|high>`
 - `/verbose <on|off>`
 - `/elevated <on|off>`
-- `/elev <on|off>`
 - `/activation <mention|always>`
 - `/deliver <on|off>`
 - `/new` or `/reset`
-- `/compact [instructions]`
 - `/abort`
 - `/settings`
 - `/exit`

docs/web.md

@@ -110,6 +110,6 @@ Open:
 The Gateway serves static files from `dist/control-ui`. Build them with:
 
 ```bash
-bun run ui:install
-bun run ui:build
+pnpm ui:install
+pnpm ui:build
 ```

docs/webhook.md

@@ -91,7 +91,7 @@ Mapping options (summary):
 - `hooks.mappings` lets you define `match`, `action`, and templates in config.
 - `hooks.transformsDir` + `transform.module` loads a JS/TS module for custom logic.
 - Use `match.source` to keep a generic ingest endpoint (payload-driven routing).
-- TS transforms require a TS loader (e.g. `bun`) or precompiled `.js` at runtime.
+- TS transforms require a TS loader (e.g. `tsx`) or precompiled `.js` at runtime.
 - `clawdbot hooks gmail setup` writes `hooks.gmail` config for `clawdbot hooks gmail run`.
 
 ## Responses

docs/whatsapp.md

@@ -49,8 +49,6 @@ WhatsApp requires a real mobile number for verification. VoIP and virtual number
 - Direct chats use E.164; groups use group JID.
 - **Allowlist**: `whatsapp.allowFrom` enforced for direct chats only.
   - If `whatsapp.allowFrom` is empty, default allowlist = self number (self-chat mode).
-- **Group policy**: `whatsapp.groupPolicy` controls group handling (`open|disabled|allowlist`).
-  - `allowlist` uses `whatsapp.groupAllowFrom` (fallback: explicit `whatsapp.allowFrom`).
 - **Self-chat mode**: avoids auto read receipts and ignores mention JIDs.
 - Read receipts sent for non-self-chat DMs.
 
@@ -71,7 +69,6 @@ WhatsApp requires a real mobile number for verification. VoIP and virtual number
 
 ## Groups
 - Groups map to `whatsapp:group:<jid>` sessions.
-- Group policy: `whatsapp.groupPolicy = open|disabled|allowlist` (default `open`).
 - Activation modes:
   - `mention` (default): requires @mention or regex match.
   - `always`: always triggers.
@@ -121,9 +118,7 @@ WhatsApp requires a real mobile number for verification. VoIP and virtual number
 
 ## Config quick map
 - `whatsapp.allowFrom` (DM allowlist).
-- `whatsapp.groupAllowFrom` (group sender allowlist).
-- `whatsapp.groupPolicy` (group policy).
-- `whatsapp.groups` (group allowlist + mention gating defaults; use `"*"` to allow all)
+- `whatsapp.groups` (group mention gating defaults/overrides)
 - `routing.groupChat.mentionPatterns`
 - `routing.groupChat.historyLimit`
 - `messages.messagePrefix` (inbound prefix)

docs/wizard.md

@@ -49,12 +49,10 @@ It does **not** install or change anything on the remote host.
 2) **Model/Auth**
    - **Anthropic OAuth (recommended)**: browser flow; paste the `code#state`.
    - **OpenAI Codex OAuth**: browser flow; paste the `code#state`.
-     - Sets `agent.model` to `openai-codex/gpt-5.2` when model is unset or `openai/*`.
    - **API key**: stores the key for you.
    - **Minimax M2.1 (LM Studio)**: config is auto‑written for the LM Studio endpoint.
    - **Skip**: no auth configured yet.
-   - Wizard runs a model check and warns if the configured model is unknown or missing auth.
-   - OAuth credentials live in `~/.clawdbot/credentials/oauth.json`; auth profiles live in `~/.clawdbot/agent/auth-profiles.json` (API keys + OAuth).
+   - OAuth credentials live in `~/.clawdbot/credentials/oauth.json`; API keys live in `~/.clawdbot/agent/auth.json`.
 
 3) **Workspace**
    - Default `~/clawd` (configurable).

package.json

@@ -44,20 +44,19 @@
     "LICENSE"
   ],
   "scripts": {
-    "dev": "bun src/entry.ts",
-    "postinstall": "node scripts/postinstall.js",
-    "docs:list": "bun scripts/docs-list.ts",
+    "dev": "tsx src/entry.ts",
+    "docs:list": "tsx scripts/docs-list.ts",
     "docs:dev": "cd docs && mint dev",
     "docs:build": "cd docs && pnpm dlx mint broken-links",
-    "build": "tsc -p tsconfig.json && bun scripts/canvas-a2ui-copy.ts",
-    "release:check": "bun scripts/release-check.ts",
-    "ui:install": "node scripts/ui.js install",
-    "ui:dev": "node scripts/ui.js dev",
-    "ui:build": "node scripts/ui.js build",
-    "start": "bun src/entry.ts",
-    "clawdbot": "bun src/entry.ts",
-    "gateway:watch": "bun --watch src/entry.ts gateway --force",
-    "clawdbot:rpc": "bun src/entry.ts agent --mode rpc --json",
+    "build": "tsc -p tsconfig.json && tsx scripts/canvas-a2ui-copy.ts",
+    "release:check": "tsx scripts/release-check.ts",
+    "ui:install": "pnpm -C ui install",
+    "ui:dev": "pnpm -C ui dev",
+    "ui:build": "pnpm -C ui build",
+    "start": "tsx src/entry.ts",
+    "clawdbot": "tsx src/entry.ts",
+    "gateway:watch": "tsx watch --clear-screen=false --include 'src/**/*.ts' src/entry.ts gateway --force",
+    "clawdbot:rpc": "tsx src/entry.ts agent --mode rpc --json",
     "lint": "biome check src test && oxlint --type-aware src test --ignore-pattern src/canvas-host/a2ui/a2ui.bundle.js",
     "lint:swift": "swiftlint lint --config .swiftlint.yml && (cd apps/ios && swiftlint lint --config .swiftlint.yml)",
     "lint:fix": "biome check --write --unsafe src && biome format --write src",
@@ -65,12 +64,11 @@
     "format:swift": "swiftformat --lint --config .swiftformat apps/macos/Sources apps/ios/Sources apps/shared/ClawdbotKit/Sources",
     "format:fix": "biome format src --write",
     "test": "vitest",
-    "test:force": "bun scripts/test-force.ts",
+    "test:force": "tsx scripts/test-force.ts",
     "test:coverage": "vitest run --coverage",
     "test:e2e": "vitest run --config vitest.e2e.config.ts",
-    "test:docker:qr": "bash scripts/e2e/qr-import-docker.sh",
-    "protocol:gen": "bun scripts/protocol-gen.ts",
-    "protocol:gen:swift": "bun scripts/protocol-gen-swift.ts",
+    "protocol:gen": "tsx scripts/protocol-gen.ts",
+    "protocol:gen:swift": "tsx scripts/protocol-gen-swift.ts",
     "protocol:check": "pnpm protocol:gen && pnpm protocol:gen:swift && git diff --exit-code -- dist/protocol.schema.json apps/macos/Sources/ClawdbotProtocol/GatewayModels.swift",
     "canvas:a2ui:bundle": "bash scripts/bundle-a2ui.sh"
   },
@@ -85,10 +83,10 @@
     "@clack/prompts": "^0.11.0",
     "@grammyjs/transformer-throttler": "^1.2.1",
     "@homebridge/ciao": "^1.3.4",
-    "@mariozechner/pi-agent-core": "^0.37.2",
-    "@mariozechner/pi-ai": "^0.37.2",
-    "@mariozechner/pi-coding-agent": "^0.37.2",
-    "@mariozechner/pi-tui": "^0.37.2",
+    "@mariozechner/pi-agent-core": "^0.36.0",
+    "@mariozechner/pi-ai": "^0.36.0",
+    "@mariozechner/pi-coding-agent": "^0.36.0",
+    "@mariozechner/pi-tui": "^0.36.0",
     "@sinclair/typebox": "0.34.46",
     "@slack/bolt": "^4.6.0",
     "@slack/web-api": "^7.13.0",
@@ -110,7 +108,6 @@
     "json5": "^2.2.3",
     "long": "5.3.2",
     "playwright-core": "1.57.0",
-    "proper-lockfile": "^4.1.2",
     "qrcode-terminal": "^0.12.0",
     "sharp": "^0.34.5",
     "tslog": "^4.10.2",
@@ -127,7 +124,6 @@
     "@types/express": "^5.0.6",
     "@types/markdown-it": "^14.1.2",
     "@types/node": "^25.0.3",
-    "@types/proper-lockfile": "^4.1.4",
     "@types/qrcode-terminal": "^0.12.2",
     "@types/ws": "^8.18.1",
     "@vitest/coverage-v8": "^4.0.16",
@@ -142,6 +138,7 @@
     "quicktype-core": "^23.2.6",
     "rolldown": "1.0.0-beta.58",
     "signal-utils": "^0.21.1",
+    "tsx": "^4.21.0",
     "typescript": "^5.9.3",
     "vitest": "^4.0.16",
     "wireit": "^0.14.12"
@@ -151,8 +148,7 @@
       "@sinclair/typebox": "0.34.46"
     },
     "patchedDependencies": {
-      "@mariozechner/pi-ai": "patches/@mariozechner__pi-ai.patch",
-      "qrcode-terminal": "patches/qrcode-terminal.patch"
+      "@mariozechner/pi-ai": "patches/@mariozechner__pi-ai.patch"
     }
   },
   "vitest": {

patches/@mariozechner__pi-ai.patch

@@ -1,52 +1,8 @@
 diff --git a/dist/providers/google-shared.js b/dist/providers/google-shared.js
-index 7bc0a9f5d6241f191cd607ecb37b3acac8d58267..56866774e47444b5d333961c9b20fce582363124 100644
+index 7bc0a9f5d6241f191cd607ecb37b3acac8d58267..76166a34784cbc0718d4b9bd1fa6336a6dd394ec 100644
 --- a/dist/providers/google-shared.js
 +++ b/dist/providers/google-shared.js
-@@ -10,13 +10,27 @@ import { transformMessages } from "./transorm-messages.js";
- export function convertMessages(model, context) {
-     const contents = [];
-     const transformedMessages = transformMessages(context.messages, model);
-+    
-+    /**
-+     * Helper to add content while merging consecutive messages of the same role.
-+     * Gemini/Cloud Code Assist requires strict role alternation (user/model/user/model).
-+     * Consecutive messages of the same role cause "function call turn" errors.
-+     */
-+    function addContent(role, parts) {
-+        if (parts.length === 0) return;
-+        const lastContent = contents[contents.length - 1];
-+        if (lastContent?.role === role) {
-+            // Merge into existing message of same role
-+            lastContent.parts.push(...parts);
-+        } else {
-+            contents.push({ role, parts });
-+        }
-+    }
-+    
-     for (const msg of transformedMessages) {
-         if (msg.role === "user") {
-             if (typeof msg.content === "string") {
--                contents.push({
--                    role: "user",
--                    parts: [{ text: sanitizeSurrogates(msg.content) }],
--                });
-+                addContent("user", [{ text: sanitizeSurrogates(msg.content) }]);
-             }
-             else {
-                 const parts = msg.content.map((item) => {
-@@ -35,10 +49,7 @@ export function convertMessages(model, context) {
-                 const filteredParts = !model.input.includes("image") ? parts.filter((p) => p.text !== undefined) : parts;
-                 if (filteredParts.length === 0)
-                     continue;
--                contents.push({
--                    role: "user",
--                    parts: filteredParts,
--                });
-+                addContent("user", filteredParts);
-             }
-         }
-         else if (msg.role === "assistant") {
-@@ -51,9 +62,19 @@ export function convertMessages(model, context) {
+@@ -51,9 +51,19 @@ export function convertMessages(model, context) {
                      parts.push({ text: sanitizeSurrogates(block.text) });
                  }
                  else if (block.type === "thinking") {
@@ -69,7 +25,7 @@ index 7bc0a9f5d6241f191cd607ecb37b3acac8d58267..56866774e47444b5d333961c9b20fce5
                          parts.push({
                              thought: true,
                              text: sanitizeSurrogates(block.thinking),
-@@ -61,6 +82,7 @@ export function convertMessages(model, context) {
+@@ -61,6 +71,7 @@ export function convertMessages(model, context) {
                          });
                      }
                      else {
@@ -77,44 +33,7 @@ index 7bc0a9f5d6241f191cd607ecb37b3acac8d58267..56866774e47444b5d333961c9b20fce5
                          parts.push({
                              text: `<thinking>\n${sanitizeSurrogates(block.thinking)}\n</thinking>`,
                          });
-@@ -85,10 +107,7 @@ export function convertMessages(model, context) {
-             }
-             if (parts.length === 0)
-                 continue;
--            contents.push({
--                role: "model",
--                parts,
--            });
-+            addContent("model", parts);
-         }
-         else if (msg.role === "toolResult") {
-             // Extract text and image content
-@@ -125,27 +144,94 @@ export function convertMessages(model, context) {
-             }
-             // Cloud Code Assist API requires all function responses to be in a single user turn.
-             // Check if the last content is already a user turn with function responses and merge.
-+            // Use addContent for proper role alternation handling.
-             const lastContent = contents[contents.length - 1];
-             if (lastContent?.role === "user" && lastContent.parts?.some((p) => p.functionResponse)) {
-                 lastContent.parts.push(functionResponsePart);
-             }
-             else {
--                contents.push({
--                    role: "user",
--                    parts: [functionResponsePart],
--                });
-+                addContent("user", [functionResponsePart]);
-             }
-             // For older models, add images in a separate user message
-+            // Note: This may create consecutive user messages, but addContent will merge them
-             if (hasImages && !supportsMultimodalFunctionResponse) {
--                contents.push({
--                    role: "user",
--                    parts: [{ text: "Tool result image:" }, ...imageParts],
--                });
-+                addContent("user", [{ text: "Tool result image:" }, ...imageParts]);
-             }
-         }
+@@ -146,6 +157,77 @@ export function convertMessages(model, context) {
      }
      return contents;
  }
@@ -192,7 +111,7 @@ index 7bc0a9f5d6241f191cd607ecb37b3acac8d58267..56866774e47444b5d333961c9b20fce5
  /**
   * Convert tools to Gemini function declarations format.
   */
-@@ -157,7 +243,7 @@ export function convertTools(tools) {
+@@ -157,7 +239,7 @@ export function convertTools(tools) {
              functionDeclarations: tools.map((tool) => ({
                  name: tool.name,
                  description: tool.description,

patches/@mariozechner__pi-coding-agent@0.32.3.patch

@@ -0,0 +1,17 @@
+diff --git a/dist/config.js b/dist/config.js
+index 7caa66d2676933b102431ec8d92c571eb9d6d82c..77103b9d9573e56c26014c8c7c918e1f853afcdc 100644
+--- a/dist/config.js
++++ b/dist/config.js
+@@ -10,8 +10,11 @@ const __dirname = dirname(__filename);
+ /**
+  * Detect if we're running as a Bun compiled binary.
+  * Bun binaries have import.meta.url containing "$bunfs", "~BUN", or "%7EBUN" (Bun's virtual filesystem path)
++ * Some packaging workflows keep import.meta.url as a file:// path, so fall back to execPath next to package.json.
+  */
+-export const isBunBinary = import.meta.url.includes("$bunfs") || import.meta.url.includes("~BUN") || import.meta.url.includes("%7EBUN");
++const bunBinaryByUrl = import.meta.url.includes("$bunfs") || import.meta.url.includes("~BUN") || import.meta.url.includes("%7EBUN");
++const bunBinaryByExecPath = existsSync(join(dirname(process.execPath), "package.json"));
++export const isBunBinary = bunBinaryByUrl || bunBinaryByExecPath;
+ // =============================================================================
+ // Package Asset Paths (shipped with executable)
+ // =============================================================================

patches/qrcode-terminal.patch

@@ -1,12 +0,0 @@
-diff --git a/lib/main.js b/lib/main.js
-index 488cc1aea9802b3d6ae13aee27556403bec55d1c..3de1f934868d81e8204f00e6a4bf2696a05f7340 100644
---- a/lib/main.js
-+++ b/lib/main.js
-@@ -1,5 +1,5 @@
--var QRCode = require('./../vendor/QRCode'),
--    QRErrorCorrectLevel = require('./../vendor/QRCode/QRErrorCorrectLevel'),
-+var QRCode = require('./../vendor/QRCode/index.js'),
-+    QRErrorCorrectLevel = require('./../vendor/QRCode/QRErrorCorrectLevel.js'),
-     black = "\033[40m  \033[0m",
-     white = "\033[47m  \033[0m",
-     toCell = function (isBlack) {

pnpm-lock.yaml

@@ -9,11 +9,8 @@ overrides:
 
 patchedDependencies:
   '@mariozechner/pi-ai':
-    hash: b49275c3e2023970d8248ababef6df60e093e58a3ba3127c2ba4de1df387d06a
+    hash: 628fb051b6f4886984a846a5ee7aa0a571c3360d35b8d114e4684e5edcd100c5
     path: patches/@mariozechner__pi-ai.patch
-  qrcode-terminal:
-    hash: ed82029850dbdf551f5df1de320945af52b8ea8500cc7bd4f39258e7a3d92e12
-    path: patches/qrcode-terminal.patch
 
 importers:
 
@@ -29,17 +26,17 @@ importers:
         specifier: ^1.3.4
         version: 1.3.4
       '@mariozechner/pi-agent-core':
-        specifier: ^0.37.2
-        version: 0.37.2(ws@8.19.0)(zod@4.3.5)
+        specifier: ^0.36.0
+        version: 0.36.0(ws@8.19.0)(zod@4.3.5)
       '@mariozechner/pi-ai':
-        specifier: ^0.37.2
-        version: 0.37.2(patch_hash=b49275c3e2023970d8248ababef6df60e093e58a3ba3127c2ba4de1df387d06a)(ws@8.19.0)(zod@4.3.5)
+        specifier: ^0.36.0
+        version: 0.36.0(patch_hash=628fb051b6f4886984a846a5ee7aa0a571c3360d35b8d114e4684e5edcd100c5)(ws@8.19.0)(zod@4.3.5)
       '@mariozechner/pi-coding-agent':
-        specifier: ^0.37.2
-        version: 0.37.2(ws@8.19.0)(zod@4.3.5)
+        specifier: ^0.36.0
+        version: 0.36.0(ws@8.19.0)(zod@4.3.5)
       '@mariozechner/pi-tui':
-        specifier: ^0.37.2
-        version: 0.37.2
+        specifier: ^0.36.0
+        version: 0.36.0
       '@sinclair/typebox':
         specifier: 0.34.46
         version: 0.34.46
@@ -103,12 +100,9 @@ importers:
       playwright-core:
         specifier: 1.57.0
         version: 1.57.0
-      proper-lockfile:
-        specifier: ^4.1.2
-        version: 4.1.2
       qrcode-terminal:
         specifier: ^0.12.0
-        version: 0.12.0(patch_hash=ed82029850dbdf551f5df1de320945af52b8ea8500cc7bd4f39258e7a3d92e12)
+        version: 0.12.0
       sharp:
         specifier: ^0.34.5
         version: 0.34.5
@@ -149,9 +143,6 @@ importers:
       '@types/node':
         specifier: ^25.0.3
         version: 25.0.3
-      '@types/proper-lockfile':
-        specifier: ^4.1.4
-        version: 4.1.4
       '@types/qrcode-terminal':
         specifier: ^0.12.2
         version: 0.12.2
@@ -194,6 +185,9 @@ importers:
       signal-utils:
         specifier: ^0.21.1
         version: 0.21.1(signal-polyfill@0.2.2)
+      tsx:
+        specifier: ^4.21.0
+        version: 4.21.0
       typescript:
         specifier: ^5.9.3
         version: 5.9.3
@@ -807,22 +801,22 @@ packages:
     peerDependencies:
       lit: ^3.3.1
 
-  '@mariozechner/pi-agent-core@0.37.2':
-    resolution: {integrity: sha512-GAN1lDVmlY1yH/FCfvpH29f2WBoqqMQkda7zKthOJO9l8tagxnlCWtq078CjzUGYlTDhKSf388XlOuDByBGYLA==}
+  '@mariozechner/pi-agent-core@0.36.0':
+    resolution: {integrity: sha512-86BI1/j/MLxQHSWRXVLz8+NuSmDvLQebNb40+lFDI9XI9YBh8+r5fkYgU43u4j2TvANZ7iW6SFFnhWhzy8y6dg==}
     engines: {node: '>=20.0.0'}
 
-  '@mariozechner/pi-ai@0.37.2':
-    resolution: {integrity: sha512-IhhvlPrgkdrlbS7QnV+qJPmlzKyae/aI1kenclG18/dXCypxUU50OuzGoVwrXvXw/RIHRwodhd7w4IH38Z7W4Q==}
+  '@mariozechner/pi-ai@0.36.0':
+    resolution: {integrity: sha512-xkzTgvdMzAZ/L/TgMH8z9Zi+aH0EWc54l5ygiafwvCgDk7xvfbylQG6pa9yn5zEn9T4NF9byJNk+nMHnycZvMQ==}
     engines: {node: '>=20.0.0'}
     hasBin: true
 
-  '@mariozechner/pi-coding-agent@0.37.2':
-    resolution: {integrity: sha512-wRFqcyY76h4mONO1si2oAn9WVKnhmVV28dPHjQXVPrl7uSwMCLn+Fcde/nmbL29pYfiU1il4GmUR+iSyoxBUVQ==}
+  '@mariozechner/pi-coding-agent@0.36.0':
+    resolution: {integrity: sha512-lKdpuGE0yVs/96GnDhrPLEEFhRteHRtnkfX04KIBpcsEXXg2vyAlpxtjtZ9nlhYqLLIY7qJRkeyjbhcFFfbAAA==}
     engines: {node: '>=20.0.0'}
     hasBin: true
 
-  '@mariozechner/pi-tui@0.37.2':
-    resolution: {integrity: sha512-XNV+jEeWJxQ8U3r5njRotVs6DnEIunkLHSA4nnF4OaRRgrcsafD8M4Pm/3RywSucclVK8P7+KoGiBB2Lokkmuw==}
+  '@mariozechner/pi-tui@0.36.0':
+    resolution: {integrity: sha512-4n+nmTd36q0AVCbqWmjtTHTjIEwlGayKKhc+4QbpN9U3Z9jyQQa8Za1P2OHRmi6Jeu+ISuf4VBDvgmgCaxPZYg==}
     engines: {node: '>=20.0.0'}
 
   '@mistralai/mistralai@1.10.0':
@@ -1275,9 +1269,6 @@ packages:
   '@types/node@25.0.3':
     resolution: {integrity: sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==}
 
-  '@types/proper-lockfile@4.1.4':
-    resolution: {integrity: sha512-uo2ABllncSqg9F1D4nugVl9v93RmjxF6LJzQLMLDdPaXCUIDPeOJ21Gbqi43xNKzBi/WQ0Q0dICqufzQbMjipQ==}
-
   '@types/qrcode-terminal@0.12.2':
     resolution: {integrity: sha512-v+RcIEJ+Uhd6ygSQ0u5YYY7ZM+la7GgPbs0V/7l/kFs2uO4S8BcIUEMoP7za4DNIqNnUD5npf0A/7kBhrCKG5Q==}
 
@@ -1290,9 +1281,6 @@ packages:
   '@types/retry@0.12.0':
     resolution: {integrity: sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==}
 
-  '@types/retry@0.12.5':
-    resolution: {integrity: sha512-3xSjTp3v03X/lSQLkczaN9UIEwJMoMCA1+Nb5HfbJEQWogdeQIyVtTvxPXDQjZ5zws8rFQfVfRdz03ARihPJgw==}
-
   '@types/send@1.2.1':
     resolution: {integrity: sha512-arsCikDvlU99zl1g69TcAB3mzZPpxgw0UQnaHeC1Nwb015xp8bknZv5rIfri9xTOcMuaVgvabfIRA7PSZVuZIQ==}
 
@@ -3597,10 +3585,10 @@ snapshots:
     transitivePeerDependencies:
       - tailwindcss
 
-  '@mariozechner/pi-agent-core@0.37.2(ws@8.19.0)(zod@4.3.5)':
+  '@mariozechner/pi-agent-core@0.36.0(ws@8.19.0)(zod@4.3.5)':
     dependencies:
-      '@mariozechner/pi-ai': 0.37.2(patch_hash=b49275c3e2023970d8248ababef6df60e093e58a3ba3127c2ba4de1df387d06a)(ws@8.19.0)(zod@4.3.5)
-      '@mariozechner/pi-tui': 0.37.2
+      '@mariozechner/pi-ai': 0.36.0(patch_hash=628fb051b6f4886984a846a5ee7aa0a571c3360d35b8d114e4684e5edcd100c5)(ws@8.19.0)(zod@4.3.5)
+      '@mariozechner/pi-tui': 0.36.0
     transitivePeerDependencies:
       - '@modelcontextprotocol/sdk'
       - bufferutil
@@ -3609,7 +3597,7 @@ snapshots:
       - ws
       - zod
 
-  '@mariozechner/pi-ai@0.37.2(patch_hash=b49275c3e2023970d8248ababef6df60e093e58a3ba3127c2ba4de1df387d06a)(ws@8.19.0)(zod@4.3.5)':
+  '@mariozechner/pi-ai@0.36.0(patch_hash=628fb051b6f4886984a846a5ee7aa0a571c3360d35b8d114e4684e5edcd100c5)(ws@8.19.0)(zod@4.3.5)':
     dependencies:
       '@anthropic-ai/sdk': 0.71.2(zod@4.3.5)
       '@google/genai': 1.34.0
@@ -3629,12 +3617,12 @@ snapshots:
       - ws
       - zod
 
-  '@mariozechner/pi-coding-agent@0.37.2(ws@8.19.0)(zod@4.3.5)':
+  '@mariozechner/pi-coding-agent@0.36.0(ws@8.19.0)(zod@4.3.5)':
     dependencies:
       '@crosscopy/clipboard': 0.2.8
-      '@mariozechner/pi-agent-core': 0.37.2(ws@8.19.0)(zod@4.3.5)
-      '@mariozechner/pi-ai': 0.37.2(patch_hash=b49275c3e2023970d8248ababef6df60e093e58a3ba3127c2ba4de1df387d06a)(ws@8.19.0)(zod@4.3.5)
-      '@mariozechner/pi-tui': 0.37.2
+      '@mariozechner/pi-agent-core': 0.36.0(ws@8.19.0)(zod@4.3.5)
+      '@mariozechner/pi-ai': 0.36.0(patch_hash=628fb051b6f4886984a846a5ee7aa0a571c3360d35b8d114e4684e5edcd100c5)(ws@8.19.0)(zod@4.3.5)
+      '@mariozechner/pi-tui': 0.36.0
       chalk: 5.6.2
       cli-highlight: 2.1.11
       diff: 8.0.2
@@ -3642,7 +3630,6 @@ snapshots:
       glob: 11.1.0
       jiti: 2.6.1
       marked: 15.0.12
-      proper-lockfile: 4.1.2
       sharp: 0.34.5
     transitivePeerDependencies:
       - '@modelcontextprotocol/sdk'
@@ -3652,7 +3639,7 @@ snapshots:
       - ws
       - zod
 
-  '@mariozechner/pi-tui@0.37.2':
+  '@mariozechner/pi-tui@0.36.0':
     dependencies:
       '@types/mime-types': 2.1.4
       chalk: 5.6.2
@@ -4048,10 +4035,6 @@ snapshots:
     dependencies:
       undici-types: 7.16.0
 
-  '@types/proper-lockfile@4.1.4':
-    dependencies:
-      '@types/retry': 0.12.5
-
   '@types/qrcode-terminal@0.12.2': {}
 
   '@types/qs@6.14.0': {}
@@ -4060,8 +4043,6 @@ snapshots:
 
   '@types/retry@0.12.0': {}
 
-  '@types/retry@0.12.5': {}
-
   '@types/send@1.2.1':
     dependencies:
       '@types/node': 25.0.3
@@ -4789,7 +4770,6 @@ snapshots:
   get-tsconfig@4.13.0:
     dependencies:
       resolve-pkg-maps: 1.0.0
-    optional: true
 
   glob-parent@5.1.2:
     dependencies:
@@ -5480,7 +5460,7 @@ snapshots:
       '@thi.ng/bitstream': 2.4.37
     optional: true
 
-  qrcode-terminal@0.12.0(patch_hash=ed82029850dbdf551f5df1de320945af52b8ea8500cc7bd4f39258e7a3d92e12): {}
+  qrcode-terminal@0.12.0: {}
 
   qs@6.14.1:
     dependencies:
@@ -5551,8 +5531,7 @@ snapshots:
 
   require-from-string@2.0.2: {}
 
-  resolve-pkg-maps@1.0.0:
-    optional: true
+  resolve-pkg-maps@1.0.0: {}
 
   retry@0.12.0: {}
 
@@ -5876,7 +5855,6 @@ snapshots:
       get-tsconfig: 4.13.0
     optionalDependencies:
       fsevents: 2.3.3
-    optional: true
 
   type-is@2.0.1:
     dependencies:

scripts/docs-list.ts

@@ -1,4 +1,4 @@
-#!/usr/bin/env bun
+#!/usr/bin/env tsx
 
 import { readdirSync, readFileSync } from 'node:fs';
 import { join, relative } from 'node:path';

scripts/e2e/Dockerfile.qr-import

@@ -1,9 +0,0 @@
-FROM node:22-bookworm
-
-RUN corepack enable
-
-WORKDIR /app
-
-COPY . .
-
-RUN pnpm install --frozen-lockfile

scripts/e2e/onboard-docker.sh

@@ -10,7 +10,6 @@ docker build -t "$IMAGE_NAME" -f "$ROOT_DIR/scripts/e2e/Dockerfile" "$ROOT_DIR"
 echo "Running onboarding E2E..."
 docker run --rm -t "$IMAGE_NAME" bash -lc '
   set -euo pipefail
-  trap "" PIPE
   export TERM=xterm-256color
 
   # Provide a minimal trash shim to avoid noisy "missing trash" logs in containers.
@@ -38,7 +37,7 @@ TRASH
     local delay="${2:-0.4}"
     # Let prompts render before sending keystrokes.
     sleep "$delay"
-    printf "%b" "$payload" >&3 2>/dev/null || true
+    printf "%b" "$payload" >&3
   }
 
   start_gateway() {
@@ -135,8 +134,6 @@ TRASH
     send $'"'"'\e[B'"'"' 0.6
     send $'"'"'\e[B'"'"' 0.6
     send $'"'"'\e[B'"'"' 0.6
-    send $'"'"'\e[B'"'"' 0.6
-    send $'"'"'\e[B'"'"' 0.6
     send $'"'"'\r'"'"' 0.6
     send $'"'"'\r'"'"' 0.5
     send $'"'"'\r'"'"' 0.5
@@ -173,7 +170,7 @@ TRASH
     # Configure providers now? (default Yes)
     send $'"'"'\r'"'"' 0.8
     send "" 0.8
-    # Select Telegram, Discord, Slack.
+    # Select Telegram, Discord, Signal.
     send $'"'"'\e[B'"'"' 0.4
     send $'"'"' '"'"' 0.4
     send $'"'"'\e[B'"'"' 0.4
@@ -181,14 +178,11 @@ TRASH
     send $'"'"'\e[B'"'"' 0.4
     send $'"'"' '"'"' 0.4
     send $'"'"'\r'"'"' 0.6
-    send $'"'"'tg_token\r'"'"' 0.8
-    send $'"'"'discord_token\r'"'"' 0.8
-    send "" 0.6
-    send $'"'"'\r'"'"' 0.6
-    send "" 0.6
-    send $'"'"'slack_bot\r'"'"' 0.8
-    send "" 0.6
-    send $'"'"'slack_app\r'"'"' 0.8
+    send $'"'"'tg_token\r'"'"' 0.6
+    send $'"'"'discord_token\r'"'"' 0.6
+    send $'"'"'n\r'"'"' 0.6
+    send $'"'"'+15551234567\r'"'"' 0.6
+    send $'"'"'n\r'"'"' 0.6
   }
 
   send_skills_flow() {
@@ -399,11 +393,11 @@ if (cfg?.telegram?.botToken !== "tg_token") {
 if (cfg?.discord?.token !== "discord_token") {
   errors.push(`discord.token mismatch (got ${cfg?.discord?.token ?? "unset"})`);
 }
-if (cfg?.slack?.botToken !== "slack_bot") {
-  errors.push(`slack.botToken mismatch (got ${cfg?.slack?.botToken ?? "unset"})`);
+if (cfg?.signal?.account !== "+15551234567") {
+  errors.push(`signal.account mismatch (got ${cfg?.signal?.account ?? "unset"})`);
 }
-if (cfg?.slack?.appToken !== "slack_app") {
-  errors.push(`slack.appToken mismatch (got ${cfg?.slack?.appToken ?? "unset"})`);
+if (cfg?.signal?.cliPath !== "signal-cli") {
+  errors.push(`signal.cliPath mismatch (got ${cfg?.signal?.cliPath ?? "unset"})`);
 }
 if (cfg?.wizard?.lastRunMode !== "local") {
   errors.push(`wizard.lastRunMode mismatch (got ${cfg?.wizard?.lastRunMode ?? "unset"})`);

scripts/e2e/qr-import-docker.sh

@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
-IMAGE_NAME="${CLAWDBOT_QR_SMOKE_IMAGE:-clawdbot-qr-smoke}"
-
-echo "Building Docker image..."
-docker build -t "$IMAGE_NAME" -f "$ROOT_DIR/scripts/e2e/Dockerfile.qr-import" "$ROOT_DIR"
-
-echo "Running qrcode-terminal import smoke..."
-docker run --rm -t "$IMAGE_NAME" node -e "import('qrcode-terminal').then((m)=>m.default.generate('qr-smoke',{small:true}))"

scripts/package-mac-app.sh

@@ -146,8 +146,8 @@ else
 fi
 
 if [[ "${SKIP_UI_BUILD:-0}" != "1" ]]; then
-  echo "🖥  Building Control UI (ui:build)"
-  (cd "$ROOT_DIR" && node scripts/ui.js build)
+  echo "🖥  Building Control UI (pnpm ui:build)"
+  (cd "$ROOT_DIR" && pnpm ui:build)
 else
   echo "🖥  Skipping Control UI build (SKIP_UI_BUILD=1)"
 fi

scripts/postinstall.js

@@ -1,110 +0,0 @@
-import { spawnSync } from "node:child_process";
-import fs from "node:fs";
-import path from "node:path";
-import { fileURLToPath } from "node:url";
-
-function isBunInstall() {
-  const ua = process.env.npm_config_user_agent ?? "";
-  return ua.includes("bun/");
-}
-
-function getRepoRoot() {
-  const here = path.dirname(fileURLToPath(import.meta.url));
-  return path.resolve(here, "..");
-}
-
-function run(cmd, args, opts = {}) {
-  const res = spawnSync(cmd, args, { stdio: "inherit", ...opts });
-  if (typeof res.status === "number") return res.status;
-  return 1;
-}
-
-function applyPatchIfNeeded(opts) {
-  const patchPath = path.resolve(opts.patchPath);
-  if (!fs.existsSync(patchPath)) {
-    throw new Error(`missing patch: ${patchPath}`);
-  }
-
-  let targetDir = path.resolve(opts.targetDir);
-  if (!fs.existsSync(targetDir) || !fs.statSync(targetDir).isDirectory()) {
-    console.warn(`[postinstall] skip missing target: ${targetDir}`);
-    return;
-  }
-
-  // Resolve symlinks to avoid "beyond a symbolic link" errors from git apply
-  // (bun/pnpm use symlinks in node_modules)
-  targetDir = fs.realpathSync(targetDir);
-
-  const gitArgsBase = ["apply", "--unsafe-paths", "--whitespace=nowarn"];
-  const reverseCheck = [
-    ...gitArgsBase,
-    "--reverse",
-    "--check",
-    "--directory",
-    targetDir,
-    patchPath,
-  ];
-  const forwardCheck = [
-    ...gitArgsBase,
-    "--check",
-    "--directory",
-    targetDir,
-    patchPath,
-  ];
-  const apply = [...gitArgsBase, "--directory", targetDir, patchPath];
-
-  // Already applied?
-  if (run("git", reverseCheck, { stdio: "ignore" }) === 0) {
-    return;
-  }
-
-  if (run("git", forwardCheck, { stdio: "ignore" }) !== 0) {
-    throw new Error(`patch does not apply cleanly: ${path.basename(patchPath)}`);
-  }
-
-  const status = run("git", apply);
-  if (status !== 0) {
-    throw new Error(`failed applying patch: ${path.basename(patchPath)}`);
-  }
-}
-
-function extractPackageName(key) {
-  if (key.startsWith("@")) {
-    const idx = key.indexOf("@", 1);
-    if (idx === -1) return key;
-    return key.slice(0, idx);
-  }
-  const idx = key.lastIndexOf("@");
-  if (idx <= 0) return key;
-  return key.slice(0, idx);
-}
-
-function main() {
-  if (!isBunInstall()) return;
-
-  const repoRoot = getRepoRoot();
-  process.chdir(repoRoot);
-
-  const pkgPath = path.join(repoRoot, "package.json");
-  const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf-8"));
-  const patched = pkg?.pnpm?.patchedDependencies ?? {};
-
-  // Bun does not support pnpm.patchedDependencies. Apply these patch files to
-  // node_modules packages as a best-effort compatibility layer.
-  for (const [key, relPatchPath] of Object.entries(patched)) {
-    if (typeof relPatchPath !== "string" || !relPatchPath.trim()) continue;
-    const pkgName = extractPackageName(String(key));
-    if (!pkgName) continue;
-    applyPatchIfNeeded({
-      targetDir: path.join("node_modules", ...pkgName.split("/")),
-      patchPath: relPatchPath,
-    });
-  }
-}
-
-try {
-  main();
-} catch (err) {
-  console.error(String(err));
-  process.exit(1);
-}

scripts/release-check.ts

@@ -1,4 +1,4 @@
-#!/usr/bin/env bun
+#!/usr/bin/env tsx
 
 import { execSync } from "node:child_process";
 

scripts/test-force.ts

@@ -1,4 +1,4 @@
-#!/usr/bin/env bun
+#!/usr/bin/env tsx
 import os from "node:os";
 import path from "node:path";
 import { spawnSync } from "node:child_process";

scripts/ui.js

@@ -1,102 +0,0 @@
-#!/usr/bin/env node
-import { spawn } from "node:child_process";
-import fs from "node:fs";
-import path from "node:path";
-import { fileURLToPath } from "node:url";
-
-const here = path.dirname(fileURLToPath(import.meta.url));
-const repoRoot = path.resolve(here, "..");
-const uiDir = path.join(repoRoot, "ui");
-
-function usage() {
-  // keep this tiny; it's invoked from npm scripts too
-  process.stderr.write(
-    "Usage: node scripts/ui.js <install|dev|build|test> [...args]\n",
-  );
-}
-
-function which(cmd) {
-  try {
-    const key = process.platform === "win32" ? "Path" : "PATH";
-    const paths = (process.env[key] ?? process.env.PATH ?? "")
-      .split(path.delimiter)
-      .filter(Boolean);
-    const extensions =
-      process.platform === "win32"
-        ? (process.env.PATHEXT ?? ".EXE;.CMD;.BAT;.COM")
-            .split(";")
-            .filter(Boolean)
-        : [""];
-    for (const entry of paths) {
-      for (const ext of extensions) {
-        const candidate = path.join(entry, process.platform === "win32" ? `${cmd}${ext}` : cmd);
-        try {
-          if (fs.existsSync(candidate)) return candidate;
-        } catch {
-          // ignore
-        }
-      }
-    }
-  } catch {
-    // ignore
-  }
-  return null;
-}
-
-function resolveRunner() {
-  const bun = which("bun");
-  if (bun) return { cmd: bun, kind: "bun" };
-  const pnpm = which("pnpm");
-  if (pnpm) return { cmd: pnpm, kind: "pnpm" };
-  return null;
-}
-
-function run(cmd, args) {
-  const child = spawn(cmd, args, {
-    cwd: uiDir,
-    stdio: "inherit",
-    env: process.env,
-  });
-  child.on("exit", (code, signal) => {
-    if (signal) process.exit(1);
-    process.exit(code ?? 1);
-  });
-}
-
-const [, , action, ...rest] = process.argv;
-if (!action) {
-  usage();
-  process.exit(2);
-}
-
-const runner = resolveRunner();
-if (!runner) {
-  process.stderr.write(
-    "Missing UI runner: install bun or pnpm, then retry.\n",
-  );
-  process.exit(1);
-}
-
-const script =
-  action === "install"
-    ? null
-    : action === "dev"
-      ? "dev"
-      : action === "build"
-        ? "build"
-        : action === "test"
-          ? "test"
-          : null;
-
-if (action !== "install" && !script) {
-  usage();
-  process.exit(2);
-}
-
-if (runner.kind === "bun") {
-  if (action === "install") run(runner.cmd, ["install", ...rest]);
-  else run(runner.cmd, ["run", script, ...rest]);
-} else {
-  if (action === "install") run(runner.cmd, ["install", ...rest]);
-  else run(runner.cmd, ["run", script, ...rest]);
-}

skills/nano-banana-pro/SKILL.md

@@ -26,5 +26,4 @@ API key
 Notes
 - Resolutions: `1K` (default), `2K`, `4K`.
 - Use timestamps in filenames: `yyyy-mm-dd-hh-mm-ss-name.png`.
-- The script prints a `MEDIA:` line for Clawdbot to auto-attach on supported chat providers.
 - Do not read the image back; report the saved path only.

skills/nano-banana-pro/scripts/generate_image.py

@@ -154,8 +154,6 @@ def main():
         if image_saved:
             full_path = output_path.resolve()
             print(f"\nImage saved: {full_path}")
-            # Clawdbot parses MEDIA tokens and will attach the file on supported providers.
-            print(f"MEDIA: {full_path}")
         else:
             print("Error: No image was generated in the response.", file=sys.stderr)
             sys.exit(1)

src/agents/agent-paths.ts

@@ -1,13 +1,14 @@
 import path from "node:path";
 
-import { resolveConfigDir, resolveUserPath } from "../utils.js";
+import { CONFIG_DIR, resolveUserPath } from "../utils.js";
+
+const DEFAULT_AGENT_DIR = path.join(CONFIG_DIR, "agent");
 
 export function resolveClawdbotAgentDir(): string {
-  const defaultAgentDir = path.join(resolveConfigDir(), "agent");
   const override =
     process.env.CLAWDBOT_AGENT_DIR?.trim() ||
     process.env.PI_CODING_AGENT_DIR?.trim() ||
-    defaultAgentDir;
+    DEFAULT_AGENT_DIR;
   return resolveUserPath(override);
 }
 

src/agents/auth-profiles.test.ts

@@ -1,199 +0,0 @@
-import { describe, expect, it } from "vitest";
-
-import {
-  type AuthProfileStore,
-  calculateAuthProfileCooldownMs,
-  resolveAuthProfileOrder,
-} from "./auth-profiles.js";
-
-describe("resolveAuthProfileOrder", () => {
-  const store: AuthProfileStore = {
-    version: 1,
-    profiles: {
-      "anthropic:default": {
-        type: "api_key",
-        provider: "anthropic",
-        key: "sk-default",
-      },
-      "anthropic:work": {
-        type: "api_key",
-        provider: "anthropic",
-        key: "sk-work",
-      },
-    },
-  };
-  const cfg = {
-    auth: {
-      profiles: {
-        "anthropic:default": { provider: "anthropic", mode: "api_key" },
-        "anthropic:work": { provider: "anthropic", mode: "api_key" },
-      },
-    },
-  };
-
-  it("uses stored profiles when no config exists", () => {
-    const order = resolveAuthProfileOrder({
-      store,
-      provider: "anthropic",
-    });
-    expect(order).toEqual(["anthropic:default", "anthropic:work"]);
-  });
-
-  it("prioritizes preferred profiles", () => {
-    const order = resolveAuthProfileOrder({
-      cfg,
-      store,
-      provider: "anthropic",
-      preferredProfile: "anthropic:work",
-    });
-    expect(order[0]).toBe("anthropic:work");
-    expect(order).toContain("anthropic:default");
-  });
-
-  it("does not prioritize lastGood over round-robin ordering", () => {
-    const order = resolveAuthProfileOrder({
-      cfg,
-      store: {
-        ...store,
-        lastGood: { anthropic: "anthropic:work" },
-        usageStats: {
-          "anthropic:default": { lastUsed: 100 },
-          "anthropic:work": { lastUsed: 200 },
-        },
-      },
-      provider: "anthropic",
-    });
-    expect(order[0]).toBe("anthropic:default");
-  });
-
-  it("uses explicit profiles when order is missing", () => {
-    const order = resolveAuthProfileOrder({
-      cfg,
-      store,
-      provider: "anthropic",
-    });
-    expect(order).toEqual(["anthropic:default", "anthropic:work"]);
-  });
-
-  it("uses configured order when provided", () => {
-    const order = resolveAuthProfileOrder({
-      cfg: {
-        auth: {
-          order: { anthropic: ["anthropic:work", "anthropic:default"] },
-          profiles: cfg.auth.profiles,
-        },
-      },
-      store,
-      provider: "anthropic",
-    });
-    expect(order).toEqual(["anthropic:work", "anthropic:default"]);
-  });
-
-  it("prioritizes oauth profiles when order missing", () => {
-    const mixedStore: AuthProfileStore = {
-      version: 1,
-      profiles: {
-        "anthropic:default": {
-          type: "api_key",
-          provider: "anthropic",
-          key: "sk-default",
-        },
-        "anthropic:oauth": {
-          type: "oauth",
-          provider: "anthropic",
-          access: "access-token",
-          refresh: "refresh-token",
-          expires: Date.now() + 60_000,
-        },
-      },
-    };
-    const order = resolveAuthProfileOrder({
-      store: mixedStore,
-      provider: "anthropic",
-    });
-    expect(order).toEqual(["anthropic:oauth", "anthropic:default"]);
-  });
-
-  it("orders by lastUsed when no explicit order exists", () => {
-    const order = resolveAuthProfileOrder({
-      store: {
-        version: 1,
-        profiles: {
-          "anthropic:a": {
-            type: "oauth",
-            provider: "anthropic",
-            access: "access-token",
-            refresh: "refresh-token",
-            expires: Date.now() + 60_000,
-          },
-          "anthropic:b": {
-            type: "api_key",
-            provider: "anthropic",
-            key: "sk-b",
-          },
-          "anthropic:c": {
-            type: "api_key",
-            provider: "anthropic",
-            key: "sk-c",
-          },
-        },
-        usageStats: {
-          "anthropic:a": { lastUsed: 200 },
-          "anthropic:b": { lastUsed: 100 },
-          "anthropic:c": { lastUsed: 300 },
-        },
-      },
-      provider: "anthropic",
-    });
-    expect(order).toEqual(["anthropic:b", "anthropic:a", "anthropic:c"]);
-  });
-
-  it("pushes cooldown profiles to the end, ordered by cooldown expiry", () => {
-    const now = Date.now();
-    const order = resolveAuthProfileOrder({
-      store: {
-        version: 1,
-        profiles: {
-          "anthropic:ready": {
-            type: "api_key",
-            provider: "anthropic",
-            key: "sk-ready",
-          },
-          "anthropic:cool1": {
-            type: "oauth",
-            provider: "anthropic",
-            access: "access-token",
-            refresh: "refresh-token",
-            expires: now + 60_000,
-          },
-          "anthropic:cool2": {
-            type: "api_key",
-            provider: "anthropic",
-            key: "sk-cool",
-          },
-        },
-        usageStats: {
-          "anthropic:ready": { lastUsed: 50 },
-          "anthropic:cool1": { cooldownUntil: now + 5_000 },
-          "anthropic:cool2": { cooldownUntil: now + 1_000 },
-        },
-      },
-      provider: "anthropic",
-    });
-    expect(order).toEqual([
-      "anthropic:ready",
-      "anthropic:cool2",
-      "anthropic:cool1",
-    ]);
-  });
-});
-
-describe("auth profile cooldowns", () => {
-  it("applies exponential backoff with a 1h cap", () => {
-    expect(calculateAuthProfileCooldownMs(1)).toBe(60_000);
-    expect(calculateAuthProfileCooldownMs(2)).toBe(5 * 60_000);
-    expect(calculateAuthProfileCooldownMs(3)).toBe(25 * 60_000);
-    expect(calculateAuthProfileCooldownMs(4)).toBe(60 * 60_000);
-    expect(calculateAuthProfileCooldownMs(5)).toBe(60 * 60_000);
-  });
-});

src/agents/auth-profiles.ts

@@ -1,606 +0,0 @@
-import fs from "node:fs";
-import path from "node:path";
-
-import {
-  getOAuthApiKey,
-  type OAuthCredentials,
-  type OAuthProvider,
-} from "@mariozechner/pi-ai";
-import lockfile from "proper-lockfile";
-
-import type { ClawdbotConfig } from "../config/config.js";
-import { resolveOAuthPath } from "../config/paths.js";
-import { resolveUserPath } from "../utils.js";
-import { resolveClawdbotAgentDir } from "./agent-paths.js";
-
-const AUTH_STORE_VERSION = 1;
-const AUTH_PROFILE_FILENAME = "auth-profiles.json";
-const LEGACY_AUTH_FILENAME = "auth.json";
-
-export type ApiKeyCredential = {
-  type: "api_key";
-  provider: string;
-  key: string;
-  email?: string;
-};
-
-export type OAuthCredential = OAuthCredentials & {
-  type: "oauth";
-  provider: OAuthProvider;
-  email?: string;
-};
-
-export type AuthProfileCredential = ApiKeyCredential | OAuthCredential;
-
-/** Per-profile usage statistics for round-robin and cooldown tracking */
-export type ProfileUsageStats = {
-  lastUsed?: number;
-  cooldownUntil?: number;
-  errorCount?: number;
-};
-
-export type AuthProfileStore = {
-  version: number;
-  profiles: Record<string, AuthProfileCredential>;
-  lastGood?: Record<string, string>;
-  /** Usage statistics per profile for round-robin rotation */
-  usageStats?: Record<string, ProfileUsageStats>;
-};
-
-type LegacyAuthStore = Record<string, AuthProfileCredential>;
-
-function resolveAuthStorePath(): string {
-  const agentDir = resolveClawdbotAgentDir();
-  return path.join(agentDir, AUTH_PROFILE_FILENAME);
-}
-
-function resolveLegacyAuthStorePath(): string {
-  const agentDir = resolveClawdbotAgentDir();
-  return path.join(agentDir, LEGACY_AUTH_FILENAME);
-}
-
-function loadJsonFile(pathname: string): unknown {
-  try {
-    if (!fs.existsSync(pathname)) return undefined;
-    const raw = fs.readFileSync(pathname, "utf8");
-    return JSON.parse(raw) as unknown;
-  } catch {
-    return undefined;
-  }
-}
-
-function saveJsonFile(pathname: string, data: unknown) {
-  const dir = path.dirname(pathname);
-  if (!fs.existsSync(dir)) {
-    fs.mkdirSync(dir, { recursive: true, mode: 0o700 });
-  }
-  fs.writeFileSync(pathname, `${JSON.stringify(data, null, 2)}\n`, "utf8");
-  fs.chmodSync(pathname, 0o600);
-}
-
-function ensureAuthStoreFile(pathname: string) {
-  if (fs.existsSync(pathname)) return;
-  const payload: AuthProfileStore = {
-    version: AUTH_STORE_VERSION,
-    profiles: {},
-  };
-  saveJsonFile(pathname, payload);
-}
-
-function buildOAuthApiKey(
-  provider: OAuthProvider,
-  credentials: OAuthCredentials,
-): string {
-  const needsProjectId =
-    provider === "google-gemini-cli" || provider === "google-antigravity";
-  return needsProjectId
-    ? JSON.stringify({
-        token: credentials.access,
-        projectId: credentials.projectId,
-      })
-    : credentials.access;
-}
-
-async function refreshOAuthTokenWithLock(params: {
-  profileId: string;
-  provider: OAuthProvider;
-}): Promise<{ apiKey: string; newCredentials: OAuthCredentials } | null> {
-  const authPath = resolveAuthStorePath();
-  ensureAuthStoreFile(authPath);
-
-  let release: (() => Promise<void>) | undefined;
-  try {
-    release = await lockfile.lock(authPath, {
-      retries: {
-        retries: 10,
-        factor: 2,
-        minTimeout: 100,
-        maxTimeout: 10_000,
-        randomize: true,
-      },
-      stale: 30_000,
-    });
-
-    const store = ensureAuthProfileStore();
-    const cred = store.profiles[params.profileId];
-    if (!cred || cred.type !== "oauth") return null;
-
-    if (Date.now() < cred.expires) {
-      return {
-        apiKey: buildOAuthApiKey(cred.provider, cred),
-        newCredentials: cred,
-      };
-    }
-
-    const oauthCreds: Record<string, OAuthCredentials> = {
-      [cred.provider]: cred,
-    };
-    const result = await getOAuthApiKey(cred.provider, oauthCreds);
-    if (!result) return null;
-    store.profiles[params.profileId] = {
-      ...cred,
-      ...result.newCredentials,
-      type: "oauth",
-    };
-    saveAuthProfileStore(store);
-    return result;
-  } finally {
-    if (release) {
-      try {
-        await release();
-      } catch {
-        // ignore unlock errors
-      }
-    }
-  }
-}
-
-function coerceLegacyStore(raw: unknown): LegacyAuthStore | null {
-  if (!raw || typeof raw !== "object") return null;
-  const record = raw as Record<string, unknown>;
-  if ("profiles" in record) return null;
-  const entries: LegacyAuthStore = {};
-  for (const [key, value] of Object.entries(record)) {
-    if (!value || typeof value !== "object") continue;
-    const typed = value as Partial<AuthProfileCredential>;
-    if (typed.type !== "api_key" && typed.type !== "oauth") continue;
-    entries[key] = {
-      ...typed,
-      provider: typed.provider ?? (key as OAuthProvider),
-    } as AuthProfileCredential;
-  }
-  return Object.keys(entries).length > 0 ? entries : null;
-}
-
-function coerceAuthStore(raw: unknown): AuthProfileStore | null {
-  if (!raw || typeof raw !== "object") return null;
-  const record = raw as Record<string, unknown>;
-  if (!record.profiles || typeof record.profiles !== "object") return null;
-  const profiles = record.profiles as Record<string, unknown>;
-  const normalized: Record<string, AuthProfileCredential> = {};
-  for (const [key, value] of Object.entries(profiles)) {
-    if (!value || typeof value !== "object") continue;
-    const typed = value as Partial<AuthProfileCredential>;
-    if (typed.type !== "api_key" && typed.type !== "oauth") continue;
-    if (!typed.provider) continue;
-    normalized[key] = typed as AuthProfileCredential;
-  }
-  return {
-    version: Number(record.version ?? AUTH_STORE_VERSION),
-    profiles: normalized,
-    lastGood:
-      record.lastGood && typeof record.lastGood === "object"
-        ? (record.lastGood as Record<string, string>)
-        : undefined,
-    usageStats:
-      record.usageStats && typeof record.usageStats === "object"
-        ? (record.usageStats as Record<string, ProfileUsageStats>)
-        : undefined,
-  };
-}
-
-function mergeOAuthFileIntoStore(store: AuthProfileStore): boolean {
-  const oauthPath = resolveOAuthPath();
-  const oauthRaw = loadJsonFile(oauthPath);
-  if (!oauthRaw || typeof oauthRaw !== "object") return false;
-  const oauthEntries = oauthRaw as Record<string, OAuthCredentials>;
-  let mutated = false;
-  for (const [provider, creds] of Object.entries(oauthEntries)) {
-    if (!creds || typeof creds !== "object") continue;
-    const profileId = `${provider}:default`;
-    if (store.profiles[profileId]) continue;
-    store.profiles[profileId] = {
-      type: "oauth",
-      provider: provider as OAuthProvider,
-      ...creds,
-    };
-    mutated = true;
-  }
-  return mutated;
-}
-
-export function loadAuthProfileStore(): AuthProfileStore {
-  const authPath = resolveAuthStorePath();
-  const raw = loadJsonFile(authPath);
-  const asStore = coerceAuthStore(raw);
-  if (asStore) return asStore;
-
-  const legacyRaw = loadJsonFile(resolveLegacyAuthStorePath());
-  const legacy = coerceLegacyStore(legacyRaw);
-  if (legacy) {
-    const store: AuthProfileStore = {
-      version: AUTH_STORE_VERSION,
-      profiles: {},
-    };
-    for (const [provider, cred] of Object.entries(legacy)) {
-      const profileId = `${provider}:default`;
-      if (cred.type === "api_key") {
-        store.profiles[profileId] = {
-          type: "api_key",
-          provider: cred.provider ?? (provider as OAuthProvider),
-          key: cred.key,
-          ...(cred.email ? { email: cred.email } : {}),
-        };
-      } else {
-        store.profiles[profileId] = {
-          type: "oauth",
-          provider: cred.provider ?? (provider as OAuthProvider),
-          access: cred.access,
-          refresh: cred.refresh,
-          expires: cred.expires,
-          ...(cred.enterpriseUrl ? { enterpriseUrl: cred.enterpriseUrl } : {}),
-          ...(cred.projectId ? { projectId: cred.projectId } : {}),
-          ...(cred.accountId ? { accountId: cred.accountId } : {}),
-          ...(cred.email ? { email: cred.email } : {}),
-        };
-      }
-    }
-    return store;
-  }
-
-  return { version: AUTH_STORE_VERSION, profiles: {} };
-}
-
-export function ensureAuthProfileStore(): AuthProfileStore {
-  const authPath = resolveAuthStorePath();
-  const raw = loadJsonFile(authPath);
-  const asStore = coerceAuthStore(raw);
-  if (asStore) return asStore;
-
-  const legacyRaw = loadJsonFile(resolveLegacyAuthStorePath());
-  const legacy = coerceLegacyStore(legacyRaw);
-  const store: AuthProfileStore = {
-    version: AUTH_STORE_VERSION,
-    profiles: {},
-  };
-  if (legacy) {
-    for (const [provider, cred] of Object.entries(legacy)) {
-      const profileId = `${provider}:default`;
-      if (cred.type === "api_key") {
-        store.profiles[profileId] = {
-          type: "api_key",
-          provider: cred.provider ?? (provider as OAuthProvider),
-          key: cred.key,
-          ...(cred.email ? { email: cred.email } : {}),
-        };
-      } else {
-        store.profiles[profileId] = {
-          type: "oauth",
-          provider: cred.provider ?? (provider as OAuthProvider),
-          access: cred.access,
-          refresh: cred.refresh,
-          expires: cred.expires,
-          ...(cred.enterpriseUrl ? { enterpriseUrl: cred.enterpriseUrl } : {}),
-          ...(cred.projectId ? { projectId: cred.projectId } : {}),
-          ...(cred.accountId ? { accountId: cred.accountId } : {}),
-          ...(cred.email ? { email: cred.email } : {}),
-        };
-      }
-    }
-  }
-
-  const mergedOAuth = mergeOAuthFileIntoStore(store);
-  const shouldWrite = legacy !== null || mergedOAuth;
-  if (shouldWrite) {
-    saveJsonFile(authPath, store);
-  }
-  return store;
-}
-
-export function saveAuthProfileStore(store: AuthProfileStore): void {
-  const authPath = resolveAuthStorePath();
-  const payload = {
-    version: AUTH_STORE_VERSION,
-    profiles: store.profiles,
-    lastGood: store.lastGood ?? undefined,
-    usageStats: store.usageStats ?? undefined,
-  } satisfies AuthProfileStore;
-  saveJsonFile(authPath, payload);
-}
-
-export function upsertAuthProfile(params: {
-  profileId: string;
-  credential: AuthProfileCredential;
-}): void {
-  const store = ensureAuthProfileStore();
-  store.profiles[params.profileId] = params.credential;
-  saveAuthProfileStore(store);
-}
-
-export function listProfilesForProvider(
-  store: AuthProfileStore,
-  provider: string,
-): string[] {
-  return Object.entries(store.profiles)
-    .filter(([, cred]) => cred.provider === provider)
-    .map(([id]) => id);
-}
-
-/**
- * Check if a profile is currently in cooldown (due to rate limiting or errors).
- */
-export function isProfileInCooldown(
-  store: AuthProfileStore,
-  profileId: string,
-): boolean {
-  const stats = store.usageStats?.[profileId];
-  if (!stats?.cooldownUntil) return false;
-  return Date.now() < stats.cooldownUntil;
-}
-
-/**
- * Mark a profile as successfully used. Resets error count and updates lastUsed.
- */
-export function markAuthProfileUsed(params: {
-  store: AuthProfileStore;
-  profileId: string;
-}): void {
-  const { store, profileId } = params;
-  if (!store.profiles[profileId]) return;
-
-  store.usageStats = store.usageStats ?? {};
-  store.usageStats[profileId] = {
-    ...store.usageStats[profileId],
-    lastUsed: Date.now(),
-    errorCount: 0,
-    cooldownUntil: undefined,
-  };
-  saveAuthProfileStore(store);
-}
-
-export function calculateAuthProfileCooldownMs(errorCount: number): number {
-  const normalized = Math.max(1, errorCount);
-  return Math.min(
-    60 * 60 * 1000, // 1 hour max
-    60 * 1000 * 5 ** Math.min(normalized - 1, 3),
-  );
-}
-
-/**
- * Mark a profile as failed/rate-limited. Applies exponential backoff cooldown.
- * Cooldown times: 1min, 5min, 25min, max 1 hour.
- */
-export function markAuthProfileCooldown(params: {
-  store: AuthProfileStore;
-  profileId: string;
-}): void {
-  const { store, profileId } = params;
-  if (!store.profiles[profileId]) return;
-
-  store.usageStats = store.usageStats ?? {};
-  const existing = store.usageStats[profileId] ?? {};
-  const errorCount = (existing.errorCount ?? 0) + 1;
-
-  // Exponential backoff: 1min, 5min, 25min, capped at 1h
-  const backoffMs = calculateAuthProfileCooldownMs(errorCount);
-
-  store.usageStats[profileId] = {
-    ...existing,
-    errorCount,
-    cooldownUntil: Date.now() + backoffMs,
-  };
-  saveAuthProfileStore(store);
-}
-
-/**
- * Clear cooldown for a profile (e.g., manual reset).
- */
-export function clearAuthProfileCooldown(params: {
-  store: AuthProfileStore;
-  profileId: string;
-}): void {
-  const { store, profileId } = params;
-  if (!store.usageStats?.[profileId]) return;
-
-  store.usageStats[profileId] = {
-    ...store.usageStats[profileId],
-    errorCount: 0,
-    cooldownUntil: undefined,
-  };
-  saveAuthProfileStore(store);
-}
-
-export function resolveAuthProfileOrder(params: {
-  cfg?: ClawdbotConfig;
-  store: AuthProfileStore;
-  provider: string;
-  preferredProfile?: string;
-}): string[] {
-  const { cfg, store, provider, preferredProfile } = params;
-  const configuredOrder = cfg?.auth?.order?.[provider];
-  const explicitProfiles = cfg?.auth?.profiles
-    ? Object.entries(cfg.auth.profiles)
-        .filter(([, profile]) => profile.provider === provider)
-        .map(([profileId]) => profileId)
-    : [];
-  const baseOrder =
-    configuredOrder ??
-    (explicitProfiles.length > 0
-      ? explicitProfiles
-      : listProfilesForProvider(store, provider));
-  if (baseOrder.length === 0) return [];
-
-  const filtered = baseOrder.filter((profileId) => {
-    const cred = store.profiles[profileId];
-    return cred ? cred.provider === provider : true;
-  });
-  const deduped: string[] = [];
-  for (const entry of filtered) {
-    if (!deduped.includes(entry)) deduped.push(entry);
-  }
-
-  // If user specified explicit order in config, respect it exactly
-  if (configuredOrder && configuredOrder.length > 0) {
-    // Still put preferredProfile first if specified
-    if (preferredProfile && deduped.includes(preferredProfile)) {
-      return [
-        preferredProfile,
-        ...deduped.filter((e) => e !== preferredProfile),
-      ];
-    }
-    return deduped;
-  }
-
-  // Otherwise, use round-robin: sort by lastUsed (oldest first)
-  // preferredProfile goes first if specified (for explicit user choice)
-  // lastGood is NOT prioritized - that would defeat round-robin
-  const sorted = orderProfilesByMode(deduped, store);
-
-  if (preferredProfile && sorted.includes(preferredProfile)) {
-    return [preferredProfile, ...sorted.filter((e) => e !== preferredProfile)];
-  }
-
-  return sorted;
-}
-
-function orderProfilesByMode(
-  order: string[],
-  store: AuthProfileStore,
-): string[] {
-  const now = Date.now();
-
-  // Partition into available and in-cooldown
-  const available: string[] = [];
-  const inCooldown: string[] = [];
-
-  for (const profileId of order) {
-    if (isProfileInCooldown(store, profileId)) {
-      inCooldown.push(profileId);
-    } else {
-      available.push(profileId);
-    }
-  }
-
-  // Sort available profiles by lastUsed (oldest first = round-robin)
-  // Then by type (oauth preferred over api_key)
-  const scored = available.map((profileId) => {
-    const type = store.profiles[profileId]?.type;
-    const typeScore = type === "oauth" ? 0 : type === "api_key" ? 1 : 2;
-    const lastUsed = store.usageStats?.[profileId]?.lastUsed ?? 0;
-    return { profileId, typeScore, lastUsed };
-  });
-
-  // Primary sort: lastUsed (oldest first for round-robin)
-  // Secondary sort: type preference (oauth > api_key)
-  const sorted = scored
-    .sort((a, b) => {
-      // First by lastUsed (oldest first)
-      if (a.lastUsed !== b.lastUsed) return a.lastUsed - b.lastUsed;
-      // Then by type
-      return a.typeScore - b.typeScore;
-    })
-    .map((entry) => entry.profileId);
-
-  // Append cooldown profiles at the end (sorted by cooldown expiry, soonest first)
-  const cooldownSorted = inCooldown
-    .map((profileId) => ({
-      profileId,
-      cooldownUntil: store.usageStats?.[profileId]?.cooldownUntil ?? now,
-    }))
-    .sort((a, b) => a.cooldownUntil - b.cooldownUntil)
-    .map((entry) => entry.profileId);
-
-  return [...sorted, ...cooldownSorted];
-}
-
-export async function resolveApiKeyForProfile(params: {
-  cfg?: ClawdbotConfig;
-  store: AuthProfileStore;
-  profileId: string;
-}): Promise<{ apiKey: string; provider: string; email?: string } | null> {
-  const { cfg, store, profileId } = params;
-  const cred = store.profiles[profileId];
-  if (!cred) return null;
-  const profileConfig = cfg?.auth?.profiles?.[profileId];
-  if (profileConfig && profileConfig.provider !== cred.provider) return null;
-  if (profileConfig && profileConfig.mode !== cred.type) return null;
-
-  if (cred.type === "api_key") {
-    return { apiKey: cred.key, provider: cred.provider, email: cred.email };
-  }
-  if (Date.now() < cred.expires) {
-    return {
-      apiKey: buildOAuthApiKey(cred.provider, cred),
-      provider: cred.provider,
-      email: cred.email,
-    };
-  }
-
-  try {
-    const result = await refreshOAuthTokenWithLock({
-      profileId,
-      provider: cred.provider,
-    });
-    if (!result) return null;
-    return {
-      apiKey: result.apiKey,
-      provider: cred.provider,
-      email: cred.email,
-    };
-  } catch (error) {
-    const refreshedStore = ensureAuthProfileStore();
-    const refreshed = refreshedStore.profiles[profileId];
-    if (refreshed?.type === "oauth" && Date.now() < refreshed.expires) {
-      return {
-        apiKey: buildOAuthApiKey(refreshed.provider, refreshed),
-        provider: refreshed.provider,
-        email: refreshed.email ?? cred.email,
-      };
-    }
-    const message = error instanceof Error ? error.message : String(error);
-    throw new Error(
-      `OAuth token refresh failed for ${cred.provider}: ${message}. ` +
-        "Please try again or re-authenticate.",
-    );
-  }
-}
-
-export function markAuthProfileGood(params: {
-  store: AuthProfileStore;
-  provider: string;
-  profileId: string;
-}): void {
-  const { store, provider, profileId } = params;
-  const profile = store.profiles[profileId];
-  if (!profile || profile.provider !== provider) return;
-  store.lastGood = { ...store.lastGood, [provider]: profileId };
-  saveAuthProfileStore(store);
-}
-
-export function resolveAuthStorePathForDisplay(): string {
-  const pathname = resolveAuthStorePath();
-  return pathname.startsWith("~") ? pathname : resolveUserPath(pathname);
-}
-
-export function resolveAuthProfileDisplayLabel(params: {
-  cfg?: ClawdbotConfig;
-  store: AuthProfileStore;
-  profileId: string;
-}): string {
-  const { cfg, store, profileId } = params;
-  const profile = store.profiles[profileId];
-  const configEmail = cfg?.auth?.profiles?.[profileId]?.email?.trim();
-  const email = configEmail || profile?.email?.trim();
-  if (email) return `${profileId} (${email})`;
-  return profileId;
-}

src/agents/bash-tools.ts

@@ -36,7 +36,6 @@ const DEFAULT_MAX_OUTPUT = clampNumber(
   150_000,
 );
 const DEFAULT_PATH =
-  process.env.PATH ??
   "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin";
 
 const stringEnum = (

src/agents/clawdbot-tools.subagents.test.ts

@@ -1,204 +0,0 @@
-import { describe, expect, it, vi } from "vitest";
-
-const callGatewayMock = vi.fn();
-vi.mock("../gateway/call.js", () => ({
-  callGateway: (opts: unknown) => callGatewayMock(opts),
-}));
-
-vi.mock("../config/config.js", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("../config/config.js")>();
-  return {
-    ...actual,
-    loadConfig: () => ({
-      session: {
-        mainKey: "main",
-        scope: "per-sender",
-      },
-    }),
-    resolveGatewayPort: () => 18789,
-  };
-});
-
-import { createClawdbotTools } from "./clawdbot-tools.js";
-
-describe("subagents", () => {
-  it("sessions_spawn announces back to the requester group surface", async () => {
-    callGatewayMock.mockReset();
-    const calls: Array<{ method?: string; params?: unknown }> = [];
-    let agentCallCount = 0;
-    let lastWaitedRunId: string | undefined;
-    const replyByRunId = new Map<string, string>();
-    let sendParams: { to?: string; provider?: string; message?: string } = {};
-    let deletedKey: string | undefined;
-
-    callGatewayMock.mockImplementation(async (opts: unknown) => {
-      const request = opts as { method?: string; params?: unknown };
-      calls.push(request);
-      if (request.method === "agent") {
-        agentCallCount += 1;
-        const runId = `run-${agentCallCount}`;
-        const params = request.params as
-          | { message?: string; sessionKey?: string }
-          | undefined;
-        const message = params?.message ?? "";
-        const reply =
-          message === "Sub-agent announce step." ? "announce now" : "result";
-        replyByRunId.set(runId, reply);
-        return {
-          runId,
-          status: "accepted",
-          acceptedAt: 1000 + agentCallCount,
-        };
-      }
-      if (request.method === "agent.wait") {
-        const params = request.params as { runId?: string } | undefined;
-        lastWaitedRunId = params?.runId;
-        return { runId: params?.runId ?? "run-1", status: "ok" };
-      }
-      if (request.method === "chat.history") {
-        const text =
-          (lastWaitedRunId && replyByRunId.get(lastWaitedRunId)) ?? "";
-        return {
-          messages: [{ role: "assistant", content: [{ type: "text", text }] }],
-        };
-      }
-      if (request.method === "send") {
-        const params = request.params as
-          | { to?: string; provider?: string; message?: string }
-          | undefined;
-        sendParams = {
-          to: params?.to,
-          provider: params?.provider,
-          message: params?.message,
-        };
-        return { messageId: "m-announce" };
-      }
-      if (request.method === "sessions.delete") {
-        const params = request.params as { key?: string } | undefined;
-        deletedKey = params?.key;
-        return { ok: true };
-      }
-      return {};
-    });
-
-    const tool = createClawdbotTools({
-      agentSessionKey: "discord:group:req",
-      agentSurface: "discord",
-    }).find((candidate) => candidate.name === "sessions_spawn");
-    if (!tool) throw new Error("missing sessions_spawn tool");
-
-    const result = await tool.execute("call1", {
-      task: "do thing",
-      timeoutSeconds: 1,
-    });
-    expect(result.details).toMatchObject({ status: "ok", reply: "result" });
-
-    await new Promise((resolve) => setTimeout(resolve, 0));
-    await new Promise((resolve) => setTimeout(resolve, 0));
-
-    const agentCalls = calls.filter((call) => call.method === "agent");
-    expect(agentCalls).toHaveLength(2);
-    const first = agentCalls[0]?.params as
-      | { lane?: string; deliver?: boolean; sessionKey?: string }
-      | undefined;
-    expect(first?.lane).toBe("subagent");
-    expect(first?.deliver).toBe(false);
-    expect(first?.sessionKey?.startsWith("subagent:")).toBe(true);
-
-    expect(sendParams).toMatchObject({
-      provider: "discord",
-      to: "channel:req",
-      message: "announce now",
-    });
-    expect(deletedKey?.startsWith("subagent:")).toBe(true);
-  });
-
-  it("sessions_spawn resolves main announce target from sessions.list", async () => {
-    callGatewayMock.mockReset();
-    const calls: Array<{ method?: string; params?: unknown }> = [];
-    let agentCallCount = 0;
-    let lastWaitedRunId: string | undefined;
-    const replyByRunId = new Map<string, string>();
-    let sendParams: { to?: string; provider?: string; message?: string } = {};
-
-    callGatewayMock.mockImplementation(async (opts: unknown) => {
-      const request = opts as { method?: string; params?: unknown };
-      calls.push(request);
-      if (request.method === "sessions.list") {
-        return {
-          sessions: [
-            {
-              key: "main",
-              lastChannel: "whatsapp",
-              lastTo: "+123",
-            },
-          ],
-        };
-      }
-      if (request.method === "agent") {
-        agentCallCount += 1;
-        const runId = `run-${agentCallCount}`;
-        const params = request.params as
-          | { message?: string; sessionKey?: string }
-          | undefined;
-        const message = params?.message ?? "";
-        const reply =
-          message === "Sub-agent announce step." ? "hello from sub" : "done";
-        replyByRunId.set(runId, reply);
-        return {
-          runId,
-          status: "accepted",
-          acceptedAt: 2000 + agentCallCount,
-        };
-      }
-      if (request.method === "agent.wait") {
-        const params = request.params as { runId?: string } | undefined;
-        lastWaitedRunId = params?.runId;
-        return { runId: params?.runId ?? "run-1", status: "ok" };
-      }
-      if (request.method === "chat.history") {
-        const text =
-          (lastWaitedRunId && replyByRunId.get(lastWaitedRunId)) ?? "";
-        return {
-          messages: [{ role: "assistant", content: [{ type: "text", text }] }],
-        };
-      }
-      if (request.method === "send") {
-        const params = request.params as
-          | { to?: string; provider?: string; message?: string }
-          | undefined;
-        sendParams = {
-          to: params?.to,
-          provider: params?.provider,
-          message: params?.message,
-        };
-        return { messageId: "m1" };
-      }
-      if (request.method === "sessions.delete") {
-        return { ok: true };
-      }
-      return {};
-    });
-
-    const tool = createClawdbotTools({
-      agentSessionKey: "main",
-      agentSurface: "whatsapp",
-    }).find((candidate) => candidate.name === "sessions_spawn");
-    if (!tool) throw new Error("missing sessions_spawn tool");
-
-    const result = await tool.execute("call2", {
-      task: "do thing",
-      timeoutSeconds: 1,
-    });
-    expect(result.details).toMatchObject({ status: "ok", reply: "done" });
-
-    await new Promise((resolve) => setTimeout(resolve, 0));
-    await new Promise((resolve) => setTimeout(resolve, 0));
-
-    expect(sendParams).toMatchObject({
-      provider: "whatsapp",
-      to: "+123",
-      message: "hello from sub",
-    });
-  });
-});

src/agents/clawdbot-tools.ts

@@ -10,14 +10,12 @@ import { createNodesTool } from "./tools/nodes-tool.js";
 import { createSessionsHistoryTool } from "./tools/sessions-history-tool.js";
 import { createSessionsListTool } from "./tools/sessions-list-tool.js";
 import { createSessionsSendTool } from "./tools/sessions-send-tool.js";
-import { createSessionsSpawnTool } from "./tools/sessions-spawn-tool.js";
 import { createSlackTool } from "./tools/slack-tool.js";
 
 export function createClawdbotTools(options?: {
   browserControlUrl?: string;
   agentSessionKey?: string;
   agentSurface?: string;
-  sandboxed?: boolean;
   config?: ClawdbotConfig;
 }): AnyAgentTool[] {
   const imageTool = createImageTool({ config: options?.config });
@@ -29,23 +27,11 @@ export function createClawdbotTools(options?: {
     createDiscordTool(),
     createSlackTool(),
     createGatewayTool(),
-    createSessionsListTool({
-      agentSessionKey: options?.agentSessionKey,
-      sandboxed: options?.sandboxed,
-    }),
-    createSessionsHistoryTool({
-      agentSessionKey: options?.agentSessionKey,
-      sandboxed: options?.sandboxed,
-    }),
+    createSessionsListTool(),
+    createSessionsHistoryTool(),
     createSessionsSendTool({
       agentSessionKey: options?.agentSessionKey,
       agentSurface: options?.agentSurface,
-      sandboxed: options?.sandboxed,
-    }),
-    createSessionsSpawnTool({
-      agentSessionKey: options?.agentSessionKey,
-      agentSurface: options?.agentSurface,
-      sandboxed: options?.sandboxed,
     }),
     ...(imageTool ? [imageTool] : []),
   ];

src/agents/model-auth.test.ts

@@ -2,6 +2,7 @@ import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
 import type { Api, Model } from "@mariozechner/pi-ai";
+import { discoverAuthStorage } from "@mariozechner/pi-coding-agent";
 import { describe, expect, it, vi } from "vitest";
 
 const oauthFixture = {
@@ -12,16 +13,12 @@ const oauthFixture = {
 };
 
 describe("getApiKeyForModel", () => {
-  it("migrates legacy oauth.json into auth-profiles.json", async () => {
+  it("migrates legacy oauth.json into auth.json", async () => {
     const previousStateDir = process.env.CLAWDBOT_STATE_DIR;
-    const previousAgentDir = process.env.CLAWDBOT_AGENT_DIR;
-    const previousPiAgentDir = process.env.PI_CODING_AGENT_DIR;
     const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-oauth-"));
 
     try {
       process.env.CLAWDBOT_STATE_DIR = tempDir;
-      process.env.CLAWDBOT_AGENT_DIR = path.join(tempDir, "agent");
-      process.env.PI_CODING_AGENT_DIR = process.env.CLAWDBOT_AGENT_DIR;
 
       const oauthDir = path.join(tempDir, "credentials");
       await fs.mkdir(oauthDir, { recursive: true, mode: 0o700 });
@@ -31,6 +28,10 @@ describe("getApiKeyForModel", () => {
         "utf8",
       );
 
+      const agentDir = path.join(tempDir, "agent");
+      await fs.mkdir(agentDir, { recursive: true, mode: 0o700 });
+      const authStorage = discoverAuthStorage(agentDir);
+
       vi.resetModules();
       const { getApiKeyForModel } = await import("./model-auth.js");
 
@@ -40,33 +41,18 @@ describe("getApiKeyForModel", () => {
         api: "openai-codex-responses",
       } as Model<Api>;
 
-      const apiKey = await getApiKeyForModel({
-        model,
-        cfg: {
-          auth: {
-            profiles: {
-              "openai-codex:default": {
-                provider: "openai-codex",
-                mode: "oauth",
-              },
-            },
-          },
-        },
-      });
-      expect(apiKey.apiKey).toBe(oauthFixture.access);
+      const apiKey = await getApiKeyForModel(model, authStorage);
+      expect(apiKey).toBe(oauthFixture.access);
 
-      const authProfiles = await fs.readFile(
-        path.join(tempDir, "agent", "auth-profiles.json"),
+      const authJson = await fs.readFile(
+        path.join(agentDir, "auth.json"),
         "utf8",
       );
-      const authData = JSON.parse(authProfiles) as Record<string, unknown>;
-      expect(authData.profiles).toMatchObject({
-        "openai-codex:default": {
-          type: "oauth",
-          provider: "openai-codex",
-          access: oauthFixture.access,
-          refresh: oauthFixture.refresh,
-        },
+      const authData = JSON.parse(authJson) as Record<string, unknown>;
+      expect(authData["openai-codex"]).toMatchObject({
+        type: "oauth",
+        access: oauthFixture.access,
+        refresh: oauthFixture.refresh,
       });
     } finally {
       if (previousStateDir === undefined) {
@@ -74,92 +60,6 @@ describe("getApiKeyForModel", () => {
       } 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;
-      }
-      await fs.rm(tempDir, { recursive: true, force: true });
-    }
-  });
-
-  it("suggests openai-codex when only Codex OAuth is configured", async () => {
-    const previousStateDir = process.env.CLAWDBOT_STATE_DIR;
-    const previousAgentDir = process.env.CLAWDBOT_AGENT_DIR;
-    const previousPiAgentDir = process.env.PI_CODING_AGENT_DIR;
-    const previousOpenAiKey = process.env.OPENAI_API_KEY;
-    const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-auth-"));
-
-    try {
-      delete process.env.OPENAI_API_KEY;
-      process.env.CLAWDBOT_STATE_DIR = tempDir;
-      process.env.CLAWDBOT_AGENT_DIR = path.join(tempDir, "agent");
-      process.env.PI_CODING_AGENT_DIR = process.env.CLAWDBOT_AGENT_DIR;
-
-      const authProfilesPath = path.join(
-        tempDir,
-        "agent",
-        "auth-profiles.json",
-      );
-      await fs.mkdir(path.dirname(authProfilesPath), {
-        recursive: true,
-        mode: 0o700,
-      });
-      await fs.writeFile(
-        authProfilesPath,
-        `${JSON.stringify(
-          {
-            version: 1,
-            profiles: {
-              "openai-codex:default": {
-                type: "oauth",
-                provider: "openai-codex",
-                ...oauthFixture,
-              },
-            },
-          },
-          null,
-          2,
-        )}\n`,
-        "utf8",
-      );
-
-      vi.resetModules();
-      const { resolveApiKeyForProvider } = await import("./model-auth.js");
-
-      let error: unknown = null;
-      try {
-        await resolveApiKeyForProvider({ provider: "openai" });
-      } catch (err) {
-        error = err;
-      }
-      expect(String(error)).toContain("openai-codex/gpt-5.2");
-    } finally {
-      if (previousOpenAiKey === undefined) {
-        delete process.env.OPENAI_API_KEY;
-      } else {
-        process.env.OPENAI_API_KEY = previousOpenAiKey;
-      }
-      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;
-      }
       await fs.rm(tempDir, { recursive: true, force: true });
     }
   });

src/agents/model-auth.ts

@@ -1,157 +1,179 @@
-import { type Api, getEnvApiKey, type Model } from "@mariozechner/pi-ai";
-import type { ClawdbotConfig } from "../config/config.js";
-import type { ModelProviderConfig } from "../config/types.js";
-import { getShellEnvAppliedKeys } from "../infra/shell-env.js";
+import fsSync from "node:fs";
+import os from "node:os";
+import path from "node:path";
+
 import {
-  type AuthProfileStore,
-  ensureAuthProfileStore,
-  listProfilesForProvider,
-  resolveApiKeyForProfile,
-  resolveAuthProfileOrder,
-} from "./auth-profiles.js";
+  type Api,
+  getEnvApiKey,
+  getOAuthApiKey,
+  type Model,
+  type OAuthCredentials,
+  type OAuthProvider,
+} from "@mariozechner/pi-ai";
+import type { discoverAuthStorage } from "@mariozechner/pi-coding-agent";
 
-export {
-  ensureAuthProfileStore,
-  resolveAuthProfileOrder,
-} from "./auth-profiles.js";
+import { CONFIG_DIR, resolveUserPath } from "../utils.js";
 
-export function getCustomProviderApiKey(
-  cfg: ClawdbotConfig | undefined,
-  provider: string,
-): string | undefined {
-  const providers = cfg?.models?.providers ?? {};
-  const entry = providers[provider] as ModelProviderConfig | undefined;
-  const key = entry?.apiKey?.trim();
-  return key || undefined;
+const OAUTH_FILENAME = "oauth.json";
+const DEFAULT_OAUTH_DIR = path.join(CONFIG_DIR, "credentials");
+let oauthStorageConfigured = false;
+let oauthStorageMigrated = false;
+
+type OAuthStorage = Record<string, OAuthCredentials>;
+
+function resolveClawdbotOAuthPath(): string {
+  const overrideDir =
+    process.env.CLAWDBOT_OAUTH_DIR?.trim() || DEFAULT_OAUTH_DIR;
+  return path.join(resolveUserPath(overrideDir), OAUTH_FILENAME);
 }
 
-export async function resolveApiKeyForProvider(params: {
-  provider: string;
-  cfg?: ClawdbotConfig;
-  profileId?: string;
-  preferredProfile?: string;
-  store?: AuthProfileStore;
-}): Promise<{ apiKey: string; profileId?: string; source: string }> {
-  const { provider, cfg, profileId, preferredProfile } = params;
-  const store = params.store ?? ensureAuthProfileStore();
-
-  if (profileId) {
-    const resolved = await resolveApiKeyForProfile({
-      cfg,
-      store,
-      profileId,
-    });
-    if (!resolved) {
-      throw new Error(`No credentials found for profile "${profileId}".`);
-    }
-    return {
-      apiKey: resolved.apiKey,
-      profileId,
-      source: `profile:${profileId}`,
-    };
+function loadOAuthStorageAt(pathname: string): OAuthStorage | null {
+  if (!fsSync.existsSync(pathname)) return null;
+  try {
+    const content = fsSync.readFileSync(pathname, "utf8");
+    const json = JSON.parse(content) as OAuthStorage;
+    if (!json || typeof json !== "object") return null;
+    return json;
+  } catch {
+    return null;
   }
+}
 
-  const order = resolveAuthProfileOrder({
-    cfg,
-    store,
-    provider,
-    preferredProfile,
-  });
-  for (const candidate of order) {
-    try {
-      const resolved = await resolveApiKeyForProfile({
-        cfg,
-        store,
-        profileId: candidate,
-      });
-      if (resolved) {
-        return {
-          apiKey: resolved.apiKey,
-          profileId: candidate,
-          source: `profile:${candidate}`,
-        };
+function hasAnthropicOAuth(storage: OAuthStorage): boolean {
+  const entry = storage.anthropic as
+    | {
+        refresh?: string;
+        refresh_token?: string;
+        refreshToken?: string;
+        access?: string;
+        access_token?: string;
+        accessToken?: string;
       }
-    } catch {}
-  }
+    | undefined;
+  if (!entry) return false;
+  const refresh =
+    entry.refresh ?? entry.refresh_token ?? entry.refreshToken ?? "";
+  const access = entry.access ?? entry.access_token ?? entry.accessToken ?? "";
+  return Boolean(refresh.trim() && access.trim());
+}
 
-  const envResolved = resolveEnvApiKey(provider);
-  if (envResolved) {
-    return { apiKey: envResolved.apiKey, source: envResolved.source };
-  }
+function saveOAuthStorageAt(pathname: string, storage: OAuthStorage): void {
+  const dir = path.dirname(pathname);
+  fsSync.mkdirSync(dir, { recursive: true, mode: 0o700 });
+  fsSync.writeFileSync(
+    pathname,
+    `${JSON.stringify(storage, null, 2)}\n`,
+    "utf8",
+  );
+  fsSync.chmodSync(pathname, 0o600);
+}
 
-  const customKey = getCustomProviderApiKey(cfg, provider);
-  if (customKey) {
-    return { apiKey: customKey, source: "models.json" };
+function legacyOAuthPaths(): string[] {
+  const paths: string[] = [];
+  const piOverride = process.env.PI_CODING_AGENT_DIR?.trim();
+  if (piOverride) {
+    paths.push(path.join(resolveUserPath(piOverride), OAUTH_FILENAME));
   }
+  paths.push(path.join(os.homedir(), ".pi", "agent", OAUTH_FILENAME));
+  paths.push(path.join(os.homedir(), ".claude", OAUTH_FILENAME));
+  paths.push(path.join(os.homedir(), ".config", "claude", OAUTH_FILENAME));
+  paths.push(path.join(os.homedir(), ".config", "anthropic", OAUTH_FILENAME));
+  return Array.from(new Set(paths));
+}
 
-  if (provider === "openai") {
-    const hasCodex = listProfilesForProvider(store, "openai-codex").length > 0;
-    if (hasCodex) {
-      throw new Error(
-        'No API key found for provider "openai". You are authenticated with OpenAI Codex OAuth. Use openai-codex/gpt-5.2 (ChatGPT OAuth) or set OPENAI_API_KEY for openai/gpt-5.2.',
-      );
+function importLegacyOAuthIfNeeded(destPath: string): void {
+  if (fsSync.existsSync(destPath)) return;
+  for (const legacyPath of legacyOAuthPaths()) {
+    const storage = loadOAuthStorageAt(legacyPath);
+    if (!storage || !hasAnthropicOAuth(storage)) continue;
+    saveOAuthStorageAt(destPath, storage);
+    return;
+  }
+}
+
+export function ensureOAuthStorage(): void {
+  if (oauthStorageConfigured) return;
+  oauthStorageConfigured = true;
+  const oauthPath = resolveClawdbotOAuthPath();
+  importLegacyOAuthIfNeeded(oauthPath);
+}
+
+function isValidOAuthCredential(
+  entry: OAuthCredentials | undefined,
+): entry is OAuthCredentials {
+  if (!entry) return false;
+  return Boolean(
+    entry.access?.trim() &&
+      entry.refresh?.trim() &&
+      Number.isFinite(entry.expires),
+  );
+}
+
+function migrateOAuthStorageToAuthStorage(
+  authStorage: ReturnType<typeof discoverAuthStorage>,
+): void {
+  if (oauthStorageMigrated) return;
+  oauthStorageMigrated = true;
+  const oauthPath = resolveClawdbotOAuthPath();
+  const storage = loadOAuthStorageAt(oauthPath);
+  if (!storage) return;
+  for (const [provider, creds] of Object.entries(storage)) {
+    if (!isValidOAuthCredential(creds)) continue;
+    if (authStorage.get(provider)) continue;
+    authStorage.set(provider, { type: "oauth", ...creds });
+  }
+}
+
+export function hydrateAuthStorage(
+  authStorage: ReturnType<typeof discoverAuthStorage>,
+): void {
+  ensureOAuthStorage();
+  migrateOAuthStorageToAuthStorage(authStorage);
+}
+
+function isOAuthProvider(provider: string): provider is OAuthProvider {
+  return (
+    provider === "anthropic" ||
+    provider === "anthropic-oauth" ||
+    provider === "google" ||
+    provider === "openai" ||
+    provider === "openai-compatible" ||
+    provider === "openai-codex" ||
+    provider === "github-copilot" ||
+    provider === "google-gemini-cli" ||
+    provider === "google-antigravity"
+  );
+}
+
+export async function getApiKeyForModel(
+  model: Model<Api>,
+  authStorage: ReturnType<typeof discoverAuthStorage>,
+): Promise<string> {
+  ensureOAuthStorage();
+  migrateOAuthStorageToAuthStorage(authStorage);
+  const storedKey = await authStorage.getApiKey(model.provider);
+  if (storedKey) return storedKey;
+  if (model.provider === "anthropic") {
+    const oauthEnv = process.env.ANTHROPIC_OAUTH_TOKEN;
+    if (oauthEnv?.trim()) return oauthEnv.trim();
+  }
+  const envKey = getEnvApiKey(model.provider);
+  if (envKey) return envKey;
+  if (isOAuthProvider(model.provider)) {
+    const oauthPath = resolveClawdbotOAuthPath();
+    const storage = loadOAuthStorageAt(oauthPath);
+    if (storage) {
+      try {
+        const result = await getOAuthApiKey(model.provider, storage);
+        if (result?.apiKey) {
+          storage[model.provider] = result.newCredentials;
+          saveOAuthStorageAt(oauthPath, storage);
+          return result.apiKey;
+        }
+      } catch {
+        // fall through to error below
+      }
     }
   }
-
-  throw new Error(`No API key found for provider "${provider}".`);
-}
-
-export type EnvApiKeyResult = { apiKey: string; source: string };
-
-export function resolveEnvApiKey(provider: string): EnvApiKeyResult | null {
-  const applied = new Set(getShellEnvAppliedKeys());
-  const pick = (envVar: string): EnvApiKeyResult | null => {
-    const value = process.env[envVar]?.trim();
-    if (!value) return null;
-    const source = applied.has(envVar)
-      ? `shell env: ${envVar}`
-      : `env: ${envVar}`;
-    return { apiKey: value, source };
-  };
-
-  if (provider === "github-copilot") {
-    return (
-      pick("COPILOT_GITHUB_TOKEN") ?? pick("GH_TOKEN") ?? pick("GITHUB_TOKEN")
-    );
-  }
-
-  if (provider === "anthropic") {
-    return pick("ANTHROPIC_OAUTH_TOKEN") ?? pick("ANTHROPIC_API_KEY");
-  }
-
-  if (provider === "google-vertex") {
-    const envKey = getEnvApiKey(provider);
-    if (!envKey) return null;
-    return { apiKey: envKey, source: "gcloud adc" };
-  }
-
-  const envMap: Record<string, string> = {
-    openai: "OPENAI_API_KEY",
-    google: "GEMINI_API_KEY",
-    groq: "GROQ_API_KEY",
-    cerebras: "CEREBRAS_API_KEY",
-    xai: "XAI_API_KEY",
-    openrouter: "OPENROUTER_API_KEY",
-    zai: "ZAI_API_KEY",
-    mistral: "MISTRAL_API_KEY",
-  };
-  const envVar = envMap[provider];
-  if (!envVar) return null;
-  return pick(envVar);
-}
-
-export async function getApiKeyForModel(params: {
-  model: Model<Api>;
-  cfg?: ClawdbotConfig;
-  profileId?: string;
-  preferredProfile?: string;
-  store?: AuthProfileStore;
-}): Promise<{ apiKey: string; profileId?: string; source: string }> {
-  return resolveApiKeyForProvider({
-    provider: params.model.provider,
-    cfg: params.cfg,
-    profileId: params.profileId,
-    preferredProfile: params.preferredProfile,
-    store: params.store,
-  });
+  throw new Error(`No API key found for provider "${model.provider}"`);
 }

src/agents/model-fallback.ts

@@ -33,10 +33,7 @@ function buildAllowedModelKeys(
   cfg: ClawdbotConfig | undefined,
   defaultProvider: string,
 ): Set<string> | null {
-  const rawAllowlist = (() => {
-    const modelMap = cfg?.agent?.models ?? {};
-    return Object.keys(modelMap);
-  })();
+  const rawAllowlist = cfg?.agent?.allowedModels ?? [];
   if (rawAllowlist.length === 0) return null;
   const keys = new Set<string>();
   for (const raw of rawAllowlist) {
@@ -84,28 +81,11 @@ function resolveImageFallbackCandidates(params: {
 
   if (params.modelOverride?.trim()) {
     addRaw(params.modelOverride, false);
-  } else {
-    const imageModel = params.cfg?.agent?.imageModel as
-      | { primary?: string }
-      | string
-      | undefined;
-    const primary =
-      typeof imageModel === "string" ? imageModel.trim() : imageModel?.primary;
-    if (primary?.trim()) addRaw(primary, false);
+  } else if (params.cfg?.agent?.imageModel?.trim()) {
+    addRaw(params.cfg.agent.imageModel, false);
   }
 
-  const imageFallbacks = (() => {
-    const imageModel = params.cfg?.agent?.imageModel as
-      | { fallbacks?: string[] }
-      | string
-      | undefined;
-    if (imageModel && typeof imageModel === "object") {
-      return imageModel.fallbacks ?? [];
-    }
-    return [];
-  })();
-
-  for (const raw of imageFallbacks) {
+  for (const raw of params.cfg?.agent?.imageModelFallbacks ?? []) {
     addRaw(raw, true);
   }
 
@@ -141,16 +121,7 @@ function resolveFallbackCandidates(params: {
 
   addCandidate({ provider, model }, false);
 
-  const modelFallbacks = (() => {
-    const model = params.cfg?.agent?.model as
-      | { fallbacks?: string[] }
-      | string
-      | undefined;
-    if (model && typeof model === "object") return model.fallbacks ?? [];
-    return [];
-  })();
-
-  for (const raw of modelFallbacks) {
+  for (const raw of params.cfg?.agent?.modelFallbacks ?? []) {
     const resolved = resolveModelRefFromString({
       raw: String(raw ?? ""),
       defaultProvider: DEFAULT_PROVIDER,
@@ -253,7 +224,7 @@ export async function runWithImageModelFallback<T>(params: {
   });
   if (candidates.length === 0) {
     throw new Error(
-      "No image model configured. Set agent.imageModel.primary or agent.imageModel.fallbacks.",
+      "No image model configured. Set agent.imageModel or agent.imageModelFallbacks.",
     );
   }
 

src/agents/model-selection.test.ts

@@ -5,9 +5,9 @@ import { DEFAULT_MODEL, DEFAULT_PROVIDER } from "./defaults.js";
 import { resolveConfiguredModelRef } from "./model-selection.js";
 
 describe("resolveConfiguredModelRef", () => {
-  it("parses provider/model from agent.model.primary", () => {
+  it("parses provider/model from agent.model", () => {
     const cfg = {
-      agent: { model: { primary: "openai/gpt-4.1-mini" } },
+      agent: { model: "openai/gpt-4.1-mini" },
     } satisfies ClawdbotConfig;
 
     const resolved = resolveConfiguredModelRef({
@@ -19,9 +19,9 @@ describe("resolveConfiguredModelRef", () => {
     expect(resolved).toEqual({ provider: "openai", model: "gpt-4.1-mini" });
   });
 
-  it("falls back to anthropic when agent.model.primary omits provider", () => {
+  it("falls back to anthropic when agent.model omits provider", () => {
     const cfg = {
-      agent: { model: { primary: "claude-opus-4-5" } },
+      agent: { model: "claude-opus-4-5" },
     } satisfies ClawdbotConfig;
 
     const resolved = resolveConfiguredModelRef({
@@ -54,9 +54,9 @@ describe("resolveConfiguredModelRef", () => {
   it("resolves agent.model aliases when configured", () => {
     const cfg = {
       agent: {
-        model: { primary: "Opus" },
-        models: {
-          "anthropic/claude-opus-4-5": { alias: "Opus" },
+        model: "Opus",
+        modelAliases: {
+          Opus: "anthropic/claude-opus-4-5",
         },
       },
     } satisfies ClawdbotConfig;
@@ -72,18 +72,4 @@ describe("resolveConfiguredModelRef", () => {
       model: "claude-opus-4-5",
     });
   });
-
-  it("still resolves legacy agent.model string", () => {
-    const cfg = {
-      agent: { model: "openai/gpt-4.1-mini" },
-    } satisfies ClawdbotConfig;
-
-    const resolved = resolveConfiguredModelRef({
-      cfg,
-      defaultProvider: DEFAULT_PROVIDER,
-      defaultModel: DEFAULT_MODEL,
-    });
-
-    expect(resolved).toEqual({ provider: "openai", model: "gpt-4.1-mini" });
-  });
 });

src/agents/model-selection.ts

@@ -41,17 +41,18 @@ export function buildModelAliasIndex(params: {
   cfg: ClawdbotConfig;
   defaultProvider: string;
 }): ModelAliasIndex {
+  const rawAliases = params.cfg.agent?.modelAliases ?? {};
   const byAlias = new Map<string, { alias: string; ref: ModelRef }>();
   const byKey = new Map<string, string[]>();
 
-  const rawModels = params.cfg.agent?.models ?? {};
-  for (const [keyRaw, entryRaw] of Object.entries(rawModels)) {
-    const parsed = parseModelRef(String(keyRaw ?? ""), params.defaultProvider);
-    if (!parsed) continue;
-    const alias = String(
-      (entryRaw as { alias?: string } | undefined)?.alias ?? "",
-    ).trim();
+  for (const [aliasRaw, targetRaw] of Object.entries(rawAliases)) {
+    const alias = aliasRaw.trim();
     if (!alias) continue;
+    const parsed = parseModelRef(
+      String(targetRaw ?? ""),
+      params.defaultProvider,
+    );
+    if (!parsed) continue;
     const aliasKey = normalizeAliasKey(alias);
     byAlias.set(aliasKey, { alias, ref: parsed });
     const key = modelKey(parsed.provider, parsed.model);
@@ -87,14 +88,7 @@ export function resolveConfiguredModelRef(params: {
   defaultProvider: string;
   defaultModel: string;
 }): ModelRef {
-  const rawModel = (() => {
-    const raw = params.cfg.agent?.model as
-      | { primary?: string }
-      | string
-      | undefined;
-    if (typeof raw === "string") return raw.trim();
-    return raw?.primary?.trim() ?? "";
-  })();
+  const rawModel = params.cfg.agent?.model?.trim() || "";
   if (rawModel) {
     const trimmed = rawModel.trim();
     const aliasIndex = buildModelAliasIndex({
@@ -122,10 +116,7 @@ export function buildAllowedModelSet(params: {
   allowedCatalog: ModelCatalogEntry[];
   allowedKeys: Set<string>;
 } {
-  const rawAllowlist = (() => {
-    const modelMap = params.cfg.agent?.models ?? {};
-    return Object.keys(modelMap);
-  })();
+  const rawAllowlist = params.cfg.agent?.allowedModels ?? [];
   const allowAny = rawAllowlist.length === 0;
   const catalogKeys = new Set(
     params.catalog.map((entry) => modelKey(entry.provider, entry.id)),

src/agents/pi-embedded-helpers.ts

@@ -120,40 +120,12 @@ export function isRateLimitAssistantError(
   if (!msg || msg.stopReason !== "error") return false;
   const raw = (msg.errorMessage ?? "").toLowerCase();
   if (!raw) return false;
-  return isRateLimitErrorMessage(raw);
-}
-
-export function isRateLimitErrorMessage(raw: string): boolean {
-  const value = raw.toLowerCase();
   return (
-    /rate[_ ]limit|too many requests|429/.test(value) ||
-    value.includes("exceeded your current quota")
+    /rate[_ ]limit|too many requests|429/.test(raw) ||
+    raw.includes("exceeded your current quota")
   );
 }
 
-export function isAuthErrorMessage(raw: string): boolean {
-  const value = raw.toLowerCase();
-  if (!value) return false;
-  return (
-    /invalid[_ ]?api[_ ]?key/.test(value) ||
-    value.includes("incorrect api key") ||
-    value.includes("invalid token") ||
-    value.includes("authentication") ||
-    value.includes("unauthorized") ||
-    value.includes("forbidden") ||
-    value.includes("access denied") ||
-    /\b401\b/.test(value) ||
-    /\b403\b/.test(value)
-  );
-}
-
-export function isAuthAssistantError(
-  msg: AssistantMessage | undefined,
-): boolean {
-  if (!msg || msg.stopReason !== "error") return false;
-  return isAuthErrorMessage(msg.errorMessage ?? "");
-}
-
 function extractSupportedValues(raw: string): string[] {
   const match =
     raw.match(/supported values are:\s*([^\n.]+)/i) ??

src/agents/pi-embedded-runner.ts

@@ -24,27 +24,15 @@ import {
 } from "../process/command-queue.js";
 import { resolveUserPath } from "../utils.js";
 import { resolveClawdbotAgentDir } from "./agent-paths.js";
-import {
-  markAuthProfileCooldown,
-  markAuthProfileGood,
-  markAuthProfileUsed,
-} from "./auth-profiles.js";
 import type { BashElevatedDefaults } from "./bash-tools.js";
 import { DEFAULT_MODEL, DEFAULT_PROVIDER } from "./defaults.js";
-import {
-  ensureAuthProfileStore,
-  getApiKeyForModel,
-  resolveAuthProfileOrder,
-} from "./model-auth.js";
+import { getApiKeyForModel } from "./model-auth.js";
 import { ensureClawdbotModelsJson } from "./models-config.js";
 import {
   buildBootstrapContextFiles,
   ensureSessionHeader,
   formatAssistantErrorText,
-  isAuthAssistantError,
-  isAuthErrorMessage,
   isRateLimitAssistantError,
-  isRateLimitErrorMessage,
   pickFallbackThinkingLevel,
   sanitizeSessionMessagesImages,
 } from "./pi-embedded-helpers.js";
@@ -86,12 +74,6 @@ export type EmbeddedPiRunMeta = {
   aborted?: boolean;
 };
 
-type ApiKeyInfo = {
-  apiKey: string;
-  profileId?: string;
-  source: string;
-};
-
 export type EmbeddedPiRunResult = {
   payloads?: Array<{
     text?: string;
@@ -102,22 +84,9 @@ export type EmbeddedPiRunResult = {
   meta: EmbeddedPiRunMeta;
 };
 
-export type EmbeddedPiCompactResult = {
-  ok: boolean;
-  compacted: boolean;
-  reason?: string;
-  result?: {
-    summary: string;
-    firstKeptEntryId: string;
-    tokensBefore: number;
-    details?: unknown;
-  };
-};
-
 type EmbeddedPiQueueHandle = {
   queueMessage: (text: string) => Promise<void>;
   isStreaming: () => boolean;
-  isCompacting: () => boolean;
   abort: () => void;
 };
 
@@ -217,7 +186,6 @@ export function queueEmbeddedPiMessage(
   const handle = ACTIVE_EMBEDDED_RUNS.get(sessionId);
   if (!handle) return false;
   if (!handle.isStreaming()) return false;
-  if (handle.isCompacting()) return false;
   void handle.queueMessage(text);
   return true;
 }
@@ -332,215 +300,6 @@ function resolvePromptSkills(
     .filter((skill): skill is Skill => Boolean(skill));
 }
 
-export async function compactEmbeddedPiSession(params: {
-  sessionId: string;
-  sessionKey?: string;
-  surface?: string;
-  sessionFile: string;
-  workspaceDir: string;
-  config?: ClawdbotConfig;
-  skillsSnapshot?: SkillSnapshot;
-  provider?: string;
-  model?: string;
-  thinkLevel?: ThinkLevel;
-  bashElevated?: BashElevatedDefaults;
-  customInstructions?: string;
-  lane?: string;
-  enqueue?: typeof enqueueCommand;
-  extraSystemPrompt?: string;
-  ownerNumbers?: string[];
-}): Promise<EmbeddedPiCompactResult> {
-  const sessionLane = resolveSessionLane(
-    params.sessionKey?.trim() || params.sessionId,
-  );
-  const globalLane = resolveGlobalLane(params.lane);
-  const enqueueGlobal =
-    params.enqueue ??
-    ((task, opts) => enqueueCommandInLane(globalLane, task, opts));
-  return enqueueCommandInLane(sessionLane, () =>
-    enqueueGlobal(async () => {
-      const resolvedWorkspace = resolveUserPath(params.workspaceDir);
-      const prevCwd = process.cwd();
-
-      const provider =
-        (params.provider ?? DEFAULT_PROVIDER).trim() || DEFAULT_PROVIDER;
-      const modelId = (params.model ?? DEFAULT_MODEL).trim() || DEFAULT_MODEL;
-      await ensureClawdbotModelsJson(params.config);
-      const agentDir = resolveClawdbotAgentDir();
-      const { model, error, authStorage, modelRegistry } = resolveModel(
-        provider,
-        modelId,
-        agentDir,
-      );
-      if (!model) {
-        return {
-          ok: false,
-          compacted: false,
-          reason: error ?? `Unknown model: ${provider}/${modelId}`,
-        };
-      }
-      try {
-        const apiKeyInfo = await getApiKeyForModel({
-          model,
-          cfg: params.config,
-        });
-        authStorage.setRuntimeApiKey(model.provider, apiKeyInfo.apiKey);
-      } catch (err) {
-        return {
-          ok: false,
-          compacted: false,
-          reason: describeUnknownError(err),
-        };
-      }
-
-      await fs.mkdir(resolvedWorkspace, { recursive: true });
-      await ensureSessionHeader({
-        sessionFile: params.sessionFile,
-        sessionId: params.sessionId,
-        cwd: resolvedWorkspace,
-      });
-
-      let restoreSkillEnv: (() => void) | undefined;
-      process.chdir(resolvedWorkspace);
-      try {
-        const shouldLoadSkillEntries =
-          !params.skillsSnapshot || !params.skillsSnapshot.resolvedSkills;
-        const skillEntries = shouldLoadSkillEntries
-          ? loadWorkspaceSkillEntries(resolvedWorkspace)
-          : [];
-        const skillsSnapshot =
-          params.skillsSnapshot ??
-          buildWorkspaceSkillSnapshot(resolvedWorkspace, {
-            config: params.config,
-            entries: skillEntries,
-          });
-        const sandboxSessionKey = params.sessionKey?.trim() || params.sessionId;
-        const sandbox = await resolveSandboxContext({
-          config: params.config,
-          sessionKey: sandboxSessionKey,
-          workspaceDir: resolvedWorkspace,
-        });
-        restoreSkillEnv = params.skillsSnapshot
-          ? applySkillEnvOverridesFromSnapshot({
-              snapshot: params.skillsSnapshot,
-              config: params.config,
-            })
-          : applySkillEnvOverrides({
-              skills: skillEntries ?? [],
-              config: params.config,
-            });
-
-        const bootstrapFiles =
-          await loadWorkspaceBootstrapFiles(resolvedWorkspace);
-        const contextFiles = buildBootstrapContextFiles(bootstrapFiles);
-        const promptSkills = resolvePromptSkills(skillsSnapshot, skillEntries);
-        const tools = createClawdbotCodingTools({
-          bash: {
-            ...params.config?.agent?.bash,
-            elevated: params.bashElevated,
-          },
-          sandbox,
-          surface: params.surface,
-          sessionKey: params.sessionKey ?? params.sessionId,
-          config: params.config,
-        });
-        const machineName = await getMachineDisplayName();
-        const runtimeInfo = {
-          host: machineName,
-          os: `${os.type()} ${os.release()}`,
-          arch: os.arch(),
-          node: process.version,
-          model: `${provider}/${modelId}`,
-        };
-        const sandboxInfo = buildEmbeddedSandboxInfo(sandbox);
-        const reasoningTagHint = provider === "ollama";
-        const userTimezone = resolveUserTimezone(
-          params.config?.agent?.userTimezone,
-        );
-        const userTime = formatUserTime(new Date(), userTimezone);
-        const systemPrompt = buildSystemPrompt({
-          appendPrompt: buildAgentSystemPromptAppend({
-            workspaceDir: resolvedWorkspace,
-            defaultThinkLevel: params.thinkLevel,
-            extraSystemPrompt: params.extraSystemPrompt,
-            ownerNumbers: params.ownerNumbers,
-            reasoningTagHint,
-            runtimeInfo,
-            sandboxInfo,
-            toolNames: tools.map((tool) => tool.name),
-            userTimezone,
-            userTime,
-          }),
-          contextFiles,
-          skills: promptSkills,
-          cwd: resolvedWorkspace,
-          tools,
-        });
-
-        const sessionManager = SessionManager.open(params.sessionFile);
-        const settingsManager = SettingsManager.create(
-          resolvedWorkspace,
-          agentDir,
-        );
-
-        const builtInToolNames = new Set(["read", "bash", "edit", "write"]);
-        const builtInTools = tools.filter((t) => builtInToolNames.has(t.name));
-        const customTools = toToolDefinitions(
-          tools.filter((t) => !builtInToolNames.has(t.name)),
-        );
-
-        const { session } = await createAgentSession({
-          cwd: resolvedWorkspace,
-          agentDir,
-          authStorage,
-          modelRegistry,
-          model,
-          thinkingLevel: mapThinkingLevel(params.thinkLevel),
-          systemPrompt,
-          tools: builtInTools,
-          customTools,
-          sessionManager,
-          settingsManager,
-          skills: promptSkills,
-          contextFiles,
-        });
-
-        try {
-          const prior = await sanitizeSessionMessagesImages(
-            session.messages,
-            "session:history",
-          );
-          if (prior.length > 0) {
-            session.agent.replaceMessages(prior);
-          }
-          const result = await session.compact(params.customInstructions);
-          return {
-            ok: true,
-            compacted: true,
-            result: {
-              summary: result.summary,
-              firstKeptEntryId: result.firstKeptEntryId,
-              tokensBefore: result.tokensBefore,
-              details: result.details,
-            },
-          };
-        } finally {
-          session.dispose();
-        }
-      } catch (err) {
-        return {
-          ok: false,
-          compacted: false,
-          reason: describeUnknownError(err),
-        };
-      } finally {
-        restoreSkillEnv?.();
-        process.chdir(prevCwd);
-      }
-    }),
-  );
-}
-
 export async function runEmbeddedPiAgent(params: {
   sessionId: string;
   sessionKey?: string;
@@ -552,7 +311,6 @@ export async function runEmbeddedPiAgent(params: {
   prompt: string;
   provider?: string;
   model?: string;
-  authProfileId?: string;
   thinkLevel?: ThinkLevel;
   verboseLevel?: VerboseLevel;
   bashElevated?: BashElevatedDefaults;
@@ -610,68 +368,11 @@ export async function runEmbeddedPiAgent(params: {
       if (!model) {
         throw new Error(error ?? `Unknown model: ${provider}/${modelId}`);
       }
-      const authStore = ensureAuthProfileStore();
-      const explicitProfileId = params.authProfileId?.trim();
-      const profileOrder = resolveAuthProfileOrder({
-        cfg: params.config,
-        store: authStore,
-        provider,
-        preferredProfile: explicitProfileId,
-      });
-      if (explicitProfileId && !profileOrder.includes(explicitProfileId)) {
-        throw new Error(
-          `Auth profile "${explicitProfileId}" is not configured for ${provider}.`,
-        );
-      }
-      const profileCandidates =
-        profileOrder.length > 0 ? profileOrder : [undefined];
-      let profileIndex = 0;
-      const initialThinkLevel = params.thinkLevel ?? "off";
-      let thinkLevel = initialThinkLevel;
+      const apiKey = await getApiKeyForModel(model, authStorage);
+      authStorage.setRuntimeApiKey(model.provider, apiKey);
+
+      let thinkLevel = params.thinkLevel ?? "off";
       const attemptedThinking = new Set<ThinkLevel>();
-      let apiKeyInfo: ApiKeyInfo | null = null;
-      let lastProfileId: string | undefined;
-
-      const resolveApiKeyForCandidate = async (candidate?: string) => {
-        return getApiKeyForModel({
-          model,
-          cfg: params.config,
-          profileId: candidate,
-          store: authStore,
-        });
-      };
-
-      const applyApiKeyInfo = async (candidate?: string): Promise<void> => {
-        apiKeyInfo = await resolveApiKeyForCandidate(candidate);
-        authStorage.setRuntimeApiKey(model.provider, apiKeyInfo.apiKey);
-        lastProfileId = apiKeyInfo.profileId;
-      };
-
-      const advanceAuthProfile = async (): Promise<boolean> => {
-        let nextIndex = profileIndex + 1;
-        while (nextIndex < profileCandidates.length) {
-          const candidate = profileCandidates[nextIndex];
-          try {
-            await applyApiKeyInfo(candidate);
-            profileIndex = nextIndex;
-            thinkLevel = initialThinkLevel;
-            attemptedThinking.clear();
-            return true;
-          } catch (err) {
-            if (candidate && candidate === explicitProfileId) throw err;
-            nextIndex += 1;
-          }
-        }
-        return false;
-      };
-
-      try {
-        await applyApiKeyInfo(profileCandidates[profileIndex]);
-      } catch (err) {
-        if (profileCandidates[profileIndex] === explicitProfileId) throw err;
-        const advanced = await advanceAuthProfile();
-        if (!advanced) throw err;
-      }
 
       while (true) {
         const thinkingLevel = mapThinkingLevel(thinkLevel);
@@ -812,13 +513,25 @@ export async function runEmbeddedPiAgent(params: {
             session.agent.replaceMessages(prior);
           }
           let aborted = Boolean(params.abortSignal?.aborted);
-          let timedOut = false;
-          const abortRun = (isTimeout = false) => {
+          const abortRun = () => {
             aborted = true;
-            if (isTimeout) timedOut = true;
             void session.abort();
           };
-          const subscription = subscribeEmbeddedPiSession({
+          const queueHandle: EmbeddedPiQueueHandle = {
+            queueMessage: async (text: string) => {
+              await session.steer(text);
+            },
+            isStreaming: () => session.isStreaming,
+            abort: abortRun,
+          };
+          ACTIVE_EMBEDDED_RUNS.set(params.sessionId, queueHandle);
+
+          const {
+            assistantTexts,
+            toolMetas,
+            unsubscribe,
+            waitForCompactionRetry,
+          } = subscribeEmbeddedPiSession({
             session,
             runId: params.runId,
             verboseLevel: params.verboseLevel,
@@ -831,22 +544,6 @@ export async function runEmbeddedPiAgent(params: {
             onAgentEvent: params.onAgentEvent,
             enforceFinalTag: params.enforceFinalTag,
           });
-          const {
-            assistantTexts,
-            toolMetas,
-            unsubscribe,
-            waitForCompactionRetry,
-          } = subscription;
-
-          const queueHandle: EmbeddedPiQueueHandle = {
-            queueMessage: async (text: string) => {
-              await session.steer(text);
-            },
-            isStreaming: () => session.isStreaming,
-            isCompacting: () => subscription.isCompacting(),
-            abort: abortRun,
-          };
-          ACTIVE_EMBEDDED_RUNS.set(params.sessionId, queueHandle);
 
           let abortWarnTimer: NodeJS.Timeout | undefined;
           const abortTimer = setTimeout(
@@ -854,7 +551,7 @@ export async function runEmbeddedPiAgent(params: {
               log.warn(
                 `embedded run timeout: runId=${params.runId} sessionId=${params.sessionId} timeoutMs=${params.timeoutMs}`,
               );
-              abortRun(true);
+              abortRun();
               if (!abortWarnTimer) {
                 abortWarnTimer = setTimeout(() => {
                   if (!session.isStreaming) return;
@@ -914,16 +611,8 @@ export async function runEmbeddedPiAgent(params: {
             params.abortSignal?.removeEventListener?.("abort", onAbort);
           }
           if (promptError && !aborted) {
-            const errorText = describeUnknownError(promptError);
-            if (
-              (isAuthErrorMessage(errorText) ||
-                isRateLimitErrorMessage(errorText)) &&
-              (await advanceAuthProfile())
-            ) {
-              continue;
-            }
             const fallbackThinking = pickFallbackThinkingLevel({
-              message: errorText,
+              message: describeUnknownError(promptError),
               attempted: attemptedThinking,
             });
             if (fallbackThinking) {
@@ -956,44 +645,13 @@ export async function runEmbeddedPiAgent(params: {
           }
 
           const fallbackConfigured =
-            (params.config?.agent?.model?.fallbacks?.length ?? 0) > 0;
-          const authFailure = isAuthAssistantError(lastAssistant);
-          const rateLimitFailure = isRateLimitAssistantError(lastAssistant);
-
-          // Treat timeout as potential rate limit (Antigravity hangs on rate limit)
-          const shouldRotate =
-            (!aborted && (authFailure || rateLimitFailure)) || timedOut;
-
-          if (shouldRotate) {
-            // Mark current profile for cooldown before rotating
-            if (lastProfileId) {
-              markAuthProfileCooldown({
-                store: authStore,
-                profileId: lastProfileId,
-              });
-              if (timedOut) {
-                log.warn(
-                  `Profile ${lastProfileId} timed out (possible rate limit). Trying next account...`,
-                );
-              }
-            }
-            const rotated = await advanceAuthProfile();
-            if (rotated) {
-              continue;
-            }
-            if (fallbackConfigured) {
-              const message =
-                lastAssistant?.errorMessage?.trim() ||
-                (lastAssistant
-                  ? formatAssistantErrorText(lastAssistant)
-                  : "") ||
-                (timedOut
-                  ? "LLM request timed out."
-                  : rateLimitFailure
-                    ? "LLM request rate limited."
-                    : "LLM request unauthorized.");
-              throw new Error(message);
-            }
+            (params.config?.agent?.modelFallbacks?.length ?? 0) > 0;
+          if (fallbackConfigured && isRateLimitAssistantError(lastAssistant)) {
+            const message =
+              lastAssistant?.errorMessage?.trim() ||
+              (lastAssistant ? formatAssistantErrorText(lastAssistant) : "") ||
+              "LLM request rate limited.";
+            throw new Error(message);
           }
 
           const usage = lastAssistant?.usage;
@@ -1059,15 +717,6 @@ export async function runEmbeddedPiAgent(params: {
           log.debug(
             `embedded run done: runId=${params.runId} sessionId=${params.sessionId} durationMs=${Date.now() - started} aborted=${aborted}`,
           );
-          if (lastProfileId) {
-            markAuthProfileGood({
-              store: authStore,
-              provider,
-              profileId: lastProfileId,
-            });
-            // Track usage for round-robin rotation
-            markAuthProfileUsed({ store: authStore, profileId: lastProfileId });
-          }
           return {
             payloads: payloads.length ? payloads : undefined,
             meta: {

src/agents/pi-embedded-subscribe.test.ts

@@ -968,7 +968,6 @@ describe("subscribeEmbeddedPiSession", () => {
       });
     }
 
-    expect(subscription.isCompacting()).toBe(true);
     expect(subscription.assistantTexts.length).toBe(0);
 
     let resolved = false;
@@ -1005,8 +1004,6 @@ describe("subscribeEmbeddedPiSession", () => {
       listener({ type: "auto_compaction_start" });
     }
 
-    expect(subscription.isCompacting()).toBe(true);
-
     let resolved = false;
     const waitPromise = subscription.waitForCompactionRetry().then(() => {
       resolved = true;
@@ -1021,7 +1018,6 @@ describe("subscribeEmbeddedPiSession", () => {
 
     await waitPromise;
     expect(resolved).toBe(true);
-    expect(subscription.isCompacting()).toBe(false);
   });
 
   it("waits for multiple compaction retries before resolving", async () => {

src/agents/pi-embedded-subscribe.ts

@@ -555,10 +555,6 @@ export function subscribeEmbeddedPiSession(params: {
         compactionInFlight = true;
         ensureCompactionPromise();
         log.debug(`embedded run compaction start: runId=${params.runId}`);
-        params.onAgentEvent?.({
-          stream: "compaction",
-          data: { phase: "start" },
-        });
       }
 
       if (evt.type === "auto_compaction_end") {
@@ -571,10 +567,6 @@ export function subscribeEmbeddedPiSession(params: {
         } else {
           maybeResolveCompactionWait();
         }
-        params.onAgentEvent?.({
-          stream: "compaction",
-          data: { phase: "end", willRetry },
-        });
       }
 
       if (evt.type === "agent_end") {
@@ -604,7 +596,6 @@ export function subscribeEmbeddedPiSession(params: {
     assistantTexts,
     toolMetas,
     unsubscribe,
-    isCompacting: () => compactionInFlight || pendingCompactionRetry > 0,
     waitForCompactionRetry: () => {
       if (compactionInFlight || pendingCompactionRetry > 0) {
         ensureCompactionPromise();

src/agents/pi-embedded.ts

@@ -1,12 +1,10 @@
 export type {
   EmbeddedPiAgentMeta,
-  EmbeddedPiCompactResult,
   EmbeddedPiRunMeta,
   EmbeddedPiRunResult,
 } from "./pi-embedded-runner.js";
 export {
   abortEmbeddedPiRun,
-  compactEmbeddedPiSession,
   isEmbeddedPiRunActive,
   isEmbeddedPiRunStreaming,
   queueEmbeddedPiMessage,

src/agents/pi-tools.test.ts

@@ -116,36 +116,6 @@ describe("createClawdbotCodingTools", () => {
     expect(slack.some((tool) => tool.name === "slack")).toBe(true);
   });
 
-  it("filters session tools for sub-agent sessions by default", () => {
-    const tools = createClawdbotCodingTools({ sessionKey: "subagent:test" });
-    const names = new Set(tools.map((tool) => tool.name));
-    expect(names.has("sessions_list")).toBe(false);
-    expect(names.has("sessions_history")).toBe(false);
-    expect(names.has("sessions_send")).toBe(false);
-    expect(names.has("sessions_spawn")).toBe(false);
-
-    expect(names.has("read")).toBe(true);
-    expect(names.has("bash")).toBe(true);
-    expect(names.has("process")).toBe(true);
-  });
-
-  it("supports allow-only sub-agent tool policy", () => {
-    const tools = createClawdbotCodingTools({
-      sessionKey: "subagent:test",
-      // Intentionally partial config; only fields used by pi-tools are provided.
-      config: {
-        agent: {
-          subagents: {
-            tools: {
-              allow: ["read"],
-            },
-          },
-        },
-      },
-    });
-    expect(tools.map((tool) => tool.name)).toEqual(["read"]);
-  });
-
   it("keeps read tool image metadata intact", async () => {
     const tools = createClawdbotCodingTools();
     const readTool = tools.find((tool) => tool.name === "read");

src/agents/pi-tools.ts

@@ -333,28 +333,6 @@ function normalizeToolNames(list?: string[]) {
   return list.map((entry) => entry.trim().toLowerCase()).filter(Boolean);
 }
 
-const DEFAULT_SUBAGENT_TOOL_DENY = [
-  "sessions_list",
-  "sessions_history",
-  "sessions_send",
-  "sessions_spawn",
-];
-
-function isSubagentSessionKey(sessionKey?: string): boolean {
-  const key = sessionKey?.trim().toLowerCase() ?? "";
-  return key.startsWith("subagent:");
-}
-
-function resolveSubagentToolPolicy(cfg?: ClawdbotConfig): SandboxToolPolicy {
-  const configured = cfg?.agent?.subagents?.tools;
-  const deny = [
-    ...DEFAULT_SUBAGENT_TOOL_DENY,
-    ...(Array.isArray(configured?.deny) ? configured.deny : []),
-  ];
-  const allow = Array.isArray(configured?.allow) ? configured.allow : undefined;
-  return { allow, deny };
-}
-
 function filterToolsByPolicy(
   tools: AnyAgentTool[],
   policy?: SandboxToolPolicy,
@@ -556,7 +534,6 @@ export function createClawdbotCodingTools(options?: {
       browserControlUrl: sandbox?.browser?.controlUrl,
       agentSessionKey: options?.sessionKey,
       agentSurface: options?.surface,
-      sandboxed: !!sandbox,
       config: options?.config,
     }),
   ];
@@ -576,14 +553,7 @@ export function createClawdbotCodingTools(options?: {
   const sandboxed = sandbox
     ? filterToolsByPolicy(globallyFiltered, sandbox.tools)
     : globallyFiltered;
-  const subagentFiltered =
-    isSubagentSessionKey(options?.sessionKey) && options?.sessionKey
-      ? filterToolsByPolicy(
-          sandboxed,
-          resolveSubagentToolPolicy(options.config),
-        )
-      : sandboxed;
   // Always normalize tool JSON Schemas before handing them to pi-agent/pi-ai.
   // Without this, some providers (notably OpenAI) will reject root-level union schemas.
-  return subagentFiltered.map(normalizeToolParameters);
+  return sandboxed.map(normalizeToolParameters);
 }

src/agents/sandbox.ts

@@ -114,17 +114,7 @@ const DEFAULT_SANDBOX_CONTAINER_PREFIX = "clawdbot-sbx-";
 const DEFAULT_SANDBOX_WORKDIR = "/workspace";
 const DEFAULT_SANDBOX_IDLE_HOURS = 24;
 const DEFAULT_SANDBOX_MAX_AGE_DAYS = 7;
-const DEFAULT_TOOL_ALLOW = [
-  "bash",
-  "process",
-  "read",
-  "write",
-  "edit",
-  "sessions_list",
-  "sessions_history",
-  "sessions_send",
-  "sessions_spawn",
-];
+const DEFAULT_TOOL_ALLOW = ["bash", "process", "read", "write", "edit"];
 const DEFAULT_TOOL_DENY = [
   "browser",
   "canvas",

src/agents/timeout.ts

@@ -1,35 +0,0 @@
-import type { ClawdbotConfig } from "../config/config.js";
-
-const DEFAULT_AGENT_TIMEOUT_SECONDS = 600;
-
-const normalizeNumber = (value: unknown): number | undefined =>
-  typeof value === "number" && Number.isFinite(value)
-    ? Math.floor(value)
-    : undefined;
-
-export function resolveAgentTimeoutSeconds(cfg?: ClawdbotConfig): number {
-  const raw = normalizeNumber(cfg?.agent?.timeoutSeconds);
-  const seconds = raw ?? DEFAULT_AGENT_TIMEOUT_SECONDS;
-  return Math.max(seconds, 1);
-}
-
-export function resolveAgentTimeoutMs(opts: {
-  cfg?: ClawdbotConfig;
-  overrideMs?: number | null;
-  overrideSeconds?: number | null;
-  minMs?: number;
-}): number {
-  const minMs = Math.max(normalizeNumber(opts.minMs) ?? 1, 1);
-  const defaultMs = resolveAgentTimeoutSeconds(opts.cfg) * 1000;
-  const overrideMs = normalizeNumber(opts.overrideMs);
-  if (overrideMs !== undefined) {
-    if (overrideMs <= 0) return defaultMs;
-    return Math.max(overrideMs, minMs);
-  }
-  const overrideSeconds = normalizeNumber(opts.overrideSeconds);
-  if (overrideSeconds !== undefined) {
-    if (overrideSeconds <= 0) return defaultMs;
-    return Math.max(overrideSeconds * 1000, minMs);
-  }
-  return Math.max(defaultMs, minMs);
-}

src/agents/tool-display.json

@@ -12,7 +12,7 @@
       "element",
       "node",
       "nodeId",
-      "id",
+      "jobId",
       "requestId",
       "to",
       "channelId",
@@ -136,10 +136,10 @@
           "label": "add",
           "detailKeys": ["job.name", "job.id", "job.schedule", "job.cron"]
         },
-        "update": { "label": "update", "detailKeys": ["id"] },
-        "remove": { "label": "remove", "detailKeys": ["id"] },
-        "run": { "label": "run", "detailKeys": ["id"] },
-        "runs": { "label": "runs", "detailKeys": ["id"] },
+        "update": { "label": "update", "detailKeys": ["jobId"] },
+        "remove": { "label": "remove", "detailKeys": ["jobId"] },
+        "run": { "label": "run", "detailKeys": ["jobId"] },
+        "runs": { "label": "runs", "detailKeys": ["jobId"] },
         "wake": { "label": "wake", "detailKeys": ["text", "mode"] }
       }
     },
@@ -165,11 +165,6 @@
       "title": "Session Send",
       "detailKeys": ["sessionKey", "timeoutSeconds"]
     },
-    "sessions_spawn": {
-      "emoji": "🧑‍🔧",
-      "title": "Sub-agent",
-      "detailKeys": ["label", "timeoutSeconds", "cleanup"]
-    },
     "whatsapp_login": {
       "emoji": "🟢",
       "title": "WhatsApp Login",
@@ -234,3 +229,4 @@
     }
   }
 }
+

src/agents/tools/agent-step.ts

@@ -1,56 +0,0 @@
-import crypto from "node:crypto";
-
-import { callGateway } from "../../gateway/call.js";
-import { extractAssistantText, stripToolMessages } from "./sessions-helpers.js";
-
-export async function readLatestAssistantReply(params: {
-  sessionKey: string;
-  limit?: number;
-}): Promise<string | undefined> {
-  const history = (await callGateway({
-    method: "chat.history",
-    params: { sessionKey: params.sessionKey, limit: params.limit ?? 50 },
-  })) as { messages?: unknown[] };
-  const filtered = stripToolMessages(
-    Array.isArray(history?.messages) ? history.messages : [],
-  );
-  const last = filtered.length > 0 ? filtered[filtered.length - 1] : undefined;
-  return last ? extractAssistantText(last) : undefined;
-}
-
-export async function runAgentStep(params: {
-  sessionKey: string;
-  message: string;
-  extraSystemPrompt: string;
-  timeoutMs: number;
-  lane?: string;
-}): Promise<string | undefined> {
-  const stepIdem = crypto.randomUUID();
-  const response = (await callGateway({
-    method: "agent",
-    params: {
-      message: params.message,
-      sessionKey: params.sessionKey,
-      idempotencyKey: stepIdem,
-      deliver: false,
-      lane: params.lane ?? "nested",
-      extraSystemPrompt: params.extraSystemPrompt,
-    },
-    timeoutMs: 10_000,
-  })) as { runId?: string; acceptedAt?: number };
-
-  const stepRunId =
-    typeof response?.runId === "string" && response.runId ? response.runId : "";
-  const resolvedRunId = stepRunId || stepIdem;
-  const stepWaitMs = Math.min(params.timeoutMs, 60_000);
-  const wait = (await callGateway({
-    method: "agent.wait",
-    params: {
-      runId: resolvedRunId,
-      timeoutMs: stepWaitMs,
-    },
-    timeoutMs: stepWaitMs + 2000,
-  })) as { status?: string };
-  if (wait?.status !== "ok") return undefined;
-  return await readLatestAssistantReply({ sessionKey: params.sessionKey });
-}

src/agents/tools/cron-tool.test.ts

@@ -35,31 +35,14 @@ describe("cron tool", () => {
     expect(call.params).toEqual(expectedParams);
   });
 
-  it("normalizes cron.add job payloads", async () => {
+  it("rejects jobId params", async () => {
     const tool = createCronTool();
-    await tool.execute("call2", {
-      action: "add",
-      job: {
-        data: {
-          name: "wake-up",
-          schedule: { atMs: 123 },
-          payload: { text: "hello" },
-        },
-      },
-    });
-
-    expect(callGatewayMock).toHaveBeenCalledTimes(1);
-    const call = callGatewayMock.mock.calls[0]?.[0] as {
-      method?: string;
-      params?: unknown;
-    };
-    expect(call.method).toBe("cron.add");
-    expect(call.params).toEqual({
-      name: "wake-up",
-      schedule: { kind: "at", atMs: 123 },
-      sessionTarget: "main",
-      wakeMode: "next-heartbeat",
-      payload: { kind: "systemEvent", text: "hello" },
-    });
+    await expect(
+      tool.execute("call2", {
+        action: "update",
+        jobId: "job-1",
+        patch: { foo: "bar" },
+      }),
+    ).rejects.toThrow("id required");
   });
 });

src/agents/tools/cron-tool.ts

@@ -1,26 +1,8 @@
 import { Type } from "@sinclair/typebox";
-import {
-  normalizeCronJobCreate,
-  normalizeCronJobPatch,
-} from "../../cron/normalize.js";
+
 import { type AnyAgentTool, jsonResult, readStringParam } from "./common.js";
 import { callGatewayTool, type GatewayCallOptions } from "./gateway.js";
 
-// NOTE: We use Type.Object({}, { additionalProperties: true }) for job/patch
-// instead of CronAddParamsSchema/CronJobPatchSchema because:
-//
-// 1. CronAddParamsSchema contains nested Type.Union (for schedule, payload, etc.)
-// 2. TypeBox compiles Type.Union to JSON Schema `anyOf`
-// 3. pi-ai's sanitizeSchemaForGoogle() strips `anyOf` from nested properties
-// 4. This leaves empty schemas `{}` which Claude rejects as invalid
-//
-// The actual validation happens at runtime via normalizeCronJobCreate/Patch
-// and the gateway's validateCronAddParams. This schema just needs to accept
-// any object so the AI can pass through the job definition.
-//
-// See: https://github.com/anthropics/anthropic-cookbook/blob/main/misc/tool_use_best_practices.md
-// Claude requires valid JSON Schema 2020-12 with explicit types.
-
 const CronToolSchema = Type.Union([
   Type.Object({
     action: Type.Literal("status"),
@@ -115,9 +97,8 @@ export function createCronTool(): AnyAgentTool {
           if (!params.job || typeof params.job !== "object") {
             throw new Error("job required");
           }
-          const job = normalizeCronJobCreate(params.job) ?? params.job;
           return jsonResult(
-            await callGatewayTool("cron.add", gatewayOpts, job),
+            await callGatewayTool("cron.add", gatewayOpts, params.job),
           );
         }
         case "update": {
@@ -125,11 +106,10 @@ export function createCronTool(): AnyAgentTool {
           if (!params.patch || typeof params.patch !== "object") {
             throw new Error("patch required");
           }
-          const patch = normalizeCronJobPatch(params.patch) ?? params.patch;
           return jsonResult(
             await callGatewayTool("cron.update", gatewayOpts, {
               id,
-              patch,
+              patch: params.patch,
             }),
           );
         }

src/agents/tools/discord-actions-messaging.ts

@@ -24,32 +24,6 @@ type ActionGate = (
   defaultValue?: boolean,
 ) => boolean;
 
-function formatDiscordTimestamp(ts?: string | null): string | undefined {
-  if (!ts) return undefined;
-  const date = new Date(ts);
-  if (Number.isNaN(date.getTime())) return undefined;
-
-  const yyyy = String(date.getFullYear()).padStart(4, "0");
-  const mm = String(date.getMonth() + 1).padStart(2, "0");
-  const dd = String(date.getDate()).padStart(2, "0");
-  const hh = String(date.getHours()).padStart(2, "0");
-  const min = String(date.getMinutes()).padStart(2, "0");
-
-  // getTimezoneOffset() is minutes *behind* UTC. Flip sign to get ISO offset.
-  const offsetMinutes = -date.getTimezoneOffset();
-  const sign = offsetMinutes >= 0 ? "+" : "-";
-  const absOffsetMinutes = Math.abs(offsetMinutes);
-  const offsetH = String(Math.floor(absOffsetMinutes / 60)).padStart(2, "0");
-  const offsetM = String(absOffsetMinutes % 60).padStart(2, "0");
-
-  const tz = Intl.DateTimeFormat().resolvedOptions().timeZone;
-  const tzSuffix = tz ? `{${tz}}` : "";
-
-  // Compact ISO-like *local* timestamp with minutes precision.
-  // Example: 2025-01-02T03:04-08:00{America/Los_Angeles}
-  return `${yyyy}-${mm}-${dd}T${hh}:${min}${sign}${offsetH}:${offsetM}${tzSuffix}`;
-}
-
 export async function handleDiscordMessagingAction(
   action: string,
   params: Record<string, unknown>,
@@ -126,10 +100,9 @@ export async function handleDiscordMessagingAction(
         typeof durationRaw === "number" && Number.isFinite(durationRaw)
           ? durationRaw
           : undefined;
-      const maxSelections = allowMultiselect ? Math.max(2, answers.length) : 1;
       await sendPollDiscord(
         to,
-        { question, options: answers, maxSelections, durationHours },
+        { question, answers, allowMultiselect, durationHours },
         { content },
       );
       return jsonResult({ ok: true });
@@ -160,12 +133,7 @@ export async function handleDiscordMessagingAction(
         after: readStringParam(params, "after"),
         around: readStringParam(params, "around"),
       });
-      const formattedMessages = messages.map((message) => ({
-        ...message,
-        timestamp:
-          formatDiscordTimestamp(message.timestamp) ?? message.timestamp,
-      }));
-      return jsonResult({ ok: true, messages: formattedMessages });
+      return jsonResult({ ok: true, messages });
     }
     case "sendMessage": {
       if (!isActionEnabled("messages")) {

src/agents/tools/image-tool.ts

@@ -24,15 +24,9 @@ import type { AnyAgentTool } from "./common.js";
 const DEFAULT_PROMPT = "Describe the image.";
 
 function ensureImageToolConfigured(cfg?: ClawdbotConfig): boolean {
-  const imageModel = cfg?.agent?.imageModel as
-    | { primary?: string; fallbacks?: string[] }
-    | string
-    | undefined;
-  const primary =
-    typeof imageModel === "string" ? imageModel.trim() : imageModel?.primary;
-  const fallbacks =
-    typeof imageModel === "object" ? (imageModel?.fallbacks ?? []) : [];
-  return Boolean(primary?.trim() || fallbacks.length > 0);
+  const primary = cfg?.agent?.imageModel?.trim();
+  const fallbacks = cfg?.agent?.imageModelFallbacks ?? [];
+  return Boolean(primary || fallbacks.length > 0);
 }
 
 function pickMaxBytes(
@@ -101,18 +95,15 @@ async function runImagePrompt(params: {
           `Model does not support images: ${provider}/${modelId}`,
         );
       }
-      const apiKeyInfo = await getApiKeyForModel({
-        model,
-        cfg: params.cfg,
-      });
-      authStorage.setRuntimeApiKey(model.provider, apiKeyInfo.apiKey);
+      const apiKey = await getApiKeyForModel(model, authStorage);
+      authStorage.setRuntimeApiKey(model.provider, apiKey);
       const context = buildImageContext(
         params.prompt,
         params.base64,
         params.mimeType,
       );
       const message = (await complete(model, context, {
-        apiKey: apiKeyInfo.apiKey,
+        apiKey,
         maxTokens: 512,
         temperature: 0,
       })) as AssistantMessage;

src/agents/tools/sessions-announce-target.ts

@@ -1,36 +0,0 @@
-import { callGateway } from "../../gateway/call.js";
-import type { AnnounceTarget } from "./sessions-send-helpers.js";
-import { resolveAnnounceTargetFromKey } from "./sessions-send-helpers.js";
-
-export async function resolveAnnounceTarget(params: {
-  sessionKey: string;
-  displayKey: string;
-}): Promise<AnnounceTarget | null> {
-  const parsed = resolveAnnounceTargetFromKey(params.sessionKey);
-  if (parsed) return parsed;
-  const parsedDisplay = resolveAnnounceTargetFromKey(params.displayKey);
-  if (parsedDisplay) return parsedDisplay;
-
-  try {
-    const list = (await callGateway({
-      method: "sessions.list",
-      params: {
-        includeGlobal: true,
-        includeUnknown: true,
-        limit: 200,
-      },
-    })) as { sessions?: Array<Record<string, unknown>> };
-    const sessions = Array.isArray(list?.sessions) ? list.sessions : [];
-    const match =
-      sessions.find((entry) => entry?.key === params.sessionKey) ??
-      sessions.find((entry) => entry?.key === params.displayKey);
-    const channel =
-      typeof match?.lastChannel === "string" ? match.lastChannel : undefined;
-    const to = typeof match?.lastTo === "string" ? match.lastTo : undefined;
-    if (channel && to) return { channel, to };
-  } catch {
-    // ignore
-  }
-
-  return null;
-}

src/agents/tools/sessions-history-tool.ts

@@ -17,37 +17,7 @@ const SessionsHistoryToolSchema = Type.Object({
   includeTools: Type.Optional(Type.Boolean()),
 });
 
-function resolveSandboxSessionToolsVisibility(
-  cfg: ReturnType<typeof loadConfig>,
-) {
-  return cfg.agent?.sandbox?.sessionToolsVisibility ?? "spawned";
-}
-
-async function isSpawnedSessionAllowed(params: {
-  requesterSessionKey: string;
-  targetSessionKey: string;
-}): Promise<boolean> {
-  try {
-    const list = (await callGateway({
-      method: "sessions.list",
-      params: {
-        includeGlobal: false,
-        includeUnknown: false,
-        limit: 500,
-        spawnedBy: params.requesterSessionKey,
-      },
-    })) as { sessions?: Array<Record<string, unknown>> };
-    const sessions = Array.isArray(list?.sessions) ? list.sessions : [];
-    return sessions.some((entry) => entry?.key === params.targetSessionKey);
-  } catch {
-    return false;
-  }
-}
-
-export function createSessionsHistoryTool(opts?: {
-  agentSessionKey?: string;
-  sandboxed?: boolean;
-}): AnyAgentTool {
+export function createSessionsHistoryTool(): AnyAgentTool {
   return {
     label: "Session History",
     name: "sessions_history",
@@ -60,37 +30,11 @@ export function createSessionsHistoryTool(opts?: {
       });
       const cfg = loadConfig();
       const { mainKey, alias } = resolveMainSessionAlias(cfg);
-      const visibility = resolveSandboxSessionToolsVisibility(cfg);
-      const requesterInternalKey =
-        typeof opts?.agentSessionKey === "string" && opts.agentSessionKey.trim()
-          ? resolveInternalSessionKey({
-              key: opts.agentSessionKey,
-              alias,
-              mainKey,
-            })
-          : undefined;
       const resolvedKey = resolveInternalSessionKey({
         key: sessionKey,
         alias,
         mainKey,
       });
-      const restrictToSpawned =
-        opts?.sandboxed === true &&
-        visibility === "spawned" &&
-        requesterInternalKey &&
-        !requesterInternalKey.toLowerCase().startsWith("subagent:");
-      if (restrictToSpawned) {
-        const ok = await isSpawnedSessionAllowed({
-          requesterSessionKey: requesterInternalKey,
-          targetSessionKey: resolvedKey,
-        });
-        if (!ok) {
-          return jsonResult({
-            status: "forbidden",
-            error: `Session not visible from this sandboxed agent session: ${sessionKey}`,
-          });
-        }
-      }
       const limit =
         typeof params.limit === "number" && Number.isFinite(params.limit)
           ? Math.max(1, Math.floor(params.limit))

src/agents/tools/sessions-list-tool.ts

@@ -44,16 +44,7 @@ const SessionsListToolSchema = Type.Object({
   messageLimit: Type.Optional(Type.Integer({ minimum: 0 })),
 });
 
-function resolveSandboxSessionToolsVisibility(
-  cfg: ReturnType<typeof loadConfig>,
-) {
-  return cfg.agent?.sandbox?.sessionToolsVisibility ?? "spawned";
-}
-
-export function createSessionsListTool(opts?: {
-  agentSessionKey?: string;
-  sandboxed?: boolean;
-}): AnyAgentTool {
+export function createSessionsListTool(): AnyAgentTool {
   return {
     label: "Sessions",
     name: "sessions_list",
@@ -63,20 +54,6 @@ export function createSessionsListTool(opts?: {
       const params = args as Record<string, unknown>;
       const cfg = loadConfig();
       const { mainKey, alias } = resolveMainSessionAlias(cfg);
-      const visibility = resolveSandboxSessionToolsVisibility(cfg);
-      const requesterInternalKey =
-        typeof opts?.agentSessionKey === "string" && opts.agentSessionKey.trim()
-          ? resolveInternalSessionKey({
-              key: opts.agentSessionKey,
-              alias,
-              mainKey,
-            })
-          : undefined;
-      const restrictToSpawned =
-        opts?.sandboxed === true &&
-        visibility === "spawned" &&
-        requesterInternalKey &&
-        !requesterInternalKey.toLowerCase().startsWith("subagent:");
 
       const kindsRaw = readStringArrayParam(params, "kinds")?.map((value) =>
         value.trim().toLowerCase(),
@@ -109,9 +86,8 @@ export function createSessionsListTool(opts?: {
         params: {
           limit,
           activeMinutes,
-          includeGlobal: !restrictToSpawned,
-          includeUnknown: !restrictToSpawned,
-          spawnedBy: restrictToSpawned ? requesterInternalKey : undefined,
+          includeGlobal: true,
+          includeUnknown: true,
         },
       })) as {
         path?: string;

src/agents/tools/sessions-send-tool.ts

@@ -4,10 +4,8 @@ import { Type } from "@sinclair/typebox";
 
 import { loadConfig } from "../../config/config.js";
 import { callGateway } from "../../gateway/call.js";
-import { readLatestAssistantReply, runAgentStep } from "./agent-step.js";
 import type { AnyAgentTool } from "./common.js";
 import { jsonResult, readStringParam } from "./common.js";
-import { resolveAnnounceTarget } from "./sessions-announce-target.js";
 import {
   extractAssistantText,
   resolveDisplaySessionKey,
@@ -16,11 +14,13 @@ import {
   stripToolMessages,
 } from "./sessions-helpers.js";
 import {
+  type AnnounceTarget,
   buildAgentToAgentAnnounceContext,
   buildAgentToAgentMessageContext,
   buildAgentToAgentReplyContext,
   isAnnounceSkip,
   isReplySkip,
+  resolveAnnounceTargetFromKey,
   resolvePingPongTurns,
 } from "./sessions-send-helpers.js";
 
@@ -33,7 +33,6 @@ const SessionsSendToolSchema = Type.Object({
 export function createSessionsSendTool(opts?: {
   agentSessionKey?: string;
   agentSurface?: string;
-  sandboxed?: boolean;
 }): AnyAgentTool {
   return {
     label: "Session Send",
@@ -48,64 +47,11 @@ export function createSessionsSendTool(opts?: {
       const message = readStringParam(params, "message", { required: true });
       const cfg = loadConfig();
       const { mainKey, alias } = resolveMainSessionAlias(cfg);
-      const visibility =
-        cfg.agent?.sandbox?.sessionToolsVisibility ?? "spawned";
-      const requesterInternalKey =
-        typeof opts?.agentSessionKey === "string" && opts.agentSessionKey.trim()
-          ? resolveInternalSessionKey({
-              key: opts.agentSessionKey,
-              alias,
-              mainKey,
-            })
-          : undefined;
       const resolvedKey = resolveInternalSessionKey({
         key: sessionKey,
         alias,
         mainKey,
       });
-      const restrictToSpawned =
-        opts?.sandboxed === true &&
-        visibility === "spawned" &&
-        requesterInternalKey &&
-        !requesterInternalKey.toLowerCase().startsWith("subagent:");
-      if (restrictToSpawned) {
-        try {
-          const list = (await callGateway({
-            method: "sessions.list",
-            params: {
-              includeGlobal: false,
-              includeUnknown: false,
-              limit: 500,
-              spawnedBy: requesterInternalKey,
-            },
-          })) as { sessions?: Array<Record<string, unknown>> };
-          const sessions = Array.isArray(list?.sessions) ? list.sessions : [];
-          const ok = sessions.some((entry) => entry?.key === resolvedKey);
-          if (!ok) {
-            return jsonResult({
-              runId: crypto.randomUUID(),
-              status: "forbidden",
-              error: `Session not visible from this sandboxed agent session: ${sessionKey}`,
-              sessionKey: resolveDisplaySessionKey({
-                key: sessionKey,
-                alias,
-                mainKey,
-              }),
-            });
-          }
-        } catch {
-          return jsonResult({
-            runId: crypto.randomUUID(),
-            status: "forbidden",
-            error: `Session not visible from this sandboxed agent session: ${sessionKey}`,
-            sessionKey: resolveDisplaySessionKey({
-              key: sessionKey,
-              alias,
-              mainKey,
-            }),
-          });
-        }
-      }
       const timeoutSeconds =
         typeof params.timeoutSeconds === "number" &&
         Number.isFinite(params.timeoutSeconds)
@@ -137,6 +83,87 @@ export function createSessionsSendTool(opts?: {
       const requesterSurface = opts?.agentSurface;
       const maxPingPongTurns = resolvePingPongTurns(cfg);
 
+      const resolveAnnounceTarget =
+        async (): Promise<AnnounceTarget | null> => {
+          const parsed = resolveAnnounceTargetFromKey(resolvedKey);
+          if (parsed) return parsed;
+          try {
+            const list = (await callGateway({
+              method: "sessions.list",
+              params: {
+                includeGlobal: true,
+                includeUnknown: true,
+                limit: 200,
+              },
+            })) as { sessions?: Array<Record<string, unknown>> };
+            const sessions = Array.isArray(list?.sessions) ? list.sessions : [];
+            const match =
+              sessions.find((entry) => entry?.key === resolvedKey) ??
+              sessions.find((entry) => entry?.key === displayKey);
+            const channel =
+              typeof match?.lastChannel === "string"
+                ? match.lastChannel
+                : undefined;
+            const to =
+              typeof match?.lastTo === "string" ? match.lastTo : undefined;
+            if (channel && to) return { channel, to };
+          } catch {
+            // ignore; fall through to null
+          }
+          return null;
+        };
+
+      const readLatestAssistantReply = async (
+        sessionKeyToRead: string,
+      ): Promise<string | undefined> => {
+        const history = (await callGateway({
+          method: "chat.history",
+          params: { sessionKey: sessionKeyToRead, limit: 50 },
+        })) as { messages?: unknown[] };
+        const filtered = stripToolMessages(
+          Array.isArray(history?.messages) ? history.messages : [],
+        );
+        const last =
+          filtered.length > 0 ? filtered[filtered.length - 1] : undefined;
+        return last ? extractAssistantText(last) : undefined;
+      };
+
+      const runAgentStep = async (step: {
+        sessionKey: string;
+        message: string;
+        extraSystemPrompt: string;
+        timeoutMs: number;
+      }): Promise<string | undefined> => {
+        const stepIdem = crypto.randomUUID();
+        const response = (await callGateway({
+          method: "agent",
+          params: {
+            message: step.message,
+            sessionKey: step.sessionKey,
+            idempotencyKey: stepIdem,
+            deliver: false,
+            lane: "nested",
+            extraSystemPrompt: step.extraSystemPrompt,
+          },
+          timeoutMs: 10_000,
+        })) as { runId?: string; acceptedAt?: number };
+        const stepRunId =
+          typeof response?.runId === "string" && response.runId
+            ? response.runId
+            : stepIdem;
+        const stepWaitMs = Math.min(step.timeoutMs, 60_000);
+        const wait = (await callGateway({
+          method: "agent.wait",
+          params: {
+            runId: stepRunId,
+            timeoutMs: stepWaitMs,
+          },
+          timeoutMs: stepWaitMs + 2000,
+        })) as { status?: string };
+        if (wait?.status !== "ok") return undefined;
+        return readLatestAssistantReply(step.sessionKey);
+      };
+
       const runAgentToAgentFlow = async (
         roundOneReply?: string,
         runInfo?: { runId: string },
@@ -155,17 +182,12 @@ export function createSessionsSendTool(opts?: {
               timeoutMs: waitMs + 2000,
             })) as { status?: string };
             if (wait?.status === "ok") {
-              primaryReply = await readLatestAssistantReply({
-                sessionKey: resolvedKey,
-              });
+              primaryReply = await readLatestAssistantReply(resolvedKey);
               latestReply = primaryReply;
             }
           }
           if (!latestReply) return;
-          const announceTarget = await resolveAnnounceTarget({
-            sessionKey: resolvedKey,
-            displayKey,
-          });
+          const announceTarget = await resolveAnnounceTarget();
           const targetChannel = announceTarget?.channel ?? "unknown";
           if (
             maxPingPongTurns > 0 &&
@@ -194,7 +216,6 @@ export function createSessionsSendTool(opts?: {
                 message: incomingMessage,
                 extraSystemPrompt: replyPrompt,
                 timeoutMs: announceTimeoutMs,
-                lane: "nested",
               });
               if (!replyText || isReplySkip(replyText)) {
                 break;
@@ -220,7 +241,6 @@ export function createSessionsSendTool(opts?: {
             message: "Agent-to-agent announce step.",
             extraSystemPrompt: announcePrompt,
             timeoutMs: announceTimeoutMs,
-            lane: "nested",
           });
           if (
             announceTarget &&