style: format gemini schema cleanup

.dockerignore

@@ -40,6 +40,7 @@ apps/ios/build
 
 # large app trees not needed for CLI build
 apps/
+ui/
 assets/
 Peekaboo/
 Swabble/

.gitignore

@@ -45,4 +45,3 @@ apps/ios/*.dSYM.zip
 
 # provisioning profiles (local)
 apps/ios/*.mobileprovision
-.env

.npmrc

@@ -1 +1 @@
-allow-build-scripts=@whiskeysockets/baileys,sharp,esbuild,protobufjs,fs-ext,node-pty
+allow-build-scripts=@whiskeysockets/baileys,sharp,esbuild,protobufjs,fs-ext

AGENTS.md

@@ -41,7 +41,6 @@
 - macOS logs: use `./scripts/clawlog.sh` (aka `vtlog`) to query unified logs for subsystem `com.steipete.clawdis`; it supports follow/tail/category filters and expects passwordless sudo for `/usr/bin/log`.
 - Also read the shared guardrails at `~/Projects/oracle/AGENTS.md` and `~/Projects/agent-scripts/AGENTS.MD` before making changes; align with any cross-repo rules noted there.
 - SwiftUI state management (iOS/macOS): prefer the `Observation` framework (`@Observable`, `@Bindable`) over `ObservableObject`/`@StateObject`; don’t introduce new `ObservableObject` unless required for compatibility, and migrate existing usages when touching related code.
-- Connection providers: when adding a new connection, update every UI surface and docs (macOS app, web UI, mobile if applicable, onboarding/overview docs) and add matching status + configuration forms so provider lists and settings stay in sync.
 - **Restart apps:** “restart iOS/Android apps” means rebuild (recompile/install) and relaunch, not just kill/launch.
 - **Device checks:** before testing, verify connected real devices (iOS/Android) before reaching for simulators/emulators.
 - iOS Team ID lookup: `security find-identity -p codesigning -v` → use Apple Development (…) TEAMID. Fallback: `defaults read com.apple.dt.Xcode IDEProvisioningTeamIdentifiers`.
@@ -54,7 +53,6 @@
 - **Multi-agent safety:** running multiple agents is OK as long as each agent has its own session.
 - When asked to open a “session” file, open the Pi session logs under `~/.clawdis/sessions/*.jsonl` (newest unless a specific ID is given), not the default `sessions.json`. If logs are needed from Mac Studio, SSH via Tailscale and read the same path there.
 - Menubar dimming + restart flow mirrors Trimmy: use `scripts/restart-mac.sh` (kills all Clawdis variants, runs `swift build`, packages, relaunches). Icon dimming depends on MenuBarExtraAccess wiring in AppMain; keep `appearsDisabled` updates intact when touching the status item.
-- Do not rebuild the macOS app over SSH; rebuilds must be run directly on the Mac.
 - Never send streaming/partial replies to external messaging surfaces (WhatsApp, Telegram); only final replies should be delivered there. Streaming/tool events may still go to internal UIs/control channel.
 - Voice wake forwarding tips:
   - Command template should stay `clawdis-mac agent --message "${text}" --thinking low`; `VoiceWakeForwarder` already shell-escapes `${text}`. Don’t add extra quotes.

CHANGELOG.md

@@ -1,13 +1,6 @@
 # Changelog
 
-## 2.0.0-beta5 — 2026-01-03
-
-### Fixed
-- Media: preserve GIF animation when uploading to Discord/other providers (skip JPEG optimization for image/gif).
-- Agent runtime: update pi-mono dependencies to 0.31.1 (agent-core split).
-- Dependencies: bump to latest compatible versions (TypeBox, grammY, Zod, Rolldown, oxlint-tsgolint).
-- Tests: cover read tool image metadata + text output.
-- Tests: add queue mode coverage (collect/followup + directive parsing).
+## 2.0.0-beta5 — Unreleased
 
 ### Breaking
 - Skills config schema moved under `skills.*`:
@@ -15,33 +8,14 @@
   - `skillsInstall.*` → `skills.install.*`
   - per-skill config map moved to `skills.entries` (e.g. `skills.peekaboo.enabled` → `skills.entries.peekaboo.enabled`)
   - new optional bundled allowlist: `skills.allowBundled` (only affects bundled skills)
-- Sessions: group keys now use `surface:group:<id>` / `surface:channel:<id>`; legacy `group:*` keys migrate on next message; `groupdm` keys are no longer recognized.
-- Discord: remove legacy `discord.allowFrom`, `discord.guildAllowFrom`, and `discord.requireMention`; use `discord.dm` + `discord.guilds`.
-- Providers: Discord/Telegram no longer auto-start from env tokens alone; add `discord: { enabled: true }` / `telegram: { enabled: true }` to your config when using `DISCORD_BOT_TOKEN` / `TELEGRAM_BOT_TOKEN`.
-- Config: remove `routing.allowFrom`; use `whatsapp.allowFrom` instead (run `clawdis doctor` to migrate).
-- Config: remove `routing.groupChat.requireMention` + `telegram.requireMention`; use `whatsapp.groups`, `imessage.groups`, and `telegram.groups` defaults instead (run `clawdis doctor` to migrate).
 
 ### Features
-- Discord: expand `discord` tool actions (reactions, stickers, polls, threads, search, moderation gates) (#115) — thanks @thewilloftheshadow.
-- Discord/Telegram: add reply tags (`[[reply_to_current]]`, `[[reply_to:<id>]]`) with per-provider `replyToMode` (off|first|all) for native threaded replies.
 - Talk mode: continuous speech conversations (macOS/iOS/Android) with ElevenLabs TTS, reply directives, and optional interrupt-on-speech.
-- Auto-reply: expand queue modes (steer/followup/collect/steer-backlog) with debounce/cap/drop options and followup backlog handling.
 - UI: add optional `ui.seamColor` accent to tint the Talk Mode side bubble (macOS/iOS/Android).
 - Nix mode: opt-in declarative config + read-only settings UI when `CLAWDIS_NIX_MODE=1` (thanks @joshp123 for the persistence — earned my trust; I'll merge these going forward).
-- CLI: add Google Antigravity OAuth auth option for Claude Opus 4.5/Gemini 3 (#88) — thanks @mukhtharcm.
 - Agent runtime: accept legacy `Z_AI_API_KEY` for Z.AI provider auth (maps to `ZAI_API_KEY`).
-- Groups: add per-group mention gating defaults/overrides for Telegram/WhatsApp/iMessage via `*.groups` with `"*"` defaults; Discord now supports `discord.guilds."*"` as a default.
-- Discord: add user-installed slash command handling with per-user sessions and auto-registration (#94) — thanks @thewilloftheshadow.
-- Discord: add DM enable/allowlist plus guild channel/user/guild allowlists with id/name matching.
 - Signal: add `signal-cli` JSON-RPC support for send/receive via the Signal provider.
-- iMessage: add imsg JSON-RPC integration (stdio), chat_id routing, and group chat support.
 - Chat UI: add recent-session dropdown switcher (main first) in macOS/iOS/Android + Control UI.
-- UI: add Discord/Signal/iMessage connection panels in macOS + Control UI (thanks @thewilloftheshadow).
-- Discord: allow agent-triggered reactions via `clawdis_discord` when enabled, and surface message ids in context.
-- Discord: revamp guild routing config with per-guild/channel rules and slugged display names; add optional group DM support (default off).
-- Discord: remove legacy guild/channel ignore lists in favor of per-guild allowlists (and proposed per-guild ignore lists).
-- Skills: add Trello skill for board/list/card management (thanks @clawd).
-- Docker: add containerized gateway/CLI setup via Dockerfile, compose, and setup script (thanks @dan-dr).
 - Tests: add a Z.AI live test gate for smoke validation when keys are present.
 - macOS Debug: add app log verbosity and rolling file log toggle for swift-log-backed app logs.
 - CLI: add onboarding wizard (gateway + workspace + skills) with daemon installers and Anthropic/Minimax setup paths.
@@ -49,40 +23,17 @@
 - CLI: add `configure`, `doctor`, and `update` wizards for ongoing setup, health checks, and modernization.
 - CLI: add Signal CLI auto-install from GitHub releases in the wizard and persist wizard run metadata in config.
 - CLI: add remote gateway client config (gateway.remote.*) with Bonjour-assisted discovery.
-- CLI: add `clawdis tui` gateway-connected terminal UI (local or remote).
 - Skills: allow `bun` as a node manager for skill installs.
 - Skills: add `things-mac` (Things 3 CLI) for read/search plus add/update via URL scheme.
-- Skills: add Apple Notes + Reminders skills via memo CLI (thanks @tylerwince).
 - Tests: add a Docker-based onboarding E2E harness.
 - Tests: harden wizard E2E flows for reset, providers, skills, and remote non-interactive runs.
 - Browser tools: add remote CDP URL support, Linux launcher options (`executablePath`, `noSandbox`), and surface `cdpUrl` in status.
-- Skills: add tmux-first coding-agent skill + `requires.anyBins` gate for multi-CLI setup (thanks @sreekaransrinath).
 
 ### Fixes
-- Gog calendar: format date ranges as RFC 3339 with timezone to satisfy Google Calendar API (thanks @jayhickey).
-- macOS onboarding: add scrollable page gutter for overflowing content (#105) — thanks @thewilloftheshadow.
-- Chat UI: keep the chat scrolled to the latest message after switching sessions.
-- Chat UI: show rich session display names in Web Chat + SwiftUI + Android.
-- Auto-reply: stream completed reply blocks as soon as they finish (configurable default + break); skip empty tool-only blocks unless verbose.
-- Discord: avoid duplicate sends when block streaming is enabled (race with typing hook).
-- Providers: make outbound text chunk limits configurable via `*.textChunkLimit` (defaults remain 4000/Discord 2000).
-- CLI onboarding: persist gateway token in config so local CLI auth works; recommend auth Off unless you need multi-machine access.
-- Control UI: accept a `?token=` URL param to auto-fill Gateway auth; onboarding now opens the dashboard with token auth when configured.
-- Agent prompt: remove hardcoded user name in system prompt example.
-- Chat UI: add extra top padding before the first message bubble in Web Chat (macOS/iOS/Android).
-- Control UI: refine Web Chat session selector styling (chevron spacing + background).
-- WebChat: stream live updates for sessions even when runs start outside the chat UI.
+- Agents: clean Gemini tool schemas and avoid caching empty model discovery results (#126) — thanks @mcinteerj
 - Gateway CLI: read `CLAWDIS_GATEWAY_PASSWORD` from environment in `callGateway()` — allows `doctor`/`health` commands to auth without explicit `--password` flag.
-- Gateway: add password auth support for remote gateway connections (thanks @jeffersonwarrior).
-- Auto-reply: strip stray leading/trailing `HEARTBEAT_OK` from normal replies; drop short (≤ 30 chars) heartbeat acks.
-- WhatsApp auto-reply: default to self-only when no config is present.
-- Logging: trim provider prefix duplication in Discord/Signal/Telegram runtime log lines.
-- Logging/Signal: treat signal-cli "Failed …" lines as errors in gateway logs.
+- Auto-reply: suppress stray `HEARTBEAT_OK` acks so they never get delivered as messages.
 - Discord: include recent guild context when replying to mentions and add `discord.historyLimit` to tune how many messages are captured.
-- Discord: include author tag + id in group context `[from:]` lines for ping-ready replies (thanks @thewilloftheshadow).
-- Discord: include replied-to message context when a Discord message references another message (thanks @thewilloftheshadow).
-- Discord: preserve newlines when stripping reply tags from agent output.
-- Gateway: fix TypeScript build by aligning hook mapping `channel` types and removing a dead Group DM branch in Discord monitor.
 - Skills: switch imsg installer to brew tap formula.
 - Skills: gate macOS-only skills by OS and surface block reasons in the Skills UI.
 - Onboarding: show skill descriptions in the macOS setup flow and surface clearer Gateway/skills error messages.
@@ -91,35 +42,18 @@
 - CLI onboarding: explain Tailscale exposure options (Off/Serve/Funnel) and colorize provider status (linked/configured/needs setup).
 - CLI onboarding: add provider primers (WhatsApp/Telegram/Discord/Signal) incl. Discord bot token setup steps.
 - CLI onboarding: allow skipping the “install missing skill dependencies” selection without canceling the wizard.
-- CLI onboarding: always prompt for WhatsApp `whatsapp.allowFrom` and print (optionally open) the Control UI URL when done.
 - CLI onboarding: detect gateway reachability and annotate Local/Remote choices (helps pick the right mode).
 - macOS settings: colorize provider status subtitles to distinguish healthy vs degraded states.
-- macOS: keep config writes on the main actor to satisfy Swift concurrency rules.
-- macOS menu: show multi-line gateway error details, add an always-visible gateway row, avoid duplicate gateway status rows, suppress transient `cancelled` device refresh errors, and auto-recover the control channel on disconnect.
-- macOS menu: show session last-used timestamps in the list and add recent-message previews in session submenus.
-- macOS menu: tighten session row padding and time out session preview loading with cached fallback.
-- macOS: log health refresh failures and recovery to make gateway issues easier to diagnose.
 - macOS codesign: skip hardened runtime for ad-hoc signing and avoid empty options args (#70) — thanks @petter-b
-- macOS codesign: include camera entitlement so permission prompts work in the menu bar app.
-- Agent tools: bash tool supports real TTY via `stdinMode: "pty"` with node-pty, warning + fallback on load/start failure.
-- Agent tools: map `camera.snap` JPEG payloads to `image/jpeg` to avoid MIME mismatch errors.
-- Tests: cover `camera.snap` MIME mapping to prevent image/png vs image/jpeg mismatches.
-- macOS camera: wait for exposure/white balance to settle before capturing a snap to avoid dark images.
-- Camera snap: add `delayMs` parameter (default 2000ms on macOS) to improve exposure reliability.
-- Camera: add `camera.list` and optional `deviceId` selection for snaps/clips.
-- Tests: cover camera device selection params in CLI + agent tools.
 - macOS packaging: move rpath config into swift build for reliability (#69) — thanks @petter-b
 - macOS: prioritize main bundle for device resources to prevent crash (#73) — thanks @petter-b
 - macOS remote: route settings through gateway config and avoid local config reads in remote mode.
 - Telegram: align token resolution for cron/agent/CLI sends (env/config/tokenFile) to prevent isolated delivery failures (#76).
-- Telegram: honor per-group mention gating defaults/overrides via `telegram.groups` and `"*"` defaults (thanks @joshp123).
 - Chat UI: clear composer input immediately and allow clear while editing to prevent duplicate sends (#72) — thanks @hrdwdmrbl
 - Restart: use systemd on Linux (and report actual restart method) instead of always launchctl.
 - Gateway relay: detect Bun binaries via execPath to resolve packaged assets on macOS.
-- Cron: prevent `every` schedules without an anchor from firing in a tight loop (thanks @jamesgroat).
 - Docs: add manual OAuth setup for remote/headless deployments (#67) — thanks @wstock
 - Docs/agent tools: clarify that browser `wait` should be avoided by default and used only in exceptional cases.
-- Docs: clarify self-chat mode and group mention gating config (#111) — thanks @rafaelreis-r.
 - Browser tools: `upload` supports auto-click refs, direct `inputRef`/`element` file inputs, and emits input/change after `setFiles` so JS-heavy sites pick up attachments.
 - Browser tools: harden CDP readiness (HTTP + WS), retry CDP connects, and auto-restart the clawd browser when the socket handshake stalls.
 - Browser CLI: add `clawdis browser reset-profile` to move the clawd profile to Trash when it gets wedged.
@@ -161,7 +95,6 @@
 - iOS/Android Talk Mode: explicitly `chat.subscribe` when Talk Mode is active, so completion events arrive even if the Chat UI isn’t open.
 - Chat UI: refresh history when another client finishes a run in the same session, so Talk Mode + Voice Wake transcripts appear consistently.
 - Gateway: `voice.transcript` now also maps agent bus output to `chat` events, ensuring chat UIs refresh for voice-triggered runs.
-- Gateway: auto-migrate legacy config on startup (non-Nix); Nix mode hard-fails with a clear error when legacy keys are present.
 - iOS/Android: show a centered Talk Mode orb overlay while Talk Mode is enabled.
 - Gateway config: inject `talk.apiKey` from `ELEVENLABS_API_KEY`/shell profile so nodes can fetch it on demand.
 - Canvas A2UI: tag requests with `platform=android|ios|macos` and boost Android canvas background contrast.
@@ -175,7 +108,6 @@
 - iOS node: fix ReplayKit screen recording crash caused by queue isolation assertions during capture.
 - iOS Talk Mode: avoid audio tap queue assertions when starting recognition.
 - macOS: use $HOME/Library/pnpm for SSH PATH exports (thanks @mbelinky).
-- macOS remote: harden SSH tunnel recovery/logging, honor `gateway.remote.url` port when forwarding, clarify gateway disconnect status, and add Debug menu tunnel reset.
 - iOS/Android nodes: bridge auto-connect refreshes stale tokens and settings now show richer bridge/device details.
 - macOS: bundle device model resources to prevent Instances crashes (thanks @mbelinky).
 - iOS/Android nodes: status pill now surfaces camera activity instead of overlay toasts.

CONTRIBUTING.md

@@ -1,42 +0,0 @@
-# Contributing to Clawdis
-
-Welcome to the lobster tank! 🦞
-
-## Quick Links
-- **GitHub:** https://github.com/steipete/clawdis
-- **Discord:** https://discord.gg/qkhbAGHRBT
-- **X/Twitter:** [@steipete](https://x.com/steipete) / [@clawdbot](https://x.com/clawdbot)
-
-## Maintainers
-
-- **Peter Steinberger** - Benevolent Dictator
-  - GitHub: [@steipete](https://github.com/steipete) · X: [@steipete](https://x.com/steipete)
-
-- **Shadow** - Discord subsystem
-  - GitHub: [@4shadowed](https://github.com/4shadowed) · X: [@4shad0wed](https://x.com/4shad0wed)
-
-- **Jos** - Telegram, API, Nix mode
-  - GitHub: [@joshp123](https://github.com/joshp123) · X: [@jjpcodes](https://x.com/jjpcodes)
-
-## How to Contribute
-1. **Bugs & small fixes** → Open a PR!
-2. **New features / architecture** → Start a [GitHub Discussion](https://github.com/steipete/clawdis/discussions) or ask in Discord first
-3. **Questions** → Discord #setup-help
-
-## Before You PR
-- Test locally with your Clawdis instance
-- Run linter: `npm run lint`
-- Keep PRs focused (one thing per PR)
-- Describe what & why
-
-## AI/Vibe-Coded PRs Welcome! 🤖
-
-Built with Codex, Claude, or other AI tools? **Awesome - just mark it!**
-
-Please include in your PR:
-- [ ] Mark as AI-assisted in the PR title or description
-- [ ] Note the degree of testing (untested / lightly tested / fully tested)
-- [ ] Include prompts or session logs if possible (super helpful!)
-- [ ] Confirm you understand what the code does
-
-AI PRs are first-class citizens here. We just want transparency so reviewers know what to look for.

Dockerfile

@@ -1,16 +0,0 @@
-FROM node:22-bookworm
-
-RUN corepack enable
-
-WORKDIR /app
-
-COPY . .
-
-RUN pnpm install --frozen-lockfile
-RUN pnpm build
-RUN pnpm ui:install
-RUN pnpm ui:build
-
-ENV NODE_ENV=production
-
-CMD ["node", "dist/index.js"]

README.md

@@ -11,16 +11,16 @@
 <p align="center">
   <a href="https://github.com/steipete/clawdis/actions/workflows/ci.yml?branch=main"><img src="https://img.shields.io/github/actions/workflow/status/steipete/clawdis/ci.yml?branch=main&style=for-the-badge" alt="CI status"></a>
   <a href="https://github.com/steipete/clawdis/releases"><img src="https://img.shields.io/github/v/release/steipete/clawdis?include_prereleases&style=for-the-badge" alt="GitHub release"></a>
-  <a href="https://discord.gg/clawd"><img src="https://img.shields.io/discord/1456350064065904867?label=Discord&logo=discord&logoColor=white&color=5865F2&style=for-the-badge" alt="Discord"></a>
+  <a href="https://discord.gg/qkhbAGHRBT"><img src="https://img.shields.io/discord/1456350064065904867?label=Discord&logo=discord&logoColor=white&color=5865F2&style=for-the-badge" alt="Discord"></a>
   <a href="LICENSE"><img src="https://img.shields.io/badge/License-MIT-blue.svg?style=for-the-badge" alt="MIT License"></a>
 </p>
 
 **Clawdis** is a *personal AI assistant* you run on your own devices.
-It answers you on the surfaces you already use (WhatsApp, Telegram, Discord, iMessage, WebChat), can speak and listen on macOS/iOS, and can render a live Canvas you control. The Gateway is just the control plane — the product is the assistant.
+It answers you on the surfaces you already use (WhatsApp, Telegram, Discord, WebChat), can speak and listen on macOS/iOS, and can render a live Canvas you control. The Gateway is just the control plane — the product is the assistant.
 
 If you want a private, single-user assistant that feels local, fast, and always-on, this is it.
 
-Website: https://clawd.me · Docs: [`docs/index.md`](docs/index.md) · FAQ: [`docs/faq.md`](docs/faq.md) · Wizard: [`docs/wizard.md`](docs/wizard.md) · Docker (optional): [`docs/docker.md`](docs/docker.md) · Discord: https://discord.gg/clawd
+Website: https://clawd.me · Docs: [`docs/index.md`](docs/index.md) · Wizard: [`docs/wizard.md`](docs/wizard.md) · Discord: https://discord.gg/qkhbAGHRBT
 
 Preferred setup: run the onboarding wizard (`clawdis onboard`). It walks through gateway, workspace, providers, and skills. The CLI wizard is the recommended path and works on **macOS, Windows, and Linux**.
 
@@ -45,7 +45,7 @@ Your surfaces
 ## What Clawdis does
 
 - **Personal assistant** — one user, one identity, one memory surface.
-- **Multi-surface inbox** — WhatsApp, Telegram, Discord, iMessage, WebChat, macOS, iOS. Signal support via `signal-cli` (see `docs/signal.md`). iMessage uses `imsg` (see `docs/imessage.md`).
+- **Multi-surface inbox** — WhatsApp, Telegram, Discord, WebChat, macOS, iOS. Signal support via `signal-cli` (see `docs/signal.md`).
 - **Voice wake + push-to-talk** — local speech recognition on macOS/iOS.
 - **Canvas** — a live visual workspace you can drive from the agent.
 - **Automation-ready** — browser control, media handling, and tool streaming.
@@ -157,7 +157,7 @@ Minimal `~/.clawdis/clawdis.json`:
 
 ```json5
 {
-  whatsapp: {
+  routing: {
     allowFrom: ["+1234567890"]
   }
 }
@@ -166,12 +166,12 @@ Minimal `~/.clawdis/clawdis.json`:
 ### WhatsApp
 
 - Link the device: `pnpm clawdis login` (stores creds in `~/.clawdis/credentials`).
-- Allowlist who can talk to the assistant via `whatsapp.allowFrom`.
+- Allowlist who can talk to the assistant via `routing.allowFrom`.
 
 ### Telegram
 
 - Set `TELEGRAM_BOT_TOKEN` or `telegram.botToken` (env wins).
-- Optional: set `telegram.groups` (with `telegram.groups."*".requireMention`), `telegram.allowFrom`, or `telegram.webhookUrl` as needed.
+- Optional: set `telegram.requireMention`, `telegram.allowFrom`, or `telegram.webhookUrl` as needed.
 
 ```json5
 {
@@ -184,7 +184,7 @@ Minimal `~/.clawdis/clawdis.json`:
 ### Discord
 
 - Set `DISCORD_BOT_TOKEN` or `discord.token` (env wins).
-- Optional: set `discord.slashCommand`, `discord.dm.allowFrom`, `discord.guilds`, or `discord.mediaMaxMb` as needed.
+- Optional: set `discord.requireMention`, `discord.allowFrom`, or `discord.mediaMaxMb` as needed.
 
 ```json5
 {
@@ -231,12 +231,6 @@ clawdis hooks gmail run
 - [`docs/ios/connect.md`](docs/ios/connect.md)
 - [`docs/clawdis-mac.md`](docs/clawdis-mac.md)
 
-## Contributing
-
-See [CONTRIBUTING.md](CONTRIBUTING.md) for guidelines, maintainers, and how to submit PRs.
-
-AI/vibe-coded PRs welcome! 🤖
-
 ## Clawd
 
 Clawdis was built for **Clawd**, a space lobster AI assistant.

appcast.xml

@@ -2,219 +2,30 @@
 <rss xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" version="2.0">
     <channel>
         <title>Clawdis</title>
+        <item>
+            <title>2.0.0-beta3</title>
+            <pubDate>Sat, 27 Dec 2025 19:02:02 +0100</pubDate>
+            <link>https://raw.githubusercontent.com/steipete/clawdis/main/appcast.xml</link>
+            <sparkle:version>2.0.0-beta3</sparkle:version>
+            <sparkle:shortVersionString>2.0.0-beta3</sparkle:shortVersionString>
+            <sparkle:minimumSystemVersion>15.0</sparkle:minimumSystemVersion>
+            <enclosure url="https://github.com/steipete/clawdis/releases/download/v2.0.0-beta3/Clawdis-2.0.0-beta3.zip" length="70407960" type="application/octet-stream" sparkle:edSignature="A8ySMmbLRrpIkqkrmc9QrC+6om8Iyqray/6x/YNiJxDoJeXjp2T5t8XT0CKJeNBUlDkzIj/fwiK53v0qQ59cDQ=="/>
+        </item>
         <item>
             <title>2.0.0-beta4</title>
-            <pubDate>Sat, 03 Jan 2026 06:04:02 +0100</pubDate>
+            <pubDate>Sat, 27 Dec 2025 19:43:22 +0100</pubDate>
             <link>https://raw.githubusercontent.com/steipete/clawdis/main/appcast.xml</link>
             <sparkle:version>2.0.0-beta4</sparkle:version>
             <sparkle:shortVersionString>2.0.0-beta4</sparkle:shortVersionString>
             <sparkle:minimumSystemVersion>15.0</sparkle:minimumSystemVersion>
-            <enclosure url="https://github.com/steipete/clawdis/releases/download/v2.0.0-beta5/Clawdis-2.0.0-beta4.zip" length="70407894" type="application/octet-stream" sparkle:edSignature="HmuiC7TnUn80ZApnKfb6w+JGSrjc3uUOndMrtbTp42bkBSVifbttNVazqvJueGBo4MgoJV8CP+zQNzVmtVihAQ=="/>
-        </item>
-        <item>
-            <title>2.0.0-beta5</title>
-            <pubDate>Sat, 03 Jan 2026 06:04:02 +0100</pubDate>
-            <link>https://raw.githubusercontent.com/steipete/clawdis/main/appcast.xml</link>
-            <sparkle:version>2.0.0-beta5</sparkle:version>
-            <sparkle:shortVersionString>2.0.0-beta5</sparkle:shortVersionString>
-            <sparkle:minimumSystemVersion>15.0</sparkle:minimumSystemVersion>
-            <description><![CDATA[<h2>Clawdis 2.0.0-beta5</h2>
-<h3>Fixed</h3>
-<ul>
-<li>Media: preserve GIF animation when uploading to Discord/other providers (skip JPEG optimization for image/gif).</li>
-<li>Agent runtime: update pi-mono dependencies to 0.31.1 (agent-core split).</li>
-<li>Dependencies: bump to latest compatible versions (TypeBox, grammY, Zod, Rolldown, oxlint-tsgolint).</li>
-<li>Tests: cover read tool image metadata + text output.</li>
-<li>Tests: add queue mode coverage (collect/followup + directive parsing).</li>
-</ul>
-<h3>Breaking</h3>
-<ul>
-<li>Skills config schema moved under <code>skills.*</code>:</li>
-</ul>
-  - <code>skillsLoad.extraDirs</code> → <code>skills.load.extraDirs</code>
-  - <code>skillsInstall.*</code> → <code>skills.install.*</code>
-  - per-skill config map moved to <code>skills.entries</code> (e.g. <code>skills.peekaboo.enabled</code> → <code>skills.entries.peekaboo.enabled</code>)
-  - new optional bundled allowlist: <code>skills.allowBundled</code> (only affects bundled skills)
-<ul>
-<li>Sessions: group keys now use <code>surface:group:<id></code> / <code>surface:channel:<id></code>; legacy <code>group:*</code> keys migrate on next message; <code>groupdm</code> keys are no longer recognized.</li>
-<li>Discord: remove legacy <code>discord.allowFrom</code>, <code>discord.guildAllowFrom</code>, and <code>discord.requireMention</code>; use <code>discord.dm</code> + <code>discord.guilds</code>.</li>
-<li>Providers: Discord/Telegram no longer auto-start from env tokens alone; add <code>discord: { enabled: true }</code> / <code>telegram: { enabled: true }</code> to your config when using <code>DISCORD_BOT_TOKEN</code> / <code>TELEGRAM_BOT_TOKEN</code>.</li>
-<li>Config: remove <code>routing.allowFrom</code>; use <code>whatsapp.allowFrom</code> instead (run <code>clawdis doctor</code> to migrate).</li>
-<li>Config: remove <code>routing.groupChat.requireMention</code> + <code>telegram.requireMention</code>; use <code>whatsapp.groups</code>, <code>imessage.groups</code>, and <code>telegram.groups</code> defaults instead (run <code>clawdis doctor</code> to migrate).</li>
-</ul>
-<h3>Features</h3>
-<ul>
-<li>Discord: expand <code>discord</code> tool actions (reactions, stickers, polls, threads, search, moderation gates) (#115) — thanks @thewilloftheshadow.</li>
-<li>Discord/Telegram: add reply tags (<code>[[reply_to_current]]</code>, <code>[[reply_to:<id>]]</code>) with per-provider <code>replyToMode</code> (off|first|all) for native threaded replies.</li>
-<li>Talk mode: continuous speech conversations (macOS/iOS/Android) with ElevenLabs TTS, reply directives, and optional interrupt-on-speech.</li>
-<li>Auto-reply: expand queue modes (steer/followup/collect/steer-backlog) with debounce/cap/drop options and followup backlog handling.</li>
-<li>UI: add optional <code>ui.seamColor</code> accent to tint the Talk Mode side bubble (macOS/iOS/Android).</li>
-<li>Nix mode: opt-in declarative config + read-only settings UI when <code>CLAWDIS_NIX_MODE=1</code> (thanks @joshp123 for the persistence — earned my trust; I'll merge these going forward).</li>
-<li>CLI: add Google Antigravity OAuth auth option for Claude Opus 4.5/Gemini 3 (#88) — thanks @mukhtharcm.</li>
-<li>Agent runtime: accept legacy <code>Z_AI_API_KEY</code> for Z.AI provider auth (maps to <code>ZAI_API_KEY</code>).</li>
-<li>Groups: add per-group mention gating defaults/overrides for Telegram/WhatsApp/iMessage via <code>*.groups</code> with <code>"*"</code> defaults; Discord now supports <code>discord.guilds."*"</code> as a default.</li>
-<li>Discord: add user-installed slash command handling with per-user sessions and auto-registration (#94) — thanks @thewilloftheshadow.</li>
-<li>Discord: add DM enable/allowlist plus guild channel/user/guild allowlists with id/name matching.</li>
-<li>Signal: add <code>signal-cli</code> JSON-RPC support for send/receive via the Signal provider.</li>
-<li>iMessage: add imsg JSON-RPC integration (stdio), chat_id routing, and group chat support.</li>
-<li>Chat UI: add recent-session dropdown switcher (main first) in macOS/iOS/Android + Control UI.</li>
-<li>UI: add Discord/Signal/iMessage connection panels in macOS + Control UI (thanks @thewilloftheshadow).</li>
-<li>Discord: allow agent-triggered reactions via <code>clawdis_discord</code> when enabled, and surface message ids in context.</li>
-<li>Discord: revamp guild routing config with per-guild/channel rules and slugged display names; add optional group DM support (default off).</li>
-<li>Discord: remove legacy guild/channel ignore lists in favor of per-guild allowlists (and proposed per-guild ignore lists).</li>
-<li>Skills: add Trello skill for board/list/card management (thanks @clawd).</li>
-<li>Docker: add containerized gateway/CLI setup via Dockerfile, compose, and setup script (thanks @dan-dr).</li>
-<li>Tests: add a Z.AI live test gate for smoke validation when keys are present.</li>
-<li>macOS Debug: add app log verbosity and rolling file log toggle for swift-log-backed app logs.</li>
-<li>CLI: add onboarding wizard (gateway + workspace + skills) with daemon installers and Anthropic/Minimax setup paths.</li>
-<li>CLI: add ASCII banner header to wizard entry points.</li>
-<li>CLI: add <code>configure</code>, <code>doctor</code>, and <code>update</code> wizards for ongoing setup, health checks, and modernization.</li>
-<li>CLI: add Signal CLI auto-install from GitHub releases in the wizard and persist wizard run metadata in config.</li>
-<li>CLI: add remote gateway client config (gateway.remote.*) with Bonjour-assisted discovery.</li>
-<li>CLI: add <code>clawdis tui</code> gateway-connected terminal UI (local or remote).</li>
-<li>Skills: allow <code>bun</code> as a node manager for skill installs.</li>
-<li>Skills: add <code>things-mac</code> (Things 3 CLI) for read/search plus add/update via URL scheme.</li>
-<li>Skills: add Apple Notes + Reminders skills via memo CLI (thanks @tylerwince).</li>
-<li>Tests: add a Docker-based onboarding E2E harness.</li>
-<li>Tests: harden wizard E2E flows for reset, providers, skills, and remote non-interactive runs.</li>
-<li>Browser tools: add remote CDP URL support, Linux launcher options (<code>executablePath</code>, <code>noSandbox</code>), and surface <code>cdpUrl</code> in status.</li>
-<li>Skills: add tmux-first coding-agent skill + <code>requires.anyBins</code> gate for multi-CLI setup (thanks @sreekaransrinath).</li>
-</ul>
+            <description><![CDATA[<h2>Clawdis 2.0.0-beta4</h2>
 <h3>Fixes</h3>
 <ul>
-<li>Gog calendar: format date ranges as RFC 3339 with timezone to satisfy Google Calendar API (thanks @jayhickey).</li>
-<li>macOS onboarding: add scrollable page gutter for overflowing content (#105) — thanks @thewilloftheshadow.</li>
-<li>Chat UI: keep the chat scrolled to the latest message after switching sessions.</li>
-<li>Chat UI: show rich session display names in Web Chat + SwiftUI + Android.</li>
-<li>Auto-reply: stream completed reply blocks as soon as they finish (configurable default + break); skip empty tool-only blocks unless verbose.</li>
-<li>Discord: avoid duplicate sends when block streaming is enabled (race with typing hook).</li>
-<li>Providers: make outbound text chunk limits configurable via <code>*.textChunkLimit</code> (defaults remain 4000/Discord 2000).</li>
-<li>CLI onboarding: persist gateway token in config so local CLI auth works; recommend auth Off unless you need multi-machine access.</li>
-<li>Control UI: accept a <code>?token=</code> URL param to auto-fill Gateway auth; onboarding now opens the dashboard with token auth when configured.</li>
-<li>Agent prompt: remove hardcoded user name in system prompt example.</li>
-<li>Chat UI: add extra top padding before the first message bubble in Web Chat (macOS/iOS/Android).</li>
-<li>Control UI: refine Web Chat session selector styling (chevron spacing + background).</li>
-<li>WebChat: stream live updates for sessions even when runs start outside the chat UI.</li>
-<li>Gateway CLI: read <code>CLAWDIS_GATEWAY_PASSWORD</code> from environment in <code>callGateway()</code> — allows <code>doctor</code>/<code>health</code> commands to auth without explicit <code>--password</code> flag.</li>
-<li>Gateway: add password auth support for remote gateway connections (thanks @jeffersonwarrior).</li>
-<li>Auto-reply: strip stray leading/trailing <code>HEARTBEAT_OK</code> from normal replies; drop short (≤ 30 chars) heartbeat acks.</li>
-<li>WhatsApp auto-reply: default to self-only when no config is present.</li>
-<li>Logging: trim provider prefix duplication in Discord/Signal/Telegram runtime log lines.</li>
-<li>Logging/Signal: treat signal-cli "Failed …" lines as errors in gateway logs.</li>
-<li>Discord: include recent guild context when replying to mentions and add <code>discord.historyLimit</code> to tune how many messages are captured.</li>
-<li>Discord: include author tag + id in group context <code>[from:]</code> lines for ping-ready replies (thanks @thewilloftheshadow).</li>
-<li>Discord: include replied-to message context when a Discord message references another message (thanks @thewilloftheshadow).</li>
-<li>Discord: preserve newlines when stripping reply tags from agent output.</li>
-<li>Gateway: fix TypeScript build by aligning hook mapping <code>channel</code> types and removing a dead Group DM branch in Discord monitor.</li>
-<li>Skills: switch imsg installer to brew tap formula.</li>
-<li>Skills: gate macOS-only skills by OS and surface block reasons in the Skills UI.</li>
-<li>Onboarding: show skill descriptions in the macOS setup flow and surface clearer Gateway/skills error messages.</li>
-<li>Onboarding: auto-verify Claude OAuth tokens, show “verified” when detected working, and avoid re-auth prompts unless verification fails.</li>
-<li>CLI onboarding: include exit code + a useful one-line summary when skill dependency installs fail.</li>
-<li>CLI onboarding: explain Tailscale exposure options (Off/Serve/Funnel) and colorize provider status (linked/configured/needs setup).</li>
-<li>CLI onboarding: add provider primers (WhatsApp/Telegram/Discord/Signal) incl. Discord bot token setup steps.</li>
-<li>CLI onboarding: allow skipping the “install missing skill dependencies” selection without canceling the wizard.</li>
-<li>CLI onboarding: always prompt for WhatsApp <code>whatsapp.allowFrom</code> and print (optionally open) the Control UI URL when done.</li>
-<li>CLI onboarding: detect gateway reachability and annotate Local/Remote choices (helps pick the right mode).</li>
-<li>macOS settings: colorize provider status subtitles to distinguish healthy vs degraded states.</li>
-<li>macOS: keep config writes on the main actor to satisfy Swift concurrency rules.</li>
-<li>macOS menu: show multi-line gateway error details, add an always-visible gateway row, avoid duplicate gateway status rows, suppress transient <code>cancelled</code> device refresh errors, and auto-recover the control channel on disconnect.</li>
-<li>macOS menu: show session last-used timestamps in the list and add recent-message previews in session submenus.</li>
-<li>macOS menu: tighten session row padding and time out session preview loading with cached fallback.</li>
-<li>macOS: log health refresh failures and recovery to make gateway issues easier to diagnose.</li>
-<li>macOS codesign: skip hardened runtime for ad-hoc signing and avoid empty options args (#70) — thanks @petter-b</li>
-<li>macOS codesign: include camera entitlement so permission prompts work in the menu bar app.</li>
-<li>Agent tools: bash tool supports real TTY via <code>stdinMode: "pty"</code> with node-pty, warning + fallback on load/start failure.</li>
-<li>Agent tools: map <code>camera.snap</code> JPEG payloads to <code>image/jpeg</code> to avoid MIME mismatch errors.</li>
-<li>Tests: cover <code>camera.snap</code> MIME mapping to prevent image/png vs image/jpeg mismatches.</li>
-<li>macOS camera: wait for exposure/white balance to settle before capturing a snap to avoid dark images.</li>
-<li>Camera snap: add <code>delayMs</code> parameter (default 2000ms on macOS) to improve exposure reliability.</li>
-<li>Camera: add <code>camera.list</code> and optional <code>deviceId</code> selection for snaps/clips.</li>
-<li>Tests: cover camera device selection params in CLI + agent tools.</li>
-<li>macOS packaging: move rpath config into swift build for reliability (#69) — thanks @petter-b</li>
-<li>macOS: prioritize main bundle for device resources to prevent crash (#73) — thanks @petter-b</li>
-<li>macOS remote: route settings through gateway config and avoid local config reads in remote mode.</li>
-<li>Telegram: align token resolution for cron/agent/CLI sends (env/config/tokenFile) to prevent isolated delivery failures (#76).</li>
-<li>Telegram: honor per-group mention gating defaults/overrides via <code>telegram.groups</code> and <code>"*"</code> defaults (thanks @joshp123).</li>
-<li>Chat UI: clear composer input immediately and allow clear while editing to prevent duplicate sends (#72) — thanks @hrdwdmrbl</li>
-<li>Restart: use systemd on Linux (and report actual restart method) instead of always launchctl.</li>
-<li>Gateway relay: detect Bun binaries via execPath to resolve packaged assets on macOS.</li>
-<li>Cron: prevent <code>every</code> schedules without an anchor from firing in a tight loop (thanks @jamesgroat).</li>
-<li>Docs: add manual OAuth setup for remote/headless deployments (#67) — thanks @wstock</li>
-<li>Docs/agent tools: clarify that browser <code>wait</code> should be avoided by default and used only in exceptional cases.</li>
-<li>Docs: clarify self-chat mode and group mention gating config (#111) — thanks @rafaelreis-r.</li>
-<li>Browser tools: <code>upload</code> supports auto-click refs, direct <code>inputRef</code>/<code>element</code> file inputs, and emits input/change after <code>setFiles</code> so JS-heavy sites pick up attachments.</li>
-<li>Browser tools: harden CDP readiness (HTTP + WS), retry CDP connects, and auto-restart the clawd browser when the socket handshake stalls.</li>
-<li>Browser CLI: add <code>clawdis browser reset-profile</code> to move the clawd profile to Trash when it gets wedged.</li>
-<li>Signal: fix daemon startup race (wait for <code>/api/v1/check</code>) and normalize JSON-RPC <code>version</code> probe parsing.</li>
-<li>Docs/Signal: clarify bot-number vs personal-account setup (self-chat loop protection) and add a quickstart config snippet.</li>
-<li>Docs: refresh the CLI wizard guide and highlight onboarding in the README.</li>
-<li>CLI: tighten onboarding prompt typing to keep bun builds green.</li>
-<li>macOS: Voice Wake now fully tears down the Speech pipeline when disabled (cancel pending restarts, drop stale callbacks) to avoid high CPU in the background.</li>
-<li>macOS menu: add a Talk Mode action alongside the Open Dashboard/Chat/Canvas entries.</li>
-<li>macOS Debug: hide “Restart Gateway” when the app won’t start a local gateway (remote mode / attach-only).</li>
-<li>macOS Debug: add an icon for the App Logging submenu.</li>
-<li>macOS Talk Mode: orb overlay refresh, ElevenLabs request logging, API key status in settings, and auto-select first voice when none is configured.</li>
-<li>macOS Talk Mode: add hard timeout around ElevenLabs TTS synthesis to avoid getting stuck “speaking” forever on hung requests.</li>
-<li>macOS Talk Mode: avoid stuck playback when the audio player never starts (fail-fast + watchdog).</li>
-<li>macOS Talk Mode: fix audio stop ordering so disabling Talk Mode always stops in-flight playback.</li>
-<li>macOS Talk Mode: throttle audio-level updates (avoid per-buffer task creation) to reduce CPU/task churn.</li>
-<li>macOS Talk Mode: increase overlay window size so wave rings don’t clip; close button is hover-only and closer to the orb.</li>
-<li>WebChat: preserve chat run ordering per session so concurrent runs don’t strand the typing indicator.</li>
-<li>Talk Mode: fall back to system TTS when ElevenLabs is unavailable, returns non-audio, or playback fails (macOS/iOS/Android).</li>
-<li>Talk Mode: stream PCM on macOS/iOS for lower latency (incremental playback); Android continues MP3 streaming.</li>
-<li>Talk Mode: validate ElevenLabs v3 stability and latency tier directives before sending requests.</li>
-<li>iOS/Android Talk Mode: auto-select the first ElevenLabs voice when none is configured.</li>
-<li>ElevenLabs: add retry/backoff for 429/5xx and include content-type in errors for debugging.</li>
-<li>Talk Mode: align to the gateway’s main session key and fall back to history polling when chat events drop (prevents stuck “thinking” / missing messages).</li>
-<li>Talk Mode: treat history timestamps as seconds or milliseconds to avoid stale assistant picks (macOS/iOS/Android).</li>
-<li>Chat UI: clear streaming/tool bubbles when external runs finish, preventing duplicate assistant bubbles.</li>
-<li>Chat UI: user bubbles use <code>ui.seamColor</code> (fallback to a calmer default blue).</li>
-<li>Android Chat UI: use <code>onPrimary</code> for user bubble text to preserve contrast (thanks @Syhids).</li>
-<li>Control UI: sync sidebar navigation with the URL for deep-linking, and auto-scroll chat to the latest message.</li>
-<li>Control UI: disable Web Chat + Talk when no iOS/Android node is connected; refreshed Web Chat styling and keyboard send.</li>
-<li>Control UI: keep chat pinned to the latest message while typing/sending and restore drafts on send failures.</li>
-<li>Control UI: soften chat bubble text opacity for calmer readability.</li>
-<li>macOS Web Chat: improve empty/error states, focus message field on open, keep pill/send inside the input field, and make the composer pill edge-to-edge with square top corners.</li>
-<li>macOS: bundle Control UI assets into the app relay so the packaged app can serve them (thanks @mbelinky).</li>
-<li>Talk Mode: wait for chat history to surface the assistant reply before starting TTS (macOS/iOS/Android).</li>
-<li>iOS Talk Mode: fix chat completion wait to time out even if no events arrive (prevents “Thinking…” hangs).</li>
-<li>iOS Talk Mode: keep recognition running during playback to support interrupt-on-speech.</li>
-<li>iOS Talk Mode: preserve directive voice/model overrides across config reloads and add ElevenLabs request timeouts.</li>
-<li>iOS/Android Talk Mode: explicitly <code>chat.subscribe</code> when Talk Mode is active, so completion events arrive even if the Chat UI isn’t open.</li>
-<li>Chat UI: refresh history when another client finishes a run in the same session, so Talk Mode + Voice Wake transcripts appear consistently.</li>
-<li>Gateway: <code>voice.transcript</code> now also maps agent bus output to <code>chat</code> events, ensuring chat UIs refresh for voice-triggered runs.</li>
-<li>Gateway: auto-migrate legacy config on startup (non-Nix); Nix mode hard-fails with a clear error when legacy keys are present.</li>
-<li>iOS/Android: show a centered Talk Mode orb overlay while Talk Mode is enabled.</li>
-<li>Gateway config: inject <code>talk.apiKey</code> from <code>ELEVENLABS_API_KEY</code>/shell profile so nodes can fetch it on demand.</li>
-<li>Canvas A2UI: tag requests with <code>platform=android|ios|macos</code> and boost Android canvas background contrast.</li>
-<li>iOS/Android nodes: enable scrolling for loaded web pages in the Canvas WebView (default scaffold stays touch-first).</li>
-<li>macOS menu: device list now uses <code>node.list</code> (devices only; no agent/tool presence entries).</li>
-<li>macOS menu: device list now shows connected nodes only.</li>
-<li>macOS menu: device rows now pack platform/version on the first line, and command lists wrap in submenus.</li>
-<li>macOS menu: split device platform/version across first and second rows for better fit.</li>
-<li>macOS Canvas: show remote control status in the debug overlay and log A2UI auto-nav decisions.</li>
-<li>Canvas A2UI: polish the debug status HUD styling.</li>
-<li>iOS node: fix ReplayKit screen recording crash caused by queue isolation assertions during capture.</li>
-<li>iOS Talk Mode: avoid audio tap queue assertions when starting recognition.</li>
-<li>macOS: use $HOME/Library/pnpm for SSH PATH exports (thanks @mbelinky).</li>
-<li>macOS remote: harden SSH tunnel recovery/logging, honor <code>gateway.remote.url</code> port when forwarding, clarify gateway disconnect status, and add Debug menu tunnel reset.</li>
-<li>iOS/Android nodes: bridge auto-connect refreshes stale tokens and settings now show richer bridge/device details.</li>
-<li>macOS: bundle device model resources to prevent Instances crashes (thanks @mbelinky).</li>
-<li>iOS/Android nodes: status pill now surfaces camera activity instead of overlay toasts.</li>
-<li>iOS/Android/macOS nodes: camera snaps recompress to keep base64 payloads under 5 MB.</li>
-<li>iOS/Android nodes: status pill now surfaces pairing, screen recording, voice wake, and foreground-required states.</li>
-<li>iOS/Android nodes: avoid duplicating “Gateway reconnecting…” when the bridge is already connecting.</li>
-<li>iOS/Android nodes: Talk Mode now lives on a side bubble (with an iOS toggle to hide it), and Android settings no longer show the Talk Mode switch.</li>
-<li>macOS menu: top status line now shows pending node pairing approvals (incl. repairs).</li>
-<li>CLI: avoid spurious gateway close errors after successful request/response cycles.</li>
-<li>Agent runtime: clamp tool-result images to the 5MB Anthropic limit to avoid hard request rejections.</li>
-<li>Agent runtime: write v2 session headers so Pi session branching stays in the Clawdis sessions dir.</li>
-<li>Tests: add Swift Testing coverage for camera errors and Kotest coverage for Android bridge endpoints.</li>
+<li>Package contents: include Discord/hooks build outputs in the npm tarball to avoid missing module errors.</li>
 </ul>
 <p><a href="https://github.com/steipete/clawdis/blob/main/CHANGELOG.md">View full changelog</a></p>
 ]]></description>
-            <enclosure url="https://github.com/steipete/clawdis/releases/download/v2.0.0-beta5/Clawdis-2.0.0-beta5.zip" length="72078343" type="application/octet-stream" sparkle:edSignature="xSfMHcYYEktlE+EC8cnM7GJP0oqjfN4EK+oIIcTHvXtgXG7LcBqo4kMQEVrr1kIzCIqQ+7/R6HMd/rWtfkc3Cg=="/>
+            <enclosure url="https://github.com/steipete/clawdis/releases/download/v2.0.0-beta4/Clawdis-2.0.0-beta4.zip" length="70407894" type="application/octet-stream" sparkle:edSignature="HmuiC7TnUn80ZApnKfb6w+JGSrjc3uUOndMrtbTp42bkBSVifbttNVazqvJueGBo4MgoJV8CP+zQNzVmtVihAQ=="/>
         </item>
     </channel>
-</rss>
+</rss>

apps/android/app/src/main/java/com/steipete/clawdis/node/chat/ChatController.kt

@@ -469,8 +469,7 @@ class ChatController(
       val key = obj["key"].asStringOrNull()?.trim().orEmpty()
       if (key.isEmpty()) return@mapNotNull null
       val updatedAt = obj["updatedAt"].asLongOrNull()
-      val displayName = obj["displayName"].asStringOrNull()?.trim()
-      ChatSessionEntry(key = key, updatedAtMs = updatedAt, displayName = displayName)
+      ChatSessionEntry(key = key, updatedAtMs = updatedAt)
     }
   }
 

apps/android/app/src/main/java/com/steipete/clawdis/node/chat/ChatModels.kt

@@ -25,7 +25,6 @@ data class ChatPendingToolCall(
 data class ChatSessionEntry(
   val key: String,
   val updatedAtMs: Long?,
-  val displayName: String? = null,
 )
 
 data class ChatHistory(

apps/android/app/src/main/java/com/steipete/clawdis/node/ui/chat/ChatComposer.kt

@@ -62,8 +62,6 @@ fun ChatComposer(
   var showSessionMenu by remember { mutableStateOf(false) }
 
   val sessionOptions = resolveSessionChoices(sessionKey, sessions)
-  val currentSessionLabel =
-    sessionOptions.firstOrNull { it.key == sessionKey }?.displayName ?: sessionKey
 
   val canSend = pendingRunCount == 0 && (input.trim().isNotEmpty() || attachments.isNotEmpty()) && healthOk
 
@@ -84,13 +82,13 @@ fun ChatComposer(
             onClick = { showSessionMenu = true },
             contentPadding = ButtonDefaults.ContentPadding,
           ) {
-            Text("Session: $currentSessionLabel")
+            Text("Session: $sessionKey")
           }
 
           DropdownMenu(expanded = showSessionMenu, onDismissRequest = { showSessionMenu = false }) {
             for (entry in sessionOptions) {
               DropdownMenuItem(
-                text = { Text(entry.displayName ?: entry.key) },
+                text = { Text(entry.key) },
                 onClick = {
                   onSelectSession(entry.key)
                   showSessionMenu = false
@@ -148,7 +146,7 @@ fun ChatComposer(
       )
 
       Row(modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
-        ConnectionPill(sessionLabel = currentSessionLabel, healthOk = healthOk)
+        ConnectionPill(sessionKey = sessionKey, healthOk = healthOk)
         Spacer(modifier = Modifier.weight(1f))
 
         if (pendingRunCount > 0) {
@@ -186,7 +184,7 @@ fun ChatComposer(
 }
 
 @Composable
-private fun ConnectionPill(sessionLabel: String, healthOk: Boolean) {
+private fun ConnectionPill(sessionKey: String, healthOk: Boolean) {
   Surface(
     shape = RoundedCornerShape(999.dp),
     color = MaterialTheme.colorScheme.surfaceContainerHighest,
@@ -201,7 +199,7 @@ private fun ConnectionPill(sessionLabel: String, healthOk: Boolean) {
         shape = androidx.compose.foundation.shape.CircleShape,
         color = if (healthOk) Color(0xFF2ECC71) else Color(0xFFF39C12),
       ) {}
-      Text(sessionLabel, style = MaterialTheme.typography.labelSmall)
+      Text(sessionKey, style = MaterialTheme.typography.labelSmall)
       Text(
         if (healthOk) "Connected" else "Connecting…",
         style = MaterialTheme.typography.labelSmall,

apps/android/app/src/main/java/com/steipete/clawdis/node/ui/chat/ChatSessionsDialog.kt

@@ -82,7 +82,7 @@ private fun SessionRow(
       verticalAlignment = Alignment.CenterVertically,
       horizontalArrangement = Arrangement.spacedBy(10.dp),
     ) {
-      Text(entry.displayName ?: entry.key, style = MaterialTheme.typography.bodyMedium)
+      Text(entry.key, style = MaterialTheme.typography.bodyMedium)
       Spacer(modifier = Modifier.weight(1f))
       if (isCurrent) {
         Text("Current", style = MaterialTheme.typography.labelSmall, color = MaterialTheme.colorScheme.onSurfaceVariant)
@@ -90,3 +90,4 @@ private fun SessionRow(
     }
   }
 }
+

apps/ios/Sources/Bridge/BridgeConnectionController.swift

@@ -247,7 +247,6 @@ final class BridgeConnectionController {
 
         let caps = Set(self.currentCaps())
         if caps.contains(ClawdisCapability.camera.rawValue) {
-            commands.append(ClawdisCameraCommand.list.rawValue)
             commands.append(ClawdisCameraCommand.snap.rawValue)
             commands.append(ClawdisCameraCommand.clip.rawValue)
         }

apps/ios/Sources/Camera/CameraController.swift

@@ -3,13 +3,6 @@ import ClawdisKit
 import Foundation
 
 actor CameraController {
-    struct CameraDeviceInfo: Codable, Sendable {
-        var id: String
-        var name: String
-        var position: String
-        var deviceType: String
-    }
-
     enum CameraError: LocalizedError, Sendable {
         case cameraUnavailable
         case microphoneUnavailable
@@ -48,14 +41,13 @@ actor CameraController {
         // If you need the full-res photo, explicitly request a larger maxWidth.
         let maxWidth = params.maxWidth.flatMap { $0 > 0 ? $0 : nil } ?? 1600
         let quality = Self.clampQuality(params.quality)
-        let delayMs = max(0, params.delayMs ?? 0)
 
         try await self.ensureAccess(for: .video)
 
         let session = AVCaptureSession()
         session.sessionPreset = .photo
 
-        guard let device = Self.pickCamera(facing: facing, deviceId: params.deviceId) else {
+        guard let device = Self.pickCamera(facing: facing) else {
             throw CameraError.cameraUnavailable
         }
 
@@ -75,7 +67,6 @@ actor CameraController {
         session.startRunning()
         defer { session.stopRunning() }
         await Self.warmUpCaptureSession()
-        await Self.sleepDelayMs(delayMs)
 
         let settings: AVCapturePhotoSettings = {
             if output.availablePhotoCodecTypes.contains(.jpeg) {
@@ -128,7 +119,7 @@ actor CameraController {
         let session = AVCaptureSession()
         session.sessionPreset = .high
 
-        guard let camera = Self.pickCamera(facing: facing, deviceId: params.deviceId) else {
+        guard let camera = Self.pickCamera(facing: facing) else {
             throw CameraError.cameraUnavailable
         }
         let cameraInput = try AVCaptureDeviceInput(device: camera)
@@ -189,23 +180,6 @@ actor CameraController {
             hasAudio: includeAudio)
     }
 
-    func listDevices() -> [CameraDeviceInfo] {
-        let types: [AVCaptureDevice.DeviceType] = [
-            .builtInWideAngleCamera,
-        ]
-        let session = AVCaptureDevice.DiscoverySession(
-            deviceTypes: types,
-            mediaType: .video,
-            position: .unspecified)
-        return session.devices.map { device in
-            CameraDeviceInfo(
-                id: device.uniqueID,
-                name: device.localizedName,
-                position: Self.positionLabel(device.position),
-                deviceType: device.deviceType.rawValue)
-        }
-    }
-
     private func ensureAccess(for mediaType: AVMediaType) async throws {
         let status = AVCaptureDevice.authorizationStatus(for: mediaType)
         switch status {
@@ -227,15 +201,7 @@ actor CameraController {
         }
     }
 
-    private nonisolated static func pickCamera(
-        facing: ClawdisCameraFacing,
-        deviceId: String?) -> AVCaptureDevice?
-    {
-        if let deviceId, !deviceId.isEmpty {
-            if let match = AVCaptureDevice.devices(for: .video).first(where: { $0.uniqueID == deviceId }) {
-                return match
-            }
-        }
+    private nonisolated static func pickCamera(facing: ClawdisCameraFacing) -> AVCaptureDevice? {
         let position: AVCaptureDevice.Position = (facing == .front) ? .front : .back
         if let device = AVCaptureDevice.default(.builtInWideAngleCamera, for: .video, position: position) {
             return device
@@ -244,14 +210,6 @@ actor CameraController {
         return AVCaptureDevice.default(for: .video)
     }
 
-    private nonisolated static func positionLabel(_ position: AVCaptureDevice.Position) -> String {
-        switch position {
-        case .front: "front"
-        case .back: "back"
-        default: "unspecified"
-        }
-    }
-
     nonisolated static func clampQuality(_ quality: Double?) -> Double {
         let q = quality ?? 0.9
         return min(1.0, max(0.05, q))
@@ -304,13 +262,6 @@ actor CameraController {
         // A short delay after `startRunning()` significantly reduces "blank first frame" captures on some devices.
         try? await Task.sleep(nanoseconds: 150_000_000) // 150ms
     }
-
-    private nonisolated static func sleepDelayMs(_ delayMs: Int) async {
-        guard delayMs > 0 else { return }
-        let maxDelayMs = 10 * 1000
-        let ns = UInt64(min(delayMs, maxDelayMs)) * UInt64(NSEC_PER_MSEC)
-        try? await Task.sleep(nanoseconds: ns)
-    }
 }
 
 private final class PhotoCaptureDelegate: NSObject, AVCapturePhotoCaptureDelegate {

apps/ios/Sources/Model/NodeAppModel.swift

@@ -589,14 +589,6 @@ final class NodeAppModel {
                 let resultJSON = try await self.screen.eval(javaScript: js)
                 return BridgeInvokeResponse(id: req.id, ok: true, payloadJSON: resultJSON)
 
-            case ClawdisCameraCommand.list.rawValue:
-                let devices = await self.camera.listDevices()
-                struct Payload: Codable {
-                    var devices: [CameraController.CameraDeviceInfo]
-                }
-                let payload = try Self.encodePayload(Payload(devices: devices))
-                return BridgeInvokeResponse(id: req.id, ok: true, payloadJSON: payload)
-
             case ClawdisCameraCommand.snap.rawValue:
                 self.showCameraHUD(text: "Taking photo…", kind: .photo)
                 self.triggerCameraFlash()

apps/ios/Sources/Settings/SettingsTab.swift

@@ -333,7 +333,6 @@ struct SettingsTab: View {
 
         let caps = Set(self.currentCaps())
         if caps.contains(ClawdisCapability.camera.rawValue) {
-            commands.append(ClawdisCameraCommand.list.rawValue)
             commands.append(ClawdisCameraCommand.snap.rawValue)
             commands.append(ClawdisCameraCommand.clip.rawValue)
         }

apps/macos/Sources/Clawdis/CameraCaptureService.swift

@@ -6,13 +6,6 @@ import Foundation
 import OSLog
 
 actor CameraCaptureService {
-    struct CameraDeviceInfo: Encodable, Sendable {
-        let id: String
-        let name: String
-        let position: String
-        let deviceType: String
-    }
-
     enum CameraError: LocalizedError, Sendable {
         case cameraUnavailable
         case microphoneUnavailable
@@ -38,36 +31,18 @@ actor CameraCaptureService {
 
     private let logger = Logger(subsystem: "com.steipete.clawdis", category: "camera")
 
-    func listDevices() -> [CameraDeviceInfo] {
-        Self.availableCameras().map { device in
-            CameraDeviceInfo(
-                id: device.uniqueID,
-                name: device.localizedName,
-                position: Self.positionLabel(device.position),
-                deviceType: device.deviceType.rawValue)
-        }
-    }
-
-    func snap(
-        facing: CameraFacing?,
-        maxWidth: Int?,
-        quality: Double?,
-        deviceId: String?,
-        delayMs: Int) async throws -> (data: Data, size: CGSize)
-    {
+    func snap(facing: CameraFacing?, maxWidth: Int?, quality: Double?) async throws -> (data: Data, size: CGSize) {
         let facing = facing ?? .front
         let normalized = Self.normalizeSnap(maxWidth: maxWidth, quality: quality)
         let maxWidth = normalized.maxWidth
         let quality = normalized.quality
-        let delayMs = max(0, delayMs)
-        let deviceId = deviceId?.trimmingCharacters(in: .whitespacesAndNewlines)
 
         try await self.ensureAccess(for: .video)
 
         let session = AVCaptureSession()
         session.sessionPreset = .photo
 
-        guard let device = Self.pickCamera(facing: facing, deviceId: deviceId) else {
+        guard let device = Self.pickCamera(facing: facing) else {
             throw CameraError.cameraUnavailable
         }
 
@@ -87,8 +62,6 @@ actor CameraCaptureService {
         session.startRunning()
         defer { session.stopRunning() }
         await Self.warmUpCaptureSession()
-        await self.waitForExposureAndWhiteBalance(device: device)
-        await self.sleepDelayMs(delayMs)
 
         let settings: AVCapturePhotoSettings = {
             if output.availablePhotoCodecTypes.contains(.jpeg) {
@@ -99,7 +72,7 @@ actor CameraCaptureService {
         settings.photoQualityPrioritization = .quality
 
         var delegate: PhotoCaptureDelegate?
-        let rawData: Data = try await withCheckedThrowingContinuation { cont in
+        let rawData: Data = try await withCheckedThrowingContinuation(isolation: nil) { cont in
             let d = PhotoCaptureDelegate(cont)
             delegate = d
             output.capturePhoto(with: settings, delegate: d)
@@ -121,12 +94,10 @@ actor CameraCaptureService {
         facing: CameraFacing?,
         durationMs: Int?,
         includeAudio: Bool,
-        deviceId: String?,
         outPath: String?) async throws -> (path: String, durationMs: Int, hasAudio: Bool)
     {
         let facing = facing ?? .front
         let durationMs = Self.clampDurationMs(durationMs)
-        let deviceId = deviceId?.trimmingCharacters(in: .whitespacesAndNewlines)
 
         try await self.ensureAccess(for: .video)
         if includeAudio {
@@ -136,7 +107,7 @@ actor CameraCaptureService {
         let session = AVCaptureSession()
         session.sessionPreset = .high
 
-        guard let camera = Self.pickCamera(facing: facing, deviceId: deviceId) else {
+        guard let camera = Self.pickCamera(facing: facing) else {
             throw CameraError.cameraUnavailable
         }
         let cameraInput = try AVCaptureDeviceInput(device: camera)
@@ -184,7 +155,7 @@ actor CameraCaptureService {
 
         let logger = self.logger
         var delegate: MovieFileDelegate?
-        let recordedURL: URL = try await withCheckedThrowingContinuation { cont in
+        let recordedURL: URL = try await withCheckedThrowingContinuation(isolation: nil) { cont in
             let d = MovieFileDelegate(cont, logger: logger)
             delegate = d
             output.startRecording(to: tmpMovURL, recordingDelegate: d)
@@ -216,38 +187,7 @@ actor CameraCaptureService {
         }
     }
 
-    private nonisolated static func availableCameras() -> [AVCaptureDevice] {
-        var types: [AVCaptureDevice.DeviceType] = [
-            .builtInWideAngleCamera,
-            .continuityCamera,
-        ]
-        if let external = externalDeviceType() {
-            types.append(external)
-        }
-        let session = AVCaptureDevice.DiscoverySession(
-            deviceTypes: types,
-            mediaType: .video,
-            position: .unspecified)
-        return session.devices
-    }
-
-    private nonisolated static func externalDeviceType() -> AVCaptureDevice.DeviceType? {
-        if #available(macOS 14.0, *) {
-            return .external
-        }
-        // Use raw value to avoid deprecated symbol in the SDK.
-        return AVCaptureDevice.DeviceType(rawValue: "AVCaptureDeviceTypeExternalUnknown")
-    }
-
-    private nonisolated static func pickCamera(
-        facing: CameraFacing,
-        deviceId: String?) -> AVCaptureDevice?
-    {
-        if let deviceId, !deviceId.isEmpty {
-            if let match = Self.availableCameras().first(where: { $0.uniqueID == deviceId }) {
-                return match
-            }
-        }
+    private nonisolated static func pickCamera(facing: CameraFacing) -> AVCaptureDevice? {
         let position: AVCaptureDevice.Position = (facing == .front) ? .front : .back
 
         if let device = AVCaptureDevice.default(.builtInWideAngleCamera, for: .video, position: position) {
@@ -317,31 +257,6 @@ actor CameraCaptureService {
         // A short delay after `startRunning()` significantly reduces "blank first frame" captures on some devices.
         try? await Task.sleep(nanoseconds: 150_000_000) // 150ms
     }
-
-    private func waitForExposureAndWhiteBalance(device: AVCaptureDevice) async {
-        let stepNs: UInt64 = 50_000_000
-        let maxSteps = 30 // ~1.5s
-        for _ in 0..<maxSteps {
-            if !(device.isAdjustingExposure || device.isAdjustingWhiteBalance) {
-                return
-            }
-            try? await Task.sleep(nanoseconds: stepNs)
-        }
-    }
-
-    private func sleepDelayMs(_ delayMs: Int) async {
-        guard delayMs > 0 else { return }
-        let ns = UInt64(min(delayMs, 10_000)) * 1_000_000
-        try? await Task.sleep(nanoseconds: ns)
-    }
-
-    private nonisolated static func positionLabel(_ position: AVCaptureDevice.Position) -> String {
-        switch position {
-        case .front: "front"
-        case .back: "back"
-        default: "unspecified"
-        }
-    }
 }
 
 private final class PhotoCaptureDelegate: NSObject, AVCapturePhotoCaptureDelegate {

apps/macos/Sources/Clawdis/ClawdisConfigFile.swift

@@ -97,13 +97,4 @@ enum ClawdisConfigFile {
         self.logger.debug("agent workspace updated set=\(!trimmed.isEmpty)")
     }
 
-    static func gatewayPassword() -> String? {
-        let root = self.loadDict()
-        guard let gateway = root["gateway"] as? [String: Any],
-              let remote = gateway["remote"] as? [String: Any] else {
-            return nil
-        }
-        return remote["password"] as? String
-    }
-
 }

apps/macos/Sources/Clawdis/ConfigSettings.swift

@@ -37,20 +37,6 @@ struct ConfigSettings: View {
     @State private var talkApiKey: String = ""
     @State private var gatewayApiKeyFound = false
 
-    private struct ConfigDraft {
-        let configModel: String
-        let customModel: String
-        let heartbeatMinutes: Int?
-        let heartbeatBody: String
-        let browserEnabled: Bool
-        let browserControlUrl: String
-        let browserColorHex: String
-        let browserAttachOnly: Bool
-        let talkVoiceId: String
-        let talkApiKey: String
-        let talkInterruptOnSpeech: Bool
-    }
-
     var body: some View {
         ScrollView { self.content }
             .onChange(of: self.modelCatalogPath) { _, _ in
@@ -334,7 +320,7 @@ struct ConfigSettings: View {
                                 .frame(maxWidth: .infinity)
                                 .disabled(self.hasEnvApiKey)
                                 .onChange(of: self.talkApiKey) { _, _ in self.autosaveConfig() }
-                            if !self.hasEnvApiKey, !self.talkApiKey.isEmpty {
+                            if !self.hasEnvApiKey && !self.talkApiKey.isEmpty {
                                 Button("Clear") {
                                     self.talkApiKey = ""
                                     self.autosaveConfig()
@@ -346,8 +332,8 @@ struct ConfigSettings: View {
                             Text("Using ELEVENLABS_API_KEY from the environment.")
                                 .font(.footnote)
                                 .foregroundStyle(.secondary)
-                        } else if self.gatewayApiKeyFound,
-                                  self.talkApiKey.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
+                        } else if self.gatewayApiKeyFound
+                            && self.talkApiKey.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
                         {
                             Text("Using API key from the gateway profile.")
                                 .font(.footnote)
@@ -445,89 +431,54 @@ struct ConfigSettings: View {
         self.configSaving = true
         defer { self.configSaving = false }
 
-        let configModel = self.configModel
-        let customModel = self.customModel
-        let heartbeatMinutes = self.heartbeatMinutes
-        let heartbeatBody = self.heartbeatBody
-        let browserEnabled = self.browserEnabled
-        let browserControlUrl = self.browserControlUrl
-        let browserColorHex = self.browserColorHex
-        let browserAttachOnly = self.browserAttachOnly
-        let talkVoiceId = self.talkVoiceId
-        let talkApiKey = self.talkApiKey
-        let talkInterruptOnSpeech = self.talkInterruptOnSpeech
-
-        let draft = ConfigDraft(
-            configModel: configModel,
-            customModel: customModel,
-            heartbeatMinutes: heartbeatMinutes,
-            heartbeatBody: heartbeatBody,
-            browserEnabled: browserEnabled,
-            browserControlUrl: browserControlUrl,
-            browserColorHex: browserColorHex,
-            browserAttachOnly: browserAttachOnly,
-            talkVoiceId: talkVoiceId,
-            talkApiKey: talkApiKey,
-            talkInterruptOnSpeech: talkInterruptOnSpeech)
-
-        let errorMessage = await ConfigSettings.buildAndSaveConfig(draft)
-
-        if let errorMessage {
-            self.modelError = errorMessage
-        }
-    }
-
-    @MainActor
-    private static func buildAndSaveConfig(_ draft: ConfigDraft) async -> String? {
         var root = await ConfigStore.load()
         var agent = root["agent"] as? [String: Any] ?? [:]
         var browser = root["browser"] as? [String: Any] ?? [:]
         var talk = root["talk"] as? [String: Any] ?? [:]
 
-        let chosenModel = (draft.configModel == "__custom__" ? draft.customModel : draft.configModel)
+        let chosenModel = (self.configModel == "__custom__" ? self.customModel : self.configModel)
             .trimmingCharacters(in: .whitespacesAndNewlines)
         let trimmedModel = chosenModel
         if !trimmedModel.isEmpty { agent["model"] = trimmedModel }
 
-        if let heartbeatMinutes = draft.heartbeatMinutes {
+        if let heartbeatMinutes {
             agent["heartbeatMinutes"] = heartbeatMinutes
         }
 
-        let trimmedBody = draft.heartbeatBody.trimmingCharacters(in: .whitespacesAndNewlines)
+        let trimmedBody = self.heartbeatBody.trimmingCharacters(in: .whitespacesAndNewlines)
         if !trimmedBody.isEmpty {
             agent["heartbeatBody"] = trimmedBody
         }
 
         root["agent"] = agent
 
-        browser["enabled"] = draft.browserEnabled
-        let trimmedUrl = draft.browserControlUrl.trimmingCharacters(in: .whitespacesAndNewlines)
+        browser["enabled"] = self.browserEnabled
+        let trimmedUrl = self.browserControlUrl.trimmingCharacters(in: .whitespacesAndNewlines)
         if !trimmedUrl.isEmpty { browser["controlUrl"] = trimmedUrl }
-        let trimmedColor = draft.browserColorHex.trimmingCharacters(in: .whitespacesAndNewlines)
+        let trimmedColor = self.browserColorHex.trimmingCharacters(in: .whitespacesAndNewlines)
         if !trimmedColor.isEmpty { browser["color"] = trimmedColor }
-        browser["attachOnly"] = draft.browserAttachOnly
+        browser["attachOnly"] = self.browserAttachOnly
         root["browser"] = browser
 
-        let trimmedVoice = draft.talkVoiceId.trimmingCharacters(in: .whitespacesAndNewlines)
+        let trimmedVoice = self.talkVoiceId.trimmingCharacters(in: .whitespacesAndNewlines)
         if trimmedVoice.isEmpty {
             talk.removeValue(forKey: "voiceId")
         } else {
             talk["voiceId"] = trimmedVoice
         }
-        let trimmedApiKey = draft.talkApiKey.trimmingCharacters(in: .whitespacesAndNewlines)
+        let trimmedApiKey = self.talkApiKey.trimmingCharacters(in: .whitespacesAndNewlines)
         if trimmedApiKey.isEmpty {
             talk.removeValue(forKey: "apiKey")
         } else {
             talk["apiKey"] = trimmedApiKey
         }
-        talk["interruptOnSpeech"] = draft.talkInterruptOnSpeech
+        talk["interruptOnSpeech"] = self.talkInterruptOnSpeech
         root["talk"] = talk
 
         do {
             try await ConfigStore.save(root)
-            return nil
         } catch {
-            return error.localizedDescription
+            self.modelError = error.localizedDescription
         }
     }
 

apps/macos/Sources/Clawdis/ConfigStore.swift

@@ -43,7 +43,7 @@ enum ConfigStore {
     }
 
     @MainActor
-    static func save(_ root: sending [String: Any]) async throws {
+    static func save(_ root: [String: Any]) async throws {
         let overrides = await self.overrideStore.overrides
         if await self.isRemoteMode() {
             if let override = overrides.saveRemote {

apps/macos/Sources/Clawdis/ConnectionsSettings.swift

@@ -2,26 +2,6 @@ import AppKit
 import SwiftUI
 
 struct ConnectionsSettings: View {
-    private enum ConnectionProvider: String, CaseIterable, Identifiable {
-        case whatsapp
-        case telegram
-        case discord
-        case signal
-        case imessage
-
-        var id: String { self.rawValue }
-
-        var sortOrder: Int {
-            switch self {
-            case .whatsapp: 0
-            case .telegram: 1
-            case .discord: 2
-            case .signal: 3
-            case .imessage: 4
-            }
-        }
-    }
-
     @Bindable var store: ConnectionsStore
     @State private var showTelegramToken = false
     @State private var showDiscordToken = false
@@ -34,9 +14,9 @@ struct ConnectionsSettings: View {
         ScrollView(.vertical) {
             VStack(alignment: .leading, spacing: 14) {
                 self.header
-                ForEach(self.orderedProviders) { provider in
-                    self.providerSection(provider)
-                }
+                self.whatsAppSection
+                self.telegramSection
+                self.discordSection
                 Spacer(minLength: 0)
             }
             .frame(maxWidth: .infinity, alignment: .leading)
@@ -51,7 +31,7 @@ struct ConnectionsSettings: View {
         VStack(alignment: .leading, spacing: 6) {
             Text("Connections")
                 .font(.title3.weight(.semibold))
-            Text("Link and monitor messaging providers.")
+            Text("Link and monitor WhatsApp, Telegram, and Discord providers.")
                 .font(.callout)
                 .foregroundStyle(.secondary)
         }
@@ -263,12 +243,6 @@ struct ConnectionsSettings: View {
                 Divider().padding(.vertical, 2)
 
                 Grid(alignment: .leadingFirstTextBaseline, horizontalSpacing: 14, verticalSpacing: 10) {
-                    GridRow {
-                        self.gridLabel("Enabled")
-                        Toggle("", isOn: self.$store.discordEnabled)
-                            .labelsHidden()
-                            .toggleStyle(.checkbox)
-                    }
                     GridRow {
                         self.gridLabel("Bot token")
                         if self.showDiscordToken {
@@ -285,19 +259,24 @@ struct ConnectionsSettings: View {
                             .disabled(self.isDiscordTokenLocked)
                     }
                     GridRow {
-                        self.gridLabel("Allow DMs from")
-                        TextField("123456789, username#1234", text: self.$store.discordAllowFrom)
-                            .textFieldStyle(.roundedBorder)
-                    }
-                    GridRow {
-                        self.gridLabel("Group DMs")
-                        Toggle("", isOn: self.$store.discordGroupEnabled)
+                        self.gridLabel("Require mention")
+                        Toggle("", isOn: self.$store.discordRequireMention)
                             .labelsHidden()
                             .toggleStyle(.checkbox)
                     }
                     GridRow {
-                        self.gridLabel("Group channels")
-                        TextField("channelId1, channelId2", text: self.$store.discordGroupChannels)
+                        self.gridLabel("Allow from")
+                        TextField("discord:123, user:456", text: self.$store.discordAllowFrom)
+                            .textFieldStyle(.roundedBorder)
+                    }
+                    GridRow {
+                        self.gridLabel("Allow guilds")
+                        TextField("guildId1, guildId2", text: self.$store.discordGuildAllowFrom)
+                            .textFieldStyle(.roundedBorder)
+                    }
+                    GridRow {
+                        self.gridLabel("Allow guild users")
+                        TextField("userId1, userId2", text: self.$store.discordGuildUsersAllowFrom)
                             .textFieldStyle(.roundedBorder)
                     }
                     GridRow {
@@ -305,132 +284,6 @@ struct ConnectionsSettings: View {
                         TextField("8", text: self.$store.discordMediaMaxMb)
                             .textFieldStyle(.roundedBorder)
                     }
-                    GridRow {
-                        self.gridLabel("History limit")
-                        TextField("20", text: self.$store.discordHistoryLimit)
-                            .textFieldStyle(.roundedBorder)
-                    }
-                    GridRow {
-                        self.gridLabel("Slash command")
-                        Toggle("", isOn: self.$store.discordSlashEnabled)
-                            .labelsHidden()
-                            .toggleStyle(.checkbox)
-                    }
-                    GridRow {
-                        self.gridLabel("Slash name")
-                        TextField("clawd", text: self.$store.discordSlashName)
-                            .textFieldStyle(.roundedBorder)
-                    }
-                    GridRow {
-                        self.gridLabel("Slash session prefix")
-                        TextField("discord:slash", text: self.$store.discordSlashSessionPrefix)
-                            .textFieldStyle(.roundedBorder)
-                    }
-                    GridRow {
-                        self.gridLabel("Slash ephemeral")
-                        Toggle("", isOn: self.$store.discordSlashEphemeral)
-                            .labelsHidden()
-                            .toggleStyle(.checkbox)
-                    }
-                }
-
-                Divider().padding(.vertical, 2)
-
-                Text("Tool actions")
-                    .font(.caption)
-                    .foregroundStyle(.secondary)
-
-                Grid(alignment: .leadingFirstTextBaseline, horizontalSpacing: 14, verticalSpacing: 10) {
-                    GridRow {
-                        self.gridLabel("Reactions")
-                        Toggle("", isOn: self.$store.discordActionReactions)
-                            .labelsHidden()
-                            .toggleStyle(.checkbox)
-                    }
-                    GridRow {
-                        self.gridLabel("Stickers")
-                        Toggle("", isOn: self.$store.discordActionStickers)
-                            .labelsHidden()
-                            .toggleStyle(.checkbox)
-                    }
-                    GridRow {
-                        self.gridLabel("Polls")
-                        Toggle("", isOn: self.$store.discordActionPolls)
-                            .labelsHidden()
-                            .toggleStyle(.checkbox)
-                    }
-                    GridRow {
-                        self.gridLabel("Permissions")
-                        Toggle("", isOn: self.$store.discordActionPermissions)
-                            .labelsHidden()
-                            .toggleStyle(.checkbox)
-                    }
-                    GridRow {
-                        self.gridLabel("Messages")
-                        Toggle("", isOn: self.$store.discordActionMessages)
-                            .labelsHidden()
-                            .toggleStyle(.checkbox)
-                    }
-                    GridRow {
-                        self.gridLabel("Threads")
-                        Toggle("", isOn: self.$store.discordActionThreads)
-                            .labelsHidden()
-                            .toggleStyle(.checkbox)
-                    }
-                    GridRow {
-                        self.gridLabel("Pins")
-                        Toggle("", isOn: self.$store.discordActionPins)
-                            .labelsHidden()
-                            .toggleStyle(.checkbox)
-                    }
-                    GridRow {
-                        self.gridLabel("Search")
-                        Toggle("", isOn: self.$store.discordActionSearch)
-                            .labelsHidden()
-                            .toggleStyle(.checkbox)
-                    }
-                    GridRow {
-                        self.gridLabel("Member info")
-                        Toggle("", isOn: self.$store.discordActionMemberInfo)
-                            .labelsHidden()
-                            .toggleStyle(.checkbox)
-                    }
-                    GridRow {
-                        self.gridLabel("Role info")
-                        Toggle("", isOn: self.$store.discordActionRoleInfo)
-                            .labelsHidden()
-                            .toggleStyle(.checkbox)
-                    }
-                    GridRow {
-                        self.gridLabel("Channel info")
-                        Toggle("", isOn: self.$store.discordActionChannelInfo)
-                            .labelsHidden()
-                            .toggleStyle(.checkbox)
-                    }
-                    GridRow {
-                        self.gridLabel("Voice status")
-                        Toggle("", isOn: self.$store.discordActionVoiceStatus)
-                            .labelsHidden()
-                            .toggleStyle(.checkbox)
-                    }
-                    GridRow {
-                        self.gridLabel("Events")
-                        Toggle("", isOn: self.$store.discordActionEvents)
-                            .labelsHidden()
-                            .toggleStyle(.checkbox)
-                    }
-                    GridRow {
-                        self.gridLabel("Role changes")
-                        Toggle("", isOn: self.$store.discordActionRoles)
-                            .labelsHidden()
-                            .toggleStyle(.checkbox)
-                    }
-                    GridRow {
-                        self.gridLabel("Moderation")
-                        Toggle("", isOn: self.$store.discordActionModeration)
-                            .labelsHidden()
-                            .toggleStyle(.checkbox)
-                    }
                 }
 
                 if self.isDiscordTokenLocked {
@@ -466,236 +319,6 @@ struct ConnectionsSettings: View {
         }
     }
 
-    private var signalSection: some View {
-        GroupBox("Signal") {
-            VStack(alignment: .leading, spacing: 10) {
-                self.providerHeader(
-                    title: "Signal REST",
-                    color: self.signalTint,
-                    subtitle: self.signalSummary)
-
-                if let details = self.signalDetails {
-                    Text(details)
-                        .font(.caption)
-                        .foregroundStyle(.secondary)
-                        .fixedSize(horizontal: false, vertical: true)
-                }
-
-                if let status = self.store.configStatus {
-                    Text(status)
-                        .font(.caption)
-                        .foregroundStyle(.secondary)
-                        .fixedSize(horizontal: false, vertical: true)
-                }
-
-                Divider().padding(.vertical, 2)
-
-                Grid(alignment: .leadingFirstTextBaseline, horizontalSpacing: 14, verticalSpacing: 10) {
-                    GridRow {
-                        self.gridLabel("Enabled")
-                        Toggle("", isOn: self.$store.signalEnabled)
-                            .labelsHidden()
-                            .toggleStyle(.checkbox)
-                    }
-                    GridRow {
-                        self.gridLabel("Account")
-                        TextField("+15551234567", text: self.$store.signalAccount)
-                            .textFieldStyle(.roundedBorder)
-                    }
-                    GridRow {
-                        self.gridLabel("HTTP URL")
-                        TextField("http://127.0.0.1:8080", text: self.$store.signalHttpUrl)
-                            .textFieldStyle(.roundedBorder)
-                    }
-                    GridRow {
-                        self.gridLabel("HTTP host")
-                        TextField("127.0.0.1", text: self.$store.signalHttpHost)
-                            .textFieldStyle(.roundedBorder)
-                    }
-                    GridRow {
-                        self.gridLabel("HTTP port")
-                        TextField("8080", text: self.$store.signalHttpPort)
-                            .textFieldStyle(.roundedBorder)
-                    }
-                    GridRow {
-                        self.gridLabel("CLI path")
-                        TextField("signal-cli", text: self.$store.signalCliPath)
-                            .textFieldStyle(.roundedBorder)
-                    }
-                    GridRow {
-                        self.gridLabel("Auto start")
-                        Toggle("", isOn: self.$store.signalAutoStart)
-                            .labelsHidden()
-                            .toggleStyle(.checkbox)
-                    }
-                    GridRow {
-                        self.gridLabel("Receive mode")
-                        Picker("", selection: self.$store.signalReceiveMode) {
-                            Text("Default").tag("")
-                            Text("on-start").tag("on-start")
-                            Text("manual").tag("manual")
-                        }
-                        .labelsHidden()
-                        .pickerStyle(.menu)
-                    }
-                    GridRow {
-                        self.gridLabel("Ignore attachments")
-                        Toggle("", isOn: self.$store.signalIgnoreAttachments)
-                            .labelsHidden()
-                            .toggleStyle(.checkbox)
-                    }
-                    GridRow {
-                        self.gridLabel("Ignore stories")
-                        Toggle("", isOn: self.$store.signalIgnoreStories)
-                            .labelsHidden()
-                            .toggleStyle(.checkbox)
-                    }
-                    GridRow {
-                        self.gridLabel("Read receipts")
-                        Toggle("", isOn: self.$store.signalSendReadReceipts)
-                            .labelsHidden()
-                            .toggleStyle(.checkbox)
-                    }
-                    GridRow {
-                        self.gridLabel("Allow from")
-                        TextField("12345, +1555", text: self.$store.signalAllowFrom)
-                            .textFieldStyle(.roundedBorder)
-                    }
-                    GridRow {
-                        self.gridLabel("Media max MB")
-                        TextField("8", text: self.$store.signalMediaMaxMb)
-                            .textFieldStyle(.roundedBorder)
-                    }
-                }
-
-                HStack(spacing: 12) {
-                    Button {
-                        Task { await self.store.saveSignalConfig() }
-                    } label: {
-                        if self.store.isSavingConfig {
-                            ProgressView().controlSize(.small)
-                        } else {
-                            Text("Save")
-                        }
-                    }
-                    .buttonStyle(.borderedProminent)
-                    .disabled(self.store.isSavingConfig)
-
-                    Spacer()
-
-                    Button("Refresh") {
-                        Task { await self.store.refresh(probe: true) }
-                    }
-                    .buttonStyle(.bordered)
-                    .disabled(self.store.isRefreshing)
-                }
-                .font(.caption)
-            }
-            .frame(maxWidth: .infinity, alignment: .leading)
-        }
-    }
-
-    private var imessageSection: some View {
-        GroupBox("iMessage") {
-            VStack(alignment: .leading, spacing: 10) {
-                self.providerHeader(
-                    title: "iMessage (imsg)",
-                    color: self.imessageTint,
-                    subtitle: self.imessageSummary)
-
-                if let details = self.imessageDetails {
-                    Text(details)
-                        .font(.caption)
-                        .foregroundStyle(.secondary)
-                        .fixedSize(horizontal: false, vertical: true)
-                }
-
-                if let status = self.store.configStatus {
-                    Text(status)
-                        .font(.caption)
-                        .foregroundStyle(.secondary)
-                        .fixedSize(horizontal: false, vertical: true)
-                }
-
-                Divider().padding(.vertical, 2)
-
-                Grid(alignment: .leadingFirstTextBaseline, horizontalSpacing: 14, verticalSpacing: 10) {
-                    GridRow {
-                        self.gridLabel("Enabled")
-                        Toggle("", isOn: self.$store.imessageEnabled)
-                            .labelsHidden()
-                            .toggleStyle(.checkbox)
-                    }
-                    GridRow {
-                        self.gridLabel("CLI path")
-                        TextField("imsg", text: self.$store.imessageCliPath)
-                            .textFieldStyle(.roundedBorder)
-                    }
-                    GridRow {
-                        self.gridLabel("DB path")
-                        TextField("~/Library/Messages/chat.db", text: self.$store.imessageDbPath)
-                            .textFieldStyle(.roundedBorder)
-                    }
-                    GridRow {
-                        self.gridLabel("Service")
-                        Picker("", selection: self.$store.imessageService) {
-                            Text("auto").tag("auto")
-                            Text("imessage").tag("imessage")
-                            Text("sms").tag("sms")
-                        }
-                        .labelsHidden()
-                        .pickerStyle(.menu)
-                    }
-                    GridRow {
-                        self.gridLabel("Region")
-                        TextField("US", text: self.$store.imessageRegion)
-                            .textFieldStyle(.roundedBorder)
-                    }
-                    GridRow {
-                        self.gridLabel("Allow from")
-                        TextField("chat_id:101, +1555", text: self.$store.imessageAllowFrom)
-                            .textFieldStyle(.roundedBorder)
-                    }
-                    GridRow {
-                        self.gridLabel("Attachments")
-                        Toggle("", isOn: self.$store.imessageIncludeAttachments)
-                            .labelsHidden()
-                            .toggleStyle(.checkbox)
-                    }
-                    GridRow {
-                        self.gridLabel("Media max MB")
-                        TextField("16", text: self.$store.imessageMediaMaxMb)
-                            .textFieldStyle(.roundedBorder)
-                    }
-                }
-
-                HStack(spacing: 12) {
-                    Button {
-                        Task { await self.store.saveIMessageConfig() }
-                    } label: {
-                        if self.store.isSavingConfig {
-                            ProgressView().controlSize(.small)
-                        } else {
-                            Text("Save")
-                        }
-                    }
-                    .buttonStyle(.borderedProminent)
-                    .disabled(self.store.isSavingConfig)
-
-                    Spacer()
-
-                    Button("Refresh") {
-                        Task { await self.store.refresh(probe: true) }
-                    }
-                    .buttonStyle(.bordered)
-                    .disabled(self.store.isRefreshing)
-                }
-                .font(.caption)
-            }
-            .frame(maxWidth: .infinity, alignment: .leading)
-        }
-    }
-
     private var whatsAppTint: Color {
         guard let status = self.store.snapshot?.whatsapp else { return .secondary }
         if !status.configured { return .secondary }
@@ -724,24 +347,6 @@ struct ConnectionsSettings: View {
         return .orange
     }
 
-    private var signalTint: Color {
-        guard let status = self.store.snapshot?.signal else { return .secondary }
-        if !status.configured { return .secondary }
-        if status.lastError != nil { return .orange }
-        if status.probe?.ok == false { return .orange }
-        if status.running { return .green }
-        return .orange
-    }
-
-    private var imessageTint: Color {
-        guard let status = self.store.snapshot?.imessage else { return .secondary }
-        if !status.configured { return .secondary }
-        if status.lastError != nil { return .orange }
-        if status.probe?.ok == false { return .orange }
-        if status.running { return .green }
-        return .orange
-    }
-
     private var whatsAppSummary: String {
         guard let status = self.store.snapshot?.whatsapp else { return "Checking…" }
         if !status.linked { return "Not linked" }
@@ -764,20 +369,6 @@ struct ConnectionsSettings: View {
         return "Configured"
     }
 
-    private var signalSummary: String {
-        guard let status = self.store.snapshot?.signal else { return "Checking…" }
-        if !status.configured { return "Not configured" }
-        if status.running { return "Running" }
-        return "Configured"
-    }
-
-    private var imessageSummary: String {
-        guard let status = self.store.snapshot?.imessage else { return "Checking…" }
-        if !status.configured { return "Not configured" }
-        if status.running { return "Running" }
-        return "Configured"
-    }
-
     private var whatsAppDetails: String? {
         guard let status = self.store.snapshot?.whatsapp else { return nil }
         var lines: [String] = []
@@ -867,54 +458,6 @@ struct ConnectionsSettings: View {
         return lines.isEmpty ? nil : lines.joined(separator: " · ")
     }
 
-    private var signalDetails: String? {
-        guard let status = self.store.snapshot?.signal else { return nil }
-        var lines: [String] = []
-        lines.append("Base URL: \(status.baseUrl)")
-        if let probe = status.probe {
-            if probe.ok {
-                if let version = probe.version, !version.isEmpty {
-                    lines.append("Version \(version)")
-                }
-                if let elapsed = probe.elapsedMs {
-                    lines.append("Probe \(Int(elapsed))ms")
-                }
-            } else {
-                let code = probe.status.map { String($0) } ?? "unknown"
-                lines.append("Probe failed (\(code))")
-            }
-        }
-        if let last = self.date(fromMs: status.lastProbeAt) {
-            lines.append("Last probe \(relativeAge(from: last))")
-        }
-        if let err = status.lastError, !err.isEmpty {
-            lines.append("Error: \(err)")
-        }
-        return lines.isEmpty ? nil : lines.joined(separator: " · ")
-    }
-
-    private var imessageDetails: String? {
-        guard let status = self.store.snapshot?.imessage else { return nil }
-        var lines: [String] = []
-        if let cliPath = status.cliPath, !cliPath.isEmpty {
-            lines.append("CLI: \(cliPath)")
-        }
-        if let dbPath = status.dbPath, !dbPath.isEmpty {
-            lines.append("DB: \(dbPath)")
-        }
-        if let probe = status.probe, !probe.ok {
-            let err = probe.error ?? "probe failed"
-            lines.append("Probe error: \(err)")
-        }
-        if let last = self.date(fromMs: status.lastProbeAt) {
-            lines.append("Last probe \(relativeAge(from: last))")
-        }
-        if let err = status.lastError, !err.isEmpty {
-            lines.append("Error: \(err)")
-        }
-        return lines.isEmpty ? nil : lines.joined(separator: " · ")
-    }
-
     private var isTelegramTokenLocked: Bool {
         self.store.snapshot?.telegram.tokenSource == "env"
     }
@@ -923,51 +466,6 @@ struct ConnectionsSettings: View {
         self.store.snapshot?.discord?.tokenSource == "env"
     }
 
-    private var orderedProviders: [ConnectionProvider] {
-        ConnectionProvider.allCases.sorted { lhs, rhs in
-            let lhsEnabled = self.providerEnabled(lhs)
-            let rhsEnabled = self.providerEnabled(rhs)
-            if lhsEnabled != rhsEnabled { return lhsEnabled && !rhsEnabled }
-            return lhs.sortOrder < rhs.sortOrder
-        }
-    }
-
-    private func providerEnabled(_ provider: ConnectionProvider) -> Bool {
-        switch provider {
-        case .whatsapp:
-            guard let status = self.store.snapshot?.whatsapp else { return false }
-            return status.configured || status.linked || status.running
-        case .telegram:
-            guard let status = self.store.snapshot?.telegram else { return false }
-            return status.configured || status.running
-        case .discord:
-            guard let status = self.store.snapshot?.discord else { return false }
-            return status.configured || status.running
-        case .signal:
-            guard let status = self.store.snapshot?.signal else { return false }
-            return status.configured || status.running
-        case .imessage:
-            guard let status = self.store.snapshot?.imessage else { return false }
-            return status.configured || status.running
-        }
-    }
-
-    @ViewBuilder
-    private func providerSection(_ provider: ConnectionProvider) -> some View {
-        switch provider {
-        case .whatsapp:
-            self.whatsAppSection
-        case .telegram:
-            self.telegramSection
-        case .discord:
-            self.discordSection
-        case .signal:
-            self.signalSection
-        case .imessage:
-            self.imessageSection
-        }
-    }
-
     private func providerHeader(title: String, color: Color, subtitle: String) -> some View {
         HStack(spacing: 10) {
             Circle()

apps/macos/Sources/Clawdis/ConnectionsStore.swift

@@ -85,48 +85,10 @@ struct ProvidersStatusSnapshot: Codable {
         let lastProbeAt: Double?
     }
 
-    struct SignalProbe: Codable {
-        let ok: Bool
-        let status: Int?
-        let error: String?
-        let elapsedMs: Double?
-        let version: String?
-    }
-
-    struct SignalStatus: Codable {
-        let configured: Bool
-        let baseUrl: String
-        let running: Bool
-        let lastStartAt: Double?
-        let lastStopAt: Double?
-        let lastError: String?
-        let probe: SignalProbe?
-        let lastProbeAt: Double?
-    }
-
-    struct IMessageProbe: Codable {
-        let ok: Bool
-        let error: String?
-    }
-
-    struct IMessageStatus: Codable {
-        let configured: Bool
-        let running: Bool
-        let lastStartAt: Double?
-        let lastStopAt: Double?
-        let lastError: String?
-        let cliPath: String?
-        let dbPath: String?
-        let probe: IMessageProbe?
-        let lastProbeAt: Double?
-    }
-
     let ts: Double
     let whatsapp: WhatsAppStatus
     let telegram: TelegramStatus
     let discord: DiscordStatus?
-    let signal: SignalStatus?
-    let imessage: IMessageStatus?
 }
 
 struct ConfigSnapshot: Codable {
@@ -167,53 +129,12 @@ final class ConnectionsStore {
     var telegramWebhookSecret: String = ""
     var telegramWebhookPath: String = ""
     var telegramBusy = false
-    var discordEnabled = true
     var discordToken: String = ""
+    var discordRequireMention = true
     var discordAllowFrom: String = ""
-    var discordGroupEnabled = false
-    var discordGroupChannels: String = ""
+    var discordGuildAllowFrom: String = ""
+    var discordGuildUsersAllowFrom: String = ""
     var discordMediaMaxMb: String = ""
-    var discordHistoryLimit: String = ""
-    var discordActionReactions = true
-    var discordActionStickers = true
-    var discordActionPolls = true
-    var discordActionPermissions = true
-    var discordActionMessages = true
-    var discordActionThreads = true
-    var discordActionPins = true
-    var discordActionSearch = true
-    var discordActionMemberInfo = true
-    var discordActionRoleInfo = true
-    var discordActionChannelInfo = true
-    var discordActionVoiceStatus = true
-    var discordActionEvents = true
-    var discordActionRoles = false
-    var discordActionModeration = false
-    var discordSlashEnabled = false
-    var discordSlashName: String = ""
-    var discordSlashSessionPrefix: String = ""
-    var discordSlashEphemeral = true
-    var signalEnabled = true
-    var signalAccount: String = ""
-    var signalHttpUrl: String = ""
-    var signalHttpHost: String = ""
-    var signalHttpPort: String = ""
-    var signalCliPath: String = ""
-    var signalAutoStart = true
-    var signalReceiveMode: String = ""
-    var signalIgnoreAttachments = false
-    var signalIgnoreStories = false
-    var signalSendReadReceipts = false
-    var signalAllowFrom: String = ""
-    var signalMediaMaxMb: String = ""
-    var imessageEnabled = true
-    var imessageCliPath: String = ""
-    var imessageDbPath: String = ""
-    var imessageService: String = "auto"
-    var imessageRegion: String = ""
-    var imessageAllowFrom: String = ""
-    var imessageIncludeAttachments = false
-    var imessageMediaMaxMb: String = ""
     var configStatus: String?
     var isSavingConfig = false
 
@@ -398,10 +319,9 @@ final class ConnectionsStore {
             self.telegramWebhookPath = telegram?["webhookPath"]?.stringValue ?? ""
 
             let discord = snap.config?["discord"]?.dictionaryValue
-            self.discordEnabled = discord?["enabled"]?.boolValue ?? true
             self.discordToken = discord?["token"]?.stringValue ?? ""
-            let discordDm = discord?["dm"]?.dictionaryValue
-            if let allow = discordDm?["allowFrom"]?.arrayValue {
+            self.discordRequireMention = discord?["requireMention"]?.boolValue ?? true
+            if let allow = discord?["allowFrom"]?.arrayValue {
                 let strings = allow.compactMap { entry -> String? in
                     if let str = entry.stringValue { return str }
                     if let intVal = entry.intValue { return String(intVal) }
@@ -412,106 +332,38 @@ final class ConnectionsStore {
             } else {
                 self.discordAllowFrom = ""
             }
-            self.discordGroupEnabled = discordDm?["groupEnabled"]?.boolValue ?? false
-            if let channels = discordDm?["groupChannels"]?.arrayValue {
-                let strings = channels.compactMap { entry -> String? in
-                    if let str = entry.stringValue { return str }
-                    if let intVal = entry.intValue { return String(intVal) }
-                    if let doubleVal = entry.doubleValue { return String(Int(doubleVal)) }
-                    return nil
+            if let guildAllow = discord?["guildAllowFrom"]?.dictionaryValue {
+                if let guilds = guildAllow["guilds"]?.arrayValue {
+                    let strings = guilds.compactMap { entry -> String? in
+                        if let str = entry.stringValue { return str }
+                        if let intVal = entry.intValue { return String(intVal) }
+                        if let doubleVal = entry.doubleValue { return String(Int(doubleVal)) }
+                        return nil
+                    }
+                    self.discordGuildAllowFrom = strings.joined(separator: ", ")
+                } else {
+                    self.discordGuildAllowFrom = ""
+                }
+                if let users = guildAllow["users"]?.arrayValue {
+                    let strings = users.compactMap { entry -> String? in
+                        if let str = entry.stringValue { return str }
+                        if let intVal = entry.intValue { return String(intVal) }
+                        if let doubleVal = entry.doubleValue { return String(Int(doubleVal)) }
+                        return nil
+                    }
+                    self.discordGuildUsersAllowFrom = strings.joined(separator: ", ")
+                } else {
+                    self.discordGuildUsersAllowFrom = ""
                 }
-                self.discordGroupChannels = strings.joined(separator: ", ")
             } else {
-                self.discordGroupChannels = ""
+                self.discordGuildAllowFrom = ""
+                self.discordGuildUsersAllowFrom = ""
             }
             if let media = discord?["mediaMaxMb"]?.doubleValue ?? discord?["mediaMaxMb"]?.intValue.map(Double.init) {
                 self.discordMediaMaxMb = String(Int(media))
             } else {
                 self.discordMediaMaxMb = ""
             }
-            if let history = discord?["historyLimit"]?.doubleValue ?? discord?["historyLimit"]?.intValue.map(Double.init) {
-                self.discordHistoryLimit = String(Int(history))
-            } else {
-                self.discordHistoryLimit = ""
-            }
-            let discordActions = discord?["actions"]?.dictionaryValue
-            self.discordActionReactions = discordActions?["reactions"]?.boolValue ?? true
-            self.discordActionStickers = discordActions?["stickers"]?.boolValue ?? true
-            self.discordActionPolls = discordActions?["polls"]?.boolValue ?? true
-            self.discordActionPermissions = discordActions?["permissions"]?.boolValue ?? true
-            self.discordActionMessages = discordActions?["messages"]?.boolValue ?? true
-            self.discordActionThreads = discordActions?["threads"]?.boolValue ?? true
-            self.discordActionPins = discordActions?["pins"]?.boolValue ?? true
-            self.discordActionSearch = discordActions?["search"]?.boolValue ?? true
-            self.discordActionMemberInfo = discordActions?["memberInfo"]?.boolValue ?? true
-            self.discordActionRoleInfo = discordActions?["roleInfo"]?.boolValue ?? true
-            self.discordActionChannelInfo = discordActions?["channelInfo"]?.boolValue ?? true
-            self.discordActionVoiceStatus = discordActions?["voiceStatus"]?.boolValue ?? true
-            self.discordActionEvents = discordActions?["events"]?.boolValue ?? true
-            self.discordActionRoles = discordActions?["roles"]?.boolValue ?? false
-            self.discordActionModeration = discordActions?["moderation"]?.boolValue ?? false
-            let slash = discord?["slashCommand"]?.dictionaryValue
-            self.discordSlashEnabled = slash?["enabled"]?.boolValue ?? false
-            self.discordSlashName = slash?["name"]?.stringValue ?? ""
-            self.discordSlashSessionPrefix = slash?["sessionPrefix"]?.stringValue ?? ""
-            self.discordSlashEphemeral = slash?["ephemeral"]?.boolValue ?? true
-
-            let signal = snap.config?["signal"]?.dictionaryValue
-            self.signalEnabled = signal?["enabled"]?.boolValue ?? true
-            self.signalAccount = signal?["account"]?.stringValue ?? ""
-            self.signalHttpUrl = signal?["httpUrl"]?.stringValue ?? ""
-            self.signalHttpHost = signal?["httpHost"]?.stringValue ?? ""
-            if let port = signal?["httpPort"]?.doubleValue ?? signal?["httpPort"]?.intValue.map(Double.init) {
-                self.signalHttpPort = String(Int(port))
-            } else {
-                self.signalHttpPort = ""
-            }
-            self.signalCliPath = signal?["cliPath"]?.stringValue ?? ""
-            self.signalAutoStart = signal?["autoStart"]?.boolValue ?? true
-            self.signalReceiveMode = signal?["receiveMode"]?.stringValue ?? ""
-            self.signalIgnoreAttachments = signal?["ignoreAttachments"]?.boolValue ?? false
-            self.signalIgnoreStories = signal?["ignoreStories"]?.boolValue ?? false
-            self.signalSendReadReceipts = signal?["sendReadReceipts"]?.boolValue ?? false
-            if let allow = signal?["allowFrom"]?.arrayValue {
-                let strings = allow.compactMap { entry -> String? in
-                    if let str = entry.stringValue { return str }
-                    if let intVal = entry.intValue { return String(intVal) }
-                    if let doubleVal = entry.doubleValue { return String(Int(doubleVal)) }
-                    return nil
-                }
-                self.signalAllowFrom = strings.joined(separator: ", ")
-            } else {
-                self.signalAllowFrom = ""
-            }
-            if let media = signal?["mediaMaxMb"]?.doubleValue ?? signal?["mediaMaxMb"]?.intValue.map(Double.init) {
-                self.signalMediaMaxMb = String(Int(media))
-            } else {
-                self.signalMediaMaxMb = ""
-            }
-
-            let imessage = snap.config?["imessage"]?.dictionaryValue
-            self.imessageEnabled = imessage?["enabled"]?.boolValue ?? true
-            self.imessageCliPath = imessage?["cliPath"]?.stringValue ?? ""
-            self.imessageDbPath = imessage?["dbPath"]?.stringValue ?? ""
-            self.imessageService = imessage?["service"]?.stringValue ?? "auto"
-            self.imessageRegion = imessage?["region"]?.stringValue ?? ""
-            if let allow = imessage?["allowFrom"]?.arrayValue {
-                let strings = allow.compactMap { entry -> String? in
-                    if let str = entry.stringValue { return str }
-                    if let intVal = entry.intValue { return String(intVal) }
-                    if let doubleVal = entry.doubleValue { return String(Int(doubleVal)) }
-                    return nil
-                }
-                self.imessageAllowFrom = strings.joined(separator: ", ")
-            } else {
-                self.imessageAllowFrom = ""
-            }
-            self.imessageIncludeAttachments = imessage?["includeAttachments"]?.boolValue ?? false
-            if let media = imessage?["mediaMaxMb"]?.doubleValue ?? imessage?["mediaMaxMb"]?.intValue.map(Double.init) {
-                self.imessageMediaMaxMb = String(Int(media))
-            } else {
-                self.imessageMediaMaxMb = ""
-            }
         } catch {
             self.configStatus = error.localizedDescription
         }
@@ -612,11 +464,6 @@ final class ConnectionsStore {
         }
 
         var discord: [String: Any] = (self.configRoot["discord"] as? [String: Any]) ?? [:]
-        if self.discordEnabled {
-            discord.removeValue(forKey: "enabled")
-        } else {
-            discord["enabled"] = false
-        }
         let token = self.discordToken.trimmingCharacters(in: .whitespacesAndNewlines)
         if token.isEmpty {
             discord.removeValue(forKey: "token")
@@ -624,37 +471,43 @@ final class ConnectionsStore {
             discord["token"] = token
         }
 
-        var dm: [String: Any] = (discord["dm"] as? [String: Any]) ?? [:]
+        discord["requireMention"] = self.discordRequireMention
+
         let allow = self.discordAllowFrom
             .split(separator: ",")
             .map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }
             .filter { !$0.isEmpty }
         if allow.isEmpty {
-            dm.removeValue(forKey: "allowFrom")
+            discord.removeValue(forKey: "allowFrom")
         } else {
-            dm["allowFrom"] = allow
+            discord["allowFrom"] = allow
         }
 
-        if self.discordGroupEnabled {
-            dm["groupEnabled"] = true
-        } else {
-            dm.removeValue(forKey: "groupEnabled")
-        }
-
-        let groupChannels = self.discordGroupChannels
+        var guildAllow: [String: Any] = (discord["guildAllowFrom"] as? [String: Any]) ?? [:]
+        let guilds = self.discordGuildAllowFrom
             .split(separator: ",")
             .map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }
             .filter { !$0.isEmpty }
-        if groupChannels.isEmpty {
-            dm.removeValue(forKey: "groupChannels")
+        if guilds.isEmpty {
+            guildAllow.removeValue(forKey: "guilds")
         } else {
-            dm["groupChannels"] = groupChannels
+            guildAllow["guilds"] = guilds
         }
 
-        if dm.isEmpty {
-            discord.removeValue(forKey: "dm")
+        let users = self.discordGuildUsersAllowFrom
+            .split(separator: ",")
+            .map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }
+            .filter { !$0.isEmpty }
+        if users.isEmpty {
+            guildAllow.removeValue(forKey: "users")
         } else {
-            discord["dm"] = dm
+            guildAllow["users"] = users
+        }
+
+        if guildAllow.isEmpty {
+            discord.removeValue(forKey: "guildAllowFrom")
+        } else {
+            discord["guildAllowFrom"] = guildAllow
         }
 
         let media = self.discordMediaMaxMb.trimmingCharacters(in: .whitespacesAndNewlines)
@@ -664,73 +517,6 @@ final class ConnectionsStore {
             discord["mediaMaxMb"] = value
         }
 
-        let history = self.discordHistoryLimit.trimmingCharacters(in: .whitespacesAndNewlines)
-        if history.isEmpty {
-            discord.removeValue(forKey: "historyLimit")
-        } else if let value = Int(history), value >= 0 {
-            discord["historyLimit"] = value
-        } else {
-            discord.removeValue(forKey: "historyLimit")
-        }
-
-        var actions: [String: Any] = (discord["actions"] as? [String: Any]) ?? [:]
-        func setAction(_ key: String, value: Bool, defaultValue: Bool) {
-            if value == defaultValue {
-                actions.removeValue(forKey: key)
-            } else {
-                actions[key] = value
-            }
-        }
-        setAction("reactions", value: self.discordActionReactions, defaultValue: true)
-        setAction("stickers", value: self.discordActionStickers, defaultValue: true)
-        setAction("polls", value: self.discordActionPolls, defaultValue: true)
-        setAction("permissions", value: self.discordActionPermissions, defaultValue: true)
-        setAction("messages", value: self.discordActionMessages, defaultValue: true)
-        setAction("threads", value: self.discordActionThreads, defaultValue: true)
-        setAction("pins", value: self.discordActionPins, defaultValue: true)
-        setAction("search", value: self.discordActionSearch, defaultValue: true)
-        setAction("memberInfo", value: self.discordActionMemberInfo, defaultValue: true)
-        setAction("roleInfo", value: self.discordActionRoleInfo, defaultValue: true)
-        setAction("channelInfo", value: self.discordActionChannelInfo, defaultValue: true)
-        setAction("voiceStatus", value: self.discordActionVoiceStatus, defaultValue: true)
-        setAction("events", value: self.discordActionEvents, defaultValue: true)
-        setAction("roles", value: self.discordActionRoles, defaultValue: false)
-        setAction("moderation", value: self.discordActionModeration, defaultValue: false)
-        if actions.isEmpty {
-            discord.removeValue(forKey: "actions")
-        } else {
-            discord["actions"] = actions
-        }
-
-        var slash: [String: Any] = (discord["slashCommand"] as? [String: Any]) ?? [:]
-        if self.discordSlashEnabled {
-            slash["enabled"] = true
-        } else {
-            slash.removeValue(forKey: "enabled")
-        }
-        let slashName = self.discordSlashName.trimmingCharacters(in: .whitespacesAndNewlines)
-        if slashName.isEmpty {
-            slash.removeValue(forKey: "name")
-        } else {
-            slash["name"] = slashName
-        }
-        let slashPrefix = self.discordSlashSessionPrefix.trimmingCharacters(in: .whitespacesAndNewlines)
-        if slashPrefix.isEmpty {
-            slash.removeValue(forKey: "sessionPrefix")
-        } else {
-            slash["sessionPrefix"] = slashPrefix
-        }
-        if self.discordSlashEphemeral {
-            slash.removeValue(forKey: "ephemeral")
-        } else {
-            slash["ephemeral"] = false
-        }
-        if slash.isEmpty {
-            discord.removeValue(forKey: "slashCommand")
-        } else {
-            discord["slashCommand"] = slash
-        }
-
         if discord.isEmpty {
             self.configRoot.removeValue(forKey: "discord")
         } else {
@@ -756,220 +542,6 @@ final class ConnectionsStore {
             self.configStatus = error.localizedDescription
         }
     }
-
-    func saveSignalConfig() async {
-        guard !self.isSavingConfig else { return }
-        self.isSavingConfig = true
-        defer { self.isSavingConfig = false }
-        if !self.configLoaded {
-            await self.loadConfig()
-        }
-
-        var signal: [String: Any] = (self.configRoot["signal"] as? [String: Any]) ?? [:]
-        if self.signalEnabled {
-            signal.removeValue(forKey: "enabled")
-        } else {
-            signal["enabled"] = false
-        }
-
-        let account = self.signalAccount.trimmingCharacters(in: .whitespacesAndNewlines)
-        if account.isEmpty {
-            signal.removeValue(forKey: "account")
-        } else {
-            signal["account"] = account
-        }
-
-        let httpUrl = self.signalHttpUrl.trimmingCharacters(in: .whitespacesAndNewlines)
-        if httpUrl.isEmpty {
-            signal.removeValue(forKey: "httpUrl")
-        } else {
-            signal["httpUrl"] = httpUrl
-        }
-
-        let httpHost = self.signalHttpHost.trimmingCharacters(in: .whitespacesAndNewlines)
-        if httpHost.isEmpty {
-            signal.removeValue(forKey: "httpHost")
-        } else {
-            signal["httpHost"] = httpHost
-        }
-
-        let httpPort = self.signalHttpPort.trimmingCharacters(in: .whitespacesAndNewlines)
-        if httpPort.isEmpty {
-            signal.removeValue(forKey: "httpPort")
-        } else if let value = Double(httpPort) {
-            signal["httpPort"] = value
-        }
-
-        let cliPath = self.signalCliPath.trimmingCharacters(in: .whitespacesAndNewlines)
-        if cliPath.isEmpty {
-            signal.removeValue(forKey: "cliPath")
-        } else {
-            signal["cliPath"] = cliPath
-        }
-
-        if self.signalAutoStart {
-            signal.removeValue(forKey: "autoStart")
-        } else {
-            signal["autoStart"] = false
-        }
-
-        let receiveMode = self.signalReceiveMode.trimmingCharacters(in: .whitespacesAndNewlines)
-        if receiveMode.isEmpty {
-            signal.removeValue(forKey: "receiveMode")
-        } else {
-            signal["receiveMode"] = receiveMode
-        }
-
-        if self.signalIgnoreAttachments {
-            signal["ignoreAttachments"] = true
-        } else {
-            signal.removeValue(forKey: "ignoreAttachments")
-        }
-        if self.signalIgnoreStories {
-            signal["ignoreStories"] = true
-        } else {
-            signal.removeValue(forKey: "ignoreStories")
-        }
-        if self.signalSendReadReceipts {
-            signal["sendReadReceipts"] = true
-        } else {
-            signal.removeValue(forKey: "sendReadReceipts")
-        }
-
-        let allow = self.signalAllowFrom
-            .split(separator: ",")
-            .map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }
-            .filter { !$0.isEmpty }
-        if allow.isEmpty {
-            signal.removeValue(forKey: "allowFrom")
-        } else {
-            signal["allowFrom"] = allow
-        }
-
-        let media = self.signalMediaMaxMb.trimmingCharacters(in: .whitespacesAndNewlines)
-        if media.isEmpty {
-            signal.removeValue(forKey: "mediaMaxMb")
-        } else if let value = Double(media) {
-            signal["mediaMaxMb"] = value
-        }
-
-        if signal.isEmpty {
-            self.configRoot.removeValue(forKey: "signal")
-        } else {
-            self.configRoot["signal"] = signal
-        }
-
-        do {
-            let data = try JSONSerialization.data(
-                withJSONObject: self.configRoot,
-                options: [.prettyPrinted, .sortedKeys])
-            guard let raw = String(data: data, encoding: .utf8) else {
-                self.configStatus = "Failed to encode config."
-                return
-            }
-            let params: [String: AnyCodable] = ["raw": AnyCodable(raw)]
-            _ = try await GatewayConnection.shared.requestRaw(
-                method: .configSet,
-                params: params,
-                timeoutMs: 10000)
-            self.configStatus = "Saved to ~/.clawdis/clawdis.json."
-            await self.refresh(probe: true)
-        } catch {
-            self.configStatus = error.localizedDescription
-        }
-    }
-
-    func saveIMessageConfig() async {
-        guard !self.isSavingConfig else { return }
-        self.isSavingConfig = true
-        defer { self.isSavingConfig = false }
-        if !self.configLoaded {
-            await self.loadConfig()
-        }
-
-        var imessage: [String: Any] = (self.configRoot["imessage"] as? [String: Any]) ?? [:]
-        if self.imessageEnabled {
-            imessage.removeValue(forKey: "enabled")
-        } else {
-            imessage["enabled"] = false
-        }
-
-        let cliPath = self.imessageCliPath.trimmingCharacters(in: .whitespacesAndNewlines)
-        if cliPath.isEmpty {
-            imessage.removeValue(forKey: "cliPath")
-        } else {
-            imessage["cliPath"] = cliPath
-        }
-
-        let dbPath = self.imessageDbPath.trimmingCharacters(in: .whitespacesAndNewlines)
-        if dbPath.isEmpty {
-            imessage.removeValue(forKey: "dbPath")
-        } else {
-            imessage["dbPath"] = dbPath
-        }
-
-        let service = self.imessageService.trimmingCharacters(in: .whitespacesAndNewlines)
-        if service.isEmpty || service == "auto" {
-            imessage.removeValue(forKey: "service")
-        } else {
-            imessage["service"] = service
-        }
-
-        let region = self.imessageRegion.trimmingCharacters(in: .whitespacesAndNewlines)
-        if region.isEmpty {
-            imessage.removeValue(forKey: "region")
-        } else {
-            imessage["region"] = region
-        }
-
-        let allow = self.imessageAllowFrom
-            .split(separator: ",")
-            .map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }
-            .filter { !$0.isEmpty }
-        if allow.isEmpty {
-            imessage.removeValue(forKey: "allowFrom")
-        } else {
-            imessage["allowFrom"] = allow
-        }
-
-        if self.imessageIncludeAttachments {
-            imessage["includeAttachments"] = true
-        } else {
-            imessage.removeValue(forKey: "includeAttachments")
-        }
-
-        let media = self.imessageMediaMaxMb.trimmingCharacters(in: .whitespacesAndNewlines)
-        if media.isEmpty {
-            imessage.removeValue(forKey: "mediaMaxMb")
-        } else if let value = Double(media) {
-            imessage["mediaMaxMb"] = value
-        }
-
-        if imessage.isEmpty {
-            self.configRoot.removeValue(forKey: "imessage")
-        } else {
-            self.configRoot["imessage"] = imessage
-        }
-
-        do {
-            let data = try JSONSerialization.data(
-                withJSONObject: self.configRoot,
-                options: [.prettyPrinted, .sortedKeys])
-            guard let raw = String(data: data, encoding: .utf8) else {
-                self.configStatus = "Failed to encode config."
-                return
-            }
-            let params: [String: AnyCodable] = ["raw": AnyCodable(raw)]
-            _ = try await GatewayConnection.shared.requestRaw(
-                method: .configSet,
-                params: params,
-                timeoutMs: 10000)
-            self.configStatus = "Saved to ~/.clawdis/clawdis.json."
-            await self.refresh(probe: true)
-        } catch {
-            self.configStatus = error.localizedDescription
-        }
-    }
 }
 
 private struct WhatsAppLoginStartResult: Codable {

apps/macos/Sources/Clawdis/ContextMenuCardView.swift

@@ -79,7 +79,7 @@ struct ContextMenuCardView: View {
                 height: self.barHeight)
 
             HStack(alignment: .firstTextBaseline, spacing: 8) {
-                Text(row.label)
+                Text(row.key)
                     .font(.caption.weight(row.key == "main" ? .semibold : .regular))
                     .lineLimit(1)
                     .truncationMode(.middle)

apps/macos/Sources/Clawdis/ControlChannel.swift

@@ -63,11 +63,9 @@ final class ControlChannel {
                 self.logger.info("control channel state -> connecting")
             case .disconnected:
                 self.logger.info("control channel state -> disconnected")
-                self.scheduleRecovery(reason: "disconnected")
             case let .degraded(message):
                 let detail = message.isEmpty ? "degraded" : "degraded: \(message)"
                 self.logger.info("control channel state -> \(detail, privacy: .public)")
-                self.scheduleRecovery(reason: message)
             }
         }
     }
@@ -76,15 +74,12 @@ final class ControlChannel {
     private let logger = Logger(subsystem: "com.steipete.clawdis", category: "control")
 
     private var eventTask: Task<Void, Never>?
-    private var recoveryTask: Task<Void, Never>?
-    private var lastRecoveryAt: Date?
 
     private init() {
         self.startEventStream()
     }
 
     func configure() async {
-        self.logger.info("control channel configure mode=local")
         self.state = .connecting
         do {
             try await GatewayConnection.shared.refresh()
@@ -103,9 +98,6 @@ final class ControlChannel {
         case let .remote(target, identity):
             do {
                 _ = (target, identity)
-                let idSet = !identity.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
-                self.logger.info(
-                    "control channel configure mode=remote target=\(target, privacy: .public) identitySet=\(idSet, privacy: .public)")
                 _ = try await GatewayEndpointStore.shared.ensureRemoteControlTunnel()
                 await self.configure()
             } catch {
@@ -239,52 +231,7 @@ final class ControlChannel {
         }
 
         let detail = nsError.localizedDescription.isEmpty ? "unknown gateway error" : nsError.localizedDescription
-        let trimmed = detail.trimmingCharacters(in: .whitespacesAndNewlines)
-        if trimmed.lowercased().hasPrefix("gateway error:") { return trimmed }
-        return "Gateway error: \(trimmed)"
-    }
-
-    private func scheduleRecovery(reason: String) {
-        let now = Date()
-        if let last = self.lastRecoveryAt, now.timeIntervalSince(last) < 10 { return }
-        guard self.recoveryTask == nil else { return }
-        self.lastRecoveryAt = now
-
-        self.recoveryTask = Task { [weak self] in
-            guard let self else { return }
-            let mode = await MainActor.run { AppStateStore.shared.connectionMode }
-            guard mode != .unconfigured else {
-                self.recoveryTask = nil
-                return
-            }
-
-            let trimmedReason = reason.trimmingCharacters(in: .whitespacesAndNewlines)
-            let reasonText = trimmedReason.isEmpty ? "unknown" : trimmedReason
-            self.logger.info(
-                "control channel recovery starting mode=\(String(describing: mode), privacy: .public) reason=\(reasonText, privacy: .public)")
-            if mode == .local {
-                GatewayProcessManager.shared.setActive(true)
-            }
-            if mode == .remote {
-                do {
-                    let port = try await GatewayEndpointStore.shared.ensureRemoteControlTunnel()
-                    self.logger.info("control channel recovery ensured SSH tunnel port=\(port, privacy: .public)")
-                } catch {
-                    self.logger.error(
-                        "control channel recovery tunnel failed \(error.localizedDescription, privacy: .public)")
-                }
-            }
-
-            do {
-                try await GatewayConnection.shared.refresh()
-                self.logger.info("control channel recovery finished")
-            } catch {
-                self.logger.error(
-                    "control channel recovery failed \(error.localizedDescription, privacy: .public)")
-            }
-
-            self.recoveryTask = nil
-        }
+        return "Gateway error: \(detail)"
     }
 
     func sendSystemEvent(_ text: String, params: [String: AnyHashable] = [:]) async throws {

apps/macos/Sources/Clawdis/GatewayChannel.swift

@@ -66,7 +66,6 @@ actor GatewayChannelActor {
     private var connectWaiters: [CheckedContinuation<Void, Error>] = []
     private var url: URL
     private var token: String?
-    private var password: String?
     private let session: WebSocketSessioning
     private var backoffMs: Double = 500
     private var shouldReconnect = true
@@ -83,13 +82,11 @@ actor GatewayChannelActor {
     init(
         url: URL,
         token: String?,
-        password: String? = nil,
         session: WebSocketSessionBox? = nil,
         pushHandler: (@Sendable (GatewayPush) async -> Void)? = nil)
     {
         self.url = url
         self.token = token
-        self.password = password
         self.session = session?.session ?? URLSession(configuration: .default)
         self.pushHandler = pushHandler
         Task { [weak self] in
@@ -217,8 +214,6 @@ actor GatewayChannelActor {
         ]
         if let token = self.token {
             params["auth"] = ProtoAnyCodable(["token": ProtoAnyCodable(token)])
-        } else if let password = self.password {
-            params["auth"] = ProtoAnyCodable(["password": ProtoAnyCodable(password)])
         }
 
         let frame = RequestFrame(

apps/macos/Sources/Clawdis/GatewayConnection.swift

@@ -40,7 +40,7 @@ struct GatewayAgentInvocation: Sendable {
 actor GatewayConnection {
     static let shared = GatewayConnection()
 
-    typealias Config = (url: URL, token: String?, password: String?)
+    typealias Config = (url: URL, token: String?)
 
     enum Method: String, Sendable {
         case agent
@@ -83,7 +83,6 @@ actor GatewayConnection {
     private var client: GatewayChannelActor?
     private var configuredURL: URL?
     private var configuredToken: String?
-    private var configuredPassword: String?
 
     private var subscribers: [UUID: AsyncStream<GatewayPush>.Continuation] = [:]
     private var lastSnapshot: HelloOk?
@@ -104,7 +103,7 @@ actor GatewayConnection {
         timeoutMs: Double? = nil) async throws -> Data
     {
         let cfg = try await self.configProvider()
-        await self.configure(url: cfg.url, token: cfg.token, password: cfg.password)
+        await self.configure(url: cfg.url, token: cfg.token)
         guard let client else {
             throw NSError(domain: "Gateway", code: 0, userInfo: [NSLocalizedDescriptionKey: "gateway not configured"])
         }
@@ -150,7 +149,7 @@ actor GatewayConnection {
                     try await Task.sleep(nanoseconds: UInt64(delayMs) * 1_000_000)
                     do {
                         let cfg = try await self.configProvider()
-                        await self.configure(url: cfg.url, token: cfg.token, password: cfg.password)
+                        await self.configure(url: cfg.url, token: cfg.token)
                         guard let client = self.client else {
                             throw NSError(
                                 domain: "Gateway",
@@ -210,7 +209,7 @@ actor GatewayConnection {
     /// Ensure the underlying socket is configured (and replaced if config changed).
     func refresh() async throws {
         let cfg = try await self.configProvider()
-        await self.configure(url: cfg.url, token: cfg.token, password: cfg.password)
+        await self.configure(url: cfg.url, token: cfg.token)
     }
 
     func shutdown() async {
@@ -265,8 +264,8 @@ actor GatewayConnection {
         }
     }
 
-    private func configure(url: URL, token: String?, password: String?) async {
-        if self.client != nil, self.configuredURL == url, self.configuredToken == token, self.configuredPassword == password {
+    private func configure(url: URL, token: String?) async {
+        if self.client != nil, self.configuredURL == url, self.configuredToken == token {
             return
         }
         if let client {
@@ -276,14 +275,12 @@ actor GatewayConnection {
         self.client = GatewayChannelActor(
             url: url,
             token: token,
-            password: password,
             session: self.sessionBox,
             pushHandler: { [weak self] push in
                 await self?.handle(push: push)
             })
         self.configuredURL = url
         self.configuredToken = token
-        self.configuredPassword = password
     }
 
     private func handle(push: GatewayPush) {
@@ -450,18 +447,10 @@ extension GatewayConnection {
 
     // MARK: - Chat
 
-    func chatHistory(
-        sessionKey: String,
-        limit: Int? = nil,
-        timeoutMs: Int? = nil) async throws -> ClawdisChatHistoryPayload
-    {
-        var params: [String: AnyCodable] = ["sessionKey": AnyCodable(sessionKey)]
-        if let limit { params["limit"] = AnyCodable(limit) }
-        let timeout = timeoutMs.map { Double($0) }
-        return try await self.requestDecoded(
+    func chatHistory(sessionKey: String) async throws -> ClawdisChatHistoryPayload {
+        try await self.requestDecoded(
             method: .chatHistory,
-            params: params,
-            timeoutMs: timeout)
+            params: ["sessionKey": AnyCodable(sessionKey)])
     }
 
     func chatSend(

apps/macos/Sources/Clawdis/GatewayEndpointStore.swift

@@ -2,7 +2,7 @@ import Foundation
 import OSLog
 
 enum GatewayEndpointState: Sendable, Equatable {
-    case ready(mode: AppState.ConnectionMode, url: URL, token: String?, password: String?)
+    case ready(mode: AppState.ConnectionMode, url: URL, token: String?)
     case unavailable(mode: AppState.ConnectionMode, reason: String)
 }
 
@@ -17,7 +17,6 @@ actor GatewayEndpointStore {
     struct Deps: Sendable {
         let mode: @Sendable () async -> AppState.ConnectionMode
         let token: @Sendable () -> String?
-        let password: @Sendable () -> String?
         let localPort: @Sendable () -> Int
         let remotePortIfRunning: @Sendable () async -> UInt16?
         let ensureRemoteTunnel: @Sendable () async throws -> UInt16
@@ -25,52 +24,11 @@ actor GatewayEndpointStore {
         static let live = Deps(
             mode: { await MainActor.run { AppStateStore.shared.connectionMode } },
             token: { ProcessInfo.processInfo.environment["CLAWDIS_GATEWAY_TOKEN"] },
-            password: {
-                let root = ClawdisConfigFile.loadDict()
-                return GatewayEndpointStore.resolveGatewayPassword(
-                    isRemote: CommandResolver.connectionModeIsRemote(),
-                    root: root,
-                    env: ProcessInfo.processInfo.environment)
-            },
             localPort: { GatewayEnvironment.gatewayPort() },
             remotePortIfRunning: { await RemoteTunnelManager.shared.controlTunnelPortIfRunning() },
             ensureRemoteTunnel: { try await RemoteTunnelManager.shared.ensureControlTunnel() })
     }
 
-    private static func resolveGatewayPassword(
-        isRemote: Bool,
-        root: [String: Any],
-        env: [String: String]
-    ) -> String? {
-        let raw = env["CLAWDIS_GATEWAY_PASSWORD"] ?? ""
-        let trimmed = raw.trimmingCharacters(in: .whitespacesAndNewlines)
-        if !trimmed.isEmpty {
-            return trimmed
-        }
-        if isRemote {
-            if let gateway = root["gateway"] as? [String: Any],
-               let remote = gateway["remote"] as? [String: Any],
-               let password = remote["password"] as? String
-            {
-                let pw = password.trimmingCharacters(in: .whitespacesAndNewlines)
-                if !pw.isEmpty {
-                    return pw
-                }
-            }
-            return nil
-        }
-        if let gateway = root["gateway"] as? [String: Any],
-           let auth = gateway["auth"] as? [String: Any],
-           let password = auth["password"] as? String
-        {
-            let pw = password.trimmingCharacters(in: .whitespacesAndNewlines)
-            if !pw.isEmpty {
-                return pw
-            }
-        }
-        return nil
-    }
-
     private let deps: Deps
     private let logger = Logger(subsystem: "com.steipete.clawdis", category: "gateway-endpoint")
 
@@ -89,11 +47,9 @@ actor GatewayEndpointStore {
         }
 
         let port = deps.localPort()
-        let token = deps.token()
-        let password = deps.password()
         switch initialMode {
         case .local:
-            self.state = .ready(mode: .local, url: URL(string: "ws://127.0.0.1:\(port)")!, token: token, password: password)
+            self.state = .ready(mode: .local, url: URL(string: "ws://127.0.0.1:\(port)")!, token: deps.token())
         case .remote:
             self.state = .unavailable(mode: .remote, reason: "Remote mode enabled but no active control tunnel")
         case .unconfigured:
@@ -121,18 +77,17 @@ actor GatewayEndpointStore {
 
     func setMode(_ mode: AppState.ConnectionMode) async {
         let token = self.deps.token()
-        let password = self.deps.password()
         switch mode {
         case .local:
             let port = self.deps.localPort()
-            self.setState(.ready(mode: .local, url: URL(string: "ws://127.0.0.1:\(port)")!, token: token, password: password))
+            self.setState(.ready(mode: .local, url: URL(string: "ws://127.0.0.1:\(port)")!, token: token))
         case .remote:
             let port = await self.deps.remotePortIfRunning()
             guard let port else {
                 self.setState(.unavailable(mode: .remote, reason: "Remote mode enabled but no active control tunnel"))
                 return
             }
-            self.setState(.ready(mode: .remote, url: URL(string: "ws://127.0.0.1:\(Int(port))")!, token: token, password: password))
+            self.setState(.ready(mode: .remote, url: URL(string: "ws://127.0.0.1:\(Int(port))")!, token: token))
         case .unconfigured:
             self.setState(.unavailable(mode: .unconfigured, reason: "Gateway not configured"))
         }
@@ -155,8 +110,8 @@ actor GatewayEndpointStore {
     func requireConfig() async throws -> GatewayConnection.Config {
         await self.refresh()
         switch self.state {
-        case let .ready(_, url, token, password):
-            return (url, token, password)
+        case let .ready(_, url, token):
+            return (url, token)
         case let .unavailable(mode, reason):
             guard mode == .remote else {
                 throw NSError(domain: "GatewayEndpoint", code: 1, userInfo: [NSLocalizedDescriptionKey: reason])
@@ -165,18 +120,14 @@ actor GatewayEndpointStore {
             // Auto-recover for remote mode: if the SSH control tunnel died (or hasn't been created yet),
             // recreate it on demand so callers can recover without a manual reconnect.
             do {
-                self.logger.info(
-                    "endpoint unavailable; ensuring remote control tunnel reason=\(reason, privacy: .public)")
                 let forwarded = try await self.deps.ensureRemoteTunnel()
                 let token = self.deps.token()
-                let password = self.deps.password()
                 let url = URL(string: "ws://127.0.0.1:\(Int(forwarded))")!
-                self.setState(.ready(mode: .remote, url: url, token: token, password: password))
-                return (url, token, password)
+                self.setState(.ready(mode: .remote, url: url, token: token))
+                return (url, token)
             } catch {
                 let msg = "\(reason) (\(error.localizedDescription))"
                 self.setState(.unavailable(mode: .remote, reason: msg))
-                self.logger.error("remote control tunnel ensure failed \(msg, privacy: .public)")
                 throw NSError(domain: "GatewayEndpoint", code: 1, userInfo: [NSLocalizedDescriptionKey: msg])
             }
         }
@@ -193,7 +144,7 @@ actor GatewayEndpointStore {
             continuation.yield(next)
         }
         switch next {
-        case let .ready(mode, url, _, _):
+        case let .ready(mode, url, _):
             let modeDesc = String(describing: mode)
             let urlDesc = url.absoluteString
             self.logger
@@ -207,15 +158,3 @@ actor GatewayEndpointStore {
         }
     }
 }
-
-#if DEBUG
-extension GatewayEndpointStore {
-    static func _testResolveGatewayPassword(
-        isRemote: Bool,
-        root: [String: Any],
-        env: [String: String]
-    ) -> String? {
-        self.resolveGatewayPassword(isRemote: isRemote, root: root, env: env)
-    }
-}
-#endif

apps/macos/Sources/Clawdis/GatewayLaunchAgentManager.swift

@@ -17,26 +17,6 @@ enum GatewayLaunchAgentManager {
         "\(bundlePath)/Contents/Resources/Relay"
     }
 
-    private static func gatewayProgramArguments(bundlePath: String, port: Int, bind: String) -> [String] {
-#if DEBUG
-        let projectRoot = CommandResolver.projectRoot()
-        if let localBin = CommandResolver.projectClawdisExecutable(projectRoot: projectRoot) {
-            return [localBin, "gateway", "--port", "\(port)", "--bind", bind]
-        }
-        if let entry = CommandResolver.gatewayEntrypoint(in: projectRoot),
-           case let .success(runtime) = CommandResolver.runtimeResolution()
-        {
-            return CommandResolver.makeRuntimeCommand(
-                runtime: runtime,
-                entrypoint: entry,
-                subcommand: "gateway",
-                extraArgs: ["--port", "\(port)", "--bind", bind])
-        }
-#endif
-        let gatewayBin = self.gatewayExecutablePath(bundlePath: bundlePath)
-        return [gatewayBin, "gateway-daemon", "--port", "\(port)", "--bind", bind]
-    }
-
     static func status() async -> Bool {
         guard FileManager.default.fileExists(atPath: self.plistURL.path) else { return false }
         let result = await self.runLaunchctl(["print", "gui/\(getuid())/\(gatewayLaunchdLabel)"])
@@ -78,13 +58,12 @@ enum GatewayLaunchAgentManager {
     }
 
     private static func writePlist(bundlePath: String, port: Int) {
+        let gatewayBin = self.gatewayExecutablePath(bundlePath: bundlePath)
         let relayDir = self.relayDir(bundlePath: bundlePath)
         let preferredPath = ([relayDir] + CommandResolver.preferredPaths())
             .joined(separator: ":")
         let bind = self.preferredGatewayBind() ?? "loopback"
-        let programArguments = self.gatewayProgramArguments(bundlePath: bundlePath, port: port, bind: bind)
         let token = self.preferredGatewayToken()
-        let password = self.preferredGatewayPassword()
         var envEntries = """
             <key>PATH</key>
             <string>\(preferredPath)</string>
@@ -92,22 +71,11 @@ enum GatewayLaunchAgentManager {
             <string>sips</string>
         """
         if let token {
-            let escapedToken = self.escapePlistValue(token)
             envEntries += """
                 <key>CLAWDIS_GATEWAY_TOKEN</key>
-                <string>\(escapedToken)</string>
+                <string>\(token)</string>
             """
         }
-        if let password {
-            let escapedPassword = self.escapePlistValue(password)
-            envEntries += """
-                <key>CLAWDIS_GATEWAY_PASSWORD</key>
-                <string>\(escapedPassword)</string>
-            """
-        }
-        let argsXml = programArguments
-            .map { "<string>\(self.escapePlistValue($0))</string>" }
-            .joined(separator: "\n            ")
         let plist = """
         <?xml version="1.0" encoding="UTF-8"?>
         <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
@@ -117,7 +85,12 @@ enum GatewayLaunchAgentManager {
           <string>\(gatewayLaunchdLabel)</string>
           <key>ProgramArguments</key>
           <array>
-            \(argsXml)
+            <string>\(gatewayBin)</string>
+            <string>gateway-daemon</string>
+            <string>--port</string>
+            <string>\(port)</string>
+            <string>--bind</string>
+            <string>\(bind)</string>
           </array>
           <key>WorkingDirectory</key>
           <string>\(FileManager.default.homeDirectoryForCurrentUser.path)</string>
@@ -173,33 +146,6 @@ enum GatewayLaunchAgentManager {
         return trimmed.isEmpty ? nil : trimmed
     }
 
-    private static func preferredGatewayPassword() -> String? {
-        // First check environment variable
-        let raw = ProcessInfo.processInfo.environment["CLAWDIS_GATEWAY_PASSWORD"] ?? ""
-        let trimmed = raw.trimmingCharacters(in: .whitespacesAndNewlines)
-        if !trimmed.isEmpty {
-            return trimmed
-        }
-        // Then check config file (gateway.auth.password)
-        let root = ClawdisConfigFile.loadDict()
-        if let gateway = root["gateway"] as? [String: Any],
-           let auth = gateway["auth"] as? [String: Any],
-           let password = auth["password"] as? String
-        {
-            return password.trimmingCharacters(in: .whitespacesAndNewlines)
-        }
-        return nil
-    }
-
-    private static func escapePlistValue(_ raw: String) -> String {
-        raw
-            .replacingOccurrences(of: "&", with: "&amp;")
-            .replacingOccurrences(of: "<", with: "&lt;")
-            .replacingOccurrences(of: ">", with: "&gt;")
-            .replacingOccurrences(of: "\"", with: "&quot;")
-            .replacingOccurrences(of: "'", with: "&apos;")
-    }
-
     private struct LaunchctlResult {
         let status: Int32
         let output: String
@@ -244,9 +190,5 @@ extension GatewayLaunchAgentManager {
     static func _testPreferredGatewayToken() -> String? {
         self.preferredGatewayToken()
     }
-
-    static func _testEscapePlistValue(_ raw: String) -> String {
-        self.escapePlistValue(raw)
-    }
 }
 #endif

apps/macos/Sources/Clawdis/HealthStore.swift

@@ -114,7 +114,6 @@ final class HealthStore {
         guard !self.isRefreshing else { return }
         self.isRefreshing = true
         defer { self.isRefreshing = false }
-        let previousError = self.lastError
 
         do {
             let data = try await ControlChannel.shared.health(timeout: 15)
@@ -122,23 +121,13 @@ final class HealthStore {
                 self.snapshot = decoded
                 self.lastSuccess = Date()
                 self.lastError = nil
-                if previousError != nil {
-                    Self.logger.info("health refresh recovered")
-                }
             } else {
                 self.lastError = "health output not JSON"
                 if onDemand { self.snapshot = nil }
-                if previousError != self.lastError {
-                    Self.logger.warning("health refresh failed: output not JSON")
-                }
             }
         } catch {
-            let desc = error.localizedDescription
-            self.lastError = desc
+            self.lastError = error.localizedDescription
             if onDemand { self.snapshot = nil }
-            if previousError != desc {
-                Self.logger.error("health refresh failed \(desc, privacy: .public)")
-            }
         }
     }
 

apps/macos/Sources/Clawdis/MenuContentView.swift

@@ -164,24 +164,14 @@ struct MenuContent: View {
     }
 
     private func saveBrowserControlEnabled(_ enabled: Bool) async {
-        let (success, _) = await MenuContent.buildAndSaveBrowserEnabled(enabled)
-
-        if !success {
-            await self.loadBrowserControlEnabled()
-        }
-    }
-
-    @MainActor
-    private static func buildAndSaveBrowserEnabled(_ enabled: Bool) async -> (Bool,()) {
         var root = await ConfigStore.load()
         var browser = root["browser"] as? [String: Any] ?? [:]
         browser["enabled"] = enabled
         root["browser"] = browser
         do {
             try await ConfigStore.save(root)
-            return (true, ())
         } catch {
-            return (false, ())
+            await self.loadBrowserControlEnabled()
         }
     }
 
@@ -204,16 +194,6 @@ struct MenuContent: View {
                 } label: {
                     Label("Send Test Heartbeat", systemImage: "waveform.path.ecg")
                 }
-                if self.state.connectionMode == .remote {
-                    Button {
-                        Task { @MainActor in
-                            let result = await DebugActions.resetGatewayTunnel()
-                            self.presentDebugResult(result, title: "Remote Tunnel")
-                        }
-                    } label: {
-                        Label("Reset Remote Tunnel", systemImage: "arrow.triangle.2.circlepath")
-                    }
-                }
                 Button {
                     Task { _ = await DebugActions.toggleVerboseLoggingMain() }
                 } label: {
@@ -385,10 +365,6 @@ struct MenuContent: View {
             Text(label)
                 .font(.caption)
                 .foregroundStyle(.secondary)
-                .multilineTextAlignment(.leading)
-                .lineLimit(nil)
-                .fixedSize(horizontal: false, vertical: true)
-                .layoutPriority(1)
         }
         .padding(.top, 2)
     }
@@ -472,21 +448,6 @@ struct MenuContent: View {
         return "System default"
     }
 
-    @MainActor
-    private func presentDebugResult(_ result: Result<String, DebugActionError>, title: String) {
-        let alert = NSAlert()
-        alert.messageText = title
-        switch result {
-        case let .success(message):
-            alert.informativeText = message
-            alert.alertStyle = .informational
-        case let .failure(error):
-            alert.informativeText = error.localizedDescription
-            alert.alertStyle = .warning
-        }
-        alert.runModal()
-    }
-
     @MainActor
     private func loadMicrophones(force: Bool = false) async {
         guard self.showVoiceWakeMicPicker else {

apps/macos/Sources/Clawdis/MenuSessionsInjector.swift

@@ -106,7 +106,13 @@ final class MenuSessionsInjector: NSObject, NSMenuDelegate {
         guard let insertIndex = self.findInsertIndex(in: menu) else { return }
         let width = self.initialWidth(for: menu)
 
-        guard self.isControlChannelConnected else { return }
+        guard self.isControlChannelConnected else {
+            menu.insertItem(self.makeMessageItem(
+                text: self.controlChannelStatusText,
+                symbolName: "wifi.slash",
+                width: width), at: insertIndex)
+            return
+        }
 
         guard let snapshot = self.cachedSnapshot else {
             let headerItem = NSMenuItem()
@@ -189,14 +195,17 @@ final class MenuSessionsInjector: NSObject, NSMenuDelegate {
         menu.insertItem(topSeparator, at: cursor)
         cursor += 1
 
-        if let gatewayEntry = self.gatewayEntry() {
-            let gatewayItem = self.makeNodeItem(entry: gatewayEntry, width: width)
-            menu.insertItem(gatewayItem, at: cursor)
+        guard self.isControlChannelConnected else {
+            menu.insertItem(
+                self.makeMessageItem(text: self.controlChannelStatusText, symbolName: "wifi.slash", width: width),
+                at: cursor)
             cursor += 1
+            let separator = NSMenuItem.separator()
+            separator.tag = self.nodesTag
+            menu.insertItem(separator, at: cursor)
+            return
         }
 
-        guard self.isControlChannelConnected else { return }
-
         if let error = self.nodesStore.lastError?.nonEmpty {
             menu.insertItem(
                 self.makeMessageItem(
@@ -220,7 +229,15 @@ final class MenuSessionsInjector: NSObject, NSMenuDelegate {
             cursor += 1
         } else {
             for entry in entries.prefix(8) {
-                let item = self.makeNodeItem(entry: entry, width: width)
+                let item = NSMenuItem()
+                item.tag = self.nodesTag
+                item.target = self
+                item.action = #selector(self.copyNodeSummary(_:))
+                item.representedObject = NodeMenuEntryFormatter.summaryText(entry)
+                item.view = HighlightedMenuItemHostView(
+                    rootView: AnyView(NodeMenuRowView(entry: entry, width: width)),
+                    width: width)
+                item.submenu = self.buildNodeSubmenu(entry: entry, width: width)
                 menu.insertItem(item, at: cursor)
                 cursor += 1
             }
@@ -248,75 +265,27 @@ final class MenuSessionsInjector: NSObject, NSMenuDelegate {
         return false
     }
 
-    private func gatewayEntry() -> NodeInfo? {
-        let mode = AppStateStore.shared.connectionMode
-        let isConnected = self.isControlChannelConnected
-        let port = GatewayEnvironment.gatewayPort()
-        var host: String?
-        var platform: String?
-
-        switch mode {
-        case .remote:
-            platform = "remote"
-            let target = AppStateStore.shared.remoteTarget
-            if let parsed = CommandResolver.parseSSHTarget(target) {
-                host = parsed.port == 22 ? parsed.host : "\(parsed.host):\(parsed.port)"
-            } else {
-                host = target.nonEmpty
-            }
-        case .local:
-            platform = "local"
-            host = "127.0.0.1:\(port)"
-        case .unconfigured:
-            platform = nil
-            host = nil
+    private var controlChannelStatusText: String {
+        switch ControlChannel.shared.state {
+        case .connected:
+            return "Connected"
+        case .connecting:
+            return "Connecting to gateway…"
+        case let .degraded(reason):
+            if self.shouldShowConnecting { return "Connecting to gateway…" }
+            return reason.nonEmpty ?? "No connection to gateway"
+        case .disconnected:
+            return self.shouldShowConnecting ? "Connecting to gateway…" : "No connection to gateway"
         }
-
-        return NodeInfo(
-            nodeId: "gateway",
-            displayName: "Gateway",
-            platform: platform,
-            version: nil,
-            deviceFamily: nil,
-            modelIdentifier: nil,
-            remoteIp: host,
-            caps: nil,
-            commands: nil,
-            permissions: nil,
-            paired: nil,
-            connected: isConnected)
     }
 
-    private func makeNodeItem(entry: NodeInfo, width: CGFloat) -> NSMenuItem {
-        let item = NSMenuItem()
-        item.tag = self.nodesTag
-        item.target = self
-        item.action = #selector(self.copyNodeSummary(_:))
-        item.representedObject = NodeMenuEntryFormatter.summaryText(entry)
-        item.view = HighlightedMenuItemHostView(
-            rootView: AnyView(NodeMenuRowView(entry: entry, width: width)),
-            width: width)
-        item.submenu = self.buildNodeSubmenu(entry: entry, width: width)
-        return item
-    }
-
-    private func makeSessionPreviewItem(
-        sessionKey: String,
-        title: String,
-        width: CGFloat,
-        maxLines: Int) -> NSMenuItem
-    {
-        let item = NSMenuItem()
-        item.tag = self.tag
-        item.isEnabled = false
-        let view = AnyView(SessionMenuPreviewView(
-            sessionKey: sessionKey,
-            width: width,
-            maxItems: 10,
-            maxLines: maxLines,
-            title: title))
-        item.view = self.makeHostedView(rootView: view, width: width, highlighted: false)
-        return item
+    private var shouldShowConnecting: Bool {
+        switch GatewayProcessManager.shared.status {
+        case .starting, .running, .attachedExisting:
+            return true
+        case .stopped, .failed:
+            return false
+        }
     }
 
     private func makeMessageItem(text: String, symbolName: String, width: CGFloat) -> NSMenuItem {
@@ -324,9 +293,8 @@ final class MenuSessionsInjector: NSObject, NSMenuDelegate {
             Label(text, systemImage: symbolName)
                 .font(.caption)
                 .foregroundStyle(.secondary)
-                .multilineTextAlignment(.leading)
-                .lineLimit(nil)
-                .fixedSize(horizontal: false, vertical: true)
+                .lineLimit(1)
+                .truncationMode(.tail)
                 .padding(.leading, 18)
                 .padding(.trailing, 12)
                 .padding(.vertical, 6)
@@ -380,19 +348,6 @@ final class MenuSessionsInjector: NSObject, NSMenuDelegate {
 
     private func buildSubmenu(for row: SessionRow, storePath: String) -> NSMenu {
         let menu = NSMenu()
-        let width = self.submenuWidth()
-
-        menu.addItem(self.makeSessionPreviewItem(
-            sessionKey: row.key,
-            title: "Recent messages (last 10)",
-            width: width,
-            maxLines: 3))
-
-        let morePreview = NSMenuItem(title: "More preview…", action: nil, keyEquivalent: "")
-        morePreview.submenu = self.buildPreviewSubmenu(sessionKey: row.key, width: width)
-        menu.addItem(morePreview)
-
-        menu.addItem(NSMenuItem.separator())
 
         let thinking = NSMenuItem(title: "Thinking", action: nil, keyEquivalent: "")
         thinking.submenu = self.buildThinkingMenu(for: row)
@@ -487,16 +442,6 @@ final class MenuSessionsInjector: NSObject, NSMenuDelegate {
         return menu
     }
 
-    private func buildPreviewSubmenu(sessionKey: String, width: CGFloat) -> NSMenu {
-        let menu = NSMenu()
-        menu.addItem(self.makeSessionPreviewItem(
-            sessionKey: sessionKey,
-            title: "Recent messages (expanded)",
-            width: width,
-            maxLines: 8))
-        return menu
-    }
-
     private func buildNodesOverflowMenu(entries: [NodeInfo], width: CGFloat) -> NSMenu {
         let menu = NSMenu()
         for entry in entries {
@@ -747,16 +692,6 @@ final class MenuSessionsInjector: NSObject, NSMenuDelegate {
         return self.currentMenuWidth(for: menu)
     }
 
-    private func submenuWidth() -> CGFloat {
-        if let openWidth = self.menuOpenWidth {
-            return max(300, openWidth)
-        }
-        if let cached = self.lastKnownMenuWidth {
-            return max(300, cached)
-        }
-        return self.fallbackWidth
-    }
-
     private func menuWindowWidth(for menu: NSMenu) -> CGFloat? {
         var menuWindow: NSWindow?
         for item in menu.items {

apps/macos/Sources/Clawdis/NodeMode/MacNodeModeCoordinator.swift

@@ -135,7 +135,6 @@ final class MacNodeModeCoordinator {
 
         let capsSet = Set(caps)
         if capsSet.contains(ClawdisCapability.camera.rawValue) {
-            commands.append(ClawdisCameraCommand.list.rawValue)
             commands.append(ClawdisCameraCommand.snap.rawValue)
             commands.append(ClawdisCameraCommand.clip.rawValue)
         }

apps/macos/Sources/Clawdis/NodeMode/MacNodeRuntime.swift

@@ -103,13 +103,10 @@ actor MacNodeRuntime {
                 }
                 let params = (try? Self.decodeParams(ClawdisCameraSnapParams.self, from: req.paramsJSON)) ??
                     ClawdisCameraSnapParams()
-                let delayMs = min(10_000, max(0, params.delayMs ?? 2000))
                 let res = try await self.cameraCapture.snap(
                     facing: CameraFacing(rawValue: params.facing?.rawValue ?? "") ?? .front,
                     maxWidth: params.maxWidth,
-                    quality: params.quality,
-                    deviceId: params.deviceId,
-                    delayMs: delayMs)
+                    quality: params.quality)
                 struct SnapPayload: Encodable {
                     var format: String
                     var base64: String
@@ -138,7 +135,6 @@ actor MacNodeRuntime {
                     facing: CameraFacing(rawValue: params.facing?.rawValue ?? "") ?? .front,
                     durationMs: params.durationMs,
                     includeAudio: params.includeAudio ?? true,
-                    deviceId: params.deviceId,
                     outPath: nil)
                 defer { try? FileManager.default.removeItem(atPath: res.path) }
                 let data = try Data(contentsOf: URL(fileURLWithPath: res.path))
@@ -155,19 +151,6 @@ actor MacNodeRuntime {
                     hasAudio: res.hasAudio))
                 return BridgeInvokeResponse(id: req.id, ok: true, payloadJSON: payload)
 
-            case ClawdisCameraCommand.list.rawValue:
-                guard Self.cameraEnabled() else {
-                    return BridgeInvokeResponse(
-                        id: req.id,
-                        ok: false,
-                        error: ClawdisNodeError(
-                            code: .unavailable,
-                            message: "CAMERA_DISABLED: enable Camera in Settings"))
-                }
-                let devices = await self.cameraCapture.listDevices()
-                let payload = try Self.encodePayload(["devices": devices])
-                return BridgeInvokeResponse(id: req.id, ok: true, payloadJSON: payload)
-
             case MacNodeScreenCommand.record.rawValue:
                 let params = (try? Self.decodeParams(MacNodeScreenRecordParams.self, from: req.paramsJSON)) ??
                     MacNodeScreenRecordParams()

apps/macos/Sources/Clawdis/NodesMenu.swift

@@ -2,30 +2,15 @@ import AppKit
 import SwiftUI
 
 struct NodeMenuEntryFormatter {
-    static func isGateway(_ entry: NodeInfo) -> Bool {
-        entry.nodeId == "gateway"
-    }
-
     static func isConnected(_ entry: NodeInfo) -> Bool {
         entry.isConnected
     }
 
     static func primaryName(_ entry: NodeInfo) -> String {
-        if self.isGateway(entry) {
-            return entry.displayName?.nonEmpty ?? "Gateway"
-        }
-        return entry.displayName?.nonEmpty ?? entry.nodeId
+        entry.displayName?.nonEmpty ?? entry.nodeId
     }
 
     static func summaryText(_ entry: NodeInfo) -> String {
-        if self.isGateway(entry) {
-            let role = self.roleText(entry)
-            let name = self.primaryName(entry)
-            var parts = ["\(name) · \(role)"]
-            if let ip = entry.remoteIp?.nonEmpty { parts.append("host \(ip)") }
-            if let platform = self.platformText(entry) { parts.append(platform) }
-            return parts.joined(separator: " · ")
-        }
         let name = self.primaryName(entry)
         var prefix = "Node: \(name)"
         if let ip = entry.remoteIp?.nonEmpty {
@@ -44,7 +29,6 @@ struct NodeMenuEntryFormatter {
 
     static func roleText(_ entry: NodeInfo) -> String {
         if entry.isConnected { return "connected" }
-        if self.isGateway(entry) { return "disconnected" }
         if entry.isPaired { return "paired" }
         return "unpaired"
     }
@@ -128,11 +112,6 @@ struct NodeMenuEntryFormatter {
     }
 
     static func leadingSymbol(_ entry: NodeInfo) -> String {
-        if self.isGateway(entry) {
-            return self.safeSystemSymbol(
-                "antenna.radiowaves.left.and.right",
-                fallback: "dot.radiowaves.left.and.right")
-        }
         if let family = entry.deviceFamily?.lowercased() {
             if family.contains("mac") {
                 return self.safeSystemSymbol("laptopcomputer", fallback: "laptopcomputer")

apps/macos/Sources/Clawdis/NodesStore.swift

@@ -75,26 +75,10 @@ final class NodesStore {
             self.lastError = nil
             self.statusMessage = nil
         } catch {
-            if Self.isCancelled(error) {
-                self.logger.debug("node.list cancelled; keeping last nodes")
-                if self.nodes.isEmpty {
-                    self.statusMessage = "Refreshing devices…"
-                }
-                self.lastError = nil
-                return
-            }
             self.logger.error("node.list failed \(error.localizedDescription, privacy: .public)")
             self.nodes = []
             self.lastError = error.localizedDescription
             self.statusMessage = nil
         }
     }
-
-    private static func isCancelled(_ error: Error) -> Bool {
-        if error is CancellationError { return true }
-        if let urlError = error as? URLError, urlError.code == .cancelled { return true }
-        let nsError = error as NSError
-        if nsError.domain == NSURLErrorDomain, nsError.code == NSURLErrorCancelled { return true }
-        return false
-    }
 }

apps/macos/Sources/Clawdis/OnboardingView+Layout.swift

@@ -133,16 +133,10 @@ extension OnboardingView {
     }
 
     func onboardingPage(@ViewBuilder _ content: () -> some View) -> some View {
-        let scrollIndicatorGutter: CGFloat = 18
-        return ScrollView {
-            VStack(spacing: 16) {
-                content()
-                Spacer(minLength: 0)
-            }
-            .frame(maxWidth: .infinity, alignment: .top)
-            .padding(.trailing, scrollIndicatorGutter)
+        VStack(spacing: 16) {
+            content()
+            Spacer()
         }
-        .scrollIndicators(.automatic)
         .padding(.horizontal, 28)
         .frame(width: self.pageWidth, alignment: .top)
     }

apps/macos/Sources/Clawdis/OnboardingView+Pages.swift

@@ -442,7 +442,7 @@ extension OnboardingView {
     }
 
     func permissionsPage() -> some View {
-        return self.onboardingPage {
+        self.onboardingPage {
             Text("Grant permissions")
                 .font(.largeTitle.weight(.semibold))
             Text("These macOS permissions let Clawdis automate apps and capture context on this Mac.")

apps/macos/Sources/Clawdis/OnboardingView+Workspace.swift

@@ -75,16 +75,6 @@ extension OnboardingView {
 
     @discardableResult
     func saveAgentWorkspace(_ workspace: String?) async -> Bool {
-        let (success, errorMessage) = await OnboardingView.buildAndSaveWorkspace(workspace)
-
-        if let errorMessage {
-            self.workspaceStatus = errorMessage
-        }
-        return success
-    }
-
-    @MainActor
-    private static func buildAndSaveWorkspace(_ workspace: String?) async -> (Bool, String?) {
         var root = await ConfigStore.load()
         var agent = root["agent"] as? [String: Any] ?? [:]
         let trimmed = workspace?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
@@ -100,10 +90,10 @@ extension OnboardingView {
         }
         do {
             try await ConfigStore.save(root)
-            return (true, nil)
-        } catch let error {
-            let errorMessage = "Failed to save config: \(error.localizedDescription)"
-            return (false, errorMessage)
+            return true
+        } catch {
+            self.workspaceStatus = "Failed to save config: \(error.localizedDescription)"
+            return false
         }
     }
 }

apps/macos/Sources/Clawdis/PermissionManager.swift

@@ -31,8 +31,6 @@ enum PermissionManager {
             await self.ensureMicrophone(interactive: interactive)
         case .speechRecognition:
             await self.ensureSpeechRecognition(interactive: interactive)
-        case .camera:
-            await self.ensureCamera(interactive: interactive)
         }
     }
 
@@ -116,24 +114,6 @@ enum PermissionManager {
         return SFSpeechRecognizer.authorizationStatus() == .authorized
     }
 
-    private static func ensureCamera(interactive: Bool) async -> Bool {
-        let status = AVCaptureDevice.authorizationStatus(for: .video)
-        switch status {
-        case .authorized:
-            return true
-        case .notDetermined:
-            guard interactive else { return false }
-            return await AVCaptureDevice.requestAccess(for: .video)
-        case .denied, .restricted:
-            if interactive {
-                CameraPermissionHelper.openSettings()
-            }
-            return false
-        @unknown default:
-            return false
-        }
-    }
-
     static func voiceWakePermissionsGranted() -> Bool {
         let mic = AVCaptureDevice.authorizationStatus(for: .audio) == .authorized
         let speech = SFSpeechRecognizer.authorizationStatus() == .authorized
@@ -173,9 +153,6 @@ enum PermissionManager {
 
             case .speechRecognition:
                 results[cap] = SFSpeechRecognizer.authorizationStatus() == .authorized
-
-            case .camera:
-                results[cap] = AVCaptureDevice.authorizationStatus(for: .video) == .authorized
             }
         }
         return results
@@ -212,21 +189,6 @@ enum MicrophonePermissionHelper {
     }
 }
 
-enum CameraPermissionHelper {
-    static func openSettings() {
-        let candidates = [
-            "x-apple.systempreferences:com.apple.preference.security?Privacy_Camera",
-            "x-apple.systempreferences:com.apple.preference.security",
-        ]
-
-        for candidate in candidates {
-            if let url = URL(string: candidate), NSWorkspace.shared.open(url) {
-                return
-            }
-        }
-    }
-}
-
 enum AppleScriptPermission {
     private static let logger = Logger(subsystem: "com.steipete.clawdis", category: "AppleScriptPermission")
 

apps/macos/Sources/Clawdis/PermissionsSettings.swift

@@ -120,7 +120,6 @@ struct PermissionRow: View {
         case .screenRecording: "Screen Recording"
         case .microphone: "Microphone"
         case .speechRecognition: "Speech Recognition"
-        case .camera: "Camera"
         }
     }
 
@@ -133,7 +132,6 @@ struct PermissionRow: View {
         case .screenRecording: "Capture the screen for context or screenshots"
         case .microphone: "Allow Voice Wake and audio capture"
         case .speechRecognition: "Transcribe Voice Wake trigger phrases on-device"
-        case .camera: "Capture photos and video from the camera"
         }
     }
 
@@ -145,7 +143,6 @@ struct PermissionRow: View {
         case .screenRecording: "display"
         case .microphone: "mic"
         case .speechRecognition: "waveform"
-        case .camera: "camera"
         }
     }
 }

apps/macos/Sources/Clawdis/RemotePortTunnel.swift

@@ -48,16 +48,6 @@ final class RemotePortTunnel {
         }
 
         let localPort = try await Self.findPort(preferred: preferredLocalPort)
-        let sshHost = parsed.host.trimmingCharacters(in: .whitespacesAndNewlines)
-        let remotePortOverride = Self.resolveRemotePortOverride(for: sshHost)
-        let resolvedRemotePort = remotePortOverride ?? remotePort
-        if let override = remotePortOverride {
-            Self.logger.info(
-                "ssh tunnel remote port override host=\(sshHost, privacy: .public) port=\(override, privacy: .public)")
-        } else {
-            Self.logger.debug(
-                "ssh tunnel using default remote port host=\(sshHost, privacy: .public) port=\(remotePort, privacy: .public)")
-        }
         var args: [String] = [
             "-o", "BatchMode=yes",
             "-o", "IdentitiesOnly=yes",
@@ -68,7 +58,7 @@ final class RemotePortTunnel {
             "-o", "ServerAliveCountMax=3",
             "-o", "TCPKeepAlive=yes",
             "-N",
-            "-L", "\(localPort):127.0.0.1:\(resolvedRemotePort)",
+            "-L", "\(localPort):127.0.0.1:\(remotePort)",
         ]
         if parsed.port > 0 { args.append(contentsOf: ["-p", String(parsed.port)]) }
         let identity = settings.identity.trimmingCharacters(in: .whitespacesAndNewlines)
@@ -124,45 +114,6 @@ final class RemotePortTunnel {
         return RemotePortTunnel(process: process, localPort: localPort, stderrHandle: stderrHandle)
     }
 
-    private static func resolveRemotePortOverride(for sshHost: String) -> Int? {
-        let root = ClawdisConfigFile.loadDict()
-        guard let gateway = root["gateway"] as? [String: Any],
-              let remote = gateway["remote"] as? [String: Any],
-              let urlRaw = remote["url"] as? String
-        else {
-            return nil
-        }
-        let trimmed = urlRaw.trimmingCharacters(in: .whitespacesAndNewlines)
-        guard !trimmed.isEmpty, let url = URL(string: trimmed), let port = url.port else {
-            return nil
-        }
-        guard let host = url.host?.trimmingCharacters(in: .whitespacesAndNewlines),
-              !host.isEmpty
-        else {
-            return nil
-        }
-        let sshKey = Self.hostKey(sshHost)
-        let urlKey = Self.hostKey(host)
-        guard !sshKey.isEmpty, !urlKey.isEmpty else { return nil }
-        guard sshKey == urlKey else {
-            Self.logger.debug(
-                "remote url host mismatch sshHost=\(sshHost, privacy: .public) urlHost=\(host, privacy: .public)")
-            return nil
-        }
-        return port
-    }
-
-    private static func hostKey(_ host: String) -> String {
-        let trimmed = host.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
-        guard !trimmed.isEmpty else { return "" }
-        if trimmed.contains(":") { return trimmed }
-        let digits = CharacterSet(charactersIn: "0123456789.")
-        if trimmed.rangeOfCharacter(from: digits.inverted) == nil {
-            return trimmed
-        }
-        return trimmed.split(separator: ".").first.map(String.init) ?? trimmed
-    }
-
     private static func findPort(preferred: UInt16?) async throws -> UInt16 {
         if let preferred, self.portIsFree(preferred) { return preferred }
 

apps/macos/Sources/Clawdis/RemoteTunnelManager.swift

@@ -13,10 +13,7 @@ actor RemoteTunnelManager {
            tunnel.process.isRunning,
            let local = tunnel.localPort
         {
-            if await self.isTunnelHealthy(port: local) {
-                self.logger.info("reusing active SSH tunnel localPort=\(local, privacy: .public)")
-                return local
-            }
+            if await self.isTunnelHealthy(port: local) { return local }
             self.logger.error("active SSH tunnel on port \(local, privacy: .public) is unhealthy; restarting")
             tunnel.terminate()
             self.controlTunnel = nil
@@ -27,11 +24,7 @@ actor RemoteTunnelManager {
         if let desc = await PortGuardian.shared.describe(port: Int(desiredPort)),
            self.isSshProcess(desc)
         {
-            if await self.isTunnelHealthy(port: desiredPort) {
-                self.logger.info(
-                    "reusing existing SSH tunnel listener localPort=\(desiredPort, privacy: .public) pid=\(desc.pid, privacy: .public)")
-                return desiredPort
-            }
+            if await self.isTunnelHealthy(port: desiredPort) { return desiredPort }
             await self.cleanupStaleTunnel(desc: desc, port: desiredPort)
         }
         return nil
@@ -48,10 +41,6 @@ actor RemoteTunnelManager {
                 userInfo: [NSLocalizedDescriptionKey: "Remote mode is not enabled"])
         }
 
-        let identitySet = !settings.identity.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
-        self.logger.info(
-            "ensure SSH tunnel target=\(settings.target, privacy: .public) identitySet=\(identitySet, privacy: .public)")
-
         if let local = await self.controlTunnelPortIfRunning() { return local }
 
         let desiredPort = UInt16(GatewayEnvironment.gatewayPort())
@@ -59,8 +48,6 @@ actor RemoteTunnelManager {
             remotePort: GatewayEnvironment.gatewayPort(),
             preferredLocalPort: desiredPort)
         self.controlTunnel = tunnel
-        let resolvedPort = tunnel.localPort ?? desiredPort
-        self.logger.info("ssh tunnel ready localPort=\(resolvedPort, privacy: .public)")
         return tunnel.localPort ?? desiredPort
     }
 

apps/macos/Sources/Clawdis/SessionData.swift

@@ -8,11 +8,6 @@ struct GatewaySessionDefaultsRecord: Codable {
 
 struct GatewaySessionEntryRecord: Codable {
     let key: String
-    let displayName: String?
-    let surface: String?
-    let subject: String?
-    let room: String?
-    let space: String?
     let updatedAt: Double?
     let sessionId: String?
     let systemSent: Bool?
@@ -70,11 +65,6 @@ struct SessionRow: Identifiable {
     let id: String
     let key: String
     let kind: SessionKind
-    let displayName: String?
-    let surface: String?
-    let subject: String?
-    let room: String?
-    let space: String?
     let updatedAt: Date?
     let sessionId: String?
     let thinkingLevel: String?
@@ -85,7 +75,6 @@ struct SessionRow: Identifiable {
     let model: String?
 
     var ageText: String { relativeAge(from: self.updatedAt) }
-    var label: String { self.displayName ?? self.key }
 
     var flagLabels: [String] {
         var flags: [String] = []
@@ -103,8 +92,6 @@ enum SessionKind {
     static func from(key: String) -> SessionKind {
         if key == "global" { return .global }
         if key.hasPrefix("group:") { return .group }
-        if key.contains(":group:") { return .group }
-        if key.contains(":channel:") { return .group }
         if key == "unknown" { return .unknown }
         return .direct
     }
@@ -140,11 +127,6 @@ extension SessionRow {
                 id: "direct-1",
                 key: "user@example.com",
                 kind: .direct,
-                displayName: nil,
-                surface: nil,
-                subject: nil,
-                room: nil,
-                space: nil,
                 updatedAt: Date().addingTimeInterval(-90),
                 sessionId: "sess-direct-1234",
                 thinkingLevel: "low",
@@ -155,13 +137,8 @@ extension SessionRow {
                 model: "claude-3.5-sonnet"),
             SessionRow(
                 id: "group-1",
-                key: "discord:channel:release-squad",
+                key: "group:engineering",
                 kind: .group,
-                displayName: "discord:#release-squad",
-                surface: "discord",
-                subject: nil,
-                room: "#release-squad",
-                space: nil,
                 updatedAt: Date().addingTimeInterval(-3600),
                 sessionId: "sess-group-4321",
                 thinkingLevel: "medium",
@@ -174,11 +151,6 @@ extension SessionRow {
                 id: "global",
                 key: "global",
                 kind: .global,
-                displayName: nil,
-                surface: nil,
-                subject: nil,
-                room: nil,
-                space: nil,
                 updatedAt: Date().addingTimeInterval(-86400),
                 sessionId: nil,
                 thinkingLevel: nil,
@@ -297,11 +269,6 @@ enum SessionLoader {
                 id: entry.key,
                 key: entry.key,
                 kind: SessionKind.from(key: entry.key),
-                displayName: entry.displayName,
-                surface: entry.surface,
-                subject: entry.subject,
-                room: entry.room,
-                space: entry.space,
                 updatedAt: updated,
                 sessionId: entry.sessionId,
                 thinkingLevel: entry.thinkingLevel,

apps/macos/Sources/Clawdis/SessionMenuLabelView.swift

@@ -15,8 +15,8 @@ struct SessionMenuLabelView: View {
     let row: SessionRow
     let width: CGFloat
     @Environment(\.menuItemHighlighted) private var isHighlighted
-    private let paddingLeading: CGFloat = 22
-    private let paddingTrailing: CGFloat = 14
+    private let paddingLeading: CGFloat = 26
+    private let paddingTrailing: CGFloat = 18
     private let barHeight: CGFloat = 6
 
     private var primaryTextColor: Color {
@@ -35,17 +35,17 @@ struct SessionMenuLabelView: View {
                 width: max(1, self.width - (self.paddingLeading + self.paddingTrailing)),
                 height: self.barHeight)
 
-            HStack(alignment: .firstTextBaseline, spacing: 2) {
-                Text(self.row.label)
+            HStack(alignment: .firstTextBaseline, spacing: 8) {
+                Text(self.row.key)
                     .font(.caption.weight(self.row.key == "main" ? .semibold : .regular))
                     .foregroundStyle(self.primaryTextColor)
                     .lineLimit(1)
                     .truncationMode(.middle)
                     .layoutPriority(1)
 
-                Spacer(minLength: 4)
+                Spacer(minLength: 8)
 
-                Text("\(self.row.tokens.contextSummaryShort) · \(self.row.ageText)")
+                Text(self.row.tokens.contextSummaryShort)
                     .font(.caption.monospacedDigit())
                     .foregroundStyle(self.secondaryTextColor)
                     .lineLimit(1)

apps/macos/Sources/Clawdis/SessionMenuPreviewView.swift

@@ -1,300 +0,0 @@
-import ClawdisChatUI
-import ClawdisKit
-import OSLog
-import SwiftUI
-
-private struct SessionPreviewItem: Identifiable, Sendable {
-    let id: String
-    let role: PreviewRole
-    let text: String
-}
-
-private enum PreviewRole: String, Sendable {
-    case user
-    case assistant
-    case tool
-    case system
-    case other
-
-    var label: String {
-        switch self {
-        case .user: "User"
-        case .assistant: "Agent"
-        case .tool: "Tool"
-        case .system: "System"
-        case .other: "Other"
-        }
-    }
-}
-
-private actor SessionPreviewCache {
-    static let shared = SessionPreviewCache()
-
-    private struct CacheEntry {
-        let items: [SessionPreviewItem]
-        let updatedAt: Date
-    }
-
-    private var entries: [String: CacheEntry] = [:]
-
-    func cachedItems(for sessionKey: String, maxAge: TimeInterval) -> [SessionPreviewItem]? {
-        guard let entry = self.entries[sessionKey] else { return nil }
-        guard Date().timeIntervalSince(entry.updatedAt) < maxAge else { return nil }
-        return entry.items
-    }
-
-    func store(items: [SessionPreviewItem], for sessionKey: String) {
-        self.entries[sessionKey] = CacheEntry(items: items, updatedAt: Date())
-    }
-
-    func lastItems(for sessionKey: String) -> [SessionPreviewItem]? {
-        self.entries[sessionKey]?.items
-    }
-}
-
-struct SessionMenuPreviewView: View {
-    private static let logger = Logger(subsystem: "com.steipete.clawdis", category: "SessionPreview")
-    private static let previewTimeoutSeconds: Double = 4
-
-    let sessionKey: String
-    let width: CGFloat
-    let maxItems: Int
-    let maxLines: Int
-    let title: String
-
-    @Environment(\.menuItemHighlighted) private var isHighlighted
-    @State private var items: [SessionPreviewItem] = []
-    @State private var status: LoadStatus = .loading
-
-    private struct PreviewTimeoutError: LocalizedError {
-        var errorDescription: String? { "preview timeout" }
-    }
-
-    private enum LoadStatus: Equatable {
-        case loading
-        case ready
-        case empty
-        case error(String)
-    }
-
-    private var primaryColor: Color {
-        self.isHighlighted ? Color(nsColor: .selectedMenuItemTextColor) : .primary
-    }
-
-    private var secondaryColor: Color {
-        self.isHighlighted ? Color(nsColor: .selectedMenuItemTextColor).opacity(0.85) : .secondary
-    }
-
-    private var previewLimit: Int {
-        min(max(self.maxItems * 3, 20), 120)
-    }
-
-    var body: some View {
-        VStack(alignment: .leading, spacing: 8) {
-            HStack(alignment: .firstTextBaseline, spacing: 4) {
-                Text(self.title)
-                    .font(.caption.weight(.semibold))
-                    .foregroundStyle(self.secondaryColor)
-                Spacer(minLength: 8)
-            }
-
-            switch self.status {
-            case .loading:
-                Text("Loading preview…")
-                    .font(.caption)
-                    .foregroundStyle(self.secondaryColor)
-            case .empty:
-                Text("No recent messages")
-                    .font(.caption)
-                    .foregroundStyle(self.secondaryColor)
-            case let .error(message):
-                Text(message)
-                    .font(.caption)
-                    .foregroundStyle(self.secondaryColor)
-            case .ready:
-                VStack(alignment: .leading, spacing: 6) {
-                    ForEach(self.items) { item in
-                        self.previewRow(item)
-                    }
-                }
-            }
-        }
-        .padding(.vertical, 6)
-        .padding(.leading, 16)
-        .padding(.trailing, 11)
-        .frame(width: max(1, self.width), alignment: .leading)
-        .task(id: self.sessionKey) {
-            await self.loadPreview()
-        }
-    }
-
-    @ViewBuilder
-    private func previewRow(_ item: SessionPreviewItem) -> some View {
-        HStack(alignment: .top, spacing: 4) {
-            Text(item.role.label)
-                .font(.caption2.monospacedDigit())
-                .foregroundStyle(self.roleColor(item.role))
-                .frame(width: 50, alignment: .leading)
-
-            Text(item.text)
-                .font(.caption)
-                .foregroundStyle(self.primaryColor)
-                .multilineTextAlignment(.leading)
-                .lineLimit(self.maxLines)
-                .truncationMode(.tail)
-                .fixedSize(horizontal: false, vertical: true)
-        }
-    }
-
-    private func roleColor(_ role: PreviewRole) -> Color {
-        if self.isHighlighted { return Color(nsColor: .selectedMenuItemTextColor).opacity(0.9) }
-        switch role {
-        case .user: return .accentColor
-        case .assistant: return .secondary
-        case .tool: return .orange
-        case .system: return .gray
-        case .other: return .secondary
-        }
-    }
-
-    private func loadPreview() async {
-        if let cached = await SessionPreviewCache.shared.cachedItems(for: self.sessionKey, maxAge: 12) {
-            await MainActor.run {
-                self.items = cached
-                self.status = cached.isEmpty ? .empty : .ready
-            }
-            return
-        }
-
-        await MainActor.run {
-            self.status = .loading
-        }
-
-        do {
-            let timeoutMs = Int(Self.previewTimeoutSeconds * 1000)
-            let payload = try await AsyncTimeout.withTimeout(
-                seconds: Self.previewTimeoutSeconds,
-                onTimeout: { PreviewTimeoutError() }) {
-                    try await GatewayConnection.shared.chatHistory(
-                        sessionKey: self.sessionKey,
-                        limit: self.previewLimit,
-                        timeoutMs: timeoutMs)
-                }
-            let built = Self.previewItems(from: payload, maxItems: self.maxItems)
-            await SessionPreviewCache.shared.store(items: built, for: self.sessionKey)
-            await MainActor.run {
-                self.items = built
-                self.status = built.isEmpty ? .empty : .ready
-            }
-        } catch is CancellationError {
-            return
-        } catch {
-            let fallback = await SessionPreviewCache.shared.lastItems(for: self.sessionKey)
-            await MainActor.run {
-                if let fallback {
-                    self.items = fallback
-                    self.status = fallback.isEmpty ? .empty : .ready
-                } else {
-                    self.status = .error("Preview unavailable")
-                }
-            }
-            Self.logger.warning("Session preview failed session=\(self.sessionKey, privacy: .public) error=\(String(describing: error), privacy: .public)")
-        }
-    }
-
-    private static func previewItems(
-        from payload: ClawdisChatHistoryPayload,
-        maxItems: Int) -> [SessionPreviewItem]
-    {
-        let raw: [ClawdisKit.AnyCodable] = payload.messages ?? []
-        let messages = self.decodeMessages(raw)
-        let built = messages.compactMap { message -> SessionPreviewItem? in
-            guard let text = self.previewText(for: message) else { return nil }
-            let isTool = self.isToolCall(message)
-            let role = self.previewRole(message.role, isTool: isTool)
-            let id = "\(message.timestamp ?? 0)-\(UUID().uuidString)"
-            return SessionPreviewItem(id: id, role: role, text: text)
-        }
-
-        let trimmed = built.suffix(maxItems)
-        return Array(trimmed.reversed())
-    }
-
-    private static func decodeMessages(_ raw: [ClawdisKit.AnyCodable]) -> [ClawdisChatMessage] {
-        raw.compactMap { item in
-            guard let data = try? JSONEncoder().encode(item) else { return nil }
-            return try? JSONDecoder().decode(ClawdisChatMessage.self, from: data)
-        }
-    }
-
-    private static func previewRole(_ raw: String, isTool: Bool) -> PreviewRole {
-        if isTool { return .tool }
-        switch raw.lowercased() {
-        case "user": return .user
-        case "assistant": return .assistant
-        case "system": return .system
-        case "tool": return .tool
-        default: return .other
-        }
-    }
-
-    private static func previewText(for message: ClawdisChatMessage) -> String? {
-        let text = message.content.compactMap(\.text).joined(separator: "\n")
-            .trimmingCharacters(in: .whitespacesAndNewlines)
-        if !text.isEmpty { return text }
-
-        let toolNames = self.toolNames(for: message)
-        if !toolNames.isEmpty {
-            let shown = toolNames.prefix(2)
-            let overflow = toolNames.count - shown.count
-            var label = "call \(shown.joined(separator: ", "))"
-            if overflow > 0 { label += " +\(overflow)" }
-            return label
-        }
-
-        if let media = self.mediaSummary(for: message) {
-            return media
-        }
-
-        return nil
-    }
-
-    private static func isToolCall(_ message: ClawdisChatMessage) -> Bool {
-        if message.toolName?.nonEmpty != nil { return true }
-        return message.content.contains { $0.name?.nonEmpty != nil || $0.type?.lowercased() == "toolcall" }
-    }
-
-    private static func toolNames(for message: ClawdisChatMessage) -> [String] {
-        var names: [String] = []
-        for content in message.content {
-            if let name = content.name?.nonEmpty {
-                names.append(name)
-            }
-        }
-        if let toolName = message.toolName?.nonEmpty {
-            names.append(toolName)
-        }
-        return Self.dedupePreservingOrder(names)
-    }
-
-    private static func mediaSummary(for message: ClawdisChatMessage) -> String? {
-        let types = message.content.compactMap { content -> String? in
-            let raw = content.type?.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
-            guard let raw, !raw.isEmpty else { return nil }
-            if raw == "text" || raw == "toolcall" { return nil }
-            return raw
-        }
-        guard let first = types.first else { return nil }
-        return "[\(first)]"
-    }
-
-    private static func dedupePreservingOrder(_ values: [String]) -> [String] {
-        var seen = Set<String>()
-        var result: [String] = []
-        for value in values where !seen.contains(value) {
-            seen.insert(value)
-            result.append(value)
-        }
-        return result
-    }
-}

apps/macos/Sources/Clawdis/SessionsSettings.swift

@@ -89,7 +89,7 @@ struct SessionsSettings: View {
     private func sessionRow(_ row: SessionRow) -> some View {
         VStack(alignment: .leading, spacing: 6) {
             HStack(alignment: .firstTextBaseline, spacing: 8) {
-                Text(row.label)
+                Text(row.key)
                     .font(.subheadline.bold())
                     .lineLimit(1)
                     .truncationMode(.middle)

apps/macos/Sources/Clawdis/TailscaleIntegrationSection.swift

@@ -280,57 +280,28 @@ struct TailscaleIntegrationSection: View {
             return
         }
 
-        let (success, errorMessage) = await TailscaleIntegrationSection.buildAndSaveTailscaleConfig(
-            tailscaleMode: self.tailscaleMode,
-            requireCredentialsForServe: self.requireCredentialsForServe,
-            password: trimmedPassword,
-            connectionMode: self.connectionMode,
-            isPaused: self.isPaused
-        )
-
-        if !success, let errorMessage {
-            self.statusMessage = errorMessage
-            return
-        }
-
-        if self.connectionMode == .local, !self.isPaused {
-            self.statusMessage = "Saved to ~/.clawdis/clawdis.json. Restarting gateway…"
-        } else {
-            self.statusMessage = "Saved to ~/.clawdis/clawdis.json. Restart the gateway to apply."
-        }
-        self.restartGatewayIfNeeded()
-    }
-
-    @MainActor
-    private static func buildAndSaveTailscaleConfig(
-        tailscaleMode: GatewayTailscaleMode,
-        requireCredentialsForServe: Bool,
-        password: String,
-        connectionMode: AppState.ConnectionMode,
-        isPaused: Bool
-    ) async -> (Bool, String?) {
         var root = await ConfigStore.load()
         var gateway = root["gateway"] as? [String: Any] ?? [:]
         var tailscale = gateway["tailscale"] as? [String: Any] ?? [:]
-        tailscale["mode"] = tailscaleMode.rawValue
+        tailscale["mode"] = self.tailscaleMode.rawValue
         gateway["tailscale"] = tailscale
 
-        if tailscaleMode != .off {
+        if self.tailscaleMode != .off {
             gateway["bind"] = "loopback"
         }
 
-        if tailscaleMode == .off {
+        if self.tailscaleMode == .off {
             gateway.removeValue(forKey: "auth")
         } else {
             var auth = gateway["auth"] as? [String: Any] ?? [:]
-            if tailscaleMode == .serve, !requireCredentialsForServe {
+            if self.tailscaleMode == .serve, !self.requireCredentialsForServe {
                 auth["allowTailscale"] = true
                 auth.removeValue(forKey: "mode")
                 auth.removeValue(forKey: "password")
             } else {
                 auth["allowTailscale"] = false
                 auth["mode"] = "password"
-                auth["password"] = password
+                auth["password"] = trimmedPassword
             }
 
             if auth.isEmpty {
@@ -348,10 +319,17 @@ struct TailscaleIntegrationSection: View {
 
         do {
             try await ConfigStore.save(root)
-            return (true, nil)
-        } catch let error {
-            return (false, error.localizedDescription)
+        } catch {
+            self.statusMessage = error.localizedDescription
+            return
         }
+
+        if self.connectionMode == .local, !self.isPaused {
+            self.statusMessage = "Saved to ~/.clawdis/clawdis.json. Restarting gateway…"
+        } else {
+            self.statusMessage = "Saved to ~/.clawdis/clawdis.json. Restart the gateway to apply."
+        }
+        self.restartGatewayIfNeeded()
     }
 
     private func restartGatewayIfNeeded() {

apps/macos/Sources/ClawdisIPC/IPC.swift

@@ -11,7 +11,6 @@ public enum Capability: String, Codable, CaseIterable, Sendable {
     case screenRecording
     case microphone
     case speechRecognition
-    case camera
 }
 
 public enum CameraFacing: String, Codable, Sendable {

apps/macos/Tests/ClawdisIPCTests/ConnectionsSettingsSmokeTests.swift

@@ -42,35 +42,9 @@ struct ConnectionsSettingsSmokeTests {
                     error: nil,
                     elapsedMs: 120,
                     bot: ProvidersStatusSnapshot.TelegramBot(id: 123, username: "clawdisbot"),
-                    webhook: ProvidersStatusSnapshot.TelegramWebhook(
-                        url: "https://example.com/hook",
-                        hasCustomCert: false)),
+                    webhook: ProvidersStatusSnapshot.TelegramWebhook(url: "https://example.com/hook", hasCustomCert: false)),
                 lastProbeAt: 1_700_000_050_000),
-            discord: nil,
-            signal: ProvidersStatusSnapshot.SignalStatus(
-                configured: true,
-                baseUrl: "http://127.0.0.1:8080",
-                running: true,
-                lastStartAt: 1_700_000_000_000,
-                lastStopAt: nil,
-                lastError: nil,
-                probe: ProvidersStatusSnapshot.SignalProbe(
-                    ok: true,
-                    status: 200,
-                    error: nil,
-                    elapsedMs: 140,
-                    version: "0.12.4"),
-                lastProbeAt: 1_700_000_050_000),
-            imessage: ProvidersStatusSnapshot.IMessageStatus(
-                configured: false,
-                running: false,
-                lastStartAt: nil,
-                lastStopAt: nil,
-                lastError: "not configured",
-                cliPath: nil,
-                dbPath: nil,
-                probe: ProvidersStatusSnapshot.IMessageProbe(ok: false, error: "imsg not found (imsg)"),
-                lastProbeAt: 1_700_000_050_000))
+            discord: nil)
 
         store.whatsappLoginMessage = "Scan QR"
         store.whatsappLoginQrDataUrl =
@@ -120,31 +94,7 @@ struct ConnectionsSettingsSmokeTests {
                     bot: nil,
                     webhook: nil),
                 lastProbeAt: 1_700_000_100_000),
-            discord: nil,
-            signal: ProvidersStatusSnapshot.SignalStatus(
-                configured: false,
-                baseUrl: "http://127.0.0.1:8080",
-                running: false,
-                lastStartAt: nil,
-                lastStopAt: nil,
-                lastError: "not configured",
-                probe: ProvidersStatusSnapshot.SignalProbe(
-                    ok: false,
-                    status: 404,
-                    error: "unreachable",
-                    elapsedMs: 200,
-                    version: nil),
-                lastProbeAt: 1_700_000_200_000),
-            imessage: ProvidersStatusSnapshot.IMessageStatus(
-                configured: false,
-                running: false,
-                lastStartAt: nil,
-                lastStopAt: nil,
-                lastError: "not configured",
-                cliPath: "imsg",
-                dbPath: nil,
-                probe: ProvidersStatusSnapshot.IMessageProbe(ok: false, error: "imsg not found (imsg)"),
-                lastProbeAt: 1_700_000_200_000))
+            discord: nil)
 
         let view = ConnectionsSettings(store: store)
         _ = view.body

apps/macos/Tests/ClawdisIPCTests/GatewayEndpointStoreTests.swift

@@ -29,7 +29,6 @@ import Testing
         let store = GatewayEndpointStore(deps: .init(
             mode: { mode.get() },
             token: { "t" },
-            password: { nil },
             localPort: { 1234 },
             remotePortIfRunning: { nil },
             ensureRemoteTunnel: { 18789 }))
@@ -45,7 +44,6 @@ import Testing
         let store = GatewayEndpointStore(deps: .init(
             mode: { mode.get() },
             token: { nil },
-            password: { nil },
             localPort: { 18789 },
             remotePortIfRunning: { nil },
             ensureRemoteTunnel: { 18789 }))
@@ -60,7 +58,6 @@ import Testing
         let store = GatewayEndpointStore(deps: .init(
             mode: { mode.get() },
             token: { "tok" },
-            password: { "pw" },
             localPort: { 1 },
             remotePortIfRunning: { 5555 },
             ensureRemoteTunnel: { 5555 }))
@@ -72,71 +69,13 @@ import Testing
         _ = try await store.ensureRemoteControlTunnel()
 
         let next = await iterator.next()
-        guard case let .ready(mode, url, token, password) = next else {
+        guard case let .ready(mode, url, token) = next else {
             Issue.record("expected .ready after ensure, got \(String(describing: next))")
             return
         }
         #expect(mode == .remote)
         #expect(url.absoluteString == "ws://127.0.0.1:5555")
         #expect(token == "tok")
-        #expect(password == "pw")
-    }
-
-    @Test func resolvesGatewayPasswordByMode() {
-        let root: [String: Any] = [
-            "gateway": [
-                "auth": ["password": " local "],
-                "remote": ["password": " remote "],
-            ],
-        ]
-        let env: [String: String] = [:]
-
-        #expect(GatewayEndpointStore._testResolveGatewayPassword(
-            isRemote: false,
-            root: root,
-            env: env) == "local")
-        #expect(GatewayEndpointStore._testResolveGatewayPassword(
-            isRemote: true,
-            root: root,
-            env: env) == "remote")
-    }
-
-    @Test func gatewayPasswordEnvOverridesConfig() {
-        let root: [String: Any] = [
-            "gateway": [
-                "auth": ["password": "local"],
-                "remote": ["password": "remote"],
-            ],
-        ]
-        let env = ["CLAWDIS_GATEWAY_PASSWORD": " env "]
-
-        #expect(GatewayEndpointStore._testResolveGatewayPassword(
-            isRemote: false,
-            root: root,
-            env: env) == "env")
-        #expect(GatewayEndpointStore._testResolveGatewayPassword(
-            isRemote: true,
-            root: root,
-            env: env) == "env")
-    }
-
-    @Test func gatewayPasswordIgnoresWhitespaceValues() {
-        let root: [String: Any] = [
-            "gateway": [
-                "auth": ["password": "   "],
-                "remote": ["password": "\n\t"],
-            ],
-        ]
-        let env = ["CLAWDIS_GATEWAY_PASSWORD": "  "]
-
-        #expect(GatewayEndpointStore._testResolveGatewayPassword(
-            isRemote: false,
-            root: root,
-            env: env) == nil)
-        #expect(GatewayEndpointStore._testResolveGatewayPassword(
-            isRemote: true,
-            root: root,
-            env: env) == nil)
     }
 
     @Test func unconfiguredModeRejectsConfig() async {
@@ -144,7 +83,6 @@ import Testing
         let store = GatewayEndpointStore(deps: .init(
             mode: { mode.get() },
             token: { nil },
-            password: { nil },
             localPort: { 18789 },
             remotePortIfRunning: { nil },
             ensureRemoteTunnel: { 18789 }))

apps/macos/Tests/ClawdisIPCTests/LowCoverageHelperTests.swift

@@ -114,9 +114,6 @@ struct LowCoverageHelperTests {
         setenv(keyToken, " secret ", 1)
         #expect(GatewayLaunchAgentManager._testPreferredGatewayBind() == "lan")
         #expect(GatewayLaunchAgentManager._testPreferredGatewayToken() == "secret")
-        #expect(
-            GatewayLaunchAgentManager._testEscapePlistValue("a&b<c>\"'") ==
-                "a&amp;b&lt;c&gt;&quot;&apos;")
 
         #expect(GatewayLaunchAgentManager._testGatewayExecutablePath(bundlePath: "/App") == "/App/Contents/Resources/Relay/clawdis")
         #expect(GatewayLaunchAgentManager._testRelayDir(bundlePath: "/App") == "/App/Contents/Resources/Relay")

apps/macos/Tests/ClawdisIPCTests/MacNodeRuntimeTests.swift

@@ -29,23 +29,4 @@ struct MacNodeRuntimeTests {
             BridgeInvokeRequest(id: "req-3", command: ClawdisSystemCommand.notify.rawValue, paramsJSON: json))
         #expect(response.ok == false)
     }
-
-    @Test func handleInvokeCameraListRequiresEnabledCamera() async {
-        let defaults = UserDefaults.standard
-        let previous = defaults.object(forKey: cameraEnabledKey)
-        defaults.set(false, forKey: cameraEnabledKey)
-        defer {
-            if let previous {
-                defaults.set(previous, forKey: cameraEnabledKey)
-            } else {
-                defaults.removeObject(forKey: cameraEnabledKey)
-            }
-        }
-
-        let runtime = MacNodeRuntime()
-        let response = await runtime.handleInvoke(
-            BridgeInvokeRequest(id: "req-4", command: ClawdisCameraCommand.list.rawValue))
-        #expect(response.ok == false)
-        #expect(response.error?.message.contains("CAMERA_DISABLED") == true)
-    }
 }

apps/macos/Tests/ClawdisIPCTests/MenuSessionsInjectorTests.swift

@@ -29,11 +29,6 @@ struct MenuSessionsInjectorTests {
                 id: "main",
                 key: "main",
                 kind: .direct,
-                displayName: nil,
-                surface: nil,
-                subject: nil,
-                room: nil,
-                space: nil,
                 updatedAt: Date(),
                 sessionId: "s1",
                 thinkingLevel: "low",
@@ -43,14 +38,9 @@ struct MenuSessionsInjectorTests {
                 tokens: SessionTokenStats(input: 10, output: 20, total: 30, contextTokens: 200_000),
                 model: "claude-opus-4-5"),
             SessionRow(
-                id: "discord:group:alpha",
-                key: "discord:group:alpha",
+                id: "group:alpha",
+                key: "group:alpha",
                 kind: .group,
-                displayName: nil,
-                surface: nil,
-                subject: nil,
-                room: nil,
-                space: nil,
                 updatedAt: Date(timeIntervalSinceNow: -60),
                 sessionId: "s2",
                 thinkingLevel: "high",

apps/macos/Tests/ClawdisIPCTests/SessionDataTests.swift

@@ -6,7 +6,7 @@ import Testing
 struct SessionDataTests {
     @Test func sessionKindFromKeyDetectsCommonKinds() {
         #expect(SessionKind.from(key: "global") == .global)
-        #expect(SessionKind.from(key: "discord:group:engineering") == .group)
+        #expect(SessionKind.from(key: "group:engineering") == .group)
         #expect(SessionKind.from(key: "unknown") == .unknown)
         #expect(SessionKind.from(key: "user@example.com") == .direct)
     }
@@ -27,11 +27,6 @@ struct SessionDataTests {
             id: "x",
             key: "user@example.com",
             kind: .direct,
-            displayName: nil,
-            surface: nil,
-            subject: nil,
-            room: nil,
-            space: nil,
             updatedAt: Date(),
             sessionId: nil,
             thinkingLevel: "high",
@@ -46,3 +41,4 @@ struct SessionDataTests {
         #expect(row.flagLabels.contains("aborted"))
     }
 }
+

apps/macos/Tests/ClawdisIPCTests/WorkActivityStoreTests.swift

@@ -8,9 +8,9 @@ struct WorkActivityStoreTests {
     @Test func mainSessionJobPreemptsOther() {
         let store = WorkActivityStore()
 
-        store.handleJob(sessionKey: "discord:group:1", state: "started")
+        store.handleJob(sessionKey: "group:1", state: "started")
         #expect(store.iconState == .workingOther(.job))
-        #expect(store.current?.sessionKey == "discord:group:1")
+        #expect(store.current?.sessionKey == "group:1")
 
         store.handleJob(sessionKey: "main", state: "started")
         #expect(store.iconState == .workingMain(.job))
@@ -18,9 +18,9 @@ struct WorkActivityStoreTests {
 
         store.handleJob(sessionKey: "main", state: "finished")
         #expect(store.iconState == .workingOther(.job))
-        #expect(store.current?.sessionKey == "discord:group:1")
+        #expect(store.current?.sessionKey == "group:1")
 
-        store.handleJob(sessionKey: "discord:group:1", state: "finished")
+        store.handleJob(sessionKey: "group:1", state: "finished")
         #expect(store.iconState == .idle)
         #expect(store.current == nil)
     }

apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatComposer.swift

@@ -103,7 +103,7 @@ struct ClawdisChatComposer: View {
                 set: { next in self.viewModel.switchSession(to: next) }))
         {
             ForEach(self.viewModel.sessionChoices, id: \.key) { session in
-                Text(session.displayName ?? session.key)
+                Text(session.key)
                     .font(.system(.caption, design: .monospaced))
                     .tag(session.key)
             }
@@ -209,7 +209,7 @@ struct ClawdisChatComposer: View {
             Circle()
                 .fill(self.viewModel.healthOK ? .green : .orange)
                 .frame(width: 7, height: 7)
-            Text(self.activeSessionLabel)
+            Text(self.viewModel.sessionKey)
                 .font(.caption2.weight(.semibold))
             Text(self.viewModel.healthOK ? "Connected" : "Connecting…")
                 .font(.caption2)
@@ -221,12 +221,6 @@ struct ClawdisChatComposer: View {
         .clipShape(Capsule())
     }
 
-    private var activeSessionLabel: String {
-        let match = self.viewModel.sessions.first { $0.key == self.viewModel.sessionKey }
-        let trimmed = match?.displayName?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-        return trimmed.isEmpty ? self.viewModel.sessionKey : trimmed
-    }
-
     private var editorOverlay: some View {
         ZStack(alignment: .topLeading) {
             if self.viewModel.input.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
@@ -446,7 +440,7 @@ private struct ChatComposerTextView: NSViewRepresentable {
         // Always allow clearing the text (e.g. after send), even while editing.
         // Only skip other updates while editing to avoid cursor jumps.
         let shouldClear = self.text.isEmpty && !textView.string.isEmpty
-        if isEditing, !shouldClear { return }
+        if isEditing && !shouldClear { return }
 
         if textView.string != self.text {
             context.coordinator.isProgrammaticUpdate = true

apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatSessions.swift

@@ -10,11 +10,6 @@ public struct ClawdisChatSessionEntry: Codable, Identifiable, Sendable, Hashable
 
     public let key: String
     public let kind: String?
-    public let displayName: String?
-    public let surface: String?
-    public let subject: String?
-    public let room: String?
-    public let space: String?
     public let updatedAt: Double?
     public let sessionId: String?
 

apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatSheets.swift

@@ -14,7 +14,7 @@ struct ChatSessionsSheet: View {
                     self.dismiss()
                 } label: {
                     VStack(alignment: .leading, spacing: 4) {
-                        Text(session.displayName ?? session.key)
+                        Text(session.key)
                             .font(.system(.body, design: .monospaced))
                             .lineLimit(1)
                         if let updatedAt = session.updatedAt, updatedAt > 0 {

apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatView.swift

@@ -23,7 +23,7 @@ public struct ClawdisChatView: View {
         static let composerPaddingHorizontal: CGFloat = 0
         static let stackSpacing: CGFloat = 0
         static let messageSpacing: CGFloat = 6
-        static let messageListPaddingTop: CGFloat = 12
+        static let messageListPaddingTop: CGFloat = 0
         static let messageListPaddingBottom: CGFloat = 16
         static let messageListPaddingHorizontal: CGFloat = 6
         #else
@@ -32,7 +32,7 @@ public struct ClawdisChatView: View {
         static let composerPaddingHorizontal: CGFloat = 6
         static let stackSpacing: CGFloat = 6
         static let messageSpacing: CGFloat = 12
-        static let messageListPaddingTop: CGFloat = 10
+        static let messageListPaddingTop: CGFloat = 4
         static let messageListPaddingBottom: CGFloat = 6
         static let messageListPaddingHorizontal: CGFloat = 8
         #endif
@@ -129,9 +129,6 @@ public struct ClawdisChatView: View {
             self.scrollPosition = self.scrollerBottomID
             self.hasPerformedInitialScroll = true
         }
-        .onChange(of: self.viewModel.sessionKey) { _, _ in
-            self.hasPerformedInitialScroll = false
-        }
         .onChange(of: self.viewModel.messages.count) { _, _ in
             guard self.hasPerformedInitialScroll else { return }
             withAnimation(.snappy(duration: 0.22)) {

apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatViewModel.swift

@@ -341,11 +341,6 @@ public final class ClawdisChatViewModel {
         ClawdisChatSessionEntry(
             key: key,
             kind: nil,
-            displayName: nil,
-            surface: nil,
-            subject: nil,
-            room: nil,
-            space: nil,
             updatedAt: nil,
             sessionId: nil,
             systemSent: nil,

apps/shared/ClawdisKit/Sources/ClawdisKit/CameraCommands.swift

@@ -1,7 +1,6 @@
 import Foundation
 
 public enum ClawdisCameraCommand: String, Codable, Sendable {
-    case list = "camera.list"
     case snap = "camera.snap"
     case clip = "camera.clip"
 }
@@ -25,23 +24,17 @@ public struct ClawdisCameraSnapParams: Codable, Sendable, Equatable {
     public var maxWidth: Int?
     public var quality: Double?
     public var format: ClawdisCameraImageFormat?
-    public var deviceId: String?
-    public var delayMs: Int?
 
     public init(
         facing: ClawdisCameraFacing? = nil,
         maxWidth: Int? = nil,
         quality: Double? = nil,
-        format: ClawdisCameraImageFormat? = nil,
-        deviceId: String? = nil,
-        delayMs: Int? = nil)
+        format: ClawdisCameraImageFormat? = nil)
     {
         self.facing = facing
         self.maxWidth = maxWidth
         self.quality = quality
         self.format = format
-        self.deviceId = deviceId
-        self.delayMs = delayMs
     }
 }
 
@@ -50,19 +43,16 @@ public struct ClawdisCameraClipParams: Codable, Sendable, Equatable {
     public var durationMs: Int?
     public var includeAudio: Bool?
     public var format: ClawdisCameraVideoFormat?
-    public var deviceId: String?
 
     public init(
         facing: ClawdisCameraFacing? = nil,
         durationMs: Int? = nil,
         includeAudio: Bool? = nil,
-        format: ClawdisCameraVideoFormat? = nil,
-        deviceId: String? = nil)
+        format: ClawdisCameraVideoFormat? = nil)
     {
         self.facing = facing
         self.durationMs = durationMs
         self.includeAudio = includeAudio
         self.format = format
-        self.deviceId = deviceId
     }
 }

apps/shared/ClawdisKit/Tests/ClawdisKitTests/ChatViewModelTests.swift

@@ -282,11 +282,6 @@ private extension TestChatTransportState {
                 ClawdisChatSessionEntry(
                     key: "recent-1",
                     kind: nil,
-                    displayName: nil,
-                    surface: nil,
-                    subject: nil,
-                    room: nil,
-                    space: nil,
                     updatedAt: recent,
                     sessionId: nil,
                     systemSent: nil,
@@ -301,11 +296,6 @@ private extension TestChatTransportState {
                 ClawdisChatSessionEntry(
                     key: "main",
                     kind: nil,
-                    displayName: nil,
-                    surface: nil,
-                    subject: nil,
-                    room: nil,
-                    space: nil,
                     updatedAt: stale,
                     sessionId: nil,
                     systemSent: nil,
@@ -320,11 +310,6 @@ private extension TestChatTransportState {
                 ClawdisChatSessionEntry(
                     key: "recent-2",
                     kind: nil,
-                    displayName: nil,
-                    surface: nil,
-                    subject: nil,
-                    room: nil,
-                    space: nil,
                     updatedAt: recentOlder,
                     sessionId: nil,
                     systemSent: nil,
@@ -339,11 +324,6 @@ private extension TestChatTransportState {
                 ClawdisChatSessionEntry(
                     key: "old-1",
                     kind: nil,
-                    displayName: nil,
-                    surface: nil,
-                    subject: nil,
-                    room: nil,
-                    space: nil,
                     updatedAt: stale,
                     sessionId: nil,
                     systemSent: nil,
@@ -385,11 +365,6 @@ private extension TestChatTransportState {
                 ClawdisChatSessionEntry(
                     key: "main",
                     kind: nil,
-                    displayName: nil,
-                    surface: nil,
-                    subject: nil,
-                    room: nil,
-                    space: nil,
                     updatedAt: recent,
                     sessionId: nil,
                     systemSent: nil,

docker-compose.yml

@@ -1,38 +0,0 @@
-services:
-  clawdis-gateway:
-    image: ${CLAWDIS_IMAGE:-clawdis:local}
-    environment:
-      HOME: /home/node
-      TERM: xterm-256color
-      CLAWDIS_GATEWAY_TOKEN: ${CLAWDIS_GATEWAY_TOKEN}
-    volumes:
-      - ${CLAWDIS_CONFIG_DIR}:/home/node/.clawdis
-      - ${CLAWDIS_WORKSPACE_DIR}:/home/node/clawd
-    ports:
-      - "${CLAWDIS_GATEWAY_PORT:-18789}:18789"
-      - "${CLAWDIS_BRIDGE_PORT:-18790}:18790"
-    init: true
-    restart: unless-stopped
-    command:
-      [
-        "node",
-        "dist/index.js",
-        "gateway-daemon",
-        "--bind",
-        "${CLAWDIS_GATEWAY_BIND:-lan}",
-        "--port",
-        "${CLAWDIS_GATEWAY_PORT:-18789}"
-      ]
-
-  clawdis-cli:
-    image: ${CLAWDIS_IMAGE:-clawdis:local}
-    environment:
-      HOME: /home/node
-      TERM: xterm-256color
-      BROWSER: echo
-    volumes:
-      - ${CLAWDIS_CONFIG_DIR}:/home/node/.clawdis
-      - ${CLAWDIS_WORKSPACE_DIR}:/home/node/clawd
-    stdin_open: true
-    tty: true
-    entrypoint: ["node", "dist/index.js"]

docker-setup.sh

@@ -1,120 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-COMPOSE_FILE="$ROOT_DIR/docker-compose.yml"
-IMAGE_NAME="${CLAWDIS_IMAGE:-clawdis:local}"
-
-require_cmd() {
-  if ! command -v "$1" >/dev/null 2>&1; then
-    echo "Missing dependency: $1" >&2
-    exit 1
-  fi
-}
-
-require_cmd docker
-if ! docker compose version >/dev/null 2>&1; then
-  echo "Docker Compose not available (try: docker compose version)" >&2
-  exit 1
-fi
-
-mkdir -p "${CLAWDIS_CONFIG_DIR:-$HOME/.clawdis}"
-mkdir -p "${CLAWDIS_WORKSPACE_DIR:-$HOME/clawd}"
-
-export CLAWDIS_CONFIG_DIR="${CLAWDIS_CONFIG_DIR:-$HOME/.clawdis}"
-export CLAWDIS_WORKSPACE_DIR="${CLAWDIS_WORKSPACE_DIR:-$HOME/clawd}"
-export CLAWDIS_GATEWAY_PORT="${CLAWDIS_GATEWAY_PORT:-18789}"
-export CLAWDIS_BRIDGE_PORT="${CLAWDIS_BRIDGE_PORT:-18790}"
-export CLAWDIS_GATEWAY_BIND="${CLAWDIS_GATEWAY_BIND:-lan}"
-export CLAWDIS_IMAGE="$IMAGE_NAME"
-
-if [[ -z "${CLAWDIS_GATEWAY_TOKEN:-}" ]]; then
-  if command -v openssl >/dev/null 2>&1; then
-    CLAWDIS_GATEWAY_TOKEN="$(openssl rand -hex 32)"
-  else
-    CLAWDIS_GATEWAY_TOKEN="$(python3 - <<'PY'
-import secrets
-print(secrets.token_hex(32))
-PY
-)"
-  fi
-fi
-export CLAWDIS_GATEWAY_TOKEN
-
-ENV_FILE="$ROOT_DIR/.env"
-upsert_env() {
-  local file="$1"
-  shift
-  local -a keys=("$@")
-  local tmp
-  tmp="$(mktemp)"
-  declare -A seen=()
-
-  if [[ -f "$file" ]]; then
-    while IFS= read -r line || [[ -n "$line" ]]; do
-      local key="${line%%=*}"
-      local replaced=false
-      for k in "${keys[@]}"; do
-        if [[ "$key" == "$k" ]]; then
-          printf '%s=%s\n' "$k" "${!k}" >>"$tmp"
-          seen["$k"]=1
-          replaced=true
-          break
-        fi
-      done
-      if [[ "$replaced" == false ]]; then
-        printf '%s\n' "$line" >>"$tmp"
-      fi
-    done <"$file"
-  fi
-
-  for k in "${keys[@]}"; do
-    if [[ -z "${seen[$k]:-}" ]]; then
-      printf '%s=%s\n' "$k" "${!k}" >>"$tmp"
-    fi
-  done
-
-  mv "$tmp" "$file"
-}
-
-upsert_env "$ENV_FILE" \
-  CLAWDIS_CONFIG_DIR \
-  CLAWDIS_WORKSPACE_DIR \
-  CLAWDIS_GATEWAY_PORT \
-  CLAWDIS_BRIDGE_PORT \
-  CLAWDIS_GATEWAY_BIND \
-  CLAWDIS_GATEWAY_TOKEN \
-  CLAWDIS_IMAGE
-
-echo "==> Building Docker image: $IMAGE_NAME"
-docker build -t "$IMAGE_NAME" -f "$ROOT_DIR/Dockerfile" "$ROOT_DIR"
-
-echo ""
-echo "==> Onboarding (interactive)"
-echo "When prompted:"
-echo "  - Gateway bind: lan"
-echo "  - Gateway auth: token"
-echo "  - Gateway token: $CLAWDIS_GATEWAY_TOKEN"
-echo "  - Tailscale exposure: Off"
-echo "  - Install Gateway daemon: No"
-echo ""
-docker compose -f "$COMPOSE_FILE" run --rm clawdis-cli onboard
-
-echo ""
-echo "==> WhatsApp login (QR will print in this terminal)"
-docker compose -f "$COMPOSE_FILE" run --rm clawdis-cli login
-
-echo ""
-echo "==> Starting gateway"
-docker compose -f "$COMPOSE_FILE" up -d clawdis-gateway
-
-echo ""
-echo "Gateway running with host port mapping."
-echo "Access from tailnet devices via the host's tailnet IP."
-echo "Config: $CLAWDIS_CONFIG_DIR"
-echo "Workspace: $CLAWDIS_WORKSPACE_DIR"
-echo "Token: $CLAWDIS_GATEWAY_TOKEN"
-echo ""
-echo "Commands:"
-echo "  docker compose -f $COMPOSE_FILE logs -f clawdis-gateway"
-echo "  docker compose -f $COMPOSE_FILE exec clawdis-gateway node dist/index.js health --token \"$CLAWDIS_GATEWAY_TOKEN\""

docs/AGENTS.default.md

@@ -83,7 +83,7 @@ git commit -m "Add Clawd workspace"
 ## What Clawdis Does
 - Runs WhatsApp gateway + Pi coding agent so the assistant can read/write chats, fetch context, and run skills via the host Mac.
 - macOS app manages permissions (screen recording, notifications, microphone) and exposes the `clawdis` CLI via its bundled binary.
-- Direct chats collapse into the shared `main` session by default; groups stay isolated as `surface:group:<id>` (rooms: `surface:channel:<id>`); heartbeats keep background tasks alive.
+- Direct chats collapse into the shared `main` session by default; groups stay isolated as `group:<jid>`; heartbeats keep background tasks alive.
 
 ## Core Skills (enable in Settings → Skills)
 - **mcporter** — Tool server runtime/CLI for managing external skill backends.
@@ -94,7 +94,6 @@ git commit -m "Add Clawd workspace"
 - **eightctl** — Control your sleep, from the terminal.
 - **imsg** — Send, read, stream iMessage & SMS.
 - **wacli** — WhatsApp CLI: sync, search, send.
-- **discord** — Discord actions: react, stickers, polls.
 - **gog** — Google Suite CLI: Gmail, Calendar, Drive, Contacts.
 - **spotify-player** — Terminal Spotify client to search/queue/control playback.
 - **sag** — ElevenLabs speech with mac-style say UX; streams to speakers by default.

docs/agent-send.md

@@ -18,4 +18,4 @@ read_when:
 - Output:
   - Default: prints text (and `MEDIA:<url>` lines) to stdout.
   - `--json`: prints structured payloads + meta.
-- Optional: `--deliver` sends the reply back to the selected provider (`whatsapp`, `telegram`, `discord`, `signal`, `imessage`).
+- Optional: `--deliver` sends the reply back to the selected provider (requires `--to` for WhatsApp).

docs/agent.md

@@ -70,25 +70,13 @@ Legacy Pi/Tau session folders are **not** read.
 
 ## Steering while streaming
 
-When queue mode is `steer`, inbound messages are injected into the current run.
-The queue is checked **after each tool call**; if a queued message is present,
-remaining tool calls from the current assistant message are skipped (error tool
-results with "Skipped due to queued user message."), then the queued user
-message is injected before the next assistant response.
-
-When queue mode is `followup` or `collect`, inbound messages are held until the
-current turn ends, then a new agent turn starts with the queued payloads. See
-`docs/queue.md` for mode + debounce/cap behavior.
-
-Block streaming sends completed assistant blocks as soon as they finish; disable
-via `agent.blockStreamingDefault: "off"` if you only want the final response.
-Tune the boundary via `agent.blockStreamingBreak` (`text_end` vs `message_end`).
+Incoming user messages are queued while the agent is streaming. The queue is checked **after each tool call**. If a queued message is present, remaining tool calls from the current assistant message are skipped (error tool results with "Skipped due to queued user message."), then the queued user message is injected before the next assistant response.
 
 ## Configuration (minimal)
 
 At minimum, set:
 - `agent.workspace`
-- `whatsapp.allowFrom` (strongly recommended)
+- `routing.allowFrom` (strongly recommended)
 
 ---
 

docs/background-process.md

@@ -16,7 +16,6 @@ Key parameters:
 - `yieldMs` (default 20000): auto‑background after this delay
 - `background` (bool): background immediately
 - `timeout` (seconds, default 1800): kill the process after this timeout
-- `stdinMode` (`pipe` | `pty`): use a real TTY when `pty` is requested and node-pty loads (otherwise warns + falls back)
 - `workdir`, `env`
 
 Behavior:

docs/bash.md

@@ -1,44 +0,0 @@
----
-summary: "Bash tool usage, stdin modes, and TTY support"
-read_when:
-  - Using or modifying the bash tool
-  - Debugging stdin or TTY behavior
----
-
-# Bash tool
-
-Run shell commands in the workspace. Supports foreground + background execution via `process`.
-
-## Parameters
-
-- `command` (required)
-- `yieldMs` (default 20000): auto-background after delay
-- `background` (bool): background immediately
-- `timeout` (seconds, default 1800): kill on expiry
-- `stdinMode` (`pipe` | `pty`):
-  - `pipe` (default): classic stdin/stdout/stderr pipes
-  - `pty`: real TTY via node-pty (merged stdout/stderr)
-
-## TTY mode (`stdinMode: "pty"`)
-
-- Uses node-pty if available. If node-pty fails to load/start, the tool warns and falls back to `pipe`.
-- Output streams are merged (no separate stderr).
-- `process write` sends raw input; `eof: true` sends Ctrl-D (`\x04`).
-
-## Examples
-
-Foreground:
-```json
-{"tool":"bash","command":"ls -la"}
-```
-
-Background + poll:
-```json
-{"tool":"bash","command":"npm run build","yieldMs":1000}
-{"tool":"process","action":"poll","sessionId":"<id>"}
-```
-
-TTY command:
-```json
-{"tool":"bash","command":"htop","stdinMode":"pty","background":true}
-```

docs/camera.md

@@ -25,18 +25,12 @@ All camera access is gated behind **user-controlled settings**.
 
 ### Commands (via Gateway `node.invoke`)
 
-- `camera.list`
-  - Response payload:
-    - `devices`: array of `{ id, name, position, deviceType }`
-
 - `camera.snap`
   - Params:
     - `facing`: `front|back` (default: `front`)
     - `maxWidth`: number (optional; default `1600` on the iOS node)
     - `quality`: `0..1` (optional; default `0.9`)
     - `format`: currently `jpg`
-    - `delayMs`: number (optional; default `0`)
-    - `deviceId`: string (optional; from `camera.list`)
   - Response payload:
     - `format: "jpg"`
     - `base64: "<...>"`
@@ -49,7 +43,6 @@ All camera access is gated behind **user-controlled settings**.
     - `durationMs`: number (default `3000`, clamped to a max of `60000`)
     - `includeAudio`: boolean (default `true`)
     - `format`: currently `mp4`
-    - `deviceId`: string (optional; from `camera.list`)
   - Response payload:
     - `format: "mp4"`
     - `base64: "<...>"`
@@ -119,20 +112,15 @@ Use the main `clawdis` CLI to invoke camera commands on the macOS node.
 Examples:
 
 ```bash
-clawdis nodes camera list --node <id>            # list camera ids
 clawdis nodes camera snap --node <id>            # prints MEDIA:<path>
 clawdis nodes camera snap --node <id> --max-width 1280
-clawdis nodes camera snap --node <id> --delay-ms 2000
-clawdis nodes camera snap --node <id> --device-id <id>
 clawdis nodes camera clip --node <id> --duration 10s          # prints MEDIA:<path>
 clawdis nodes camera clip --node <id> --duration-ms 3000      # prints MEDIA:<path> (legacy flag)
-clawdis nodes camera clip --node <id> --device-id <id>
 clawdis nodes camera clip --node <id> --no-audio
 ```
 
 Notes:
 - `clawdis nodes camera snap` defaults to `maxWidth=1600` unless overridden.
-- On macOS, `camera.snap` waits `delayMs` (default 2000ms) after warm-up/exposure settle before capturing.
 - Photo payloads are recompressed to keep base64 under 5 MB.
 
 ## Safety + practical limits

docs/clawd.md

@@ -17,7 +17,7 @@ You’re putting an agent in a position to:
 - send messages back out via WhatsApp/Telegram/Discord
 
 Start conservative:
-- Always set `whatsapp.allowFrom` (never run open-to-the-world on your personal Mac).
+- Always set `routing.allowFrom` (never run open-to-the-world on your personal Mac).
 - Use a dedicated WhatsApp number for the assistant.
 - Keep heartbeats disabled until you trust the setup (omit `agent.heartbeat` or set `agent.heartbeat.every: "0m"`).
 
@@ -74,7 +74,7 @@ clawdis gateway --port 18789
 
 ```json5
 {
-  whatsapp: {
+  routing: {
     allowFrom: ["+15555550123"]
   }
 }
@@ -124,14 +124,10 @@ Example:
     // Start with 0; enable later.
     heartbeat: { every: "0m" }
   },
-  whatsapp: {
-    allowFrom: ["+15555550123"],
-    groups: {
-      "*": { requireMention: true }
-    }
-  },
   routing: {
+    allowFrom: ["+15555550123"],
     groupChat: {
+      requireMention: true,
       mentionPatterns: ["@clawd", "clawd"]
     }
   },

docs/configuration.md

@@ -9,39 +9,19 @@ read_when:
 CLAWDIS reads an optional **JSON5** config from `~/.clawdis/clawdis.json` (comments + trailing commas allowed).
 
 If the file is missing, CLAWDIS 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 mention behavior (`whatsapp.groups`, `telegram.groups`, `discord.guilds`, `routing.groupChat`)
+- restrict who can trigger the bot (`routing.allowFrom`)
+- tune group mention behavior (`routing.groupChat`)
 - customize message prefixes (`messages`)
-- set the agent's workspace (`agent.workspace`)
+- set the agent’s workspace (`agent.workspace`)
 - tune the embedded agent (`agent`) and session behavior (`session`)
-- set the agent's identity (`identity`)
+- set the agent’s identity (`identity`)
 
 ## Minimal config (recommended starting point)
 
 ```json5
 {
   agent: { workspace: "~/clawd" },
-  whatsapp: { allowFrom: ["+15555550123"] }
-}
-```
-
-## Self-chat mode (recommended for group control)
-
-To prevent the bot from responding to WhatsApp @-mentions in groups (only respond to specific text triggers):
-
-```json5
-{
-  agent: { workspace: "~/clawd" },
-  whatsapp: {
-    // Allowlist is DMs only; including your own number enables self-chat mode.
-    allowFrom: ["+15555550123"],
-    groups: { "*": { requireMention: true } }
-  },
-  routing: {
-    groupChat: {
-      mentionPatterns: ["@clawd", "reisponde"]
-    }
-  }
+  routing: { allowFrom: ["+15555550123"] }
 }
 ```
 
@@ -96,27 +76,19 @@ Metadata written by CLI wizards (`onboard`, `configure`, `doctor`, `update`).
 }
 ```
 
-### `whatsapp.allowFrom`
+### `routing.allowFrom`
 
-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).
+Allowlist of E.164 phone numbers that may trigger auto-replies.
 
 ```json5
 {
-  whatsapp: {
-    allowFrom: ["+15555550123", "+447700900123"],
-    textChunkLimit: 4000 // optional outbound chunk size (chars)
-  }
+  routing: { allowFrom: ["+15555550123", "+447700900123"] }
 }
 ```
 
 ### `routing.groupChat`
 
-Group messages default to **require mention** (either metadata mention or regex patterns). Applies to WhatsApp, Telegram, Discord, and iMessage group chats.
-
-**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.
+Group messages default to **require mention** (either metadata mention or regex patterns).
 
 ```json5
 {
@@ -129,25 +101,6 @@ 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`).
-
-To respond **only** to specific text triggers (ignoring native @-mentions):
-```json5
-{
-  whatsapp: {
-    // Include your own number to enable self-chat mode (ignore native @-mentions).
-    allowFrom: ["+15555550123"],
-    groups: { "*": { requireMention: true } }
-  },
-  routing: {
-    groupChat: {
-      // Only these text patterns will trigger responses
-      mentionPatterns: ["reisponde", "@clawd"]
-    }
-  }
-}
-```
-
 ### `routing.queue`
 
 Controls how inbound messages behave when an agent run is already active.
@@ -156,16 +109,12 @@ Controls how inbound messages behave when an agent run is already active.
 {
   routing: {
     queue: {
-      mode: "collect", // steer | followup | collect | steer-backlog (steer+backlog ok) | interrupt (queue=steer legacy)
-      debounceMs: 1000,
-      cap: 20,
-      drop: "summarize", // old | new | summarize
+      mode: "interrupt", // global default: queue | interrupt
       bySurface: {
-        whatsapp: "collect",
-        telegram: "collect",
-        discord: "steer-backlog",
-        imessage: "collect",
-        webchat: "collect"
+        whatsapp: "interrupt",
+        telegram: "interrupt",
+        discord: "queue",
+        webchat: "queue"
       }
     }
   }
@@ -195,7 +144,7 @@ Set `web.enabled: false` to keep it off by default.
 
 ### `telegram` (bot transport)
 
-Clawdis starts Telegram only when a `telegram` config section exists. The bot token is resolved from `TELEGRAM_BOT_TOKEN` or `telegram.botToken`.
+Clawdis reads `TELEGRAM_BOT_TOKEN` or `telegram.botToken` to start the provider.
 Set `telegram.enabled: false` to disable automatic startup.
 
 ```json5
@@ -223,79 +172,19 @@ Configure the Discord bot by setting the bot token and optional gating:
   discord: {
     enabled: true,
     token: "your-bot-token",
+    allowFrom: ["discord:1234567890", "*"], // optional DM allowlist (user ids)
+    guildAllowFrom: {
+      guilds: ["123456789012345678"],      // optional guild allowlist (ids)
+      users: ["987654321098765432"]        // optional user allowlist (ids)
+    },
+    requireMention: true,                   // require @bot mentions in guilds
     mediaMaxMb: 8,                          // clamp inbound media size
-    actions: {                              // tool action gates (false disables)
-      reactions: true,
-      stickers: true,
-      polls: true,
-      permissions: true,
-      messages: true,
-      threads: true,
-      pins: true,
-      search: true,
-      memberInfo: true,
-      roleInfo: true,
-      roles: false,
-      channelInfo: true,
-      voiceStatus: true,
-      events: true,
-      moderation: false
-    },
-    replyToMode: "off",                     // off | first | all
-    slashCommand: {                         // user-installed app slash commands
-      enabled: true,
-      name: "clawd",
-      sessionPrefix: "discord:slash",
-      ephemeral: true
-    },
-    dm: {
-      enabled: true,                        // disable all DMs when false
-      allowFrom: ["1234567890", "steipete"], // optional DM allowlist (ids or names)
-      groupEnabled: false,                 // enable group DMs
-      groupChannels: ["clawd-dm"]          // optional group DM allowlist
-    },
-    guilds: {
-      "123456789012345678": {               // guild id (preferred) or slug
-        slug: "friends-of-clawd",
-        requireMention: false,              // per-guild default
-        users: ["987654321098765432"],      // optional per-guild user allowlist
-        channels: {
-          general: { allow: true },
-          help: { allow: true, requireMention: true }
-        }
-      }
-    },
     historyLimit: 20                        // include last N guild messages as context
   }
 }
 ```
 
-Clawdis starts Discord only when a `discord` config section exists. The token is resolved from `DISCORD_BOT_TOKEN` or `discord.token` (unless `discord.enabled` is `false`). Use `user:<id>` (DM) or `channel:<id>` (guild channel) when specifying delivery targets for cron/CLI commands.
-Guild slugs are lowercase with spaces replaced by `-`; channel keys use the slugged channel name (no leading `#`). Prefer guild ids as keys to avoid rename ambiguity.
-
-### `imessage` (imsg CLI)
-
-Clawdis spawns `imsg rpc` (JSON-RPC over stdio). No daemon or port required.
-
-```json5
-{
-  imessage: {
-    enabled: true,
-    cliPath: "imsg",
-    dbPath: "~/Library/Messages/chat.db",
-    allowFrom: ["+15555550123", "user@example.com", "chat_id:123"],
-    includeAttachments: false,
-    mediaMaxMb: 16,
-    service: "auto",
-    region: "US"
-  }
-}
-```
-
-Notes:
-- Requires Full Disk Access to the Messages DB.
-- The first send will prompt for Messages automation permission.
-- Prefer `chat_id:<id>` targets. Use `imsg chats --limit 20` to list chats.
+Clawdis reads `DISCORD_BOT_TOKEN` or `discord.token` to start the provider (unless `discord.enabled` is `false`). Use `user:<id>` (DM) or `channel:<id>` (guild channel) when specifying delivery targets for cron/CLI commands.
 
 ### `agent.workspace`
 
@@ -394,7 +283,7 @@ Z.AI models are available as `zai/<model>` (e.g. `zai/glm-4.7`) and require
 - `every`: duration string (`ms`, `s`, `m`, `h`); default unit minutes. Omit or set
   `0m` to disable.
 - `model`: optional override model for heartbeat runs (`provider/model`).
-- `target`: optional delivery channel (`last`, `whatsapp`, `telegram`, `discord`, `imessage`, `none`). Default: `last`.
+- `target`: optional delivery channel (`last`, `whatsapp`, `telegram`, `discord`, `none`). Default: `last`.
 - `to`: optional recipient override (E.164 for WhatsApp, chat id for Telegram).
 - `prompt`: optional override for the heartbeat body (default: `HEARTBEAT`).
 
@@ -622,7 +511,7 @@ Defaults:
     mode: "local", // or "remote"
     bind: "loopback",
     // controlUi: { enabled: true }
-    // auth: { mode: "token", token: "your-token" } // token is for multi-machine CLI access
+    // auth: { mode: "token" | "password" }
     // tailscale: { mode: "off" | "serve" | "funnel" }
   }
 }
@@ -633,7 +522,6 @@ Notes:
 
 Auth and Tailscale:
 - `gateway.auth.mode` sets the handshake requirements (`token` or `password`).
-- `gateway.auth.token` stores the shared token for token auth (used by the CLI on the same machine).
 - When `gateway.auth.mode` is set, only that method is accepted (plus optional Tailscale headers).
 - `gateway.auth.password` can be set here, or via `CLAWDIS_GATEWAY_PASSWORD` (recommended).
 - `gateway.auth.allowTailscale` controls whether Tailscale identity headers can satisfy auth.
@@ -730,11 +618,6 @@ Gmail helper config (used by `clawdis hooks gmail setup` / `run`):
 }
 ```
 
-Gateway auto-start:
-- If `hooks.enabled=true` and `hooks.gmail.account` is set, the Gateway starts
-  `gog gmail watch serve` on boot and auto-renews the watch.
-- Set `CLAWDIS_SKIP_GMAIL_WATCHER=1` to disable the auto-start (for manual runs).
-
 Note: when `tailscale.mode` is on, Clawdis defaults `serve.path` to `/` so
 Tailscale can proxy `/gmail-pubsub` correctly (it strips the set-path prefix).
 
@@ -834,7 +717,7 @@ Template placeholders are expanded in `routing.transcribeAudio.command` (and any
 | `{{GroupMembers}}` | Group members preview (best effort) |
 | `{{SenderName}}` | Sender display name (best effort) |
 | `{{SenderE164}}` | Sender phone number (best effort) |
-| `{{Surface}}` | Surface hint (whatsapp|telegram|discord|imessage|webchat|…) |
+| `{{Surface}}` | Surface hint (whatsapp|telegram|discord|webchat|…) |
 
 ## Cron (Gateway scheduler)
 

docs/cron.md

@@ -75,7 +75,7 @@ Each job is a JSON object with stable keys (unknown keys ignored for forward com
   - For `sessionTarget:"main"`, `wakeMode` controls whether we trigger the heartbeat immediately or just enqueue and wait.
 - `payload` (one of)
   - `{"kind":"systemEvent","text":string}` (enqueue as `System:`)
-  - `{"kind":"agentTurn","message":string,"deliver"?:boolean,"channel"?: "last"|"whatsapp"|"telegram"|"discord"|"signal"|"imessage","to"?:string,"timeoutSeconds"?:number}`
+  - `{"kind":"agentTurn","message":string,"deliver"?:boolean,"channel"?: "last"|"whatsapp"|"telegram","to"?:string,"timeoutSeconds"?:number}`
 - `isolation` (optional; only meaningful for isolated jobs)
   - `{"postToMainPrefix"?: string}`
 - `runtime` (optional)
@@ -264,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|signal|imessage] [--to <dest>]`
+    - `--message "<agent message>" [--deliver] [--channel last|whatsapp|telegram|discord] [--to <dest>]`
 
 - `clawdis cron edit <id> ...` (patch-by-flags, non-interactive)
 - `clawdis cron rm <id>`

docs/discord.md

@@ -11,36 +11,27 @@ Status: ready for DM and guild text channels via the official Discord bot gatewa
 
 ## Goals
 - Talk to Clawdis via Discord DMs or guild channels.
-- Share the same `main` session used by WhatsApp/Telegram/WebChat; guild channels stay isolated as `discord:group:<channelId>` (display names use `discord:<guildSlug>#<channelSlug>`).
-- Group DMs are ignored by default; enable via `discord.dm.groupEnabled` and optionally restrict by `discord.dm.groupChannels`.
+- Share the same `main` session used by WhatsApp/Telegram/WebChat; guild channels stay isolated as `group:<channelId>`.
 - Keep routing deterministic: replies always go back to the surface they arrived on.
 
 ## How it works
 1. Create a Discord application → Bot, enable the intents you need (DMs + guild messages + message content), and grab the bot token.
 2. Invite the bot to your server with the permissions required to read/send messages where you want to use it.
 3. Configure Clawdis with `DISCORD_BOT_TOKEN` (or `discord.token` in `~/.clawdis/clawdis.json`).
-4. Run the gateway; it auto-starts the Discord provider only when a `discord` config section exists **and** the token is set (unless `discord.enabled = false`).
-   - If you prefer env vars, still add `discord: { enabled: true }` to `~/.clawdis/clawdis.json` and set `DISCORD_BOT_TOKEN`.
+4. Run the gateway; it auto-starts the Discord provider when the token is set (unless `discord.enabled = false`).
 5. Direct chats: use `user:<id>` (or a `<@id>` mention) when delivering; all turns land in the shared `main` session.
-6. Guild channels: use `channel:<channelId>` for delivery. Mentions are required by default and can be set per guild or per channel.
-7. Optional DM control: set `discord.dm.enabled = false` to ignore all DMs, or `discord.dm.allowFrom` to allow specific users (ids or names). Use `discord.dm.groupEnabled` + `discord.dm.groupChannels` to allow group DMs.
-8. Optional guild rules: set `discord.guilds` keyed by guild id (preferred) or slug, with per-channel rules.
-9. Optional slash commands: enable `discord.slashCommand` to accept user-installed app commands (ephemeral replies). Slash invocations respect the same DM/guild allowlists.
-10. Optional guild context history: set `discord.historyLimit` (default 20) to include the last N guild messages as context when replying to a mention. Set `0` to disable.
-11. Reactions: the agent can trigger reactions via the `discord` tool (gated by `discord.actions.*`).
-12. Slash commands use isolated session keys (`${sessionPrefix}:${userId}`) rather than the shared `main` session.
+6. Guild channels: use `channel:<channelId>` for delivery. Mentions are required by default; disable with `discord.requireMention = false`.
+7. Optional DM allowlist: reuse `discord.allowFrom` with user ids (`1234567890` or `discord:1234567890`). Use `"*"` to allow all DMs.
+8. Optional guild allowlist: set `discord.guildAllowFrom` with `guilds` and/or `users` to gate who can invoke the bot in servers.
+9. Optional guild context history: set `discord.historyLimit` (default 20) to include the last N guild messages as context when replying to a mention. Set `0` to disable.
 
 Note: Discord does not provide a simple username → id lookup without extra guild context, so prefer ids or `<@id>` mentions for DM delivery targets.
-Note: Slugs are lowercase with spaces replaced by `-`. Channel names are slugged without the leading `#`.
-Note: Guild context `[from:]` lines include `author.tag` + `id` to make ping-ready replies easy.
 
 ## Capabilities & limits
 - DMs and guild text channels (threads are treated as separate channels; voice not supported).
 - Typing indicators sent best-effort; message chunking honors Discord’s 2k character limit.
 - File uploads supported up to the configured `discord.mediaMaxMb` (default 8 MB).
 - Mention-gated guild replies by default to avoid noisy bots.
-- Reply context is injected when a message references another message (quoted content + ids).
-- Native reply threading is **off by default**; enable with `discord.replyToMode` and reply tags.
 
 ## Config
 
@@ -49,130 +40,23 @@ Note: Guild context `[from:]` lines include `author.tag` + `id` to make ping-rea
   discord: {
     enabled: true,
     token: "abc.123",
+    allowFrom: ["123456789012345678"],
+    guildAllowFrom: {
+      guilds: ["123456789012345678"],
+      users: ["987654321098765432"]
+    },
+    requireMention: true,
     mediaMaxMb: 8,
-    actions: {
-      reactions: true,
-      stickers: true,
-      polls: true,
-      permissions: true,
-      messages: true,
-      threads: true,
-      pins: true,
-      search: true,
-      memberInfo: true,
-      roleInfo: true,
-      roles: false,
-      channelInfo: true,
-      voiceStatus: true,
-      events: true,
-      moderation: false
-    },
-    replyToMode: "off",
-    slashCommand: {
-      enabled: true,
-      name: "clawd",
-      sessionPrefix: "discord:slash",
-      ephemeral: true
-    },
-    dm: {
-      enabled: true,
-      allowFrom: ["123456789012345678", "steipete"],
-      groupEnabled: false,
-      groupChannels: ["clawd-dm"]
-    },
-    guilds: {
-      "*": { requireMention: true },
-      "123456789012345678": {
-        slug: "friends-of-clawd",
-        requireMention: false,
-        users: ["987654321098765432", "steipete"],
-        channels: {
-          general: { allow: true },
-          help: { allow: true, requireMention: true }
-        }
-      }
-    }
+    historyLimit: 20
   }
 }
 ```
 
-- `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.
-- `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.
-- `guilds.<id>.users`: optional per-guild user allowlist (ids or names).
-- `guilds.<id>.channels`: channel rules (keys are channel slugs or ids).
-- `guilds.<id>.requireMention`: per-guild mention requirement (overridable per channel).
-- `slashCommand`: optional config for user-installed slash commands (ephemeral responses).
+- `allowFrom`: DM allowlist (user ids). Omit or set to `["*"]` to allow any DM sender.
+- `guildAllowFrom`: Optional allowlist for guild messages. Set `guilds` and/or `users` (ids). When both are set, both must match.
+- `requireMention`: when `true`, messages in guild channels must mention the bot.
 - `mediaMaxMb`: clamp inbound media saved to disk.
 - `historyLimit`: number of recent guild messages to include as context when replying to a mention (default 20, `0` disables).
-- `actions`: per-action tool gates; omit to allow all (set `false` to disable).
-  - `reactions` (covers react + read reactions)
-  - `stickers`, `polls`, `permissions`, `messages`, `threads`, `pins`, `search`
-  - `memberInfo`, `roleInfo`, `channelInfo`, `voiceStatus`, `events`
-  - `roles` (role add/remove, default `false`)
-  - `moderation` (timeout/kick/ban, default `false`)
-
-### Tool action defaults
-
-| Action group | Default | Notes |
-| --- | --- | --- |
-| reactions | enabled | React + list reactions + emojiList |
-| stickers | enabled | Send stickers |
-| polls | enabled | Create polls |
-| permissions | enabled | Channel permission snapshot |
-| messages | enabled | Read/send/edit/delete |
-| threads | enabled | Create/list/reply |
-| pins | enabled | Pin/unpin/list |
-| search | enabled | Message search (preview spec) |
-| memberInfo | enabled | Member info |
-| roleInfo | enabled | Role list |
-| channelInfo | enabled | Channel info + list |
-| voiceStatus | enabled | Voice state lookup |
-| events | enabled | List/create scheduled events |
-| roles | disabled | Role add/remove |
-| moderation | disabled | Timeout/kick/ban |
-- `replyToMode`: `off` (default), `first`, or `all`. Applies only when the model includes a reply tag.
-
-## Reply tags
-To request a threaded reply, the model can include one tag in its output:
-- `[[reply_to_current]]` — reply to the triggering Discord message.
-- `[[reply_to:<id>]]` — reply to a specific message id from context/history.
-Current message ids are appended to prompts as `[message_id: …]`; history entries already include ids.
-
-Behavior is controlled by `discord.replyToMode`:
-- `off`: ignore tags.
-- `first`: only the first outbound chunk/attachment is a reply.
-- `all`: every outbound chunk/attachment is a reply.
-
-Allowlist matching notes:
-- `allowFrom`/`users`/`groupChannels` accept ids, names, tags, or mentions like `<@id>`.
-- Prefixes like `discord:`/`user:` (users) and `channel:` (group DMs) are supported.
-- Use `*` to allow any sender/channel.
-- When `guilds.<id>.channels` is present, channels not listed are denied by default.
-
-Slash command notes:
-- Register a chat input command in Discord with at least one string option (e.g., `prompt`).
-- The first non-empty string option is treated as the prompt.
-- Slash commands honor the same allowlists as DMs/guild messages (`discord.dm.allowFrom`, `discord.guilds`, per-channel rules).
-- Clawdis will auto-register `/clawd` (or the configured name) if it doesn't already exist.
-
-## Tool actions
-The agent can call `discord` with actions like:
-- `react` / `reactions` (add or list reactions)
-- `sticker`, `poll`, `permissions`
-- `readMessages`, `sendMessage`, `editMessage`, `deleteMessage`
-- `threadCreate`, `threadList`, `threadReply`
-- `pinMessage`, `unpinMessage`, `listPins`
-- `searchMessages`, `memberInfo`, `roleInfo`, `roleAdd`, `roleRemove`, `emojiList`
-- `channelInfo`, `channelList`, `voiceStatus`, `eventList`, `eventCreate`
-- `timeout`, `kick`, `ban`
-
-Discord message ids are surfaced in the injected context (`[discord message id: …]` and history lines) so the agent can target them.
-Emoji can be unicode (e.g., `✅`) or custom emoji syntax like `<:party_blob:1234567890>`.
 
 ## Safety & ops
 - Treat the bot token like a password; prefer the `DISCORD_BOT_TOKEN` env var on supervised hosts or lock down the config file permissions.

docs/docker.md

@@ -1,49 +0,0 @@
----
-summary: "Optional Docker-based setup and onboarding for Clawdis"
-read_when:
-  - You want a containerized gateway instead of local installs
-  - You are validating the Docker flow
----
-
-# Docker (optional)
-
-Docker is **optional**. Use it only if you want a containerized gateway or to validate the Docker flow.
-
-## Quick start (recommended)
-
-From the repo root:
-
-```bash
-./docker-setup.sh
-```
-
-This script:
-- builds the image
-- runs the onboarding wizard
-- runs WhatsApp login
-- starts the gateway via Docker Compose
-
-It writes config/workspace on the host:
-- `~/.clawdis/`
-- `~/clawd`
-
-## Manual flow (compose)
-
-```bash
-docker build -t clawdis:local -f Dockerfile .
-docker compose run --rm clawdis-cli onboard
-docker compose run --rm clawdis-cli login
-docker compose up -d clawdis-gateway
-```
-
-## E2E smoke test (Docker)
-
-```bash
-scripts/e2e/onboard-docker.sh
-```
-
-## Notes
-
-- Gateway bind defaults to `lan` for container use.
-- Health check:
-  `docker compose exec clawdis-gateway node dist/index.js health --token "$CLAWDIS_GATEWAY_TOKEN"`

docs/doctor.md

@@ -1,36 +0,0 @@
----
-summary: "Doctor command: health checks, config migrations, and repair steps"
-read_when:
-  - Adding or modifying doctor migrations
-  - Introducing breaking config changes
----
-# Doctor
-
-`clawdis doctor` is the repair + migration tool for Clawdis. It runs a quick health check, audits skills, and can migrate deprecated config entries to the new schema.
-
-## What it does
-- Runs a health check and offers to restart the gateway if it looks unhealthy.
-- Prints a skills status summary (eligible/missing/blocked).
-- Detects deprecated config keys and offers to migrate them.
-
-## Legacy config migrations
-When the config contains deprecated keys, other commands will refuse to run and ask you to run `clawdis doctor`.
-Doctor will:
-- Explain which legacy keys were found.
-- Show the migration it applied.
-- Rewrite `~/.clawdis/clawdis.json` with the updated schema.
-
-Current migrations:
-- `routing.allowFrom` → `whatsapp.allowFrom`
-
-## Usage
-
-```bash
-clawdis doctor
-```
-
-If you want to review changes before writing, open the config file first:
-
-```bash
-cat ~/.clawdis/clawdis.json
-```

docs/faq.md

@@ -1,405 +0,0 @@
----
-summary: "Frequently asked questions about Clawdis setup, configuration, and usage"
----
-# FAQ 🦞
-
-Common questions from the community. For detailed configuration, see [configuration.md](./configuration.md).
-
-## Installation & Setup
-
-### Where does Clawdis store its data?
-
-Everything lives under `~/.clawdis/`:
-
-| Path | Purpose |
-|------|---------|
-| `~/.clawdis/clawdis.json` | Main config (JSON5) |
-| `~/.clawdis/credentials/` | WhatsApp/Telegram auth tokens |
-| `~/.clawdis/sessions/` | Conversation history & state |
-| `~/.clawdis/sessions/sessions.json` | Session metadata |
-
-Your **workspace** (AGENTS.md, memory files, skills) is separate — configured via `agent.workspace` in your config (default: `~/clawd`).
-
-### What platforms does Clawdis run on?
-
-**macOS and Linux** are the primary targets. Anywhere Node.js 22+ runs should work in theory.
-
-- **macOS** — Fully supported, most tested
-- **Linux** — Works great, common for VPS/server deployments
-- **Windows** — Should work but largely untested! You're in pioneer territory 🤠
-
-Some features are platform-specific:
-- **iMessage** — macOS only (uses `imsg` CLI)
-- **Clawdis.app** — macOS native app (optional, gateway works without it)
-
-### I'm getting "unauthorized" errors on health check
-
-You need a config file. Run the onboarding wizard:
-
-```bash
-pnpm clawdis onboard
-```
-
-This creates `~/.clawdis/clawdis.json` with your API keys, workspace path, and owner phone number.
-
-### How do I start fresh?
-
-```bash
-# Backup first (optional)
-cp -r ~/.clawdis ~/.clawdis-backup
-
-# Remove config and credentials
-rm -rf ~/.clawdis
-
-# Re-run onboarding
-pnpm clawdis onboard
-pnpm clawdis login
-```
-
-### Something's broken — how do I diagnose?
-
-Run the doctor:
-
-```bash
-pnpm clawdis doctor
-```
-
-It checks your config, skills status, and gateway health. It can also restart the gateway daemon if needed.
-
-### Terminal onboarding vs macOS app?
-
-**Use terminal onboarding** (`pnpm clawdis onboard`) — it's more stable right now.
-
-The macOS app onboarding is still being polished and can have quirks (e.g., WhatsApp 515 errors, OAuth issues).
-
----
-
-## Authentication
-
-### OAuth vs API key — what's the difference?
-
-- **OAuth** — Uses your Claude Pro/Max subscription ($20-100/mo flat). No per-token charges. ✅ Recommended!
-- **API key** — Pay-per-token via console.anthropic.com. Can get expensive fast.
-
-They're **separate billing**! An API key does NOT use your subscription.
-
-**For OAuth:** During onboarding, pick "Anthropic OAuth", log in to your Claude account, paste the code back.
-
-**If OAuth fails** (headless/container): Do OAuth on a normal machine, then copy `~/.clawdis/` to your server. The auth is just a JSON file.
-
-### OAuth callback not working (containers/headless)?
-
-OAuth needs the callback to reach the machine running the CLI. Options:
-
-1. **Copy auth manually** — Run OAuth on your laptop, copy `~/.clawdis/credentials/` to the container.
-2. **SSH tunnel** — `ssh -L 18789:localhost:18789 user@server`
-3. **Tailscale** — Put both machines on your tailnet.
-
----
-
-## Migration & Deployment
-
-### How do I migrate Clawdis to a new machine (or VPS)?
-
-1. **Backup on old machine:**
-   ```bash
-   # Config + credentials + sessions
-   tar -czvf clawdis-backup.tar.gz ~/.clawdis
-   
-   # Your workspace (memories, AGENTS.md, etc.)
-   tar -czvf workspace-backup.tar.gz ~/path/to/workspace
-   ```
-
-2. **Copy to new machine:**
-   ```bash
-   scp clawdis-backup.tar.gz workspace-backup.tar.gz user@new-machine:~/
-   ```
-
-3. **Restore on new machine:**
-   ```bash
-   cd ~
-   tar -xzvf clawdis-backup.tar.gz
-   tar -xzvf workspace-backup.tar.gz
-   ```
-
-4. **Install Clawdis** (Node 22+, pnpm, clone repo, `pnpm install && pnpm build`)
-
-5. **Start gateway:**
-   ```bash
-   pnpm clawdis gateway
-   ```
-
-**Note:** WhatsApp may notice the IP change and require re-authentication. If so, run `pnpm clawdis login` again. Stop the old instance before starting the new one to avoid conflicts.
-
-### Can I run Clawdis in Docker?
-
-There's no official Docker setup yet, but it works. Key considerations:
-
-- **WhatsApp login:** QR code works in terminal — no display needed.
-- **Persistence:** Mount `~/.clawdis/` and your workspace as volumes.
-- **pnpm doesn't persist:** Global npm installs don't survive container restarts. Install pnpm in your startup script.
-- **Browser automation:** Optional. If needed, install headless Chrome + Playwright deps, or connect to a remote browser via `--remote-debugging-port`.
-
-**Volume mappings (e.g., Unraid):**
-```
-/mnt/user/appdata/clawdis/config    → /root/.clawdis
-/mnt/user/appdata/clawdis/workspace → /root/clawd
-/mnt/user/appdata/clawdis/app       → /app
-```
-
-**Startup script (`start.sh`):**
-```bash
-#!/bin/bash
-npm install -g pnpm
-cd /app
-pnpm clawdis gateway
-```
-
-**Container command:**
-```
-bash /app/start.sh
-```
-
-Docker support is on the roadmap — PRs welcome!
-
-### Can I run Clawdis headless on a VPS?
-
-Yes! The terminal QR code login works fine over SSH. For long-running operation:
-
-- Use `pm2`, `systemd`, or a `launchd` plist to keep the gateway running.
-- Consider Tailscale for secure remote access.
-
-### bun binary vs Node runtime?
-
-Clawdis can run as:
-- **bun binary** — Single executable, easy distribution, auto-restarts via launchd
-- **Node runtime** (`pnpm clawdis gateway`) — More stable for WhatsApp
-
-If you see WebSocket errors like `ws.WebSocket 'upgrade' event is not implemented`, use Node instead of the bun binary. Bun's WebSocket implementation has edge cases that can break WhatsApp (Baileys).
-
-**For stability:** Use launchd (macOS) or the Clawdis.app — they handle process supervision (auto-restart on crash).
-
-**For debugging:** Use `pnpm gateway:watch` for live reload during development.
-
-### WhatsApp keeps disconnecting / crashing (macOS app)
-
-This is often the bun WebSocket issue. Workaround:
-
-1. Run gateway with Node instead:
-   ```bash
-   pnpm gateway:watch
-   ```
-2. In **Clawdis.app → Settings → Debug**, check **"External gateway"**
-3. The app now connects to your Node gateway instead of spawning bun
-
-This is the most stable setup until bun's WebSocket handling improves.
-
----
-
-## Multi-Instance & Contexts
-
-### Can I run multiple Clawds (separate instances)?
-
-The intended design is **one Clawd, one identity**. Rather than running separate instances:
-
-- **Add skills** — Give your Clawd multiple capabilities (business + fitness + personal).
-- **Use context switching** — "Hey Clawd, let's talk about fitness" within the same conversation.
-- **Use groups for separation** — Create Telegram/Discord groups for different contexts; each group gets its own session.
-
-Why? A unified assistant knows your whole context. Your fitness coach knows when you've had a stressful work week.
-
-If you truly need full separation (different users, privacy boundaries), you'd need:
-- Separate config directories
-- Separate gateway ports
-- Separate phone numbers for WhatsApp (one number = one account)
-
-### Can I have separate "threads" for different topics?
-
-Currently, sessions are per-chat:
-- Each WhatsApp/Telegram DM = one session
-- Each group = separate session
-
-**Workaround:** Create multiple groups (even just you + the bot) for different contexts. Each group maintains its own session.
-
-Feature request? Open a [GitHub discussion](https://github.com/steipete/clawdis/discussions)!
-
-### How do groups work?
-
-Groups get separate sessions automatically. By default, the bot requires a **mention** to respond in groups.
-
-Per-group activation can be changed by the owner:
-- `/activation mention` — respond only when mentioned (default)
-- `/activation always` — respond to all messages
-
-See [groups.md](./groups.md) for details.
-
----
-
-## Context & Memory
-
-### How much context can Clawdis handle?
-
-Claude Opus has a 200k token context window, and Clawdis uses **autocompaction** — older conversation gets summarized to stay under the limit.
-
-Practical tips:
-- Keep `AGENTS.md` focused, not bloated.
-- 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?
-
-In your workspace directory (configured in `agent.workspace`, default `~/clawd`). Look for:
-- `memory/` — daily memory files
-- `AGENTS.md` — agent instructions
-- `TOOLS.md` — tool-specific notes
-
-Check your config:
-```bash
-cat ~/.clawdis/clawdis.json | grep workspace
-```
-
----
-
-## Platforms
-
-### Which platforms does Clawdis support?
-
-- **WhatsApp** — Primary. Uses WhatsApp Web protocol.
-- **Telegram** — Via Bot API (grammY).
-- **Discord** — Bot integration.
-- **iMessage** — Via `imsg` CLI (macOS only).
-- **Signal** — Via `signal-cli` (see [signal.md](./signal.md)).
-- **WebChat** — Browser-based chat UI.
-
-### Can I use multiple platforms at once?
-
-Yes! One Clawdis gateway can connect to WhatsApp, Telegram, Discord, and more simultaneously. Each platform maintains its own sessions.
-
-### WhatsApp: Can I use two numbers?
-
-One WhatsApp account = one phone number = one gateway connection. For a second number, you'd need a second gateway instance with a separate config directory.
-
----
-
-## Skills & Tools
-
-### How do I add new skills?
-
-Skills are auto-discovered from your workspace's `skills/` folder. After adding new skills:
-
-1. Send `/reset` (or `/new`) in chat to start a new session
-2. The new skills will be available
-
-No gateway restart needed!
-
-### How do I run commands on other machines?
-
-Use **[Tailscale](https://tailscale.com/)** to create a secure network between your machines:
-
-1. Install Tailscale on all machines (it's separate from Clawdis — set it up yourself)
-2. Each gets a stable IP (like `100.x.x.x`)
-3. SSH just works: `ssh user@100.x.x.x "command"`
-
-Clawdis can use Tailscale when you set `bridge.bind: "tailnet"` in your config — it auto-detects your Tailscale IP.
-
-For deeper integration, look into **Clawdis nodes** — pair remote machines with your gateway for camera/screen/automation access.
-
----
-
-## Troubleshooting
-
-### Build errors (TypeScript)
-
-If you hit build errors on `main`:
-
-1. Pull latest: `git pull origin main && pnpm install`
-2. Try `pnpm clawdis doctor`
-3. Check [GitHub issues](https://github.com/steipete/clawdis/issues) or Discord
-4. Temporary workaround: checkout an older commit
-
-### WhatsApp logged me out
-
-WhatsApp sometimes disconnects on IP changes or after updates. Re-authenticate:
-
-```bash
-pnpm clawdis login
-```
-
-Scan the QR code and you're back.
-
-### Gateway won't start
-
-Check logs:
-```bash
-cat /tmp/clawdis/clawdis-$(date +%Y-%m-%d).log
-```
-
-Common issues:
-- Port already in use (change with `--port`)
-- Missing API keys in config
-- Invalid config syntax (remember it's JSON5, but still check for errors)
-
-**Debug mode** — use watch for live reload:
-```bash
-pnpm gateway:watch
-```
-
-**Pro tip:** Use Codex to debug:
-```bash
-cd ~/path/to/clawdis
-codex --full-auto "debug why clawdis gateway won't start"
-```
-
-### Processes keep restarting after I kill them (Linux)
-
-Something is supervising them. Check:
-
-```bash
-# systemd?
-systemctl list-units | grep -i clawdis
-sudo systemctl stop clawdis
-
-# pm2?
-pm2 list
-pm2 delete all
-```
-
-Stop the supervisor first, then the processes.
-
-### Clean uninstall (start fresh)
-
-```bash
-# Stop processes
-pkill -f "clawdis"
-
-# If using systemd
-sudo systemctl stop clawdis
-sudo systemctl disable clawdis
-
-# Remove data
-rm -rf ~/.clawdis
-
-# Remove repo and re-clone
-rm -rf ~/clawdis
-git clone https://github.com/steipete/clawdis.git
-cd clawdis && pnpm install && pnpm build
-pnpm clawdis onboard
-```
-
----
-
-## Chat Commands
-
-Quick reference (send these in chat):
-
-| Command | Action |
-|---------|--------|
-| `/status` | Health + session info |
-| `/new` or `/reset` | Reset the session |
-| `/think <level>` | Set thinking level (off\|minimal\|low\|medium\|high) |
-| `/verbose on\|off` | Toggle verbose mode |
-| `/activation mention\|always` | Group activation (owner-only) |
-
----
-
-*Still stuck? Ask in [Discord](https://discord.gg/qkhbAGHRBT) or open a [GitHub discussion](https://github.com/steipete/clawdis/discussions).* 🦞

docs/gmail-pubsub.md

@@ -56,12 +56,7 @@ Want a custom endpoint? Use `--push-endpoint <url>` or `--tailscale off`.
 Platform note: on macOS the wizard installs `gcloud`, `gogcli`, and `tailscale`
 via Homebrew; on Linux install them manually first.
 
-Gateway auto-start (recommended):
-- When `hooks.enabled=true` and `hooks.gmail.account` is set, the Gateway starts
-  `gog gmail watch serve` on boot and auto-renews the watch.
-- Set `CLAWDIS_SKIP_GMAIL_WATCHER=1` to opt out (useful if you run the daemon yourself).
-
-Manual daemon (starts `gog gmail watch serve` + auto-renew):
+Run the daemon (starts `gog gmail watch serve` + auto-renew):
 
 ```bash
 clawdis hooks gmail run

docs/grammy.md

@@ -17,8 +17,8 @@ Updated: 2025-12-07
 - **Gateway:** `monitorTelegramProvider` builds a grammY `Bot`, wires mention/allowlist gating, media download via `getFile`/`download`, and delivers replies with `sendMessage/sendPhoto/sendVideo/sendAudio/sendDocument`. Supports long-poll or webhook via `webhookCallback`.
 - **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`, `telegram.allowFrom`, `telegram.mediaMaxMb`, `telegram.proxy`, `telegram.webhookSecret`, `telegram.webhookUrl`.
+- **Sessions:** direct chats map to `main`; groups map to `group:<chatId>`; replies route back to the same surface.
+- **Config knobs:** `telegram.botToken`, `requireMention`, `allowFrom`, `mediaMaxMb`, `proxy`, `webhookSecret`, `webhookUrl`.
 - **Tests:** grammy mocks cover DM + group mention gating and outbound send; more media/webhook fixtures still welcome.
 
 Open questions

docs/group-messages.md

@@ -8,9 +8,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.
 
 ## 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`.
-- 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.
+- 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`. Activation is controlled per group (command or UI), not via config.
+- Group allowlist bypass: we still enforce `routing.allowFrom` on the participant at inbox ingest, but group JIDs themselves no longer block replies.
+- Per-group sessions: session keys look like `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.
 - Ephemeral/view-once: we unwrap those before extracting text/mentions, so pings inside them still trigger.
@@ -21,11 +21,6 @@ Add a `groupChat` block to `~/.clawdis/clawdis.json` so display-name pings work
 
 ```json5
 {
-  "whatsapp": {
-    "groups": {
-      "*": { "requireMention": true }
-    }
-  },
   "routing": {
     "groupChat": {
       "historyLimit": 50,
@@ -50,7 +45,7 @@ Use the group chat command:
 - `/activation mention`
 - `/activation always`
 
-Only the owner number (from `whatsapp.allowFrom`, defaulting to the bot’s own E.164 when unset) can change this. `/status` in the group shows the current activation mode.
+Only the owner number (from `routing.allowFrom`, defaulting to the bot’s own E.164 when unset) can change this. `/status` in the group shows the current activation mode.
 
 ## How to use
 1) Add Clawd UK (`+447700900123`) to the group.
@@ -68,4 +63,4 @@ Only the owner number (from `whatsapp.allowFrom`, defaulting to the bot’s own
 ## Known considerations
 - Heartbeats are intentionally skipped for groups to avoid noisy broadcasts.
 - Echo suppression uses the combined batch string; if you send identical text twice without mentions, only the first will get a response.
-- Session store entries will appear as `whatsapp:group:<jid>` in the session store (`~/.clawdis/sessions/sessions.json` by default); a missing entry just means the group hasn’t triggered a run yet.
+- Session store entries will appear as `group:<jid>` in the session store (`~/.clawdis/sessions/sessions.json` by default); a missing entry just means the group hasn’t triggered a run yet.

docs/groups.md

@@ -1,78 +0,0 @@
----
-summary: "Group chat behavior across surfaces (WhatsApp/Telegram/Discord/iMessage)"
-read_when:
-  - Changing group chat behavior or mention gating
----
-# Groups
-
-Clawdis 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>`).
-- Direct chats use the main session (or per-sender if configured).
-- Heartbeats are skipped for group sessions.
-
-## Display labels
-- UI labels use `displayName` when available, formatted as `surface:<token>`.
-- `#room` is reserved for rooms/channels; group chats use `g-<slug>` (lowercase, spaces -> `-`, keep `#@+._-`).
-
-## Mention gating (default)
-Group messages require a mention unless overridden per group. Defaults live per subsystem under `*.groups."*"`.
-
-```json5
-{
-  whatsapp: {
-    groups: {
-      "*": { requireMention: true },
-      "123@g.us": { requireMention: false }
-    }
-  },
-  telegram: {
-    groups: {
-      "*": { requireMention: true },
-      "123456789": { requireMention: false }
-    }
-  },
-  imessage: {
-    groups: {
-      "*": { requireMention: true },
-      "123": { requireMention: false }
-    }
-  },
-  routing: {
-    groupChat: {
-      mentionPatterns: ["@clawd", "clawdbot", "\\+15555550123"],
-      historyLimit: 50
-    }
-  }
-}
-```
-
-Notes:
-- `mentionPatterns` are case-insensitive regexes.
-- Surfaces that provide explicit mentions still pass; patterns are a fallback.
-- Discord defaults live in `discord.guilds."*"` (overridable per guild/channel).
-
-## Activation (owner-only)
-Group owners can toggle per-group activation:
-- `/activation mention`
-- `/activation always`
-
-Owner is determined by `whatsapp.allowFrom` (or the bot’s self E.164 when unset). Other surfaces currently ignore `/activation`.
-
-## Context fields
-Group inbound payloads set:
-- `ChatType=group`
-- `GroupSubject` (if known)
-- `GroupMembers` (if known)
-- `WasMentioned` (mention gating result)
-
-The agent system prompt includes a group intro on the first turn of a new group session.
-
-## iMessage specifics
-- Prefer `chat_id:<id>` when routing or allowlisting.
-- List chats: `imsg chats --limit 20`.
-- Group replies always go back to the same `chat_id`.
-
-## WhatsApp specifics
-See `docs/group-messages.md` for WhatsApp-only behavior (history injection, mention handling details).

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 `clawdis logout` then `clawdis login`.
 - Gateway unreachable → start it: `clawdis 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 mention rules match (`routing.groupChat.mentionPatterns` and `whatsapp.groups`).
+- No inbound messages → confirm linked phone is online and the sender is allowed (`routing.allowFrom`); for group chats, ensure mention rules match (`routing.groupChat`).
 
 ## Dedicated "health" command
 `clawdis 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/heartbeat.md

@@ -10,18 +10,10 @@ surface anything that needs attention without spamming the user.
 
 ## Prompt contract
 - Heartbeat body defaults to `HEARTBEAT` (configurable via `agent.heartbeat.prompt`).
-- If nothing needs attention, the model should reply **exactly** `HEARTBEAT_OK`.
-- During heartbeat runs, Clawdis treats `HEARTBEAT_OK` as an ack when it appears at
-  the **start or end** of the reply. Clawdis strips the token and discards the
-  reply if the remaining content is **≤ 30 characters**.
-- If `HEARTBEAT_OK` is in the **middle** of a reply, it is not treated specially.
+- If nothing needs attention, the model must reply **exactly** `HEARTBEAT_OK`.
+- Any response containing `HEARTBEAT_OK` is treated as an ack and discarded.
 - For alerts, do **not** include `HEARTBEAT_OK`; return only the alert text.
 
-### Stray `HEARTBEAT_OK` outside heartbeats
-If the model accidentally includes `HEARTBEAT_OK` at the start or end of a
-normal (non-heartbeat) reply, Clawdis strips the token and logs a verbose
-message. If the reply is only `HEARTBEAT_OK`, it is dropped.
-
 ## Config
 
 ```json5

docs/imessage.md

@@ -1,63 +0,0 @@
----
-summary: "iMessage support via imsg (JSON-RPC over stdio), setup, and chat_id routing"
-read_when:
-  - Setting up iMessage support
-  - Debugging iMessage send/receive
----
-# iMessage (imsg)
-
-Status: external CLI integration. No daemon.
-
-## Model
-- Clawdis spawns `imsg rpc` as a child process.
-- JSON-RPC runs over stdin/stdout (one JSON object per line).
-- Gateway owns the process; no TCP port needed.
-
-## Requirements
-- macOS with Messages signed in.
-- Full Disk Access for Clawdis + the `imsg` binary (Messages DB access).
-- Automation permission for Messages when sending.
-
-## Config
-
-```json5
-{
-  imessage: {
-    enabled: true,
-    cliPath: "imsg",
-    dbPath: "~/Library/Messages/chat.db",
-    allowFrom: ["+15555550123", "user@example.com", "chat_id:123"],
-    includeAttachments: false,
-    mediaMaxMb: 16,
-    service: "auto",
-    region: "US"
-  }
-}
-```
-
-Notes:
-- `allowFrom` accepts handles (phone/email) or `chat_id:<id>` entries.
-- `service` defaults to `auto` (use `imessage` or `sms` to pin).
-- `region` is only used for SMS targeting.
-
-## Addressing / targets
-
-Prefer `chat_id` for stable routing:
-- `chat_id:123` (preferred)
-- `chat_guid:...` (fallback)
-- `chat_identifier:...` (fallback)
-- direct handles: `imessage:+1555` / `sms:+1555` / `user@example.com`
-
-List chats:
-```
-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`.
-- Replies go back to the same `chat_id` (group or direct).
-
-## Troubleshooting
-- `clawdis gateway call providers.status --params '{"probe":true}'`
-- Verify `imsg` is on PATH and has access to Messages DB.

docs/index.md

@@ -13,17 +13,17 @@ read_when:
 </p>
 
 <p align="center">
-  <strong>WhatsApp + Telegram + Discord + iMessage gateway for AI agents (Pi).</strong><br>
+  <strong>WhatsApp + Telegram + Discord gateway for AI agents (Pi).</strong><br>
   Send a message, get an agent response — from your pocket.
 </p>
 
 <p align="center">
   <a href="https://github.com/steipete/clawdis">GitHub</a> ·
   <a href="https://github.com/steipete/clawdis/releases">Releases</a> ·
-  <a href="./clawd.md">Clawd setup</a>
+  <a href="./clawd">Clawd setup</a>
 </p>
 
-CLAWDIS bridges WhatsApp (via WhatsApp Web / Baileys), Telegram (Bot API / grammY), Discord (Bot API / discord.js), and iMessage (imsg CLI) to coding agents like [Pi](https://github.com/badlogic/pi-mono).
+CLAWDIS bridges WhatsApp (via WhatsApp Web / Baileys), Telegram (Bot API / grammY), and Discord (Bot API / discord.js) to coding agents like [Pi](https://github.com/badlogic/pi-mono).
 It’s built for [Clawd](https://clawd.me), a space lobster who needed a TARDIS.
 
 ## How it works
@@ -61,7 +61,6 @@ Most operations flow through the **Gateway** (`clawdis gateway`), a single long-
 - 📱 **WhatsApp Integration** — Uses Baileys for WhatsApp Web protocol
 - ✈️ **Telegram Bot** — DMs + groups via grammY
 - 🎮 **Discord Bot** — DMs + guild channels via discord.js
-- 💬 **iMessage** — Local imsg CLI integration (macOS)
 - 🤖 **Agent bridge** — Pi (RPC mode) with tool streaming
 - 💬 **Sessions** — Direct chats collapse into shared `main` (default); groups are isolated
 - 👥 **Group Chat Support** — Mention-based by default; owner can toggle `/activation always|mention`
@@ -100,31 +99,28 @@ clawdis send --to +15555550123 --message "Hello from CLAWDIS"
 Config lives at `~/.clawdis/clawdis.json`.
 
 - If you **do nothing**, CLAWDIS uses the bundled Pi binary in RPC mode with per-sender sessions.
-- If you want to lock it down, start with `whatsapp.allowFrom` and (for groups) mention rules.
+- If you want to lock it down, start with `routing.allowFrom` and (for groups) mention rules.
 
 Example:
 
 ```json5
 {
-  whatsapp: {
+  routing: {
     allowFrom: ["+15555550123"],
-    groups: { "*": { requireMention: true } }
-  },
-  routing: { groupChat: { mentionPatterns: ["@clawd"] } }
+    groupChat: { requireMention: true, mentionPatterns: ["@clawd"] }
+  }
 }
 ```
 
 ## Docs
 
 - Start here:
-  - [FAQ](./faq.md) ← *common questions answered*
   - [Configuration](./configuration.md)
   - [Nix mode](./nix.md)
   - [Clawd personal assistant setup](./clawd.md)
   - [Skills](./skills.md)
   - [Skills config](./skills-config.md)
   - [Workspace templates](./templates/AGENTS.md)
-  - [RPC adapters](./rpc.md)
   - [Gateway runbook](./gateway.md)
   - [Nodes (iOS/Android)](./nodes.md)
   - [Web surfaces (Control UI)](./web.md)
@@ -135,9 +131,7 @@ Example:
   - [Control UI (browser)](./control-ui.md)
   - [Telegram](./telegram.md)
   - [Discord](./discord.md)
-  - [iMessage](./imessage.md)
-  - [Groups](./groups.md)
-  - [WhatsApp group messages](./group-messages.md)
+  - [Group messages](./group-messages.md)
   - [Media: images](./images.md)
   - [Media: audio](./audio.md)
 - Ops and safety:

docs/onboarding.md

@@ -22,10 +22,6 @@ First question: where does the **Gateway** run?
 - **Local (this Mac):** onboarding can run the Anthropic OAuth flow and write the Clawdis token store locally.
 - **Remote (over SSH/tailnet):** onboarding must not run OAuth locally, because credentials must exist on the **gateway host**.
 
-Gateway auth tip:
-- If you only use Clawdis on this Mac (loopback gateway), keep auth **Off**.
-- Use **Token** for multi-machine access or non-loopback binds.
-
 Implementation note (2025-12-19): in local mode, the macOS app bundles the Gateway and enables it via a per-user launchd LaunchAgent (no global npm install/Node requirement for the user).
 
 ## 2) Local-only: Connect Claude (Anthropic OAuth)

docs/queue.md

@@ -3,7 +3,7 @@ summary: "Command queue design that serializes auto-reply command execution"
 read_when:
   - Changing auto-reply execution or concurrency
 ---
-# Command Queue (2026-01-03)
+# Command Queue (2025-11-25)
 
 We now serialize command-based auto-replies (WhatsApp Web listener) through a tiny in-process queue to prevent multiple commands from running at once, while allowing safe parallelism across sessions.
 
@@ -19,16 +19,13 @@ We now serialize command-based auto-replies (WhatsApp Web listener) through a ti
 - Typing indicators (`onReplyStart`) still fire immediately on enqueue so user experience is unchanged while we wait our turn.
 
 ## Queue modes (per surface)
-Inbound messages can steer the current run, wait for a followup turn, or do both:
-- `steer`: inject immediately into the current run (cancels pending tool calls after the next tool boundary). If not streaming, falls back to followup.
-- `followup`: enqueue for the next agent turn after the current run ends.
-- `collect`: coalesce all queued messages into a **single** followup turn (default).
-- `steer-backlog` (aka `steer+backlog`): steer now **and** preserve the message for a followup turn.
-- `interrupt` (legacy): abort the active run for that session, then run the newest message.
-- `queue` (legacy alias): same as `steer`.
+Inbound messages can either queue or interrupt when a run is already active:
+- `queue`: serialize per session; if the agent is streaming, the new message is appended to the current run.
+- `interrupt`: abort the active run for that session, then run the newest message.
 
 Defaults (when unset in config):
-- All surfaces → `collect`
+- WhatsApp + Telegram → `interrupt`
+- Discord + WebChat → `queue`
 
 Configure globally or per surface via `routing.queue`:
 
@@ -36,29 +33,16 @@ Configure globally or per surface via `routing.queue`:
 {
   routing: {
     queue: {
-      mode: "collect",
-      debounceMs: 1000,
-      cap: 20,
-      drop: "summarize",
-      bySurface: { discord: "steer-backlog" }
+      mode: "interrupt",
+      bySurface: { discord: "queue", telegram: "interrupt" }
     }
   }
 }
 ```
 
-## Queue options
-Options apply to `followup`, `collect`, and `steer-backlog` (and to `steer` when it falls back to followup):
-- `debounceMs`: wait for quiet before starting a followup turn (prevents “continue, continue”).
-- `cap`: max queued messages per session.
-- `drop`: overflow policy (`old`, `new`, `summarize`).
-
-Summarize keeps a short bullet list of dropped messages and injects it as a synthetic followup prompt.
-Defaults: `debounceMs: 1000`, `cap: 20`, `drop: summarize`.
-
 ## Per-session overrides
 - `/queue <mode>` as a standalone command stores the mode for the current session.
 - `/queue <mode>` embedded in a message applies **once** (no persistence).
-- Options can be combined: `/queue collect debounce:2s cap:25 drop:summarize`
 - `/queue default` or `/queue reset` clears the session override.
 
 ## Scope and guarantees

docs/rpc.md

@@ -1,35 +0,0 @@
----
-summary: "RPC adapters for external CLIs (signal-cli, imsg) and gateway patterns"
-read_when:
-  - Adding or changing external CLI integrations
-  - Debugging RPC adapters (signal-cli, imsg)
----
-# RPC adapters
-
-Clawdis integrates external CLIs via JSON-RPC. Two patterns are used today.
-
-## Pattern A: HTTP daemon (signal-cli)
-- `signal-cli` runs as a daemon with JSON-RPC over HTTP.
-- Event stream is SSE (`/api/v1/events`).
-- Health probe: `/api/v1/check`.
-- Clawdis owns lifecycle when `signal.autoStart=true`.
-
-See `docs/signal.md` for setup and endpoints.
-
-## Pattern B: stdio child process (imsg)
-- Clawdis spawns `imsg rpc` as a child process.
-- JSON-RPC is line-delimited over stdin/stdout (one JSON object per line).
-- No TCP port, no daemon required.
-
-Core methods used:
-- `watch.subscribe` → notifications (`method: "message"`)
-- `watch.unsubscribe`
-- `send`
-- `chats.list` (probe/diagnostics)
-
-See `docs/imessage.md` for setup and addressing (`chat_id` preferred).
-
-## Adapter guidelines
-- Gateway owns the process (start/stop tied to provider lifecycle).
-- Keep RPC clients resilient: timeouts, restart on exit.
-- Prefer stable IDs (e.g., `chat_id`) over display strings.

docs/security.md

@@ -42,7 +42,7 @@ This is social engineering 101. Create distrust, encourage snooping.
 
 ```json
 {
-  "whatsapp": {
+  "routing": {
     "allowFrom": ["+15555550123"]
   }
 }
@@ -54,13 +54,9 @@ Only allow specific phone numbers to trigger your AI. Never use `["*"]` in produ
 
 ```json
 {
-  "whatsapp": {
-    "groups": {
-      "*": { "requireMention": true }
-    }
-  },
   "routing": {
     "groupChat": {
+      "requireMention": true,
       "mentionPatterns": ["@clawd", "@mybot"]
     }
   }

docs/session.md

@@ -18,14 +18,12 @@ All session state is **owned by the gateway** (the “master” Clawdis). UI cli
   - Store file: `~/.clawdis/sessions/sessions.json` (legacy: `~/.clawdis/sessions.json`).
   - Transcripts: `~/.clawdis/sessions/<SessionId>.jsonl` (one file per session id).
 - The store is a map `sessionKey -> { sessionId, updatedAt, ... }`. Deleting entries is safe; they are recreated on demand.
-- Group entries may include `displayName`, `surface`, `subject`, `room`, and `space` to label sessions in UIs.
 - Clawdis does **not** read legacy Pi/Tau session folders.
 
 ## Mapping transports → session keys
 - Direct chats (WhatsApp, Telegram, Discord, desktop Web Chat) all collapse to the **primary key** so they share context.
 - Multiple phone numbers can map to that same key; they act as transports into the same conversation.
-- Group chats isolate state with `surface:group:<id>` keys (rooms/channels use `surface:channel:<id>`); do not reuse the primary key for groups. (Discord display names show `discord:<guildSlug>#<channelSlug>`.)
-  - Legacy `group:<surface>:<id>` and `group:<id>` keys are still recognized.
+- Group chats still isolate state with `group:<jid>` keys; do not reuse the primary key for groups.
 
 ## Lifecyle
 - Idle expiry: `session.idleMinutes` (default 60). After the timeout a new `sessionId` is minted on the next message.

docs/sessions.md

@@ -1,8 +0,0 @@
----
-summary: "Alias for session management docs"
-read_when:
-  - You looked for docs/sessions.md; canonical doc lives in docs/session.md
----
-# Sessions
-
-Canonical session management docs live in `docs/session.md`.

docs/setup.md

@@ -17,7 +17,6 @@ Last updated: 2026-01-01
 ## Prereqs (from source)
 - Node `>=22`
 - `pnpm`
-- Docker (optional; only for containerized setup/e2e — see `docs/docker.md`)
 
 ## Tailoring strategy (so updates don’t hurt)
 
@@ -113,6 +112,5 @@ pnpm clawdis health
 
 - `docs/gateway.md` (Gateway runbook; flags, supervision, ports)
 - `docs/configuration.md` (config schema + examples)
-- `docs/discord.md` and `docs/telegram.md` (reply tags + replyToMode settings)
 - `docs/clawd.md` (personal assistant setup)
 - `docs/clawdis-mac.md` (macOS app behavior; gateway lifecycle + “Attach only”)

docs/signal.md

@@ -30,11 +30,6 @@ You can still run Clawdis on your own Signal account if your goal is “respond
 
 ## Quickstart (bot number)
 1) Install `signal-cli` (keep Java installed).
-   - If you use the CLI wizard, it can auto-install to `~/.clawdis/tools/signal-cli/...`.
-   - If you want a pinned version (example: `v0.13.22`), install manually:
-     - Download the release asset for your platform from GitHub (tag `v0.13.22`).
-     - Extract it somewhere stable (example: `~/.clawdis/tools/signal-cli/0.13.22/`).
-     - Set `signal.cliPath` to the extracted `signal-cli` binary path.
 2) Link the bot account as a device:
    - Run: `signal-cli link -n "Clawdis"`
    - Scan QR in Signal: Settings → Linked Devices → Link New Device
@@ -60,15 +55,6 @@ You can still run Clawdis on your own Signal account if your goal is “respond
    - Expect `signal.probe.ok=true` and `signal.probe.version`.
 5) DM the bot number from your phone; Clawdis replies.
 
-## “Do I need a separate number?”
-- If you want “I text her and she texts me back”, yes: **use a separate Signal account/number for the bot**.
-- Your personal account can run `signal-cli`, but you can’t self-chat (Signal loop protection; Clawdis ignores sender==account).
-
-If you have a second phone:
-- Create/activate the bot number on that phone.
-- Run `signal-cli link -n "Clawdis"` on your Mac, scan the QR on the bot phone.
-- Put your personal number in `signal.allowFrom`, then DM the bot number from your personal phone.
-
 ## Endpoints (daemon --http)
 - `POST /api/v1/rpc` JSON-RPC request (single or batch).
 - `GET /api/v1/events` SSE stream of `receive` notifications.
@@ -79,10 +65,6 @@ If you have a second phone:
 - Include `params.account` (E164) on JSON-RPC calls.
 - SSE `?account=+E164` filters events; no param = all accounts.
 
-## Troubleshooting
-- Gateway log coloring: `signal-cli: ...` lines are classified by severity; red means “treat this as an error”.
-- `Failed to initialize HTTP Server` typically means the daemon can’t bind the HTTP port (already in use). Stop the other daemon or change `signal.httpPort`.
-
 ## Minimal RPC surface
 - `send` (recipient/groupId/username, message, attachments).
 - `listGroups` (map group IDs).
@@ -91,7 +73,7 @@ If you have a second phone:
 
 ## Addressing (send targets)
 - Direct: `signal:+15551234567` (or plain `+15551234567`)
-- Groups: `signal:group:<groupId>`
+- Groups: `group:<groupId>`
 - Usernames: `username:<name>` / `u:<name>`
 
 ## Process plan (Clawdis adapter)

docs/skills.md

@@ -61,7 +61,6 @@ Fields under `metadata.clawdis`:
 - `homepage` — optional URL shown as “Website” in the macOS Skills UI.
 - `os` — optional list of platforms (`darwin`, `linux`, `win32`). If set, the skill is only eligible on those OSes.
 - `requires.bins` — list; each must exist on `PATH`.
-- `requires.anyBins` — list; at least one must exist on `PATH`.
 - `requires.env` — list; env var must exist **or** be provided in config.
 - `requires.config` — list of `clawdis.json` paths that must be truthy.
 - `primaryEnv` — env var name associated with `skills.entries.<name>.apiKey`.

docs/surface.md

@@ -9,12 +9,12 @@ Updated: 2025-12-07
 
 Goal: make replies deterministic per channel while keeping one shared context for direct chats.
 
-- **Surfaces** (channel labels): `whatsapp`, `webchat`, `telegram`, `discord`, `imessage`, `voice`, etc. Add `Surface` to inbound `MsgContext` so templates/agents can log which channel a turn came from. Routing is fixed: replies go back to the origin surface; the model doesn’t choose.
+- **Surfaces** (channel labels): `whatsapp`, `webchat`, `telegram`, `discord`, `voice`, etc. Add `Surface` to inbound `MsgContext` so templates/agents can log which channel a turn came from. Routing is fixed: replies go back to the origin surface; the model doesn’t choose.
 - **Reply context:** inbound replies include `ReplyToId`, `ReplyToBody`, and `ReplyToSender`, and the quoted context is appended to `Body` as a `[Replying to ...]` block.
-- **Canonical direct session:** All direct chats collapse into the single `main` session by default (no config needed). Groups stay `surface:group:<id>` (rooms: `surface:channel:<id>`), so they remain isolated.
+- **Canonical direct session:** All direct chats collapse into the single `main` session by default (no config needed). Groups stay `group:<jid>`, so they remain isolated.
 - **Session store:** Keys are resolved via `resolveSessionKey(scope, ctx, mainKey)`; the agent JSONL path lives under `~/.clawdis/sessions/<SessionId>.jsonl`.
 - **WebChat:** Always attaches to `main`, loads the full session transcript so desktop reflects cross-surface history, and writes new turns back to the same session.
 - **Implementation hints:**
-  - Set `Surface` in each ingress (WhatsApp gateway, WebChat bridge, Telegram, Discord, iMessage).
+  - Set `Surface` in each ingress (WhatsApp gateway, WebChat bridge, Telegram, Discord). 
   - Keep routing deterministic: originate → same surface. Use the gateway WebSocket for sends; avoid side channels.
   - Do not let the agent emit “send to X” decisions; keep that policy in the host code.

docs/telegram.md

@@ -7,38 +7,36 @@ read_when:
 
 Updated: 2025-12-07
 
-Status: ready for bot-mode use with grammY (long-polling by default; webhook supported when configured). Text + media send, mention-gated group replies with per-group overrides, and optional proxy support are implemented.
+Status: ready for bot-mode use with grammY (long-polling by default; webhook supported when configured). Text + media send, mention-gated group replies, and optional proxy support are implemented.
 
 ## Goals
 - Let you talk to Clawdis via a Telegram bot in DMs and groups.
-- Share the same `main` session used by WhatsApp/WebChat; groups stay isolated as `telegram:group:<chatId>`.
+- Share the same `main` session used by WhatsApp/WebChat; groups stay isolated as `group:<chatId>`.
 - Keep transport routing deterministic: replies always go back to the surface they arrived on.
 
 ## How it will work (Bot API)
 1) Create a bot with @BotFather and grab the token.
 2) Configure Clawdis with `TELEGRAM_BOT_TOKEN` (or `telegram.botToken` in `~/.clawdis/clawdis.json`).
-3) Run the gateway; it auto-starts Telegram only when a `telegram` config section exists **and** a bot token is set (unless `telegram.enabled = false`).
-   - If you prefer env vars, still add `telegram: { enabled: true }` to `~/.clawdis/clawdis.json` and set `TELEGRAM_BOT_TOKEN`.
+3) Run the gateway; it auto-starts Telegram when the bot token is set (unless `telegram.enabled = false`).
    - **Long-polling** is the default.
    - **Webhook mode** is enabled by setting `telegram.webhookUrl` (optionally `telegram.webhookSecret` / `telegram.webhookPath`).
      - 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>` 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`).
+5) Groups: add the bot, disable privacy mode (or make it admin) so it can read messages; group threads stay on `group:<chatId>` and require mention/command to trigger replies.
+6) Optional allowlist: reuse `routing.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.
 - Cannot DM users first; they must initiate. Channels are receive-only unless the bot is an admin poster.
 - File size caps follow Telegram Bot API (up to 2 GB for documents; smaller for some media types).
-- Typing indicators (`sendChatAction`) supported; native replies are **off by default** and enabled via `telegram.replyToMode` + reply tags.
+- Typing indicators (`sendChatAction`) supported; outbound replies are sent as native replies to the triggering message (threaded where Telegram allows).
 
 ## 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 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; groups require @bot mention by default.
 - 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`, `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`.
+- Config: `TELEGRAM_BOT_TOKEN` env or `telegram.botToken` required; `telegram.requireMention`, `telegram.allowFrom`, `telegram.mediaMaxMb`, `telegram.proxy`, `telegram.webhookSecret`, `telegram.webhookUrl`, `telegram.webhookPath` supported.
 
 Example config:
 ```json5
@@ -46,11 +44,7 @@ Example config:
   telegram: {
     enabled: true,
     botToken: "123:abc",
-    replyToMode: "off",
-    groups: {
-      "*": { requireMention: true },
-      "123456789": { requireMention: false } // group chat id
-    },
+    requireMention: true,
     allowFrom: ["123456789"], // direct chat ids allowed (or "*")
     mediaMaxMb: 5,
     proxy: "socks5://localhost:9050",
@@ -65,18 +59,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 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:
-- `[[reply_to_current]]` — reply to the triggering Telegram message.
-- `[[reply_to:<id>]]` — reply to a specific message id from context.
-Current message ids are appended to prompts as `[message_id: …]`; reply context includes `id:` when available.
-
-Behavior is controlled by `telegram.replyToMode`:
-- `off`: ignore tags.
-- `first`: only the first outbound chunk/attachment is a reply.
-- `all`: every outbound chunk/attachment is a reply.
+- Mention the bot (`@yourbot`) or use commands to trigger; we’ll honor `group.requireMention` by default to avoid noise.
 
 ## Roadmap
 - ✅ Design and defaults (this doc)

docs/templates/AGENTS.md

@@ -28,16 +28,6 @@ You wake up fresh each session. These files are your continuity:
 
 Capture what matters. Decisions, context, things to remember. Skip the secrets unless asked to keep them.
 
-### 🧠 Memory Recall - Use qmd!
-When you need to remember something from the past, use `qmd` instead of grepping files:
-```bash
-qmd query "what happened at Christmas"   # Semantic search with reranking
-qmd search "specific phrase"              # BM25 keyword search  
-qmd vsearch "conceptual question"         # Pure vector similarity
-```
-Index your memory folder: `qmd index memory/`
-Vectors + BM25 + reranking finds things even with different wording.
-
 ## Safety
 
 - Don't exfiltrate private data. Ever.

docs/test.md

@@ -23,8 +23,6 @@ Last run (2025-12-31, 20 runs):
 
 ## Onboarding E2E (Docker)
 
-Docker is optional; this is only needed for containerized onboarding smoke tests.
-
 Full cold-start flow in a clean Linux container:
 
 ```bash

docs/tools.md

@@ -21,7 +21,6 @@ Core parameters:
 - `yieldMs` (auto-background after timeout, default 20000)
 - `background` (immediate background)
 - `timeout` (seconds; kills the process if exceeded, default 1800)
-- `stdinMode` (`pipe` | `pty`; `pty` uses node-pty for a real TTY with fallback warning)
 
 Notes:
 - Returns `status: "running"` with a `sessionId` when backgrounded.
@@ -105,45 +104,6 @@ Core actions:
 Notes:
 - Use `delayMs` (defaults to 2000) to avoid interrupting an in-flight reply.
 
-### `discord`
-Send Discord reactions, stickers, or polls.
-
-Core actions:
-- `react` (`channelId`, `messageId`, `emoji`)
-- `reactions` (`channelId`, `messageId`, optional `limit`)
-- `sticker` (`to`, `stickerIds`, optional `content`)
-- `poll` (`to`, `question`, `answers`, optional `allowMultiselect`, `durationHours`, `content`)
-- `permissions` (`channelId`)
-- `readMessages` (`channelId`, optional `limit`/`before`/`after`/`around`)
-- `sendMessage` (`to`, `content`, optional `mediaUrl`, `replyTo`)
-- `editMessage` (`channelId`, `messageId`, `content`)
-- `deleteMessage` (`channelId`, `messageId`)
-- `threadCreate` (`channelId`, `name`, optional `messageId`, `autoArchiveMinutes`)
-- `threadList` (`guildId`, optional `channelId`, `includeArchived`, `before`, `limit`)
-- `threadReply` (`channelId`, `content`, optional `mediaUrl`, `replyTo`)
-- `pinMessage`/`unpinMessage` (`channelId`, `messageId`)
-- `listPins` (`channelId`)
-- `searchMessages` (`guildId`, `content`, optional `channelId`/`channelIds`, `authorId`/`authorIds`, `limit`)
-- `memberInfo` (`guildId`, `userId`)
-- `roleInfo` (`guildId`)
-- `emojiList` (`guildId`)
-- `roleAdd`/`roleRemove` (`guildId`, `userId`, `roleId`)
-- `channelInfo` (`channelId`)
-- `channelList` (`guildId`)
-- `voiceStatus` (`guildId`, `userId`)
-- `eventList` (`guildId`)
-- `eventCreate` (`guildId`, `name`, `startTime`, optional `endTime`, `description`, `channelId`, `entityType`, `location`)
-- `timeout` (`guildId`, `userId`, optional `durationMinutes`, `until`, `reason`)
-- `kick` (`guildId`, `userId`, optional `reason`)
-- `ban` (`guildId`, `userId`, optional `reason`, `deleteMessageDays`)
-
-Notes:
-- `to` accepts `channel:<id>` or `user:<id>`.
-- Polls require 2–10 answers and default to 24 hours.
-- `reactions` returns per-emoji user lists (limited to 100 per reaction).
-- `discord.actions.*` gates Discord tool actions; `roles` + `moderation` default to `false`.
-- `searchMessages` follows the Discord preview spec (limit max 25, channel/author filters accept arrays).
-
 ## Parameters (common)
 
 Gateway-backed tools (`clawdis_canvas`, `clawdis_nodes`, `clawdis_cron`):