fix: enforce node invoke timeouts (#1357) (thanks @vignesh07)

Use the timeout provided on node invoke requests to ensure node
clients always respond with a result.

This prevents gateway-side node.invoke calls from hanging until the
gateway timeout when a node command stalls.

Tests:
- swift test --filter GatewayNodeSessionTests

.agent/workflows/update_clawdbot.md

@@ -0,0 +1,366 @@
+---
+description: Update Clawdbot from upstream when branch has diverged (ahead/behind)
+---
+
+# Clawdbot Upstream Sync Workflow
+
+Use this workflow when your fork has diverged from upstream (e.g., "18 commits ahead, 29 commits behind").
+
+## Quick Reference
+
+```bash
+# Check divergence status
+git fetch upstream && git rev-list --left-right --count main...upstream/main
+
+# Full sync (rebase preferred)
+git fetch upstream && git rebase upstream/main && pnpm install && pnpm build && ./scripts/restart-mac.sh
+
+# Check for Swift 6.2 issues after sync
+grep -r "FileManager\.default\|Thread\.isMainThread" src/ apps/ --include="*.swift"
+```
+
+---
+
+## Step 1: Assess Divergence
+
+```bash
+git fetch upstream
+git log --oneline --left-right main...upstream/main | head -20
+```
+
+This shows:
+- `<` = your local commits (ahead)
+- `>` = upstream commits you're missing (behind)
+
+**Decision point:**
+- Few local commits, many upstream → **Rebase** (cleaner history)
+- Many local commits or shared branch → **Merge** (preserves history)
+
+---
+
+## Step 2A: Rebase Strategy (Preferred)
+
+Replays your commits on top of upstream. Results in linear history.
+
+```bash
+# Ensure working tree is clean
+git status
+
+# Rebase onto upstream
+git rebase upstream/main
+```
+
+### Handling Rebase Conflicts
+
+```bash
+# When conflicts occur:
+# 1. Fix conflicts in the listed files
+# 2. Stage resolved files
+git add <resolved-files>
+
+# 3. Continue rebase
+git rebase --continue
+
+# If a commit is no longer needed (already in upstream):
+git rebase --skip
+
+# To abort and return to original state:
+git rebase --abort
+```
+
+### Common Conflict Patterns
+
+| File | Resolution |
+|------|------------|
+| `package.json` | Take upstream deps, keep local scripts if needed |
+| `pnpm-lock.yaml` | Accept upstream, regenerate with `pnpm install` |
+| `*.patch` files | Usually take upstream version |
+| Source files | Merge logic carefully, prefer upstream structure |
+
+---
+
+## Step 2B: Merge Strategy (Alternative)
+
+Preserves all history with a merge commit.
+
+```bash
+git merge upstream/main --no-edit
+```
+
+Resolve conflicts same as rebase, then:
+```bash
+git add <resolved-files>
+git commit
+```
+
+---
+
+## Step 3: Rebuild Everything
+
+After sync completes:
+
+```bash
+# Install dependencies (regenerates lock if needed)
+pnpm install
+
+# Build TypeScript
+pnpm build
+
+# Build UI assets
+pnpm ui:build
+
+# Run diagnostics
+pnpm clawdbot doctor
+```
+
+---
+
+## Step 4: Rebuild macOS App
+
+```bash
+# Full rebuild, sign, and launch
+./scripts/restart-mac.sh
+
+# Or just package without restart
+pnpm mac:package
+```
+
+### Install to /Applications
+
+```bash
+# Kill running app
+pkill -x "Clawdbot" || true
+
+# Move old version
+mv /Applications/Clawdbot.app /tmp/Clawdbot-backup.app
+
+# Install new build
+cp -R dist/Clawdbot.app /Applications/
+
+# Launch
+open /Applications/Clawdbot.app
+```
+
+---
+
+## Step 4A: Verify macOS App & Agent
+
+After rebuilding the macOS app, always verify it works correctly:
+
+```bash
+# Check gateway health
+pnpm clawdbot health
+
+# Verify no zombie processes
+ps aux | grep -E "(clawdbot|gateway)" | grep -v grep
+
+# Test agent functionality by sending a verification message
+pnpm clawdbot agent --message "Verification: macOS app rebuild successful - agent is responding." --session-id YOUR_TELEGRAM_SESSION_ID
+
+# Confirm the message was received on Telegram
+# (Check your Telegram chat with the bot)
+```
+
+**Important:** Always wait for the Telegram verification message before proceeding. If the agent doesn't respond, troubleshoot the gateway or model configuration before pushing.
+
+---
+
+## Step 5: Handle Swift/macOS Build Issues (Common After Upstream Sync)
+
+Upstream updates may introduce Swift 6.2 / macOS 26 SDK incompatibilities. Use analyze-mode for systematic debugging:
+
+### Analyze-Mode Investigation
+```bash
+# Gather context with parallel agents
+morph-mcp_warpgrep_codebase_search search_string="Find deprecated FileManager.default and Thread.isMainThread usages in Swift files" repo_path="/Volumes/Main SSD/Developer/clawdis"
+morph-mcp_warpgrep_codebase_search search_string="Locate Peekaboo submodule and macOS app Swift files with concurrency issues" repo_path="/Volumes/Main SSD/Developer/clawdis"
+```
+
+### Common Swift 6.2 Fixes
+
+**FileManager.default Deprecation:**
+```bash
+# Search for deprecated usage
+grep -r "FileManager\.default" src/ apps/ --include="*.swift"
+
+# Replace with proper initialization
+# OLD: FileManager.default
+# NEW: FileManager()
+```
+
+**Thread.isMainThread Deprecation:**
+```bash
+# Search for deprecated usage
+grep -r "Thread\.isMainThread" src/ apps/ --include="*.swift"
+
+# Replace with modern concurrency check
+# OLD: Thread.isMainThread
+# NEW: await MainActor.run { ... } or DispatchQueue.main.sync { ... }
+```
+
+### Peekaboo Submodule Fixes
+```bash
+# Check Peekaboo for concurrency issues
+cd src/canvas-host/a2ui
+grep -r "Thread\.isMainThread\|FileManager\.default" . --include="*.swift"
+
+# Fix and rebuild submodule
+cd /Volumes/Main SSD/Developer/clawdis
+pnpm canvas:a2ui:bundle
+```
+
+### macOS App Concurrency Fixes
+```bash
+# Check macOS app for issues
+grep -r "Thread\.isMainThread\|FileManager\.default" apps/macos/ --include="*.swift"
+
+# Clean and rebuild after fixes
+cd apps/macos && rm -rf .build .swiftpm
+./scripts/restart-mac.sh
+```
+
+### Model Configuration Updates
+If upstream introduced new model configurations:
+```bash
+# Check for OpenRouter API key requirements
+grep -r "openrouter\|OPENROUTER" src/ --include="*.ts" --include="*.js"
+
+# Update clawdbot.json with fallback chains
+# Add model fallback configurations as needed
+```
+
+---
+
+## Step 6: Verify & Push
+
+```bash
+# Verify everything works
+pnpm clawdbot health
+pnpm test
+
+# Push (force required after rebase)
+git push origin main --force-with-lease
+
+# Or regular push after merge
+git push origin main
+```
+
+---
+
+## Troubleshooting
+
+### Build Fails After Sync
+
+```bash
+# Clean and rebuild
+rm -rf node_modules dist
+pnpm install
+pnpm build
+```
+
+### Type Errors (Bun/Node Incompatibility)
+
+Common issue: `fetch.preconnect` type mismatch. Fix by using `FetchLike` type instead of `typeof fetch`.
+
+### macOS App Crashes on Launch
+
+Usually resource bundle mismatch. Full rebuild required:
+```bash
+cd apps/macos && rm -rf .build .swiftpm
+./scripts/restart-mac.sh
+```
+
+### Patch Failures
+
+```bash
+# Check patch status
+pnpm install 2>&1 | grep -i patch
+
+# If patches fail, they may need updating for new dep versions
+# Check patches/ directory against package.json patchedDependencies
+```
+
+### Swift 6.2 / macOS 26 SDK Build Failures
+
+**Symptoms:** Build fails with deprecation warnings about `FileManager.default` or `Thread.isMainThread`
+
+**Search-Mode Investigation:**
+```bash
+# Exhaustive search for deprecated APIs
+morph-mcp_warpgrep_codebase_search search_string="Find all Swift files using deprecated FileManager.default or Thread.isMainThread" repo_path="/Volumes/Main SSD/Developer/clawdis"
+```
+
+**Quick Fix Commands:**
+```bash
+# Find all affected files
+find . -name "*.swift" -exec grep -l "FileManager\.default\|Thread\.isMainThread" {} \;
+
+# Replace FileManager.default with FileManager()
+find . -name "*.swift" -exec sed -i '' 's/FileManager\.default/FileManager()/g' {} \;
+
+# For Thread.isMainThread, need manual review of each usage
+grep -rn "Thread\.isMainThread" --include="*.swift" .
+```
+
+**Rebuild After Fixes:**
+```bash
+# Clean all build artifacts
+rm -rf apps/macos/.build apps/macos/.swiftpm
+rm -rf src/canvas-host/a2ui/.build
+
+# Rebuild Peekaboo bundle
+pnpm canvas:a2ui:bundle
+
+# Full macOS rebuild
+./scripts/restart-mac.sh
+```
+
+---
+
+## Automation Script
+
+Save as `scripts/sync-upstream.sh`:
+
+```bash
+#!/usr/bin/env bash
+set -euo pipefail
+
+echo "==> Fetching upstream..."
+git fetch upstream
+
+echo "==> Current divergence:"
+git rev-list --left-right --count main...upstream/main
+
+echo "==> Rebasing onto upstream/main..."
+git rebase upstream/main
+
+echo "==> Installing dependencies..."
+pnpm install
+
+echo "==> Building..."
+pnpm build
+pnpm ui:build
+
+echo "==> Running doctor..."
+pnpm clawdbot doctor
+
+echo "==> Rebuilding macOS app..."
+./scripts/restart-mac.sh
+
+echo "==> Verifying gateway health..."
+pnpm clawdbot health
+
+echo "==> Checking for Swift 6.2 compatibility issues..."
+if grep -r "FileManager\.default\|Thread\.isMainThread" src/ apps/ --include="*.swift" --quiet; then
+    echo "⚠️  Found potential Swift 6.2 deprecated API usage"
+    echo "   Run manual fixes or use analyze-mode investigation"
+else
+    echo "✅ No obvious Swift deprecation issues found"
+fi
+
+echo "==> Testing agent functionality..."
+# Note: Update YOUR_TELEGRAM_SESSION_ID with actual session ID
+pnpm clawdbot agent --message "Verification: Upstream sync and macOS rebuild completed successfully." --session-id YOUR_TELEGRAM_SESSION_ID || echo "Warning: Agent test failed - check Telegram for verification message"
+
+echo "==> Done! Check Telegram for verification message, then run 'git push --force-with-lease' when ready."
+```

.gitignore

@@ -1,4 +1,5 @@
 node_modules
+**/node_modules/
 .env
 docker-compose.extra.yml
 dist
@@ -31,6 +32,11 @@ apps/ios/*.xcodeproj/
 apps/ios/*.xcworkspace/
 apps/ios/.swiftpm/
 vendor/
+apps/ios/Clawdbot.xcodeproj/
+apps/ios/Clawdbot.xcodeproj/**
+apps/macos/.build/**
+**/*.bun-build
+apps/ios/*.xcfilelist
 
 # Vendor build artifacts
 vendor/a2ui/renderers/lit/dist/
@@ -43,6 +49,8 @@ apps/ios/fastlane/Preview.html
 apps/ios/fastlane/screenshots/
 apps/ios/fastlane/test_output/
 apps/ios/fastlane/logs/
+apps/ios/fastlane/.env
+apps/ios/fastlane/report.xml
 
 # fastlane build artifacts (local)
 apps/ios/*.ipa
@@ -58,3 +66,6 @@ apps/ios/*.mobileprovision
 IDENTITY.md
 USER.md
 .tgz
+
+# local tooling
+.serena/

.npmrc

@@ -1 +1 @@
-allow-build-scripts=@whiskeysockets/baileys,sharp,esbuild,protobufjs,fs-ext,node-pty,@lydell/node-pty
+allow-build-scripts=@whiskeysockets/baileys,sharp,esbuild,protobufjs,fs-ext,node-pty,@lydell/node-pty,@matrix-org/matrix-sdk-crypto-nodejs

.prettierignore

@@ -0,0 +1 @@
+src/canvas-host/a2ui/a2ui.bundle.js

AGENTS.md

@@ -8,6 +8,10 @@
 - Docs: `docs/` (images, queue, Pi config). Built output lives in `dist/`.
 - Plugins/extensions: live under `extensions/*` (workspace packages). Keep plugin-only deps in the extension `package.json`; do not add them to the root `package.json` unless core uses them.
 - Installers served from `https://clawd.bot/*`: live in the sibling repo `../clawd.bot` (`public/install.sh`, `public/install-cli.sh`, `public/install.ps1`).
+- Messaging channels: always consider **all** built-in + extension channels when refactoring shared logic (routing, allowlists, pairing, command gating, onboarding, docs).
+  - Core channel docs: `docs/channels/`
+  - Core channel code: `src/telegram`, `src/discord`, `src/slack`, `src/signal`, `src/imessage`, `src/web` (WhatsApp web), `src/channels`, `src/routing`
+  - Extensions (channel plugins): `extensions/*` (e.g. `extensions/msteams`, `extensions/matrix`, `extensions/zalo`, `extensions/zalouser`, `extensions/voice-call`)
 
 ## Docs Linking (Mintlify)
 - Docs are hosted on Mintlify (docs.clawd.bot).
@@ -37,6 +41,11 @@
 - Aim to keep files under ~700 LOC; guideline only (not a hard guardrail). Split/refactor when it improves clarity or testability.
 - Naming: use **Clawdbot** for product/app/docs headings; use `clawdbot` for CLI command, package/binary, paths, and config keys.
 
+## Release Channels (Naming)
+- stable: tagged releases only (e.g. `vYYYY.M.D`), npm dist-tag `latest`.
+- beta: prerelease tags `vYYYY.M.D-beta.N`, npm dist-tag `beta` (may ship without macOS app).
+- dev: moving head on `main` (no tag; git checkout main).
+
 ## Testing Guidelines
 - Framework: Vitest with V8 coverage thresholds (70% lines/branches/functions/statements).
 - Naming: match source names with `*.test.ts`; e2e in `*.e2e.test.ts`.
@@ -53,6 +62,8 @@
 - Changelog workflow: keep latest released version at top (no `Unreleased`); after publishing, bump version and start a new top section.
 - PRs should summarize scope, note testing performed, and mention any user-facing changes or new flags.
 - PR review flow: when given a PR link, review via `gh pr view`/`gh pr diff` and do **not** change branches.
+- PR review calls: prefer a single `gh pr view --json ...` to batch metadata/comments; run `gh pr diff` only when needed.
+- Before starting a review when a GH Issue/PR is pasted: run `git pull`; if there are local changes or unpushed commits, stop and alert the user before reviewing.
 - PR merge flow: create a temp branch from `main`, merge the PR branch into it (prefer squash unless commit history is important; use rebase/merge when it is). Always try to merge the PR unless it’s truly difficult, then use another approach. If we squash, add the PR author as a co-contributor. Apply fixes, add changelog entry (include PR # + thanks), run full gate before the final commit, commit, merge back to `main`, delete the temp branch, and end on `main`.
 - If you review a PR and later do work on it, land via merge/squash (no direct-main commits) and always add the PR author as a co-contributor.
 - When working on a PR: add a changelog entry with the PR number and thank the contributor.
@@ -62,7 +73,7 @@
 - After merging a PR: run `bun scripts/update-clawtributors.ts` if the contributor is missing, then commit the regenerated README.
 
 ## Shorthand Commands
-- `sync up`: if working tree is dirty, commit all changes (pick a sensible Conventional Commit message), then `git pull --rebase`; if rebase conflicts and cannot resolve, stop; otherwise `git push`.
+- `sync`: if working tree is dirty, commit all changes (pick a sensible Conventional Commit message), then `git pull --rebase`; if rebase conflicts and cannot resolve, stop; otherwise `git push`.
 
 ### PR Workflow (Review vs Land)
 - **Review mode (PR link only):** read `gh pr view/diff`; **do not** switch branches; **do not** change code.
@@ -80,6 +91,7 @@
 
 ## Agent-Specific Notes
 - Vocabulary: "makeup" = "mac app".
+- Never edit `node_modules` (global/Homebrew/npm/git installs too). Updates overwrite. Skill notes go in `tools.md` or `AGENTS.md`.
 - When working on a GitHub Issue or PR, print the full URL at the end of the task.
 - When answering questions, respond with high-confidence answers only: verify in code; do not guess.
 - Never update the Carbon dependency.
@@ -111,8 +123,7 @@
 - Code style: add brief comments for tricky logic; keep files under ~500 LOC when feasible (split/refactor as needed).
 - Tool schema guardrails (google-antigravity): avoid `Type.Union` in tool input schemas; no `anyOf`/`oneOf`/`allOf`. Use `stringEnum`/`optionalStringEnum` (Type.Unsafe enum) for string lists, and `Type.Optional(...)` instead of `... | null`. Keep top-level tool schema as `type: "object"` with `properties`.
 - Tool schema guardrails: avoid raw `format` property names in tool schemas; some validators treat `format` as a reserved keyword and reject the schema.
-- When asked to open a “session” file, open the Pi session logs under `~/.clawdbot/agents/main/sessions/*.jsonl` (newest unless a specific ID is given), not the default `sessions.json`. If logs are needed from another machine, SSH via Tailscale and read the same path there.
-- Menubar dimming + restart flow mirrors Trimmy: use `scripts/restart-mac.sh` (kills all Clawdbot variants, runs `swift build`, packages, relaunches). Icon dimming depends on MenuBarExtraAccess wiring in AppMain; keep `appearsDisabled` updates intact when touching the status item.
+- When asked to open a “session” file, open the Pi session logs under `~/.clawdbot/agents/<agentId>/sessions/*.jsonl` (use the `agent=<id>` value in the Runtime line of the system prompt; newest unless a specific ID is given), not the default `sessions.json`. If logs are needed from another machine, SSH via Tailscale and read the same path there.
 - 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:
@@ -128,19 +139,3 @@
 - Publish: `npm publish --access public --otp="<otp>"` (run from the package dir).
 - Verify without local npmrc side effects: `npm view <pkg> version --userconfig "$(mktemp)"`.
 - Kill the tmux session after publish.
-
-## Exclamation Mark Escaping Workaround
-The Claude Code Bash tool escapes `!` to `\\!` in command arguments. When using `clawdbot message send` with messages containing exclamation marks, use heredoc syntax:
-
-```bash
-# WRONG - will send "Hello\\!" with backslash
-clawdbot message send --to "+1234" --message 'Hello!'
-
-# CORRECT - use heredoc to avoid escaping
-clawdbot message send --to "+1234" --message "$(cat <<'EOF'
-Hello!
-EOF
-)"
-```
-
-This is a Claude Code quirk, not a clawdbot bug.

CHANGELOG.md

@@ -2,63 +2,159 @@
 
 Docs: https://docs.clawd.bot
 
-## 2026.1.17-7
+## 2026.1.20
+
+### Changes
+- Deps: update workspace + memory-lancedb dependencies.
+- Dev: use tsgo for dev/watch builds by default; set `CLAWDBOT_TS_COMPILER=tsc` to opt out.
+- Repo: remove the Peekaboo git submodule now that the SPM release is used.
+- Update: sync plugin sources on channel switches and update npm-installed plugins during `clawdbot update`.
+- Plugins: share npm plugin update logic between `clawdbot update` and `clawdbot plugins update`.
+- Browser: allow config defaults for efficient snapshots in the tool/CLI. (#1336) — thanks @sebslight.
+- Channels: add the Nostr plugin channel with profile management + onboarding install defaults. (#1323) — thanks @joelklabo.
+- Plugins: require manifest-embedded config schemas, validate configs without loading plugin code, and surface plugin config warnings. (#1272) — thanks @thewilloftheshadow.
+- Plugins: move channel catalog metadata into plugin manifests; align Nextcloud Talk policy helpers with core patterns. (#1290) — thanks @NicholaiVogel.
+- Discord: fall back to /skill when native command limits are exceeded; expose /skill globally. (#1287) — thanks @thewilloftheshadow.
+- Docs: refresh bird skill install metadata and usage notes. (#1302) — thanks @odysseus0.
+- Matrix: migrate to matrix-bot-sdk with E2EE support, location handling, and group allowlist upgrades. (#1298) — thanks @sibbl.
+- Plugins/UI: let channel plugin metadata drive UI labels/icons and cron channel options. (#1306) — thanks @steipete.
+- Zalouser: add channel dock metadata, config schema, setup wiring, probe, and status issues. (#1219) — thanks @suminhthanh.
+- Security: warn when <=300B models run without sandboxing and with web tools enabled.
+- Skills: add download installs with OS-filtered install options; add local sherpa-onnx-tts skill.
+- Docs: clarify WhatsApp voice notes and Windows WSL portproxy LAN access notes.
+- UI: add copy-as-markdown with error feedback and drop legacy list view. (#1345) — thanks @bradleypriest.
+- TUI: add input history (up/down) for submitted messages. (#1348) — thanks @vignesh07.
+### Fixes
+- Discovery: shorten Bonjour DNS-SD service type to `_clawdbot-gw._tcp` and update discovery clients/docs.
+- Agents: preserve subagent announce thread/topic routing + queued replies across channels. (#1241) — thanks @gnarco.
+- Agents: avoid treating timeout errors with "aborted" messages as user aborts, so model fallback still runs.
+- Diagnostics: export OTLP logs, correct queue depth tracking, and document message-flow telemetry.
+- Diagnostics: emit message-flow diagnostics across channels via shared dispatch; gate heartbeat/webhook logging. (#1244) — thanks @oscargavin.
+- CLI: preserve cron delivery settings when editing message payloads. (#1322) — thanks @KrauseFx.
+- CLI: keep `clawdbot logs` output resilient to broken pipes while preserving progress output.
+- Nodes: enforce node.invoke timeouts for node handlers. (#1357) — thanks @vignesh07.
+- Model catalog: avoid caching import failures, log transient discovery errors, and keep partial results. (#1332) — thanks @dougvk.
+- Doctor: clarify plugin auto-enable hint text in the startup banner.
+- Gateway: clarify unauthorized handshake responses with token/password mismatch guidance.
+- Gateway: clarify connect/validation errors for gateway params. (#1347) — thanks @vignesh07.
+- Gateway: preserve restart wake routing + thread replies across restarts. (#1337) — thanks @John-Rood.
+- Gateway: reschedule per-agent heartbeats on config hot reload without restarting the runner.
+- Config: log invalid config issues once per run and keep invalid-config errors stackless.
+- Exec: default gateway/node exec security to allowlist when unset (sandbox stays deny).
+- UI: keep config form enums typed, preserve empty strings, protect sensitive defaults, and deepen config search. (#1315) — thanks @MaudeBot.
+- UI: preserve ordered list numbering in chat markdown. (#1341) — thanks @bradleypriest.
+- UI: allow Control UI to read gatewayUrl from URL params for remote WebSocket targets. (#1342) — thanks @ameno-.
+- Web search: infer Perplexity base URL from API key source (direct vs OpenRouter).
+- Web fetch: harden SSRF protection with shared hostname checks and redirect limits. (#1346) — thanks @fogboots.
+- TUI: keep thinking blocks ordered before content during streaming and isolate per-run assembly. (#1202) — thanks @aaronveklabs.
+- TUI: align custom editor initialization with the latest pi-tui API. (#1298) — thanks @sibbl.
+- CLI: avoid duplicating --profile/--dev flags when formatting commands.
+- Status: route native `/status` to the active agent so model selection reflects the correct profile. (#1301)
+- Exec: prefer bash when fish is default shell, falling back to sh if bash is missing. (#1297) — thanks @ysqander.
+- Exec: merge login-shell PATH for host=gateway exec while keeping daemon PATH minimal. (#1304)
+- Plugins: add Nextcloud Talk manifest for plugin config validation. (#1297) — thanks @ysqander.
+- Anthropic: default API prompt caching to 1h with configurable TTL override; ignore TTL for OAuth.
+- Discord: make resolve warnings avoid raw JSON payloads on rate limits.
+- Discord: process message handlers in parallel across sessions to avoid event queue blocking. (#1295)
+- Cron: auto-deliver isolated agent output to explicit targets without tool calls. (#1285)
+
+## 2026.1.19-3
+
+### Changes
+- Android: remove legacy bridge transport code now that nodes use the gateway protocol.
+- Android: send structured payloads in node events/invokes and include user-agent metadata in gateway connects.
+- Gateway: expand `/v1/responses` to support file/image inputs, tool_choice, usage, and output limits. (#1229) — thanks @RyanLisse.
+- Docs: surface Amazon Bedrock in provider lists and clarify Bedrock auth env vars. (#1289) — thanks @steipete.
+
+### Fixes
+- Gateway: strip inbound envelope headers from chat history messages to keep clients clean.
+- UI: prevent double-scroll in Control UI chat by locking chat layout to the viewport. (#1283) — thanks @bradleypriest.
+- Config: allow Perplexity as a web_search provider in config validation. (#1230)
+- Browser: register AI snapshot refs for act commands. (#1282) — thanks @John-Rood.
+
+## 2026.1.19-2
+
+### Changes
+- Android: migrate node transport to the Gateway WebSocket protocol with TLS pinning support + gateway discovery naming.
+- Android: bump okhttp + dnsjava to satisfy lint dependency checks.
+- Docs: refresh Android node discovery docs for the Gateway WS service type.
+
+### Fixes
+- Tests: stabilize Windows gateway/CLI tests by skipping sidecars, normalizing argv, and extending timeouts.
+- CLI: skip runner rebuilds when dist is fresh. (#1231) — thanks @mukhtharcm, @thewilloftheshadow.
+
+## 2026.1.19-1
+
+### Breaking
+- **BREAKING:** Reject invalid/unknown config entries and refuse to start the gateway for safety; run `clawdbot doctor --fix` to repair. 
+
+### Changes
+- Gateway: add `/v1/responses` endpoint (OpenResponses API) for agentic workflows with item-based input and semantic streaming events. Enable via `gateway.http.endpoints.responses.enabled: true`.
+- Usage: add `/usage cost` summaries and macOS menu cost submenu with daily charting.
+- Agents: clarify node_modules read-only guidance in agent instructions.
+- TUI: add syntax highlighting for code blocks. (#1200) — thanks @vignesh07.
+- TUI: session picker shows derived titles, fuzzy search, relative times, and last message preview. (#1271) — thanks @Whoaa512.
+
+### Fixes
+- UI: enable shell mode for sync Windows spawns to avoid `pnpm ui:build` EINVAL. (#1212) — thanks @longmaba.
+- Agents: add `clawdbot agents set-identity` helper and update bootstrap guidance for multi-agent setups. (#1222) — thanks @ThePickle31.
+- Plugins: surface plugin load/register/config errors in gateway logs with plugin/source context.
+- Agents: propagate accountId into embedded runs so sub-agent announce routing honors the originating account. (#1058)
+- Compaction: include tool failure summaries in safeguard compaction to prevent retry loops. (#1084)
+- Daemon: include HOME in service environments to avoid missing HOME errors. (#1214) — thanks @ameno-.
+- Memory: show total file counts + scan issues in `clawdbot memory status`; fall back to non-batch embeddings after repeated batch failures.
+- TUI: show generic empty-state text for searchable pickers. (#1201) — thanks @vignesh07.
+- Doctor: canonicalize legacy session keys in session stores to prevent stale metadata. (#1169)
+- CLI: centralize CLI command registration to keep fast-path routing and program wiring in sync. (#1207) — thanks @gumadeiras.
+- Config: allow custom fields under `skills.entries.<name>.config` for skill credentials/config. (#1226) — thanks @VACInc. (fixes #1225)
+
+## 2026.1.18-5
 
 ### Changes
-- Exec approvals: add `clawdbot approvals` CLI for viewing and updating gateway/node allowlists.
-- CLI: add `clawdbot service` gateway/node management and a `clawdbot node status` alias.
-- Status: show gateway + node service summaries in `clawdbot status` and `status --all`.
-- Control UI: add gateway/node target selector for exec approvals.
-- Docs: add approvals/service references and refresh node/control UI docs.
 - Dependencies: update core + plugin deps (grammy, vitest, openai, Microsoft agents hosting, etc.).
-- macOS: switch PeekabooBridge integration to the tagged Swift Package Manager release (no submodule).
-- macOS: stop syncing Peekaboo as a git submodule in postinstall.
+- Onboarding: add allowlist prompts and username-to-id resolution across core and extension channels.
+- TUI: add searchable model picker for quicker model selection. (#1198) — thanks @vignesh07.
+- Docs: clarify allowlist input types and onboarding behavior for messaging channels.
+
+### Fixes
+- Configure: hide OpenRouter auto routing model from the model picker. (#1182) — thanks @zerone0x.
+- Docs: make docs:list fail fast with a clear error if the docs directory is missing.
+- macOS: load menu session previews asynchronously so items populate while the menu is open.
+- macOS: use label colors for session preview text so previews render in menu subviews.
+- macOS: suppress usage error text in the menubar cost view.
+- Telegram: honor pairing allowlists for native slash commands.
+- TUI: highlight model search matches and stabilize search ordering.
+- CLI: keep banners on routed commands, restore config guarding outside fast-path routing, and tighten fast-path flag parsing while skipping console capture for extra speed. (#1195) — thanks @gumadeiras.
+- Slack: resolve Bolt import interop for Bun + Node. (#1191) — thanks @CoreyH.
+- Gateway: require authorized restarts for SIGUSR1 (restart/apply/update) so config gating can't be bypassed.
+- Discord: stop reconnecting the gateway after aborts to prevent duplicate listeners.
+
+## 2026.1.18-4
+
+### Changes
+- macOS: switch PeekabooBridge integration to the tagged Swift Package Manager release.
+- macOS: stop syncing Peekaboo in postinstall.
 - Swabble: use the tagged Commander Swift package release.
 - CLI: add `clawdbot acp client` interactive ACP harness for debugging.
 - Plugins: route command detection/text chunking helpers through the plugin runtime and drop runtime exports from the SDK.
+- Plugins: auto-enable bundled channel/provider plugins when configuration is present.
+- Config: stamp last-touched metadata on write and warn if the config is newer than the running build.
+- macOS: hide usage section when usage is unavailable instead of showing provider errors.
 - Memory: add native Gemini embeddings provider for memory search. (#1151)
 - Agents: add local docs path resolution and include docs/mirror/source/community pointers in the system prompt.
 - Slack: add HTTP webhook mode via Bolt HTTP receiver for Events API deployments. (#1143) — thanks @jdrhyne.
-- Nodes: report core/ui versions in node list + presence; surface both in CLI + macOS UI.
-<<<<<<< HEAD
-- Agents: add local docs path resolution and include docs/mirror/source/community pointers in the system prompt.
-- Slack: add HTTP webhook mode via Bolt HTTP receiver for Events API deployments. (#1143) — thanks @jdrhyne.
-||||||| parent of 903e9be49 (feat: surface node core/ui versions in macOS)
 
 ### Fixes
 - Auth profiles: keep auto-pinned preference while allowing rotation on failover; user pins stay locked. (#1138) — thanks @cheeeee.
+- Agents: sanitize oversized image payloads before send and surface image-dimension errors.
+- macOS: Doctor repairs LaunchAgent bootstrap issues for Gateway + Node when listed but not loaded. (#1166) — thanks @AlexMikhalev.
 - macOS: avoid touching launchd in Remote over SSH so quitting the app no longer disables the remote gateway. (#1105)
 - Memory: index atomically so failed reindex preserves the previous memory database. (#1151)
 - Memory: avoid sqlite-vec unique constraint failures when reindexing duplicate chunk ids. (#1151)
-- Voice call: separate TwiML fetches from status callbacks to avoid stuck calls. (#1180) — thanks @andrew-kurin.
-
-## 2026.1.18-5
-
-### Changes
-- Dependencies: update core + plugin deps (grammy, vitest, openai, Microsoft agents hosting, etc.).
 
 ## 2026.1.18-3
 
 ### Changes
-=======
-- Nodes: report core/ui versions in node list + presence; surface both in CLI + macOS UI.
-
-### Fixes
-- Auth profiles: keep auto-pinned preference while allowing rotation on failover; user pins stay locked. (#1138) — thanks @cheeeee.
-- macOS: avoid touching launchd in Remote over SSH so quitting the app no longer disables the remote gateway. (#1105)
-- Memory: index atomically so failed reindex preserves the previous memory database. (#1151)
-- Memory: avoid sqlite-vec unique constraint failures when reindexing duplicate chunk ids. (#1151)
-- Voice call: separate TwiML fetches from status callbacks to avoid stuck calls. (#1180) — thanks @andrew-kurin.
-
-## 2026.1.18-5
-
-### Changes
-- Dependencies: update core + plugin deps (grammy, vitest, openai, Microsoft agents hosting, etc.).
-
-## 2026.1.18-3
-
-### Changes
->>>>>>> 903e9be49 (feat: surface node core/ui versions in macOS)
 - Exec: add host/security/ask routing for gateway + node exec.
 - Exec: add `/exec` directive for per-session exec defaults (host/security/ask/node).
 - macOS: migrate exec approvals to `~/.clawdbot/exec-approvals.json` with per-agent allowlists and skill auto-allow toggle.
@@ -79,21 +175,34 @@ Docs: https://docs.clawd.bot
 - Memory: allow parallel OpenAI batch indexing jobs (default concurrency: 2).
 - macOS: add per-agent exec approvals with allowlists, skill CLI auto-allow, and settings UI.
 - Docs: add exec approvals guide and link from tools index. https://docs.clawd.bot/tools/exec-approvals
+- macOS: add exec-host IPC for node service `system.run` with HMAC + peer UID checks.
 
 ### Fixes
-- Auth profiles: keep auto-pinned preference while allowing rotation on failover; user pins stay locked. (#1138) — thanks @cheeeee.
-- Agents: sanitize oversized image payloads before send and surface image-dimension errors.
-- macOS: avoid touching launchd in Remote over SSH so quitting the app no longer disables the remote gateway. (#1105)
-- Memory: index atomically so failed reindex preserves the previous memory database. (#1151)
-- Memory: avoid sqlite-vec unique constraint failures when reindexing duplicate chunk ids. (#1151)
-- Skills: improve remote bin probe logging with node labels + connectivity hints.
 - Exec approvals: enforce allowlist when ask is off; prefer raw command for node approvals/events.
 - Tools: return a companion-app-required message when node exec is requested with no paired node.
 - Streaming: emit assistant deltas for OpenAI-compatible SSE chunks. (#1147) — thanks @alauppe.
 - Model fallback: treat timeout aborts as failover while preserving user aborts. (#1137) — thanks @cheeeee.
+
+## 2026.1.18-2
+
+### Fixes
 - Tests: stabilize plugin SDK resolution and embedded agent timeouts.
+
+## 2026.1.18-1
+
+### Changes
+- Tools: allow `sessions_spawn` to override thinking level for sub-agent runs.
+- Channels: unify thread/topic allowlist matching + command/mention gating helpers across core providers.
+- Models: add Qwen Portal OAuth provider support. (#1120) — thanks @mukhtharcm.
+- Memory: add `--verbose` logging for memory status + batch indexing details.
+- Memory: allow parallel OpenAI batch indexing jobs (default concurrency: 2).
+- macOS: add per-agent exec approvals with allowlists, skill CLI auto-allow, and settings UI.
+- Docs: add exec approvals guide and link from tools index. https://docs.clawd.bot/tools/exec-approvals
+
+### Fixes
 - Memory: apply OpenAI batch defaults even without explicit remote config.
 - macOS: bundle Textual resources in packaged app builds to avoid code block crashes. (#1006)
+- Tools: return a companion-app-required message when `system.run` is requested without a supporting node.
 - Discord: only emit slow listener warnings after 30s.
 
 ## 2026.1.17-6
@@ -122,6 +231,22 @@ Docs: https://docs.clawd.bot
 ### Fixes
 - Voice call: include request query in Twilio webhook verification when publicUrl is set. (#864)
 
+## 2026.1.18-1
+
+### Changes
+- Tools: allow `sessions_spawn` to override thinking level for sub-agent runs.
+- Channels: unify thread/topic allowlist matching + command/mention gating helpers across core providers.
+- Models: add Qwen Portal OAuth provider support. (#1120) — thanks @mukhtharcm.
+- Memory: add `--verbose` logging for memory status + batch indexing details.
+- Memory: allow parallel OpenAI batch indexing jobs (default concurrency: 2).
+- macOS: add per-agent exec approvals with allowlists, skill CLI auto-allow, and settings UI.
+- Docs: add exec approvals guide and link from tools index. https://docs.clawd.bot/tools/exec-approvals
+
+### Fixes
+- Memory: apply OpenAI batch defaults even without explicit remote config.
+- macOS: bundle Textual resources in packaged app builds to avoid code block crashes. (#1006)
+- Tools: return a companion-app-required message when `system.run` is requested without a supporting node.
+- Discord: only emit slow listener warnings after 30s.
 ## 2026.1.17-3
 
 ### Changes

README.md

@@ -11,12 +11,13 @@
 <p align="center">
   <a href="https://github.com/clawdbot/clawdbot/actions/workflows/ci.yml?branch=main"><img src="https://img.shields.io/github/actions/workflow/status/clawdbot/clawdbot/ci.yml?branch=main&style=for-the-badge" alt="CI status"></a>
   <a href="https://github.com/clawdbot/clawdbot/releases"><img src="https://img.shields.io/github/v/release/clawdbot/clawdbot?include_prereleases&style=for-the-badge" alt="GitHub release"></a>
+  <a href="https://deepwiki.com/clawdbot/clawdbot"><img src="https://img.shields.io/badge/DeepWiki-clawdbot-111111?style=for-the-badge" alt="DeepWiki"></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="LICENSE"><img src="https://img.shields.io/badge/License-MIT-blue.svg?style=for-the-badge" alt="MIT License"></a>
 </p>
 
 **Clawdbot** is a *personal AI assistant* you run on your own devices.
-It answers you on the channels you already use (WhatsApp, Telegram, Slack, Discord, Signal, iMessage, Microsoft Teams, WebChat), can speak and listen on macOS/iOS/Android, 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 channels you already use (WhatsApp, Telegram, Slack, Discord, Signal, iMessage, Microsoft Teams, WebChat), plus extension channels like BlueBubbles, Matrix, Zalo, and Zalo Personal. It can speak and listen on macOS/iOS/Android, and can render a live Canvas you control. The Gateway is just the control plane — the product is the assistant.
 
 If you want a personal, single-user assistant that feels local, fast, and always-on, this is it.
 
@@ -64,12 +65,21 @@ clawdbot gateway --port 18789 --verbose
 # Send a message
 clawdbot message send --to +1234567890 --message "Hello from Clawdbot"
 
-# Talk to the assistant (optionally deliver back to WhatsApp/Telegram/Slack/Discord/Microsoft Teams)
+# Talk to the assistant (optionally deliver back to any connected channel: WhatsApp/Telegram/Slack/Discord/Signal/iMessage/BlueBubbles/Microsoft Teams/Matrix/Zalo/Zalo Personal/WebChat)
 clawdbot agent --message "Ship checklist" --thinking high
 ```
 
 Upgrading? [Updating guide](https://docs.clawd.bot/install/updating) (and run `clawdbot doctor`).
 
+## Development channels
+
+- **stable**: tagged releases (`vYYYY.M.D` or `vYYYY.M.D-<patch>`), npm dist-tag `latest`.
+- **beta**: prerelease tags (`vYYYY.M.D-beta.N`), npm dist-tag `beta` (macOS app may be missing).
+- **dev**: moving head of `main`, npm dist-tag `dev` (when published).
+
+Switch channels (git + npm): `clawdbot update --channel stable|beta|dev`.
+Details: [Development channels](https://docs.clawd.bot/install/development-channels).
+
 ## From source (development)
 
 Prefer `pnpm` for builds from source. Bun is optional for running TypeScript directly.
@@ -106,7 +116,7 @@ Run `clawdbot doctor` to surface risky/misconfigured DM policies.
 ## Highlights
 
 - **[Local-first Gateway](https://docs.clawd.bot/gateway)** — single control plane for sessions, channels, tools, and events.
-- **[Multi-channel inbox](https://docs.clawd.bot/channels)** — WhatsApp, Telegram, Slack, Discord, Signal, iMessage, Microsoft Teams, WebChat, macOS, iOS/Android.
+- **[Multi-channel inbox](https://docs.clawd.bot/channels)** — WhatsApp, Telegram, Slack, Discord, Signal, iMessage, BlueBubbles, Microsoft Teams, Matrix, Zalo, Zalo Personal, WebChat, macOS, iOS/Android.
 - **[Multi-agent routing](https://docs.clawd.bot/gateway/configuration)** — route inbound channels/accounts/peers to isolated agents (workspaces + per-agent sessions).
 - **[Voice Wake](https://docs.clawd.bot/nodes/voicewake) + [Talk Mode](https://docs.clawd.bot/nodes/talk)** — always-on speech for macOS/iOS/Android with ElevenLabs.
 - **[Live Canvas](https://docs.clawd.bot/platforms/mac/canvas)** — agent-driven visual workspace with [A2UI](https://docs.clawd.bot/platforms/mac/canvas#canvas-a2ui).
@@ -128,7 +138,7 @@ Run `clawdbot doctor` to surface risky/misconfigured DM policies.
 - [Media pipeline](https://docs.clawd.bot/nodes/images): images/audio/video, transcription hooks, size caps, temp file lifecycle. Audio details: [Audio](https://docs.clawd.bot/nodes/audio).
 
 ### Channels
-- [Channels](https://docs.clawd.bot/channels): [WhatsApp](https://docs.clawd.bot/channels/whatsapp) (Baileys), [Telegram](https://docs.clawd.bot/channels/telegram) (grammY), [Slack](https://docs.clawd.bot/channels/slack) (Bolt), [Discord](https://docs.clawd.bot/channels/discord) (discord.js), [Signal](https://docs.clawd.bot/channels/signal) (signal-cli), [iMessage](https://docs.clawd.bot/channels/imessage) (imsg), [Microsoft Teams](https://docs.clawd.bot/channels/msteams) (Bot Framework), [WebChat](https://docs.clawd.bot/web/webchat).
+- [Channels](https://docs.clawd.bot/channels): [WhatsApp](https://docs.clawd.bot/channels/whatsapp) (Baileys), [Telegram](https://docs.clawd.bot/channels/telegram) (grammY), [Slack](https://docs.clawd.bot/channels/slack) (Bolt), [Discord](https://docs.clawd.bot/channels/discord) (discord.js), [Signal](https://docs.clawd.bot/channels/signal) (signal-cli), [iMessage](https://docs.clawd.bot/channels/imessage) (imsg), [BlueBubbles](https://docs.clawd.bot/channels/bluebubbles) (extension), [Microsoft Teams](https://docs.clawd.bot/channels/msteams) (extension), [Matrix](https://docs.clawd.bot/channels/matrix) (extension), [Zalo](https://docs.clawd.bot/channels/zalo) (extension), [Zalo Personal](https://docs.clawd.bot/channels/zalouser) (extension), [WebChat](https://docs.clawd.bot/web/webchat).
 - [Group routing](https://docs.clawd.bot/concepts/group-messages): mention gating, reply tags, per-channel chunking and routing. Channel rules: [Channels](https://docs.clawd.bot/channels).
 
 ### Apps + nodes
@@ -159,7 +169,7 @@ Run `clawdbot doctor` to surface risky/misconfigured DM policies.
 ## How it works (short)
 
 ```
-WhatsApp / Telegram / Slack / Discord / Signal / iMessage / Microsoft Teams / WebChat
+WhatsApp / Telegram / Slack / Discord / Signal / iMessage / BlueBubbles / Microsoft Teams / Matrix / Zalo / Zalo Personal / WebChat
                │
                ▼
 ┌───────────────────────────────┐
@@ -257,12 +267,7 @@ Send these in WhatsApp/Telegram/Slack/Microsoft Teams/WebChat (group commands ar
 
 The Gateway alone delivers a great experience. All apps are optional and add extra features.
 
-If you plan to build/run companion apps, initialize submodules first:
-
-```bash
-git submodule update --init --recursive
-./scripts/restart-mac.sh
-```
+If you plan to build/run companion apps, follow the platform runbooks below.
 
 ### macOS (Clawdbot.app) (optional)
 
@@ -474,25 +479,27 @@ Core contributors:
 Thanks to all clawtributors:
 
 <p align="left">
-  <a href="https://github.com/steipete"><img src="https://avatars.githubusercontent.com/u/58493?v=4&s=48" width="48" height="48" alt="steipete" title="steipete"/></a> <a href="https://github.com/bohdanpodvirnyi"><img src="https://avatars.githubusercontent.com/u/31819391?v=4&s=48" width="48" height="48" alt="bohdanpodvirnyi" title="bohdanpodvirnyi"/></a> <a href="https://github.com/joaohlisboa"><img src="https://avatars.githubusercontent.com/u/8200873?v=4&s=48" width="48" height="48" alt="joaohlisboa" title="joaohlisboa"/></a> <a href="https://github.com/mneves75"><img src="https://avatars.githubusercontent.com/u/2423436?v=4&s=48" width="48" height="48" alt="mneves75" title="mneves75"/></a> <a href="https://github.com/MatthieuBizien"><img src="https://avatars.githubusercontent.com/u/173090?v=4&s=48" width="48" height="48" alt="MatthieuBizien" title="MatthieuBizien"/></a> <a href="https://github.com/rahthakor"><img src="https://avatars.githubusercontent.com/u/8470553?v=4&s=48" width="48" height="48" alt="rahthakor" title="rahthakor"/></a> <a href="https://github.com/vrknetha"><img src="https://avatars.githubusercontent.com/u/20596261?v=4&s=48" width="48" height="48" alt="vrknetha" title="vrknetha"/></a> <a href="https://github.com/joshp123"><img src="https://avatars.githubusercontent.com/u/1497361?v=4&s=48" width="48" height="48" alt="joshp123" title="joshp123"/></a> <a href="https://github.com/mukhtharcm"><img src="https://avatars.githubusercontent.com/u/56378562?v=4&s=48" width="48" height="48" alt="mukhtharcm" title="mukhtharcm"/></a> <a href="https://github.com/maxsumrall"><img src="https://avatars.githubusercontent.com/u/628843?v=4&s=48" width="48" height="48" alt="maxsumrall" title="maxsumrall"/></a>
-  <a href="https://github.com/xadenryan"><img src="https://avatars.githubusercontent.com/u/165437834?v=4&s=48" width="48" height="48" alt="xadenryan" title="xadenryan"/></a> <a href="https://github.com/tobiasbischoff"><img src="https://avatars.githubusercontent.com/u/711564?v=4&s=48" width="48" height="48" alt="Tobias Bischoff" title="Tobias Bischoff"/></a> <a href="https://github.com/juanpablodlc"><img src="https://avatars.githubusercontent.com/u/92012363?v=4&s=48" width="48" height="48" alt="juanpablodlc" title="juanpablodlc"/></a> <a href="https://github.com/hsrvc"><img src="https://avatars.githubusercontent.com/u/129702169?v=4&s=48" width="48" height="48" alt="hsrvc" title="hsrvc"/></a> <a href="https://github.com/magimetal"><img src="https://avatars.githubusercontent.com/u/36491250?v=4&s=48" width="48" height="48" alt="magimetal" title="magimetal"/></a> <a href="https://github.com/meaningfool"><img src="https://avatars.githubusercontent.com/u/2862331?v=4&s=48" width="48" height="48" alt="meaningfool" title="meaningfool"/></a> <a href="https://github.com/NicholasSpisak"><img src="https://avatars.githubusercontent.com/u/129075147?v=4&s=48" width="48" height="48" alt="NicholasSpisak" title="NicholasSpisak"/></a> <a href="https://github.com/AbhisekBasu1"><img src="https://avatars.githubusercontent.com/u/40645221?v=4&s=48" width="48" height="48" alt="abhisekbasu1" title="abhisekbasu1"/></a> <a href="https://github.com/claude"><img src="https://avatars.githubusercontent.com/u/81847?v=4&s=48" width="48" height="48" alt="claude" title="claude"/></a> <a href="https://github.com/jamesgroat"><img src="https://avatars.githubusercontent.com/u/2634024?v=4&s=48" width="48" height="48" alt="jamesgroat" title="jamesgroat"/></a>
-  <a href="https://github.com/Hyaxia"><img src="https://avatars.githubusercontent.com/u/36747317?v=4&s=48" width="48" height="48" alt="Hyaxia" title="Hyaxia"/></a> <a href="https://github.com/dantelex"><img src="https://avatars.githubusercontent.com/u/631543?v=4&s=48" width="48" height="48" alt="dantelex" title="dantelex"/></a> <a href="https://github.com/daveonkels"><img src="https://avatars.githubusercontent.com/u/533642?v=4&s=48" width="48" height="48" alt="daveonkels" title="daveonkels"/></a> <a href="https://github.com/radek-paclt"><img src="https://avatars.githubusercontent.com/u/50451445?v=4&s=48" width="48" height="48" alt="radek-paclt" title="radek-paclt"/></a> <a href="https://github.com/mteam88"><img src="https://avatars.githubusercontent.com/u/84196639?v=4&s=48" width="48" height="48" alt="mteam88" title="mteam88"/></a> <a href="https://github.com/omniwired"><img src="https://avatars.githubusercontent.com/u/322761?v=4&s=48" width="48" height="48" alt="Eng. Juan Combetto" title="Eng. Juan Combetto"/></a> <a href="https://github.com/dbhurley"><img src="https://avatars.githubusercontent.com/u/5251425?v=4&s=48" width="48" height="48" alt="dbhurley" title="dbhurley"/></a> <a href="https://github.com/mbelinky"><img src="https://avatars.githubusercontent.com/u/132747814?v=4&s=48" width="48" height="48" alt="Mariano Belinky" title="Mariano Belinky"/></a> <a href="https://github.com/julianengel"><img src="https://avatars.githubusercontent.com/u/10634231?v=4&s=48" width="48" height="48" alt="julianengel" title="julianengel"/></a> <a href="https://github.com/benithors"><img src="https://avatars.githubusercontent.com/u/20652882?v=4&s=48" width="48" height="48" alt="benithors" title="benithors"/></a>
-  <a href="https://github.com/timolins"><img src="https://avatars.githubusercontent.com/u/1440854?v=4&s=48" width="48" height="48" alt="timolins" title="timolins"/></a> <a href="https://github.com/Nachx639"><img src="https://avatars.githubusercontent.com/u/71144023?v=4&s=48" width="48" height="48" alt="nachx639" title="nachx639"/></a> <a href="https://github.com/sreekaransrinath"><img src="https://avatars.githubusercontent.com/u/50989977?v=4&s=48" width="48" height="48" alt="sreekaransrinath" title="sreekaransrinath"/></a> <a href="https://github.com/gupsammy"><img src="https://avatars.githubusercontent.com/u/20296019?v=4&s=48" width="48" height="48" alt="gupsammy" title="gupsammy"/></a> <a href="https://github.com/cristip73"><img src="https://avatars.githubusercontent.com/u/24499421?v=4&s=48" width="48" height="48" alt="cristip73" title="cristip73"/></a> <a href="https://github.com/nachoiacovino"><img src="https://avatars.githubusercontent.com/u/50103937?v=4&s=48" width="48" height="48" alt="nachoiacovino" title="nachoiacovino"/></a> <a href="https://github.com/vsabavat"><img src="https://avatars.githubusercontent.com/u/50385532?v=4&s=48" width="48" height="48" alt="Vasanth Rao Naik Sabavat" title="Vasanth Rao Naik Sabavat"/></a> <a href="https://github.com/cpojer"><img src="https://avatars.githubusercontent.com/u/13352?v=4&s=48" width="48" height="48" alt="cpojer" title="cpojer"/></a> <a href="https://github.com/lc0rp"><img src="https://avatars.githubusercontent.com/u/2609441?v=4&s=48" width="48" height="48" alt="lc0rp" title="lc0rp"/></a> <a href="https://github.com/scald"><img src="https://avatars.githubusercontent.com/u/1215913?v=4&s=48" width="48" height="48" alt="scald" title="scald"/></a>
-  <a href="https://github.com/andranik-sahakyan"><img src="https://avatars.githubusercontent.com/u/8908029?v=4&s=48" width="48" height="48" alt="andranik-sahakyan" title="andranik-sahakyan"/></a> <a href="https://github.com/davidguttman"><img src="https://avatars.githubusercontent.com/u/431696?v=4&s=48" width="48" height="48" alt="davidguttman" title="davidguttman"/></a> <a href="https://github.com/sleontenko"><img src="https://avatars.githubusercontent.com/u/7135949?v=4&s=48" width="48" height="48" alt="sleontenko" title="sleontenko"/></a> <a href="https://github.com/sircrumpet"><img src="https://avatars.githubusercontent.com/u/4436535?v=4&s=48" width="48" height="48" alt="sircrumpet" title="sircrumpet"/></a> <a href="https://github.com/peschee"><img src="https://avatars.githubusercontent.com/u/63866?v=4&s=48" width="48" height="48" alt="peschee" title="peschee"/></a> <a href="https://github.com/rafaelreis-r"><img src="https://avatars.githubusercontent.com/u/57492577?v=4&s=48" width="48" height="48" alt="rafaelreis-r" title="rafaelreis-r"/></a> <a href="https://github.com/ratulsarna"><img src="https://avatars.githubusercontent.com/u/105903728?v=4&s=48" width="48" height="48" alt="ratulsarna" title="ratulsarna"/></a> <a href="https://github.com/thewilloftheshadow"><img src="https://avatars.githubusercontent.com/u/35580099?v=4&s=48" width="48" height="48" alt="thewilloftheshadow" title="thewilloftheshadow"/></a> <a href="https://github.com/lutr0"><img src="https://avatars.githubusercontent.com/u/76906369?v=4&s=48" width="48" height="48" alt="lutr0" title="lutr0"/></a> <a href="https://github.com/danielz1z"><img src="https://avatars.githubusercontent.com/u/235270390?v=4&s=48" width="48" height="48" alt="danielz1z" title="danielz1z"/></a>
-  <a href="https://github.com/gumadeiras"><img src="https://avatars.githubusercontent.com/u/5599352?v=4&s=48" width="48" height="48" alt="gumadeiras" title="gumadeiras"/></a> <a href="https://github.com/emanuelst"><img src="https://avatars.githubusercontent.com/u/9994339?v=4&s=48" width="48" height="48" alt="emanuelst" title="emanuelst"/></a> <a href="https://github.com/KristijanJovanovski"><img src="https://avatars.githubusercontent.com/u/8942284?v=4&s=48" width="48" height="48" alt="KristijanJovanovski" title="KristijanJovanovski"/></a> <a href="https://github.com/CashWilliams"><img src="https://avatars.githubusercontent.com/u/613573?v=4&s=48" width="48" height="48" alt="CashWilliams" title="CashWilliams"/></a> <a href="https://github.com/rdev"><img src="https://avatars.githubusercontent.com/u/8418866?v=4&s=48" width="48" height="48" alt="rdev" title="rdev"/></a> <a href="https://github.com/osolmaz"><img src="https://avatars.githubusercontent.com/u/2453968?v=4&s=48" width="48" height="48" alt="osolmaz" title="osolmaz"/></a> <a href="https://github.com/kiranjd"><img src="https://avatars.githubusercontent.com/u/25822851?v=4&s=48" width="48" height="48" alt="kiranjd" title="kiranjd"/></a> <a href="https://github.com/adityashaw2"><img src="https://avatars.githubusercontent.com/u/41204444?v=4&s=48" width="48" height="48" alt="adityashaw2" title="adityashaw2"/></a> <a href="https://github.com/sebslight"><img src="https://avatars.githubusercontent.com/u/19554889?v=4&s=48" width="48" height="48" alt="sebslight" title="sebslight"/></a> <a href="https://github.com/search?q=sheeek"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="sheeek" title="sheeek"/></a>
-  <a href="https://github.com/artuskg"><img src="https://avatars.githubusercontent.com/u/11966157?v=4&s=48" width="48" height="48" alt="artuskg" title="artuskg"/></a> <a href="https://github.com/onutc"><img src="https://avatars.githubusercontent.com/u/152018508?v=4&s=48" width="48" height="48" alt="onutc" title="onutc"/></a> <a href="https://github.com/ManuelHettich"><img src="https://avatars.githubusercontent.com/u/17690367?v=4&s=48" width="48" height="48" alt="manuelhettich" title="manuelhettich"/></a> <a href="https://github.com/minghinmatthewlam"><img src="https://avatars.githubusercontent.com/u/14224566?v=4&s=48" width="48" height="48" alt="minghinmatthewlam" title="minghinmatthewlam"/></a> <a href="https://github.com/myfunc"><img src="https://avatars.githubusercontent.com/u/19294627?v=4&s=48" width="48" height="48" alt="myfunc" title="myfunc"/></a> <a href="https://github.com/buddyh"><img src="https://avatars.githubusercontent.com/u/31752869?v=4&s=48" width="48" height="48" alt="buddyh" title="buddyh"/></a> <a href="https://github.com/connorshea"><img src="https://avatars.githubusercontent.com/u/2977353?v=4&s=48" width="48" height="48" alt="connorshea" title="connorshea"/></a> <a href="https://github.com/mcinteerj"><img src="https://avatars.githubusercontent.com/u/3613653?v=4&s=48" width="48" height="48" alt="mcinteerj" title="mcinteerj"/></a> <a href="https://github.com/timkrase"><img src="https://avatars.githubusercontent.com/u/38947626?v=4&s=48" width="48" height="48" alt="timkrase" title="timkrase"/></a> <a href="https://github.com/gerardward2007"><img src="https://avatars.githubusercontent.com/u/3002155?v=4&s=48" width="48" height="48" alt="gerardward2007" title="gerardward2007"/></a>
-  <a href="https://github.com/obviyus"><img src="https://avatars.githubusercontent.com/u/22031114?v=4&s=48" width="48" height="48" alt="obviyus" title="obviyus"/></a> <a href="https://github.com/tosh-hamburg"><img src="https://avatars.githubusercontent.com/u/58424326?v=4&s=48" width="48" height="48" alt="tosh-hamburg" title="tosh-hamburg"/></a> <a href="https://github.com/azade-c"><img src="https://avatars.githubusercontent.com/u/252790079?v=4&s=48" width="48" height="48" alt="azade-c" title="azade-c"/></a> <a href="https://github.com/roshanasingh4"><img src="https://avatars.githubusercontent.com/u/88576930?v=4&s=48" width="48" height="48" alt="roshanasingh4" title="roshanasingh4"/></a> <a href="https://github.com/bjesuiter"><img src="https://avatars.githubusercontent.com/u/2365676?v=4&s=48" width="48" height="48" alt="bjesuiter" title="bjesuiter"/></a> <a href="https://github.com/j1philli"><img src="https://avatars.githubusercontent.com/u/3744255?v=4&s=48" width="48" height="48" alt="Josh Phillips" title="Josh Phillips"/></a> <a href="https://github.com/YuriNachos"><img src="https://avatars.githubusercontent.com/u/19365375?v=4&s=48" width="48" height="48" alt="YuriNachos" title="YuriNachos"/></a> <a href="https://github.com/zerone0x"><img src="https://avatars.githubusercontent.com/u/39543393?v=4&s=48" width="48" height="48" alt="zerone0x" title="zerone0x"/></a> <a href="https://github.com/superman32432432"><img src="https://avatars.githubusercontent.com/u/7228420?v=4&s=48" width="48" height="48" alt="superman32432432" title="superman32432432"/></a> <a href="https://github.com/search?q=Yurii%20Chukhlib"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Yurii Chukhlib" title="Yurii Chukhlib"/></a>
-  <a href="https://github.com/antons"><img src="https://avatars.githubusercontent.com/u/129705?v=4&s=48" width="48" height="48" alt="antons" title="antons"/></a> <a href="https://github.com/austinm911"><img src="https://avatars.githubusercontent.com/u/31991302?v=4&s=48" width="48" height="48" alt="austinm911" title="austinm911"/></a> <a href="https://github.com/apps/blacksmith-sh"><img src="https://avatars.githubusercontent.com/in/807020?v=4&s=48" width="48" height="48" alt="blacksmith-sh[bot]" title="blacksmith-sh[bot]"/></a> <a href="https://github.com/dan-dr"><img src="https://avatars.githubusercontent.com/u/6669808?v=4&s=48" width="48" height="48" alt="dan-dr" title="dan-dr"/></a> <a href="https://github.com/grp06"><img src="https://avatars.githubusercontent.com/u/1573959?v=4&s=48" width="48" height="48" alt="grp06" title="grp06"/></a> <a href="https://github.com/HeimdallStrategy"><img src="https://avatars.githubusercontent.com/u/223014405?v=4&s=48" width="48" height="48" alt="HeimdallStrategy" title="HeimdallStrategy"/></a> <a href="https://github.com/imfing"><img src="https://avatars.githubusercontent.com/u/5097752?v=4&s=48" width="48" height="48" alt="imfing" title="imfing"/></a> <a href="https://github.com/jalehman"><img src="https://avatars.githubusercontent.com/u/550978?v=4&s=48" width="48" height="48" alt="jalehman" title="jalehman"/></a> <a href="https://github.com/jarvis-medmatic"><img src="https://avatars.githubusercontent.com/u/252428873?v=4&s=48" width="48" height="48" alt="jarvis-medmatic" title="jarvis-medmatic"/></a> <a href="https://github.com/kkarimi"><img src="https://avatars.githubusercontent.com/u/875218?v=4&s=48" width="48" height="48" alt="kkarimi" title="kkarimi"/></a>
-  <a href="https://github.com/mahmoudashraf93"><img src="https://avatars.githubusercontent.com/u/9130129?v=4&s=48" width="48" height="48" alt="mahmoudashraf93" title="mahmoudashraf93"/></a> <a href="https://github.com/petter-b"><img src="https://avatars.githubusercontent.com/u/62076402?v=4&s=48" width="48" height="48" alt="petter-b" title="petter-b"/></a> <a href="https://github.com/pkrmf"><img src="https://avatars.githubusercontent.com/u/1714267?v=4&s=48" width="48" height="48" alt="pkrmf" title="pkrmf"/></a> <a href="https://github.com/RandyVentures"><img src="https://avatars.githubusercontent.com/u/149904821?v=4&s=48" width="48" height="48" alt="RandyVentures" title="RandyVentures"/></a> <a href="https://github.com/erikpr1994"><img src="https://avatars.githubusercontent.com/u/6299331?v=4&s=48" width="48" height="48" alt="erikpr1994" title="erikpr1994"/></a> <a href="https://github.com/jonasjancarik"><img src="https://avatars.githubusercontent.com/u/2459191?v=4&s=48" width="48" height="48" alt="jonasjancarik" title="jonasjancarik"/></a> <a href="https://github.com/search?q=Keith%20the%20Silly%20Goose"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Keith the Silly Goose" title="Keith the Silly Goose"/></a> <a href="https://github.com/search?q=L36%20Server"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="L36 Server" title="L36 Server"/></a> <a href="https://github.com/search?q=Marc"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Marc" title="Marc"/></a> <a href="https://github.com/mitschabaude-bot"><img src="https://avatars.githubusercontent.com/u/247582884?v=4&s=48" width="48" height="48" alt="mitschabaude-bot" title="mitschabaude-bot"/></a>
-  <a href="https://github.com/neist"><img src="https://avatars.githubusercontent.com/u/1029724?v=4&s=48" width="48" height="48" alt="neist" title="neist"/></a> <a href="https://github.com/tyler6204"><img src="https://avatars.githubusercontent.com/u/64381258?v=4&s=48" width="48" height="48" alt="tyler6204" title="tyler6204"/></a> <a href="https://github.com/chrisrodz"><img src="https://avatars.githubusercontent.com/u/2967620?v=4&s=48" width="48" height="48" alt="chrisrodz" title="chrisrodz"/></a> <a href="https://github.com/search?q=Friederike%20Seiler"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Friederike Seiler" title="Friederike Seiler"/></a> <a href="https://github.com/gabriel-trigo"><img src="https://avatars.githubusercontent.com/u/38991125?v=4&s=48" width="48" height="48" alt="gabriel-trigo" title="gabriel-trigo"/></a> <a href="https://github.com/Iamadig"><img src="https://avatars.githubusercontent.com/u/102129234?v=4&s=48" width="48" height="48" alt="iamadig" title="iamadig"/></a> <a href="https://github.com/search?q=Kit"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Kit" title="Kit"/></a> <a href="https://github.com/koala73"><img src="https://avatars.githubusercontent.com/u/996596?v=4&s=48" width="48" height="48" alt="koala73" title="koala73"/></a> <a href="https://github.com/manmal"><img src="https://avatars.githubusercontent.com/u/142797?v=4&s=48" width="48" height="48" alt="manmal" title="manmal"/></a> <a href="https://github.com/ngutman"><img src="https://avatars.githubusercontent.com/u/1540134?v=4&s=48" width="48" height="48" alt="ngutman" title="ngutman"/></a>
-  <a href="https://github.com/ogulcancelik"><img src="https://avatars.githubusercontent.com/u/7064011?v=4&s=48" width="48" height="48" alt="ogulcancelik" title="ogulcancelik"/></a> <a href="https://github.com/pasogott"><img src="https://avatars.githubusercontent.com/u/23458152?v=4&s=48" width="48" height="48" alt="pasogott" title="pasogott"/></a> <a href="https://github.com/petradonka"><img src="https://avatars.githubusercontent.com/u/7353770?v=4&s=48" width="48" height="48" alt="petradonka" title="petradonka"/></a> <a href="https://github.com/rubyrunsstuff"><img src="https://avatars.githubusercontent.com/u/246602379?v=4&s=48" width="48" height="48" alt="rubyrunsstuff" title="rubyrunsstuff"/></a> <a href="https://github.com/VACInc"><img src="https://avatars.githubusercontent.com/u/3279061?v=4&s=48" width="48" height="48" alt="VACInc" title="VACInc"/></a> <a href="https://github.com/wes-davis"><img src="https://avatars.githubusercontent.com/u/16506720?v=4&s=48" width="48" height="48" alt="wes-davis" title="wes-davis"/></a> <a href="https://github.com/zats"><img src="https://avatars.githubusercontent.com/u/2688806?v=4&s=48" width="48" height="48" alt="zats" title="zats"/></a> <a href="https://github.com/search?q=Chris%20Taylor"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Chris Taylor" title="Chris Taylor"/></a> <a href="https://github.com/djangonavarro220"><img src="https://avatars.githubusercontent.com/u/251162586?v=4&s=48" width="48" height="48" alt="Django Navarro" title="Django Navarro"/></a> <a href="https://github.com/evalexpr"><img src="https://avatars.githubusercontent.com/u/23485511?v=4&s=48" width="48" height="48" alt="evalexpr" title="evalexpr"/></a>
-  <a href="https://github.com/henrino3"><img src="https://avatars.githubusercontent.com/u/4260288?v=4&s=48" width="48" height="48" alt="henrino3" title="henrino3"/></a> <a href="https://github.com/mkbehr"><img src="https://avatars.githubusercontent.com/u/1285?v=4&s=48" width="48" height="48" alt="mkbehr" title="mkbehr"/></a> <a href="https://github.com/oswalpalash"><img src="https://avatars.githubusercontent.com/u/6431196?v=4&s=48" width="48" height="48" alt="oswalpalash" title="oswalpalash"/></a> <a href="https://github.com/pcty-nextgen-service-account"><img src="https://avatars.githubusercontent.com/u/112553441?v=4&s=48" width="48" height="48" alt="pcty-nextgen-service-account" title="pcty-nextgen-service-account"/></a> <a href="https://github.com/Syhids"><img src="https://avatars.githubusercontent.com/u/671202?v=4&s=48" width="48" height="48" alt="Syhids" title="Syhids"/></a> <a href="https://github.com/search?q=Aaron%20Konyer"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Aaron Konyer" title="Aaron Konyer"/></a> <a href="https://github.com/adam91holt"><img src="https://avatars.githubusercontent.com/u/9592417?v=4&s=48" width="48" height="48" alt="adam91holt" title="adam91holt"/></a> <a href="https://github.com/erik-agens"><img src="https://avatars.githubusercontent.com/u/80908960?v=4&s=48" width="48" height="48" alt="erik-agens" title="erik-agens"/></a> <a href="https://github.com/fcatuhe"><img src="https://avatars.githubusercontent.com/u/17382215?v=4&s=48" width="48" height="48" alt="fcatuhe" title="fcatuhe"/></a> <a href="https://github.com/ivanrvpereira"><img src="https://avatars.githubusercontent.com/u/183991?v=4&s=48" width="48" height="48" alt="ivanrvpereira" title="ivanrvpereira"/></a>
-  <a href="https://github.com/jayhickey"><img src="https://avatars.githubusercontent.com/u/1676460?v=4&s=48" width="48" height="48" alt="jayhickey" title="jayhickey"/></a> <a href="https://github.com/jeffersonwarrior"><img src="https://avatars.githubusercontent.com/u/89030989?v=4&s=48" width="48" height="48" alt="jeffersonwarrior" title="jeffersonwarrior"/></a> <a href="https://github.com/search?q=jeffersonwarrior"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="jeffersonwarrior" title="jeffersonwarrior"/></a> <a href="https://github.com/jdrhyne"><img src="https://avatars.githubusercontent.com/u/7828464?v=4&s=48" width="48" height="48" alt="Jonathan D. Rhyne (DJ-D)" title="Jonathan D. Rhyne (DJ-D)"/></a> <a href="https://github.com/jverdi"><img src="https://avatars.githubusercontent.com/u/345050?v=4&s=48" width="48" height="48" alt="jverdi" title="jverdi"/></a> <a href="https://github.com/mickahouan"><img src="https://avatars.githubusercontent.com/u/31423109?v=4&s=48" width="48" height="48" alt="mickahouan" title="mickahouan"/></a> <a href="https://github.com/mjrussell"><img src="https://avatars.githubusercontent.com/u/1641895?v=4&s=48" width="48" height="48" alt="mjrussell" title="mjrussell"/></a> <a href="https://github.com/p6l-richard"><img src="https://avatars.githubusercontent.com/u/18185649?v=4&s=48" width="48" height="48" alt="p6l-richard" title="p6l-richard"/></a> <a href="https://github.com/philipp-spiess"><img src="https://avatars.githubusercontent.com/u/458591?v=4&s=48" width="48" height="48" alt="philipp-spiess" title="philipp-spiess"/></a> <a href="https://github.com/robaxelsen"><img src="https://avatars.githubusercontent.com/u/13132899?v=4&s=48" width="48" height="48" alt="robaxelsen" title="robaxelsen"/></a>
-  <a href="https://github.com/search?q=Sash%20Catanzarite"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Sash Catanzarite" title="Sash Catanzarite"/></a> <a href="https://github.com/sibbl"><img src="https://avatars.githubusercontent.com/u/866535?v=4&s=48" width="48" height="48" alt="sibbl" title="sibbl"/></a> <a href="https://github.com/search?q=VAC"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="VAC" title="VAC"/></a> <a href="https://github.com/zknicker"><img src="https://avatars.githubusercontent.com/u/1164085?v=4&s=48" width="48" height="48" alt="zknicker" title="zknicker"/></a> <a href="https://github.com/search?q=alejandro%20maza"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="alejandro maza" title="alejandro maza"/></a> <a href="https://github.com/andrewting19"><img src="https://avatars.githubusercontent.com/u/10536704?v=4&s=48" width="48" height="48" alt="andrewting19" title="andrewting19"/></a> <a href="https://github.com/Asleep123"><img src="https://avatars.githubusercontent.com/u/122379135?v=4&s=48" width="48" height="48" alt="Asleep123" title="Asleep123"/></a> <a href="https://github.com/bolismauro"><img src="https://avatars.githubusercontent.com/u/771999?v=4&s=48" width="48" height="48" alt="bolismauro" title="bolismauro"/></a> <a href="https://github.com/cash-echo-bot"><img src="https://avatars.githubusercontent.com/u/252747386?v=4&s=48" width="48" height="48" alt="cash-echo-bot" title="cash-echo-bot"/></a> <a href="https://github.com/search?q=Clawd"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Clawd" title="Clawd"/></a>
-  <a href="https://github.com/conhecendocontato"><img src="https://avatars.githubusercontent.com/u/82890727?v=4&s=48" width="48" height="48" alt="conhecendocontato" title="conhecendocontato"/></a> <a href="https://github.com/search?q=Dimitrios%20Ploutarchos"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Dimitrios Ploutarchos" title="Dimitrios Ploutarchos"/></a> <a href="https://github.com/search?q=Drake%20Thomsen"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Drake Thomsen" title="Drake Thomsen"/></a> <a href="https://github.com/gtsifrikas"><img src="https://avatars.githubusercontent.com/u/8904378?v=4&s=48" width="48" height="48" alt="gtsifrikas" title="gtsifrikas"/></a> <a href="https://github.com/HazAT"><img src="https://avatars.githubusercontent.com/u/363802?v=4&s=48" width="48" height="48" alt="HazAT" title="HazAT"/></a> <a href="https://github.com/hrdwdmrbl"><img src="https://avatars.githubusercontent.com/u/554881?v=4&s=48" width="48" height="48" alt="hrdwdmrbl" title="hrdwdmrbl"/></a> <a href="https://github.com/hugobarauna"><img src="https://avatars.githubusercontent.com/u/2719?v=4&s=48" width="48" height="48" alt="hugobarauna" title="hugobarauna"/></a> <a href="https://github.com/search?q=Jamie%20Openshaw"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Jamie Openshaw" title="Jamie Openshaw"/></a> <a href="https://github.com/search?q=Jarvis"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Jarvis" title="Jarvis"/></a> <a href="https://github.com/search?q=Jefferson%20Nunn"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Jefferson Nunn" title="Jefferson Nunn"/></a>
-  <a href="https://github.com/kitze"><img src="https://avatars.githubusercontent.com/u/1160594?v=4&s=48" width="48" height="48" alt="kitze" title="kitze"/></a> <a href="https://github.com/levifig"><img src="https://avatars.githubusercontent.com/u/1605?v=4&s=48" width="48" height="48" alt="levifig" title="levifig"/></a> <a href="https://github.com/search?q=Lloyd"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Lloyd" title="Lloyd"/></a> <a href="https://github.com/longmaba"><img src="https://avatars.githubusercontent.com/u/9361500?v=4&s=48" width="48" height="48" alt="longmaba" title="longmaba"/></a> <a href="https://github.com/loukotal"><img src="https://avatars.githubusercontent.com/u/18210858?v=4&s=48" width="48" height="48" alt="loukotal" title="loukotal"/></a> <a href="https://github.com/martinpucik"><img src="https://avatars.githubusercontent.com/u/5503097?v=4&s=48" width="48" height="48" alt="martinpucik" title="martinpucik"/></a> <a href="https://github.com/search?q=Miles"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Miles" title="Miles"/></a> <a href="https://github.com/mrdbstn"><img src="https://avatars.githubusercontent.com/u/58957632?v=4&s=48" width="48" height="48" alt="mrdbstn" title="mrdbstn"/></a> <a href="https://github.com/MSch"><img src="https://avatars.githubusercontent.com/u/7475?v=4&s=48" width="48" height="48" alt="MSch" title="MSch"/></a> <a href="https://github.com/search?q=Mustafa%20Tag%20Eldeen"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Mustafa Tag Eldeen" title="Mustafa Tag Eldeen"/></a>
-  <a href="https://github.com/ndraiman"><img src="https://avatars.githubusercontent.com/u/12609607?v=4&s=48" width="48" height="48" alt="ndraiman" title="ndraiman"/></a> <a href="https://github.com/nexty5870"><img src="https://avatars.githubusercontent.com/u/3869659?v=4&s=48" width="48" height="48" alt="nexty5870" title="nexty5870"/></a> <a href="https://github.com/prathamdby"><img src="https://avatars.githubusercontent.com/u/134331217?v=4&s=48" width="48" height="48" alt="prathamdby" title="prathamdby"/></a> <a href="https://github.com/reeltimeapps"><img src="https://avatars.githubusercontent.com/u/637338?v=4&s=48" width="48" height="48" alt="reeltimeapps" title="reeltimeapps"/></a> <a href="https://github.com/RLTCmpe"><img src="https://avatars.githubusercontent.com/u/10762242?v=4&s=48" width="48" height="48" alt="RLTCmpe" title="RLTCmpe"/></a> <a href="https://github.com/search?q=Rolf%20Fredheim"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Rolf Fredheim" title="Rolf Fredheim"/></a> <a href="https://github.com/search?q=Rony%20Kelner"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Rony Kelner" title="Rony Kelner"/></a> <a href="https://github.com/search?q=Samrat%20Jha"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Samrat Jha" title="Samrat Jha"/></a> <a href="https://github.com/siraht"><img src="https://avatars.githubusercontent.com/u/73152895?v=4&s=48" width="48" height="48" alt="siraht" title="siraht"/></a> <a href="https://github.com/snopoke"><img src="https://avatars.githubusercontent.com/u/249606?v=4&s=48" width="48" height="48" alt="snopoke" title="snopoke"/></a>
-  <a href="https://github.com/suminhthanh"><img src="https://avatars.githubusercontent.com/u/2907636?v=4&s=48" width="48" height="48" alt="suminhthanh" title="suminhthanh"/></a> <a href="https://github.com/search?q=The%20Admiral"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="The Admiral" title="The Admiral"/></a> <a href="https://github.com/thesash"><img src="https://avatars.githubusercontent.com/u/1166151?v=4&s=48" width="48" height="48" alt="thesash" title="thesash"/></a> <a href="https://github.com/search?q=Ubuntu"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Ubuntu" title="Ubuntu"/></a> <a href="https://github.com/voidserf"><img src="https://avatars.githubusercontent.com/u/477673?v=4&s=48" width="48" height="48" alt="voidserf" title="voidserf"/></a> <a href="https://github.com/wstock"><img src="https://avatars.githubusercontent.com/u/1394687?v=4&s=48" width="48" height="48" alt="wstock" title="wstock"/></a> <a href="https://github.com/search?q=Zach%20Knickerbocker"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Zach Knickerbocker" title="Zach Knickerbocker"/></a> <a href="https://github.com/Alphonse-arianee"><img src="https://avatars.githubusercontent.com/u/254457365?v=4&s=48" width="48" height="48" alt="Alphonse-arianee" title="Alphonse-arianee"/></a> <a href="https://github.com/search?q=Azade"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Azade" title="Azade"/></a> <a href="https://github.com/carlulsoe"><img src="https://avatars.githubusercontent.com/u/34673973?v=4&s=48" width="48" height="48" alt="carlulsoe" title="carlulsoe"/></a>
-  <a href="https://github.com/search?q=ddyo"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="ddyo" title="ddyo"/></a> <a href="https://github.com/search?q=Erik"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Erik" title="Erik"/></a> <a href="https://github.com/latitudeki5223"><img src="https://avatars.githubusercontent.com/u/119656367?v=4&s=48" width="48" height="48" alt="latitudeki5223" title="latitudeki5223"/></a> <a href="https://github.com/search?q=Manuel%20Maly"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Manuel Maly" title="Manuel Maly"/></a> <a href="https://github.com/search?q=Mourad%20Boustani"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Mourad Boustani" title="Mourad Boustani"/></a> <a href="https://github.com/pcty-nextgen-ios-builder"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="pcty-nextgen-ios-builder" title="pcty-nextgen-ios-builder"/></a> <a href="https://github.com/search?q=Quentin"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Quentin" title="Quentin"/></a> <a href="https://github.com/search?q=Randy%20Torres"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Randy Torres" title="Randy Torres"/></a> <a href="https://github.com/rhjoh"><img src="https://avatars.githubusercontent.com/u/105699450?v=4&s=48" width="48" height="48" alt="rhjoh" title="rhjoh"/></a> <a href="https://github.com/ronak-guliani"><img src="https://avatars.githubusercontent.com/u/23518228?v=4&s=48" width="48" height="48" alt="ronak-guliani" title="ronak-guliani"/></a>
-  <a href="https://github.com/search?q=William%20Stock"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="William Stock" title="William Stock"/></a>
+  <a href="https://github.com/steipete"><img src="https://avatars.githubusercontent.com/u/58493?v=4&s=48" width="48" height="48" alt="steipete" title="steipete"/></a> <a href="https://github.com/bohdanpodvirnyi"><img src="https://avatars.githubusercontent.com/u/31819391?v=4&s=48" width="48" height="48" alt="bohdanpodvirnyi" title="bohdanpodvirnyi"/></a> <a href="https://github.com/joaohlisboa"><img src="https://avatars.githubusercontent.com/u/8200873?v=4&s=48" width="48" height="48" alt="joaohlisboa" title="joaohlisboa"/></a> <a href="https://github.com/mneves75"><img src="https://avatars.githubusercontent.com/u/2423436?v=4&s=48" width="48" height="48" alt="mneves75" title="mneves75"/></a> <a href="https://github.com/MatthieuBizien"><img src="https://avatars.githubusercontent.com/u/173090?v=4&s=48" width="48" height="48" alt="MatthieuBizien" title="MatthieuBizien"/></a> <a href="https://github.com/MaudeBot"><img src="https://avatars.githubusercontent.com/u/255777700?v=4&s=48" width="48" height="48" alt="MaudeBot" title="MaudeBot"/></a> <a href="https://github.com/rahthakor"><img src="https://avatars.githubusercontent.com/u/8470553?v=4&s=48" width="48" height="48" alt="rahthakor" title="rahthakor"/></a> <a href="https://github.com/vrknetha"><img src="https://avatars.githubusercontent.com/u/20596261?v=4&s=48" width="48" height="48" alt="vrknetha" title="vrknetha"/></a> <a href="https://github.com/radek-paclt"><img src="https://avatars.githubusercontent.com/u/50451445?v=4&s=48" width="48" height="48" alt="radek-paclt" title="radek-paclt"/></a> <a href="https://github.com/joshp123"><img src="https://avatars.githubusercontent.com/u/1497361?v=4&s=48" width="48" height="48" alt="joshp123" title="joshp123"/></a>
+  <a href="https://github.com/mukhtharcm"><img src="https://avatars.githubusercontent.com/u/56378562?v=4&s=48" width="48" height="48" alt="mukhtharcm" title="mukhtharcm"/></a> <a href="https://github.com/maxsumrall"><img src="https://avatars.githubusercontent.com/u/628843?v=4&s=48" width="48" height="48" alt="maxsumrall" title="maxsumrall"/></a> <a href="https://github.com/xadenryan"><img src="https://avatars.githubusercontent.com/u/165437834?v=4&s=48" width="48" height="48" alt="xadenryan" title="xadenryan"/></a> <a href="https://github.com/tobiasbischoff"><img src="https://avatars.githubusercontent.com/u/711564?v=4&s=48" width="48" height="48" alt="Tobias Bischoff" title="Tobias Bischoff"/></a> <a href="https://github.com/juanpablodlc"><img src="https://avatars.githubusercontent.com/u/92012363?v=4&s=48" width="48" height="48" alt="juanpablodlc" title="juanpablodlc"/></a> <a href="https://github.com/hsrvc"><img src="https://avatars.githubusercontent.com/u/129702169?v=4&s=48" width="48" height="48" alt="hsrvc" title="hsrvc"/></a> <a href="https://github.com/magimetal"><img src="https://avatars.githubusercontent.com/u/36491250?v=4&s=48" width="48" height="48" alt="magimetal" title="magimetal"/></a> <a href="https://github.com/meaningfool"><img src="https://avatars.githubusercontent.com/u/2862331?v=4&s=48" width="48" height="48" alt="meaningfool" title="meaningfool"/></a> <a href="https://github.com/NicholasSpisak"><img src="https://avatars.githubusercontent.com/u/129075147?v=4&s=48" width="48" height="48" alt="NicholasSpisak" title="NicholasSpisak"/></a> <a href="https://github.com/AbhisekBasu1"><img src="https://avatars.githubusercontent.com/u/40645221?v=4&s=48" width="48" height="48" alt="abhisekbasu1" title="abhisekbasu1"/></a>
+  <a href="https://github.com/sebslight"><img src="https://avatars.githubusercontent.com/u/19554889?v=4&s=48" width="48" height="48" alt="sebslight" title="sebslight"/></a> <a href="https://github.com/claude"><img src="https://avatars.githubusercontent.com/u/81847?v=4&s=48" width="48" height="48" alt="claude" title="claude"/></a> <a href="https://github.com/jamesgroat"><img src="https://avatars.githubusercontent.com/u/2634024?v=4&s=48" width="48" height="48" alt="jamesgroat" title="jamesgroat"/></a> <a href="https://github.com/Hyaxia"><img src="https://avatars.githubusercontent.com/u/36747317?v=4&s=48" width="48" height="48" alt="Hyaxia" title="Hyaxia"/></a> <a href="https://github.com/dantelex"><img src="https://avatars.githubusercontent.com/u/631543?v=4&s=48" width="48" height="48" alt="dantelex" title="dantelex"/></a> <a href="https://github.com/daveonkels"><img src="https://avatars.githubusercontent.com/u/533642?v=4&s=48" width="48" height="48" alt="daveonkels" title="daveonkels"/></a> <a href="https://github.com/mteam88"><img src="https://avatars.githubusercontent.com/u/84196639?v=4&s=48" width="48" height="48" alt="mteam88" title="mteam88"/></a> <a href="https://github.com/omniwired"><img src="https://avatars.githubusercontent.com/u/322761?v=4&s=48" width="48" height="48" alt="Eng. Juan Combetto" title="Eng. Juan Combetto"/></a> <a href="https://github.com/dbhurley"><img src="https://avatars.githubusercontent.com/u/5251425?v=4&s=48" width="48" height="48" alt="dbhurley" title="dbhurley"/></a> <a href="https://github.com/mbelinky"><img src="https://avatars.githubusercontent.com/u/132747814?v=4&s=48" width="48" height="48" alt="Mariano Belinky" title="Mariano Belinky"/></a>
+  <a href="https://github.com/TSavo"><img src="https://avatars.githubusercontent.com/u/877990?v=4&s=48" width="48" height="48" alt="TSavo" title="TSavo"/></a> <a href="https://github.com/julianengel"><img src="https://avatars.githubusercontent.com/u/10634231?v=4&s=48" width="48" height="48" alt="julianengel" title="julianengel"/></a> <a href="https://github.com/benithors"><img src="https://avatars.githubusercontent.com/u/20652882?v=4&s=48" width="48" height="48" alt="benithors" title="benithors"/></a> <a href="https://github.com/bradleypriest"><img src="https://avatars.githubusercontent.com/u/167215?v=4&s=48" width="48" height="48" alt="bradleypriest" title="bradleypriest"/></a> <a href="https://github.com/timolins"><img src="https://avatars.githubusercontent.com/u/1440854?v=4&s=48" width="48" height="48" alt="timolins" title="timolins"/></a> <a href="https://github.com/Nachx639"><img src="https://avatars.githubusercontent.com/u/71144023?v=4&s=48" width="48" height="48" alt="nachx639" title="nachx639"/></a> <a href="https://github.com/sreekaransrinath"><img src="https://avatars.githubusercontent.com/u/50989977?v=4&s=48" width="48" height="48" alt="sreekaransrinath" title="sreekaransrinath"/></a> <a href="https://github.com/gupsammy"><img src="https://avatars.githubusercontent.com/u/20296019?v=4&s=48" width="48" height="48" alt="gupsammy" title="gupsammy"/></a> <a href="https://github.com/cristip73"><img src="https://avatars.githubusercontent.com/u/24499421?v=4&s=48" width="48" height="48" alt="cristip73" title="cristip73"/></a> <a href="https://github.com/nachoiacovino"><img src="https://avatars.githubusercontent.com/u/50103937?v=4&s=48" width="48" height="48" alt="nachoiacovino" title="nachoiacovino"/></a>
+  <a href="https://github.com/vsabavat"><img src="https://avatars.githubusercontent.com/u/50385532?v=4&s=48" width="48" height="48" alt="Vasanth Rao Naik Sabavat" title="Vasanth Rao Naik Sabavat"/></a> <a href="https://github.com/cpojer"><img src="https://avatars.githubusercontent.com/u/13352?v=4&s=48" width="48" height="48" alt="cpojer" title="cpojer"/></a> <a href="https://github.com/lc0rp"><img src="https://avatars.githubusercontent.com/u/2609441?v=4&s=48" width="48" height="48" alt="lc0rp" title="lc0rp"/></a> <a href="https://github.com/scald"><img src="https://avatars.githubusercontent.com/u/1215913?v=4&s=48" width="48" height="48" alt="scald" title="scald"/></a> <a href="https://github.com/gumadeiras"><img src="https://avatars.githubusercontent.com/u/5599352?v=4&s=48" width="48" height="48" alt="gumadeiras" title="gumadeiras"/></a> <a href="https://github.com/andranik-sahakyan"><img src="https://avatars.githubusercontent.com/u/8908029?v=4&s=48" width="48" height="48" alt="andranik-sahakyan" title="andranik-sahakyan"/></a> <a href="https://github.com/davidguttman"><img src="https://avatars.githubusercontent.com/u/431696?v=4&s=48" width="48" height="48" alt="davidguttman" title="davidguttman"/></a> <a href="https://github.com/sleontenko"><img src="https://avatars.githubusercontent.com/u/7135949?v=4&s=48" width="48" height="48" alt="sleontenko" title="sleontenko"/></a> <a href="https://github.com/sircrumpet"><img src="https://avatars.githubusercontent.com/u/4436535?v=4&s=48" width="48" height="48" alt="sircrumpet" title="sircrumpet"/></a> <a href="https://github.com/peschee"><img src="https://avatars.githubusercontent.com/u/63866?v=4&s=48" width="48" height="48" alt="peschee" title="peschee"/></a>
+  <a href="https://github.com/rafaelreis-r"><img src="https://avatars.githubusercontent.com/u/57492577?v=4&s=48" width="48" height="48" alt="rafaelreis-r" title="rafaelreis-r"/></a> <a href="https://github.com/thewilloftheshadow"><img src="https://avatars.githubusercontent.com/u/35580099?v=4&s=48" width="48" height="48" alt="thewilloftheshadow" title="thewilloftheshadow"/></a> <a href="https://github.com/ratulsarna"><img src="https://avatars.githubusercontent.com/u/105903728?v=4&s=48" width="48" height="48" alt="ratulsarna" title="ratulsarna"/></a> <a href="https://github.com/lutr0"><img src="https://avatars.githubusercontent.com/u/76906369?v=4&s=48" width="48" height="48" alt="lutr0" title="lutr0"/></a> <a href="https://github.com/danielz1z"><img src="https://avatars.githubusercontent.com/u/235270390?v=4&s=48" width="48" height="48" alt="danielz1z" title="danielz1z"/></a> <a href="https://github.com/emanuelst"><img src="https://avatars.githubusercontent.com/u/9994339?v=4&s=48" width="48" height="48" alt="emanuelst" title="emanuelst"/></a> <a href="https://github.com/KristijanJovanovski"><img src="https://avatars.githubusercontent.com/u/8942284?v=4&s=48" width="48" height="48" alt="KristijanJovanovski" title="KristijanJovanovski"/></a> <a href="https://github.com/CashWilliams"><img src="https://avatars.githubusercontent.com/u/613573?v=4&s=48" width="48" height="48" alt="CashWilliams" title="CashWilliams"/></a> <a href="https://github.com/rdev"><img src="https://avatars.githubusercontent.com/u/8418866?v=4&s=48" width="48" height="48" alt="rdev" title="rdev"/></a> <a href="https://github.com/osolmaz"><img src="https://avatars.githubusercontent.com/u/2453968?v=4&s=48" width="48" height="48" alt="osolmaz" title="osolmaz"/></a>
+  <a href="https://github.com/joshrad-dev"><img src="https://avatars.githubusercontent.com/u/62785552?v=4&s=48" width="48" height="48" alt="joshrad-dev" title="joshrad-dev"/></a> <a href="https://github.com/kiranjd"><img src="https://avatars.githubusercontent.com/u/25822851?v=4&s=48" width="48" height="48" alt="kiranjd" title="kiranjd"/></a> <a href="https://github.com/adityashaw2"><img src="https://avatars.githubusercontent.com/u/41204444?v=4&s=48" width="48" height="48" alt="adityashaw2" title="adityashaw2"/></a> <a href="https://github.com/search?q=sheeek"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="sheeek" title="sheeek"/></a> <a href="https://github.com/artuskg"><img src="https://avatars.githubusercontent.com/u/11966157?v=4&s=48" width="48" height="48" alt="artuskg" title="artuskg"/></a> <a href="https://github.com/onutc"><img src="https://avatars.githubusercontent.com/u/152018508?v=4&s=48" width="48" height="48" alt="onutc" title="onutc"/></a> <a href="https://github.com/tyler6204"><img src="https://avatars.githubusercontent.com/u/64381258?v=4&s=48" width="48" height="48" alt="tyler6204" title="tyler6204"/></a> <a href="https://github.com/ManuelHettich"><img src="https://avatars.githubusercontent.com/u/17690367?v=4&s=48" width="48" height="48" alt="manuelhettich" title="manuelhettich"/></a> <a href="https://github.com/minghinmatthewlam"><img src="https://avatars.githubusercontent.com/u/14224566?v=4&s=48" width="48" height="48" alt="minghinmatthewlam" title="minghinmatthewlam"/></a> <a href="https://github.com/myfunc"><img src="https://avatars.githubusercontent.com/u/19294627?v=4&s=48" width="48" height="48" alt="myfunc" title="myfunc"/></a>
+  <a href="https://github.com/buddyh"><img src="https://avatars.githubusercontent.com/u/31752869?v=4&s=48" width="48" height="48" alt="buddyh" title="buddyh"/></a> <a href="https://github.com/connorshea"><img src="https://avatars.githubusercontent.com/u/2977353?v=4&s=48" width="48" height="48" alt="connorshea" title="connorshea"/></a> <a href="https://github.com/mcinteerj"><img src="https://avatars.githubusercontent.com/u/3613653?v=4&s=48" width="48" height="48" alt="mcinteerj" title="mcinteerj"/></a> <a href="https://github.com/John-Rood"><img src="https://avatars.githubusercontent.com/u/62669593?v=4&s=48" width="48" height="48" alt="John-Rood" title="John-Rood"/></a> <a href="https://github.com/timkrase"><img src="https://avatars.githubusercontent.com/u/38947626?v=4&s=48" width="48" height="48" alt="timkrase" title="timkrase"/></a> <a href="https://github.com/zerone0x"><img src="https://avatars.githubusercontent.com/u/39543393?v=4&s=48" width="48" height="48" alt="zerone0x" title="zerone0x"/></a> <a href="https://github.com/gerardward2007"><img src="https://avatars.githubusercontent.com/u/3002155?v=4&s=48" width="48" height="48" alt="gerardward2007" title="gerardward2007"/></a> <a href="https://github.com/obviyus"><img src="https://avatars.githubusercontent.com/u/22031114?v=4&s=48" width="48" height="48" alt="obviyus" title="obviyus"/></a> <a href="https://github.com/tosh-hamburg"><img src="https://avatars.githubusercontent.com/u/58424326?v=4&s=48" width="48" height="48" alt="tosh-hamburg" title="tosh-hamburg"/></a> <a href="https://github.com/azade-c"><img src="https://avatars.githubusercontent.com/u/252790079?v=4&s=48" width="48" height="48" alt="azade-c" title="azade-c"/></a>
+  <a href="https://github.com/roshanasingh4"><img src="https://avatars.githubusercontent.com/u/88576930?v=4&s=48" width="48" height="48" alt="roshanasingh4" title="roshanasingh4"/></a> <a href="https://github.com/bjesuiter"><img src="https://avatars.githubusercontent.com/u/2365676?v=4&s=48" width="48" height="48" alt="bjesuiter" title="bjesuiter"/></a> <a href="https://github.com/cheeeee"><img src="https://avatars.githubusercontent.com/u/21245729?v=4&s=48" width="48" height="48" alt="cheeeee" title="cheeeee"/></a> <a href="https://github.com/j1philli"><img src="https://avatars.githubusercontent.com/u/3744255?v=4&s=48" width="48" height="48" alt="Josh Phillips" title="Josh Phillips"/></a> <a href="https://github.com/Whoaa512"><img src="https://avatars.githubusercontent.com/u/1581943?v=4&s=48" width="48" height="48" alt="Whoaa512" title="Whoaa512"/></a> <a href="https://github.com/YuriNachos"><img src="https://avatars.githubusercontent.com/u/19365375?v=4&s=48" width="48" height="48" alt="YuriNachos" title="YuriNachos"/></a> <a href="https://github.com/chriseidhof"><img src="https://avatars.githubusercontent.com/u/5382?v=4&s=48" width="48" height="48" alt="chriseidhof" title="chriseidhof"/></a> <a href="https://github.com/vignesh07"><img src="https://avatars.githubusercontent.com/u/1436853?v=4&s=48" width="48" height="48" alt="vignesh07" title="vignesh07"/></a> <a href="https://github.com/ysqander"><img src="https://avatars.githubusercontent.com/u/80843820?v=4&s=48" width="48" height="48" alt="ysqander" title="ysqander"/></a> <a href="https://github.com/superman32432432"><img src="https://avatars.githubusercontent.com/u/7228420?v=4&s=48" width="48" height="48" alt="superman32432432" title="superman32432432"/></a>
+  <a href="https://github.com/search?q=Yurii%20Chukhlib"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Yurii Chukhlib" title="Yurii Chukhlib"/></a> <a href="https://github.com/grp06"><img src="https://avatars.githubusercontent.com/u/1573959?v=4&s=48" width="48" height="48" alt="grp06" title="grp06"/></a> <a href="https://github.com/antons"><img src="https://avatars.githubusercontent.com/u/129705?v=4&s=48" width="48" height="48" alt="antons" title="antons"/></a> <a href="https://github.com/austinm911"><img src="https://avatars.githubusercontent.com/u/31991302?v=4&s=48" width="48" height="48" alt="austinm911" title="austinm911"/></a> <a href="https://github.com/apps/blacksmith-sh"><img src="https://avatars.githubusercontent.com/in/807020?v=4&s=48" width="48" height="48" alt="blacksmith-sh[bot]" title="blacksmith-sh[bot]"/></a> <a href="https://github.com/dan-dr"><img src="https://avatars.githubusercontent.com/u/6669808?v=4&s=48" width="48" height="48" alt="dan-dr" title="dan-dr"/></a> <a href="https://github.com/HeimdallStrategy"><img src="https://avatars.githubusercontent.com/u/223014405?v=4&s=48" width="48" height="48" alt="HeimdallStrategy" title="HeimdallStrategy"/></a> <a href="https://github.com/imfing"><img src="https://avatars.githubusercontent.com/u/5097752?v=4&s=48" width="48" height="48" alt="imfing" title="imfing"/></a> <a href="https://github.com/jalehman"><img src="https://avatars.githubusercontent.com/u/550978?v=4&s=48" width="48" height="48" alt="jalehman" title="jalehman"/></a> <a href="https://github.com/jarvis-medmatic"><img src="https://avatars.githubusercontent.com/u/252428873?v=4&s=48" width="48" height="48" alt="jarvis-medmatic" title="jarvis-medmatic"/></a>
+  <a href="https://github.com/kkarimi"><img src="https://avatars.githubusercontent.com/u/875218?v=4&s=48" width="48" height="48" alt="kkarimi" title="kkarimi"/></a> <a href="https://github.com/mahmoudashraf93"><img src="https://avatars.githubusercontent.com/u/9130129?v=4&s=48" width="48" height="48" alt="mahmoudashraf93" title="mahmoudashraf93"/></a> <a href="https://github.com/petter-b"><img src="https://avatars.githubusercontent.com/u/62076402?v=4&s=48" width="48" height="48" alt="petter-b" title="petter-b"/></a> <a href="https://github.com/pkrmf"><img src="https://avatars.githubusercontent.com/u/1714267?v=4&s=48" width="48" height="48" alt="pkrmf" title="pkrmf"/></a> <a href="https://github.com/RandyVentures"><img src="https://avatars.githubusercontent.com/u/149904821?v=4&s=48" width="48" height="48" alt="RandyVentures" title="RandyVentures"/></a> <a href="https://github.com/search?q=Ryan%20Lisse"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Ryan Lisse" title="Ryan Lisse"/></a> <a href="https://github.com/dougvk"><img src="https://avatars.githubusercontent.com/u/401660?v=4&s=48" width="48" height="48" alt="dougvk" title="dougvk"/></a> <a href="https://github.com/erikpr1994"><img src="https://avatars.githubusercontent.com/u/6299331?v=4&s=48" width="48" height="48" alt="erikpr1994" title="erikpr1994"/></a> <a href="https://github.com/search?q=Ghost"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Ghost" title="Ghost"/></a> <a href="https://github.com/jonasjancarik"><img src="https://avatars.githubusercontent.com/u/2459191?v=4&s=48" width="48" height="48" alt="jonasjancarik" title="jonasjancarik"/></a>
+  <a href="https://github.com/search?q=Keith%20the%20Silly%20Goose"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Keith the Silly Goose" title="Keith the Silly Goose"/></a> <a href="https://github.com/search?q=L36%20Server"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="L36 Server" title="L36 Server"/></a> <a href="https://github.com/search?q=Marc"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Marc" title="Marc"/></a> <a href="https://github.com/mitschabaude-bot"><img src="https://avatars.githubusercontent.com/u/247582884?v=4&s=48" width="48" height="48" alt="mitschabaude-bot" title="mitschabaude-bot"/></a> <a href="https://github.com/neist"><img src="https://avatars.githubusercontent.com/u/1029724?v=4&s=48" width="48" height="48" alt="neist" title="neist"/></a> <a href="https://github.com/ngutman"><img src="https://avatars.githubusercontent.com/u/1540134?v=4&s=48" width="48" height="48" alt="ngutman" title="ngutman"/></a> <a href="https://github.com/chrisrodz"><img src="https://avatars.githubusercontent.com/u/2967620?v=4&s=48" width="48" height="48" alt="chrisrodz" title="chrisrodz"/></a> <a href="https://github.com/search?q=Friederike%20Seiler"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Friederike Seiler" title="Friederike Seiler"/></a> <a href="https://github.com/gabriel-trigo"><img src="https://avatars.githubusercontent.com/u/38991125?v=4&s=48" width="48" height="48" alt="gabriel-trigo" title="gabriel-trigo"/></a> <a href="https://github.com/Iamadig"><img src="https://avatars.githubusercontent.com/u/102129234?v=4&s=48" width="48" height="48" alt="iamadig" title="iamadig"/></a>
+  <a href="https://github.com/search?q=Kit"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Kit" title="Kit"/></a> <a href="https://github.com/koala73"><img src="https://avatars.githubusercontent.com/u/996596?v=4&s=48" width="48" height="48" alt="koala73" title="koala73"/></a> <a href="https://github.com/manmal"><img src="https://avatars.githubusercontent.com/u/142797?v=4&s=48" width="48" height="48" alt="manmal" title="manmal"/></a> <a href="https://github.com/ogulcancelik"><img src="https://avatars.githubusercontent.com/u/7064011?v=4&s=48" width="48" height="48" alt="ogulcancelik" title="ogulcancelik"/></a> <a href="https://github.com/pasogott"><img src="https://avatars.githubusercontent.com/u/23458152?v=4&s=48" width="48" height="48" alt="pasogott" title="pasogott"/></a> <a href="https://github.com/petradonka"><img src="https://avatars.githubusercontent.com/u/7353770?v=4&s=48" width="48" height="48" alt="petradonka" title="petradonka"/></a> <a href="https://github.com/rubyrunsstuff"><img src="https://avatars.githubusercontent.com/u/246602379?v=4&s=48" width="48" height="48" alt="rubyrunsstuff" title="rubyrunsstuff"/></a> <a href="https://github.com/sibbl"><img src="https://avatars.githubusercontent.com/u/866535?v=4&s=48" width="48" height="48" alt="sibbl" title="sibbl"/></a> <a href="https://github.com/suminhthanh"><img src="https://avatars.githubusercontent.com/u/2907636?v=4&s=48" width="48" height="48" alt="suminhthanh" title="suminhthanh"/></a> <a href="https://github.com/VACInc"><img src="https://avatars.githubusercontent.com/u/3279061?v=4&s=48" width="48" height="48" alt="VACInc" title="VACInc"/></a>
+  <a href="https://github.com/wes-davis"><img src="https://avatars.githubusercontent.com/u/16506720?v=4&s=48" width="48" height="48" alt="wes-davis" title="wes-davis"/></a> <a href="https://github.com/zats"><img src="https://avatars.githubusercontent.com/u/2688806?v=4&s=48" width="48" height="48" alt="zats" title="zats"/></a> <a href="https://github.com/24601"><img src="https://avatars.githubusercontent.com/u/1157207?v=4&s=48" width="48" height="48" alt="24601" title="24601"/></a> <a href="https://github.com/search?q=Chris%20Taylor"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Chris Taylor" title="Chris Taylor"/></a> <a href="https://github.com/djangonavarro220"><img src="https://avatars.githubusercontent.com/u/251162586?v=4&s=48" width="48" height="48" alt="Django Navarro" title="Django Navarro"/></a> <a href="https://github.com/evalexpr"><img src="https://avatars.githubusercontent.com/u/23485511?v=4&s=48" width="48" height="48" alt="evalexpr" title="evalexpr"/></a> <a href="https://github.com/henrino3"><img src="https://avatars.githubusercontent.com/u/4260288?v=4&s=48" width="48" height="48" alt="henrino3" title="henrino3"/></a> <a href="https://github.com/humanwritten"><img src="https://avatars.githubusercontent.com/u/206531610?v=4&s=48" width="48" height="48" alt="humanwritten" title="humanwritten"/></a> <a href="https://github.com/larlyssa"><img src="https://avatars.githubusercontent.com/u/13128869?v=4&s=48" width="48" height="48" alt="larlyssa" title="larlyssa"/></a> <a href="https://github.com/mkbehr"><img src="https://avatars.githubusercontent.com/u/1285?v=4&s=48" width="48" height="48" alt="mkbehr" title="mkbehr"/></a>
+  <a href="https://github.com/oswalpalash"><img src="https://avatars.githubusercontent.com/u/6431196?v=4&s=48" width="48" height="48" alt="oswalpalash" title="oswalpalash"/></a> <a href="https://github.com/pcty-nextgen-service-account"><img src="https://avatars.githubusercontent.com/u/112553441?v=4&s=48" width="48" height="48" alt="pcty-nextgen-service-account" title="pcty-nextgen-service-account"/></a> <a href="https://github.com/Syhids"><img src="https://avatars.githubusercontent.com/u/671202?v=4&s=48" width="48" height="48" alt="Syhids" title="Syhids"/></a> <a href="https://github.com/search?q=Aaron%20Konyer"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Aaron Konyer" title="Aaron Konyer"/></a> <a href="https://github.com/aaronveklabs"><img src="https://avatars.githubusercontent.com/u/225997828?v=4&s=48" width="48" height="48" alt="aaronveklabs" title="aaronveklabs"/></a> <a href="https://github.com/adam91holt"><img src="https://avatars.githubusercontent.com/u/9592417?v=4&s=48" width="48" height="48" alt="adam91holt" title="adam91holt"/></a> <a href="https://github.com/search?q=ClawdFx"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="ClawdFx" title="ClawdFx"/></a> <a href="https://github.com/erik-agens"><img src="https://avatars.githubusercontent.com/u/80908960?v=4&s=48" width="48" height="48" alt="erik-agens" title="erik-agens"/></a> <a href="https://github.com/fcatuhe"><img src="https://avatars.githubusercontent.com/u/17382215?v=4&s=48" width="48" height="48" alt="fcatuhe" title="fcatuhe"/></a> <a href="https://github.com/ivanrvpereira"><img src="https://avatars.githubusercontent.com/u/183991?v=4&s=48" width="48" height="48" alt="ivanrvpereira" title="ivanrvpereira"/></a>
+  <a href="https://github.com/jayhickey"><img src="https://avatars.githubusercontent.com/u/1676460?v=4&s=48" width="48" height="48" alt="jayhickey" title="jayhickey"/></a> <a href="https://github.com/jeffersonwarrior"><img src="https://avatars.githubusercontent.com/u/89030989?v=4&s=48" width="48" height="48" alt="jeffersonwarrior" title="jeffersonwarrior"/></a> <a href="https://github.com/search?q=jeffersonwarrior"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="jeffersonwarrior" title="jeffersonwarrior"/></a> <a href="https://github.com/jdrhyne"><img src="https://avatars.githubusercontent.com/u/7828464?v=4&s=48" width="48" height="48" alt="Jonathan D. Rhyne (DJ-D)" title="Jonathan D. Rhyne (DJ-D)"/></a> <a href="https://github.com/jverdi"><img src="https://avatars.githubusercontent.com/u/345050?v=4&s=48" width="48" height="48" alt="jverdi" title="jverdi"/></a> <a href="https://github.com/longmaba"><img src="https://avatars.githubusercontent.com/u/9361500?v=4&s=48" width="48" height="48" alt="longmaba" title="longmaba"/></a> <a href="https://github.com/mickahouan"><img src="https://avatars.githubusercontent.com/u/31423109?v=4&s=48" width="48" height="48" alt="mickahouan" title="mickahouan"/></a> <a href="https://github.com/mjrussell"><img src="https://avatars.githubusercontent.com/u/1641895?v=4&s=48" width="48" height="48" alt="mjrussell" title="mjrussell"/></a> <a href="https://github.com/p6l-richard"><img src="https://avatars.githubusercontent.com/u/18185649?v=4&s=48" width="48" height="48" alt="p6l-richard" title="p6l-richard"/></a> <a href="https://github.com/philipp-spiess"><img src="https://avatars.githubusercontent.com/u/458591?v=4&s=48" width="48" height="48" alt="philipp-spiess" title="philipp-spiess"/></a>
+  <a href="https://github.com/robaxelsen"><img src="https://avatars.githubusercontent.com/u/13132899?v=4&s=48" width="48" height="48" alt="robaxelsen" title="robaxelsen"/></a> <a href="https://github.com/search?q=Sash%20Catanzarite"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Sash Catanzarite" title="Sash Catanzarite"/></a> <a href="https://github.com/T5-AndyML"><img src="https://avatars.githubusercontent.com/u/22801233?v=4&s=48" width="48" height="48" alt="T5-AndyML" title="T5-AndyML"/></a> <a href="https://github.com/search?q=VAC"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="VAC" title="VAC"/></a> <a href="https://github.com/zknicker"><img src="https://avatars.githubusercontent.com/u/1164085?v=4&s=48" width="48" height="48" alt="zknicker" title="zknicker"/></a> <a href="https://github.com/search?q=alejandro%20maza"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="alejandro maza" title="alejandro maza"/></a> <a href="https://github.com/ameno-"><img src="https://avatars.githubusercontent.com/u/2416135?v=4&s=48" width="48" height="48" alt="ameno-" title="ameno-"/></a> <a href="https://github.com/andrewting19"><img src="https://avatars.githubusercontent.com/u/10536704?v=4&s=48" width="48" height="48" alt="andrewting19" title="andrewting19"/></a> <a href="https://github.com/anpoirier"><img src="https://avatars.githubusercontent.com/u/1245729?v=4&s=48" width="48" height="48" alt="anpoirier" title="anpoirier"/></a> <a href="https://github.com/Asleep123"><img src="https://avatars.githubusercontent.com/u/122379135?v=4&s=48" width="48" height="48" alt="Asleep123" title="Asleep123"/></a>
+  <a href="https://github.com/bolismauro"><img src="https://avatars.githubusercontent.com/u/771999?v=4&s=48" width="48" height="48" alt="bolismauro" title="bolismauro"/></a> <a href="https://github.com/cash-echo-bot"><img src="https://avatars.githubusercontent.com/u/252747386?v=4&s=48" width="48" height="48" alt="cash-echo-bot" title="cash-echo-bot"/></a> <a href="https://github.com/search?q=Clawd"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Clawd" title="Clawd"/></a> <a href="https://github.com/conhecendocontato"><img src="https://avatars.githubusercontent.com/u/82890727?v=4&s=48" width="48" height="48" alt="conhecendocontato" title="conhecendocontato"/></a> <a href="https://github.com/search?q=Dimitrios%20Ploutarchos"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Dimitrios Ploutarchos" title="Dimitrios Ploutarchos"/></a> <a href="https://github.com/search?q=Drake%20Thomsen"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Drake Thomsen" title="Drake Thomsen"/></a> <a href="https://github.com/search?q=Felix%20Krause"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Felix Krause" title="Felix Krause"/></a> <a href="https://github.com/gtsifrikas"><img src="https://avatars.githubusercontent.com/u/8904378?v=4&s=48" width="48" height="48" alt="gtsifrikas" title="gtsifrikas"/></a> <a href="https://github.com/HazAT"><img src="https://avatars.githubusercontent.com/u/363802?v=4&s=48" width="48" height="48" alt="HazAT" title="HazAT"/></a> <a href="https://github.com/hrdwdmrbl"><img src="https://avatars.githubusercontent.com/u/554881?v=4&s=48" width="48" height="48" alt="hrdwdmrbl" title="hrdwdmrbl"/></a>
+  <a href="https://github.com/hugobarauna"><img src="https://avatars.githubusercontent.com/u/2719?v=4&s=48" width="48" height="48" alt="hugobarauna" title="hugobarauna"/></a> <a href="https://github.com/search?q=Jamie%20Openshaw"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Jamie Openshaw" title="Jamie Openshaw"/></a> <a href="https://github.com/search?q=Jarvis"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Jarvis" title="Jarvis"/></a> <a href="https://github.com/search?q=Jefferson%20Nunn"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Jefferson Nunn" title="Jefferson Nunn"/></a> <a href="https://github.com/search?q=Kevin%20Lin"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Kevin Lin" title="Kevin Lin"/></a> <a href="https://github.com/kitze"><img src="https://avatars.githubusercontent.com/u/1160594?v=4&s=48" width="48" height="48" alt="kitze" title="kitze"/></a> <a href="https://github.com/levifig"><img src="https://avatars.githubusercontent.com/u/1605?v=4&s=48" width="48" height="48" alt="levifig" title="levifig"/></a> <a href="https://github.com/search?q=Lloyd"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Lloyd" title="Lloyd"/></a> <a href="https://github.com/loukotal"><img src="https://avatars.githubusercontent.com/u/18210858?v=4&s=48" width="48" height="48" alt="loukotal" title="loukotal"/></a> <a href="https://github.com/martinpucik"><img src="https://avatars.githubusercontent.com/u/5503097?v=4&s=48" width="48" height="48" alt="martinpucik" title="martinpucik"/></a>
+  <a href="https://github.com/search?q=Miles"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Miles" title="Miles"/></a> <a href="https://github.com/mrdbstn"><img src="https://avatars.githubusercontent.com/u/58957632?v=4&s=48" width="48" height="48" alt="mrdbstn" title="mrdbstn"/></a> <a href="https://github.com/MSch"><img src="https://avatars.githubusercontent.com/u/7475?v=4&s=48" width="48" height="48" alt="MSch" title="MSch"/></a> <a href="https://github.com/search?q=Mustafa%20Tag%20Eldeen"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Mustafa Tag Eldeen" title="Mustafa Tag Eldeen"/></a> <a href="https://github.com/ndraiman"><img src="https://avatars.githubusercontent.com/u/12609607?v=4&s=48" width="48" height="48" alt="ndraiman" title="ndraiman"/></a> <a href="https://github.com/nexty5870"><img src="https://avatars.githubusercontent.com/u/3869659?v=4&s=48" width="48" height="48" alt="nexty5870" title="nexty5870"/></a> <a href="https://github.com/odysseus0"><img src="https://avatars.githubusercontent.com/u/8635094?v=4&s=48" width="48" height="48" alt="odysseus0" title="odysseus0"/></a> <a href="https://github.com/prathamdby"><img src="https://avatars.githubusercontent.com/u/134331217?v=4&s=48" width="48" height="48" alt="prathamdby" title="prathamdby"/></a> <a href="https://github.com/reeltimeapps"><img src="https://avatars.githubusercontent.com/u/637338?v=4&s=48" width="48" height="48" alt="reeltimeapps" title="reeltimeapps"/></a> <a href="https://github.com/RLTCmpe"><img src="https://avatars.githubusercontent.com/u/10762242?v=4&s=48" width="48" height="48" alt="RLTCmpe" title="RLTCmpe"/></a>
+  <a href="https://github.com/rodrigouroz"><img src="https://avatars.githubusercontent.com/u/384037?v=4&s=48" width="48" height="48" alt="rodrigouroz" title="rodrigouroz"/></a> <a href="https://github.com/search?q=Rolf%20Fredheim"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Rolf Fredheim" title="Rolf Fredheim"/></a> <a href="https://github.com/search?q=Rony%20Kelner"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Rony Kelner" title="Rony Kelner"/></a> <a href="https://github.com/search?q=Samrat%20Jha"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Samrat Jha" title="Samrat Jha"/></a> <a href="https://github.com/siraht"><img src="https://avatars.githubusercontent.com/u/73152895?v=4&s=48" width="48" height="48" alt="siraht" title="siraht"/></a> <a href="https://github.com/snopoke"><img src="https://avatars.githubusercontent.com/u/249606?v=4&s=48" width="48" height="48" alt="snopoke" title="snopoke"/></a> <a href="https://github.com/search?q=The%20Admiral"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="The Admiral" title="The Admiral"/></a> <a href="https://github.com/thesash"><img src="https://avatars.githubusercontent.com/u/1166151?v=4&s=48" width="48" height="48" alt="thesash" title="thesash"/></a> <a href="https://github.com/search?q=Ubuntu"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Ubuntu" title="Ubuntu"/></a> <a href="https://github.com/voidserf"><img src="https://avatars.githubusercontent.com/u/477673?v=4&s=48" width="48" height="48" alt="voidserf" title="voidserf"/></a>
+  <a href="https://github.com/wstock"><img src="https://avatars.githubusercontent.com/u/1394687?v=4&s=48" width="48" height="48" alt="wstock" title="wstock"/></a> <a href="https://github.com/search?q=Zach%20Knickerbocker"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Zach Knickerbocker" title="Zach Knickerbocker"/></a> <a href="https://github.com/Alphonse-arianee"><img src="https://avatars.githubusercontent.com/u/254457365?v=4&s=48" width="48" height="48" alt="Alphonse-arianee" title="Alphonse-arianee"/></a> <a href="https://github.com/search?q=Azade"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Azade" title="Azade"/></a> <a href="https://github.com/carlulsoe"><img src="https://avatars.githubusercontent.com/u/34673973?v=4&s=48" width="48" height="48" alt="carlulsoe" title="carlulsoe"/></a> <a href="https://github.com/search?q=ddyo"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="ddyo" title="ddyo"/></a> <a href="https://github.com/search?q=Erik"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Erik" title="Erik"/></a> <a href="https://github.com/latitudeki5223"><img src="https://avatars.githubusercontent.com/u/119656367?v=4&s=48" width="48" height="48" alt="latitudeki5223" title="latitudeki5223"/></a> <a href="https://github.com/search?q=Manuel%20Maly"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Manuel Maly" title="Manuel Maly"/></a> <a href="https://github.com/search?q=Mourad%20Boustani"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Mourad Boustani" title="Mourad Boustani"/></a>
+  <a href="https://github.com/odrobnik"><img src="https://avatars.githubusercontent.com/u/333270?v=4&s=48" width="48" height="48" alt="odrobnik" title="odrobnik"/></a> <a href="https://github.com/pcty-nextgen-ios-builder"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="pcty-nextgen-ios-builder" title="pcty-nextgen-ios-builder"/></a> <a href="https://github.com/search?q=Quentin"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Quentin" title="Quentin"/></a> <a href="https://github.com/search?q=Randy%20Torres"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Randy Torres" title="Randy Torres"/></a> <a href="https://github.com/rhjoh"><img src="https://avatars.githubusercontent.com/u/105699450?v=4&s=48" width="48" height="48" alt="rhjoh" title="rhjoh"/></a> <a href="https://github.com/ronak-guliani"><img src="https://avatars.githubusercontent.com/u/23518228?v=4&s=48" width="48" height="48" alt="ronak-guliani" title="ronak-guliani"/></a> <a href="https://github.com/search?q=William%20Stock"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="William Stock" title="William Stock"/></a>
 </p>

Swabble/Package.resolved

@@ -1,13 +1,13 @@
 {
-  "originHash" : "5d29ee82825e0764775562242cfa1ff4dc79584797dd638f76c9876545454748",
+  "originHash" : "c0677e232394b5f6b0191b6dbb5bae553d55264f65ae725cd03a8ffdfda9cdd3",
   "pins" : [
     {
-      "identity" : "elevenlabskit",
+      "identity" : "commander",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/steipete/ElevenLabsKit",
+      "location" : "https://github.com/steipete/Commander.git",
       "state" : {
-        "revision" : "c8679fbd37416a8780fe43be88a497ff16209e2d",
-        "version" : "0.1.0"
+        "revision" : "9e349575c8e3c6745e81fe19e5bb5efa01b078ce",
+        "version" : "0.2.1"
       }
     },
     {

Swabble/README.md

@@ -101,8 +101,8 @@ Environment variables:
 - Authorization requested at first start; requires macOS 26 + new Speech.framework APIs.
 
 ## Development
-- Format: `./scripts/format.sh` (uses ../peekaboo/.swiftformat if present)
-- Lint: `./scripts/lint.sh` (uses ../peekaboo/.swiftlint.yml if present)
+- Format: `./scripts/format.sh` (uses local `.swiftformat`)
+- Lint: `./scripts/lint.sh` (uses local `.swiftlint.yml`)
 - Tests: `swift test` (uses swift-testing package)
 
 ## Roadmap

Swabble/scripts/format.sh

@@ -1,10 +1,5 @@
 #!/bin/bash
 set -euo pipefail
 ROOT="$(cd "$(dirname "$0")/.." && pwd)"
-PEEKABOO_ROOT="${ROOT}/../peekaboo"
-if [ -f "${PEEKABOO_ROOT}/.swiftformat" ]; then
-  CONFIG="${PEEKABOO_ROOT}/.swiftformat"
-else
-  CONFIG="${ROOT}/.swiftformat"
-fi
+CONFIG="${ROOT}/.swiftformat"
 swiftformat --config "$CONFIG" "$ROOT/Sources"

Swabble/scripts/lint.sh

@@ -1,12 +1,7 @@
 #!/bin/bash
 set -euo pipefail
 ROOT="$(cd "$(dirname "$0")/.." && pwd)"
-PEEKABOO_ROOT="${ROOT}/../peekaboo"
-if [ -f "${PEEKABOO_ROOT}/.swiftlint.yml" ]; then
-  CONFIG="${PEEKABOO_ROOT}/.swiftlint.yml"
-else
-  CONFIG="$ROOT/.swiftlint.yml"
-fi
+CONFIG="${ROOT}/.swiftlint.yml"
 if ! command -v swiftlint >/dev/null; then
   echo "swiftlint not installed" >&2
   exit 1

apps/android/README.md

@@ -1,6 +1,6 @@
 ## Clawdbot Node (Android) (internal)
 
-Modern Android node app: connects to the **Gateway-owned bridge** (`_clawdbot-bridge._tcp`) over TCP and exposes **Canvas + Chat + Camera**.
+Modern Android node app: connects to the **Gateway WebSocket** (`_clawdbot-gw._tcp`) and exposes **Canvas + Chat + Camera**.
 
 Notes:
 - The node keeps the connection alive via a **foreground service** (persistent notification with a Disconnect action).
@@ -30,7 +30,7 @@ pnpm clawdbot gateway --port 18789 --verbose
 
 2) In the Android app:
 - Open **Settings**
-- Either select a discovered bridge under **Discovered Bridges**, or use **Advanced → Manual Bridge** (host + port).
+- Either select a discovered gateway under **Discovered Gateways**, or use **Advanced → Manual Gateway** (host + port).
 
 3) Approve pairing (on the gateway machine):
 ```bash
@@ -38,7 +38,7 @@ clawdbot nodes pending
 clawdbot nodes approve <requestId>
 ```
 
-More details: `docs/android/connect.md`.
+More details: `docs/platforms/android.md`.
 
 ## Permissions
 

apps/android/app/build.gradle.kts

@@ -21,8 +21,8 @@ android {
     applicationId = "com.clawdbot.android"
     minSdk = 31
     targetSdk = 36
-    versionCode = 202601114
-    versionName = "2026.1.11-4"
+    versionCode = 202601200
+    versionName = "2026.1.20"
   }
 
   buildTypes {
@@ -103,6 +103,7 @@ dependencies {
 
   implementation("androidx.security:security-crypto:1.1.0")
   implementation("androidx.exifinterface:exifinterface:1.4.2")
+  implementation("com.squareup.okhttp3:okhttp:5.3.2")
 
   // CameraX (for node.invoke camera.* parity)
   implementation("androidx.camera:camera-core:1.5.2")
@@ -112,7 +113,7 @@ dependencies {
   implementation("androidx.camera:camera-view:1.5.2")
 
   // Unicast DNS-SD (Wide-Area Bonjour) for tailnet discovery domains.
-  implementation("dnsjava:dnsjava:3.6.3")
+  implementation("dnsjava:dnsjava:3.6.4")
 
   testImplementation("junit:junit:4.13.2")
   testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2")

apps/android/app/src/main/java/com/clawdbot/android/MainViewModel.kt

@@ -2,7 +2,7 @@ package com.clawdbot.android
 
 import android.app.Application
 import androidx.lifecycle.AndroidViewModel
-import com.clawdbot.android.bridge.BridgeEndpoint
+import com.clawdbot.android.gateway.GatewayEndpoint
 import com.clawdbot.android.chat.OutgoingAttachment
 import com.clawdbot.android.node.CameraCaptureManager
 import com.clawdbot.android.node.CanvasController
@@ -18,7 +18,7 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
   val screenRecorder: ScreenRecordManager = runtime.screenRecorder
   val sms: SmsManager = runtime.sms
 
-  val bridges: StateFlow<List<BridgeEndpoint>> = runtime.bridges
+  val gateways: StateFlow<List<GatewayEndpoint>> = runtime.gateways
   val discoveryStatusText: StateFlow<String> = runtime.discoveryStatusText
 
   val isConnected: StateFlow<Boolean> = runtime.isConnected
@@ -50,6 +50,7 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
   val manualEnabled: StateFlow<Boolean> = runtime.manualEnabled
   val manualHost: StateFlow<String> = runtime.manualHost
   val manualPort: StateFlow<Int> = runtime.manualPort
+  val manualTls: StateFlow<Boolean> = runtime.manualTls
   val canvasDebugStatusEnabled: StateFlow<Boolean> = runtime.canvasDebugStatusEnabled
 
   val chatSessionKey: StateFlow<String> = runtime.chatSessionKey
@@ -99,6 +100,10 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
     runtime.setManualPort(value)
   }
 
+  fun setManualTls(value: Boolean) {
+    runtime.setManualTls(value)
+  }
+
   fun setCanvasDebugStatusEnabled(value: Boolean) {
     runtime.setCanvasDebugStatusEnabled(value)
   }
@@ -119,11 +124,11 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
     runtime.setTalkEnabled(enabled)
   }
 
-  fun refreshBridgeHello() {
-    runtime.refreshBridgeHello()
+  fun refreshGatewayConnection() {
+    runtime.refreshGatewayConnection()
   }
 
-  fun connect(endpoint: BridgeEndpoint) {
+  fun connect(endpoint: GatewayEndpoint) {
     runtime.connect(endpoint)
   }
 

apps/android/app/src/main/java/com/clawdbot/android/NodeRuntime.kt

@@ -12,11 +12,14 @@ import com.clawdbot.android.chat.ChatMessage
 import com.clawdbot.android.chat.ChatPendingToolCall
 import com.clawdbot.android.chat.ChatSessionEntry
 import com.clawdbot.android.chat.OutgoingAttachment
-import com.clawdbot.android.bridge.BridgeDiscovery
-import com.clawdbot.android.bridge.BridgeEndpoint
-import com.clawdbot.android.bridge.BridgePairingClient
-import com.clawdbot.android.bridge.BridgeSession
-import com.clawdbot.android.bridge.BridgeTlsParams
+import com.clawdbot.android.gateway.DeviceAuthStore
+import com.clawdbot.android.gateway.DeviceIdentityStore
+import com.clawdbot.android.gateway.GatewayClientInfo
+import com.clawdbot.android.gateway.GatewayConnectOptions
+import com.clawdbot.android.gateway.GatewayDiscovery
+import com.clawdbot.android.gateway.GatewayEndpoint
+import com.clawdbot.android.gateway.GatewaySession
+import com.clawdbot.android.gateway.GatewayTlsParams
 import com.clawdbot.android.node.CameraCaptureManager
 import com.clawdbot.android.node.LocationCaptureManager
 import com.clawdbot.android.BuildConfig
@@ -60,6 +63,7 @@ class NodeRuntime(context: Context) {
   private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
 
   val prefs = SecurePrefs(appContext)
+  private val deviceAuthStore = DeviceAuthStore(prefs)
   val canvas = CanvasController()
   val camera = CameraCaptureManager(appContext)
   val location = LocationCaptureManager(appContext)
@@ -74,7 +78,7 @@ class NodeRuntime(context: Context) {
       context = appContext,
       scope = scope,
       onCommand = { command ->
-        session.sendEvent(
+        nodeSession.sendNodeEvent(
           event = "agent.request",
           payloadJson =
             buildJsonObject {
@@ -103,10 +107,12 @@ class NodeRuntime(context: Context) {
   val talkIsSpeaking: StateFlow<Boolean>
     get() = talkMode.isSpeaking
 
-  private val discovery = BridgeDiscovery(appContext, scope = scope)
-  val bridges: StateFlow<List<BridgeEndpoint>> = discovery.bridges
+  private val discovery = GatewayDiscovery(appContext, scope = scope)
+  val gateways: StateFlow<List<GatewayEndpoint>> = discovery.gateways
   val discoveryStatusText: StateFlow<String> = discovery.statusText
 
+  private val identityStore = DeviceIdentityStore(appContext)
+
   private val _isConnected = MutableStateFlow(false)
   val isConnected: StateFlow<Boolean> = _isConnected.asStateFlow()
 
@@ -139,52 +145,89 @@ class NodeRuntime(context: Context) {
   val isForeground: StateFlow<Boolean> = _isForeground.asStateFlow()
 
   private var lastAutoA2uiUrl: String? = null
+  private var operatorConnected = false
+  private var nodeConnected = false
+  private var operatorStatusText: String = "Offline"
+  private var nodeStatusText: String = "Offline"
+  private var connectedEndpoint: GatewayEndpoint? = null
 
-  private val session =
-    BridgeSession(
+  private val operatorSession =
+    GatewaySession(
       scope = scope,
+      identityStore = identityStore,
+      deviceAuthStore = deviceAuthStore,
       onConnected = { name, remote, mainSessionKey ->
-        _statusText.value = "Connected"
+        operatorConnected = true
+        operatorStatusText = "Connected"
         _serverName.value = name
         _remoteAddress.value = remote
-        _isConnected.value = true
         _seamColorArgb.value = DEFAULT_SEAM_COLOR_ARGB
         applyMainSessionKey(mainSessionKey)
+        updateStatus()
         scope.launch { refreshBrandingFromGateway() }
         scope.launch { refreshWakeWordsFromGateway() }
+      },
+      onDisconnected = { message ->
+        operatorConnected = false
+        operatorStatusText = message
+        _serverName.value = null
+        _remoteAddress.value = null
+        _seamColorArgb.value = DEFAULT_SEAM_COLOR_ARGB
+        if (!isCanonicalMainSessionKey(_mainSessionKey.value)) {
+          _mainSessionKey.value = "main"
+        }
+        val mainKey = resolveMainSessionKey()
+        talkMode.setMainSessionKey(mainKey)
+        chat.applyMainSessionKey(mainKey)
+        chat.onDisconnected(message)
+        updateStatus()
+      },
+      onEvent = { event, payloadJson ->
+        handleGatewayEvent(event, payloadJson)
+      },
+    )
+
+  private val nodeSession =
+    GatewaySession(
+      scope = scope,
+      identityStore = identityStore,
+      deviceAuthStore = deviceAuthStore,
+      onConnected = { _, _, _ ->
+        nodeConnected = true
+        nodeStatusText = "Connected"
+        updateStatus()
         maybeNavigateToA2uiOnConnect()
       },
-      onDisconnected = { message -> handleSessionDisconnected(message) },
-      onEvent = { event, payloadJson ->
-        handleBridgeEvent(event, payloadJson)
+      onDisconnected = { message ->
+        nodeConnected = false
+        nodeStatusText = message
+        updateStatus()
+        showLocalCanvasOnDisconnect()
       },
+      onEvent = { _, _ -> },
       onInvoke = { req ->
         handleInvoke(req.command, req.paramsJson)
       },
       onTlsFingerprint = { stableId, fingerprint ->
-        prefs.saveBridgeTlsFingerprint(stableId, fingerprint)
+        prefs.saveGatewayTlsFingerprint(stableId, fingerprint)
       },
     )
 
-  private val chat = ChatController(scope = scope, session = session, json = json)
+  private val chat: ChatController =
+    ChatController(
+      scope = scope,
+      session = operatorSession,
+      json = json,
+      supportsChatSubscribe = false,
+    )
   private val talkMode: TalkModeManager by lazy {
-    TalkModeManager(context = appContext, scope = scope).also { it.attachSession(session) }
-  }
-
-  private fun handleSessionDisconnected(message: String) {
-    _statusText.value = message
-    _serverName.value = null
-    _remoteAddress.value = null
-    _isConnected.value = false
-    _seamColorArgb.value = DEFAULT_SEAM_COLOR_ARGB
-    if (!isCanonicalMainSessionKey(_mainSessionKey.value)) {
-      _mainSessionKey.value = "main"
-    }
-    val mainKey = resolveMainSessionKey()
-    talkMode.setMainSessionKey(mainKey)
-    chat.applyMainSessionKey(mainKey)
-    chat.onDisconnected(message)
-    showLocalCanvasOnDisconnect()
+    TalkModeManager(
+      context = appContext,
+      scope = scope,
+      session = operatorSession,
+      supportsChatSubscribe = false,
+      isConnected = { operatorConnected },
+    )
   }
 
   private fun applyMainSessionKey(candidate: String?) {
@@ -197,6 +240,18 @@ class NodeRuntime(context: Context) {
     chat.applyMainSessionKey(trimmed)
   }
 
+  private fun updateStatus() {
+    _isConnected.value = operatorConnected
+    _statusText.value =
+      when {
+        operatorConnected && nodeConnected -> "Connected"
+        operatorConnected && !nodeConnected -> "Connected (node offline)"
+        !operatorConnected && nodeConnected -> "Connected (operator offline)"
+        operatorStatusText.isNotBlank() && operatorStatusText != "Offline" -> operatorStatusText
+        else -> nodeStatusText
+      }
+  }
+
   private fun resolveMainSessionKey(): String {
     val trimmed = _mainSessionKey.value.trim()
     return if (trimmed.isEmpty()) "main" else trimmed
@@ -228,6 +283,7 @@ class NodeRuntime(context: Context) {
   val manualEnabled: StateFlow<Boolean> = prefs.manualEnabled
   val manualHost: StateFlow<String> = prefs.manualHost
   val manualPort: StateFlow<Int> = prefs.manualPort
+  val manualTls: StateFlow<Boolean> = prefs.manualTls
   val lastDiscoveredStableId: StateFlow<String> = prefs.lastDiscoveredStableId
   val canvasDebugStatusEnabled: StateFlow<Boolean> = prefs.canvasDebugStatusEnabled
 
@@ -288,24 +344,21 @@ class NodeRuntime(context: Context) {
     }
 
     scope.launch(Dispatchers.Default) {
-      bridges.collect { list ->
+      gateways.collect { list ->
         if (list.isNotEmpty()) {
-          // Persist the last discovered bridge (best-effort UX parity with iOS).
+          // Persist the last discovered gateway (best-effort UX parity with iOS).
           prefs.setLastDiscoveredStableId(list.last().stableId)
         }
 
         if (didAutoConnect) return@collect
         if (_isConnected.value) return@collect
 
-        val token = prefs.loadBridgeToken()
-        if (token.isNullOrBlank()) return@collect
-
         if (manualEnabled.value) {
           val host = manualHost.value.trim()
           val port = manualPort.value
           if (host.isNotEmpty() && port in 1..65535) {
             didAutoConnect = true
-            connect(BridgeEndpoint.manual(host = host, port = port))
+            connect(GatewayEndpoint.manual(host = host, port = port))
           }
           return@collect
         }
@@ -371,6 +424,10 @@ class NodeRuntime(context: Context) {
     prefs.setManualPort(value)
   }
 
+  fun setManualTls(value: Boolean) {
+    prefs.setManualTls(value)
+  }
+
   fun setCanvasDebugStatusEnabled(value: Boolean) {
     prefs.setCanvasDebugStatusEnabled(value)
   }
@@ -429,99 +486,87 @@ class NodeRuntime(context: Context) {
       }
     }
 
-  private fun buildPairingHello(token: String?): BridgePairingClient.Hello {
-    val modelIdentifier = listOfNotNull(Build.MANUFACTURER, Build.MODEL)
-      .joinToString(" ")
-      .trim()
-      .ifEmpty { null }
+  private fun resolvedVersionName(): String {
     val versionName = BuildConfig.VERSION_NAME.trim().ifEmpty { "dev" }
-    val advertisedVersion =
-      if (BuildConfig.DEBUG && !versionName.contains("dev", ignoreCase = true)) {
-        "$versionName-dev"
-      } else {
-        versionName
-      }
-    return BridgePairingClient.Hello(
-      nodeId = instanceId.value,
-      displayName = displayName.value,
-      token = token,
-      platform = "Android",
-      version = advertisedVersion,
-      deviceFamily = "Android",
-      modelIdentifier = modelIdentifier,
-      caps = buildCapabilities(),
-      commands = buildInvokeCommands(),
-    )
-  }
-
-  private fun buildSessionHello(token: String?): BridgeSession.Hello {
-    val modelIdentifier = listOfNotNull(Build.MANUFACTURER, Build.MODEL)
-      .joinToString(" ")
-      .trim()
-      .ifEmpty { null }
-    val versionName = BuildConfig.VERSION_NAME.trim().ifEmpty { "dev" }
-    val advertisedVersion =
-      if (BuildConfig.DEBUG && !versionName.contains("dev", ignoreCase = true)) {
-        "$versionName-dev"
-      } else {
-        versionName
-      }
-    return BridgeSession.Hello(
-      nodeId = instanceId.value,
-      displayName = displayName.value,
-      token = token,
-      platform = "Android",
-      version = advertisedVersion,
-      deviceFamily = "Android",
-      modelIdentifier = modelIdentifier,
-      caps = buildCapabilities(),
-      commands = buildInvokeCommands(),
-    )
-  }
-
-  fun refreshBridgeHello() {
-    scope.launch {
-      if (!_isConnected.value) return@launch
-      val token = prefs.loadBridgeToken()
-      if (token.isNullOrBlank()) return@launch
-      session.updateHello(buildSessionHello(token))
+    return if (BuildConfig.DEBUG && !versionName.contains("dev", ignoreCase = true)) {
+      "$versionName-dev"
+    } else {
+      versionName
     }
   }
 
-  fun connect(endpoint: BridgeEndpoint) {
-    scope.launch {
-      _statusText.value = "Connecting…"
-      val storedToken = prefs.loadBridgeToken()
-      val tls = resolveTlsParams(endpoint)
-      val resolved =
-        if (storedToken.isNullOrBlank()) {
-          _statusText.value = "Pairing…"
-          BridgePairingClient().pairAndHello(
-            endpoint = endpoint,
-            hello = buildPairingHello(token = null),
-            tls = tls,
-            onTlsFingerprint = { fingerprint ->
-              prefs.saveBridgeTlsFingerprint(endpoint.stableId, fingerprint)
-            },
-          )
-        } else {
-          BridgePairingClient.PairResult(ok = true, token = storedToken.trim())
-        }
+  private fun resolveModelIdentifier(): String? {
+    return listOfNotNull(Build.MANUFACTURER, Build.MODEL)
+      .joinToString(" ")
+      .trim()
+      .ifEmpty { null }
+  }
 
-      if (!resolved.ok || resolved.token.isNullOrBlank()) {
-        val errorMessage = resolved.error?.trim().orEmpty().ifEmpty { "pairing required" }
-        _statusText.value = "Failed: $errorMessage"
-        return@launch
-      }
+  private fun buildUserAgent(): String {
+    val version = resolvedVersionName()
+    val release = Build.VERSION.RELEASE?.trim().orEmpty()
+    val releaseLabel = if (release.isEmpty()) "unknown" else release
+    return "ClawdbotAndroid/$version (Android $releaseLabel; SDK ${Build.VERSION.SDK_INT})"
+  }
 
-      val authToken = requireNotNull(resolved.token).trim()
-      prefs.saveBridgeToken(authToken)
-      session.connect(
-        endpoint = endpoint,
-        hello = buildSessionHello(token = authToken),
-        tls = tls,
-      )
-    }
+  private fun buildClientInfo(clientId: String, clientMode: String): GatewayClientInfo {
+    return GatewayClientInfo(
+      id = clientId,
+      displayName = displayName.value,
+      version = resolvedVersionName(),
+      platform = "android",
+      mode = clientMode,
+      instanceId = instanceId.value,
+      deviceFamily = "Android",
+      modelIdentifier = resolveModelIdentifier(),
+    )
+  }
+
+  private fun buildNodeConnectOptions(): GatewayConnectOptions {
+    return GatewayConnectOptions(
+      role = "node",
+      scopes = emptyList(),
+      caps = buildCapabilities(),
+      commands = buildInvokeCommands(),
+      permissions = emptyMap(),
+      client = buildClientInfo(clientId = "node-host", clientMode = "node"),
+      userAgent = buildUserAgent(),
+    )
+  }
+
+  private fun buildOperatorConnectOptions(): GatewayConnectOptions {
+    return GatewayConnectOptions(
+      role = "operator",
+      scopes = emptyList(),
+      caps = emptyList(),
+      commands = emptyList(),
+      permissions = emptyMap(),
+      client = buildClientInfo(clientId = "clawdbot-control-ui", clientMode = "ui"),
+      userAgent = buildUserAgent(),
+    )
+  }
+
+  fun refreshGatewayConnection() {
+    val endpoint = connectedEndpoint ?: return
+    val token = prefs.loadGatewayToken()
+    val password = prefs.loadGatewayPassword()
+    val tls = resolveTlsParams(endpoint)
+    operatorSession.connect(endpoint, token, password, buildOperatorConnectOptions(), tls)
+    nodeSession.connect(endpoint, token, password, buildNodeConnectOptions(), tls)
+    operatorSession.reconnect()
+    nodeSession.reconnect()
+  }
+
+  fun connect(endpoint: GatewayEndpoint) {
+    connectedEndpoint = endpoint
+    operatorStatusText = "Connecting…"
+    nodeStatusText = "Connecting…"
+    updateStatus()
+    val token = prefs.loadGatewayToken()
+    val password = prefs.loadGatewayPassword()
+    val tls = resolveTlsParams(endpoint)
+    operatorSession.connect(endpoint, token, password, buildOperatorConnectOptions(), tls)
+    nodeSession.connect(endpoint, token, password, buildNodeConnectOptions(), tls)
   }
 
   private fun hasRecordAudioPermission(): Boolean {
@@ -559,20 +604,32 @@ class NodeRuntime(context: Context) {
       _statusText.value = "Failed: invalid manual host/port"
       return
     }
-    connect(BridgeEndpoint.manual(host = host, port = port))
+    connect(GatewayEndpoint.manual(host = host, port = port))
   }
 
   fun disconnect() {
-    session.disconnect()
+    connectedEndpoint = null
+    operatorSession.disconnect()
+    nodeSession.disconnect()
   }
 
-  private fun resolveTlsParams(endpoint: BridgeEndpoint): BridgeTlsParams? {
-    val stored = prefs.loadBridgeTlsFingerprint(endpoint.stableId)
+  private fun resolveTlsParams(endpoint: GatewayEndpoint): GatewayTlsParams? {
+    val stored = prefs.loadGatewayTlsFingerprint(endpoint.stableId)
     val hinted = endpoint.tlsEnabled || !endpoint.tlsFingerprintSha256.isNullOrBlank()
     val manual = endpoint.stableId.startsWith("manual|")
 
+    if (manual) {
+      if (!manualTls.value) return null
+      return GatewayTlsParams(
+        required = true,
+        expectedFingerprint = endpoint.tlsFingerprintSha256 ?: stored,
+        allowTOFU = stored == null,
+        stableId = endpoint.stableId,
+      )
+    }
+
     if (hinted) {
-      return BridgeTlsParams(
+      return GatewayTlsParams(
         required = true,
         expectedFingerprint = endpoint.tlsFingerprintSha256 ?: stored,
         allowTOFU = stored == null,
@@ -581,7 +638,7 @@ class NodeRuntime(context: Context) {
     }
 
     if (!stored.isNullOrBlank()) {
-      return BridgeTlsParams(
+      return GatewayTlsParams(
         required = true,
         expectedFingerprint = stored,
         allowTOFU = false,
@@ -589,15 +646,6 @@ class NodeRuntime(context: Context) {
       )
     }
 
-    if (manual) {
-      return BridgeTlsParams(
-        required = false,
-        expectedFingerprint = null,
-        allowTOFU = true,
-        stableId = endpoint.stableId,
-      )
-    }
-
     return null
   }
 
@@ -637,11 +685,11 @@ class NodeRuntime(context: Context) {
           contextJson = contextJson,
         )
 
-      val connected = isConnected.value
+      val connected = nodeConnected
       var error: String? = null
       if (connected) {
         try {
-          session.sendEvent(
+          nodeSession.sendNodeEvent(
             event = "agent.request",
             payloadJson =
               buildJsonObject {
@@ -656,7 +704,7 @@ class NodeRuntime(context: Context) {
           error = e.message ?: "send failed"
         }
       } else {
-        error = "bridge not connected"
+        error = "gateway not connected"
       }
 
       try {
@@ -702,7 +750,7 @@ class NodeRuntime(context: Context) {
     chat.sendMessage(message = message, thinkingLevel = thinking, attachments = attachments)
   }
 
-  private fun handleBridgeEvent(event: String, payloadJson: String?) {
+  private fun handleGatewayEvent(event: String, payloadJson: String?) {
     if (event == "voicewake.changed") {
       if (payloadJson.isNullOrBlank()) return
       try {
@@ -716,8 +764,8 @@ class NodeRuntime(context: Context) {
       return
     }
 
-    talkMode.handleBridgeEvent(event, payloadJson)
-    chat.handleBridgeEvent(event, payloadJson)
+    talkMode.handleGatewayEvent(event, payloadJson)
+    chat.handleGatewayEvent(event, payloadJson)
   }
 
   private fun applyWakeWordsFromGateway(words: List<String>) {
@@ -738,7 +786,7 @@ class NodeRuntime(context: Context) {
         val jsonList = snapshot.joinToString(separator = ",") { it.toJsonString() }
         val params = """{"triggers":[$jsonList]}"""
         try {
-          session.request("voicewake.set", params)
+          operatorSession.request("voicewake.set", params)
         } catch (_: Throwable) {
           // ignore
         }
@@ -748,7 +796,7 @@ class NodeRuntime(context: Context) {
   private suspend fun refreshWakeWordsFromGateway() {
     if (!_isConnected.value) return
     try {
-      val res = session.request("voicewake.get", "{}")
+      val res = operatorSession.request("voicewake.get", "{}")
       val payload = json.parseToJsonElement(res).asObjectOrNull() ?: return
       val array = payload["triggers"] as? JsonArray ?: return
       val triggers = array.mapNotNull { it.asStringOrNull() }
@@ -761,7 +809,7 @@ class NodeRuntime(context: Context) {
   private suspend fun refreshBrandingFromGateway() {
     if (!_isConnected.value) return
     try {
-      val res = session.request("config.get", "{}")
+      val res = operatorSession.request("config.get", "{}")
       val root = json.parseToJsonElement(res).asObjectOrNull()
       val config = root?.get("config").asObjectOrNull()
       val ui = config?.get("ui").asObjectOrNull()
@@ -777,7 +825,7 @@ class NodeRuntime(context: Context) {
     }
   }
 
-  private suspend fun handleInvoke(command: String, paramsJson: String?): BridgeSession.InvokeResult {
+  private suspend fun handleInvoke(command: String, paramsJson: String?): GatewaySession.InvokeResult {
     if (
       command.startsWith(ClawdbotCanvasCommand.NamespacePrefix) ||
         command.startsWith(ClawdbotCanvasA2UICommand.NamespacePrefix) ||
@@ -785,14 +833,14 @@ class NodeRuntime(context: Context) {
         command.startsWith(ClawdbotScreenCommand.NamespacePrefix)
       ) {
       if (!isForeground.value) {
-        return BridgeSession.InvokeResult.error(
+        return GatewaySession.InvokeResult.error(
           code = "NODE_BACKGROUND_UNAVAILABLE",
           message = "NODE_BACKGROUND_UNAVAILABLE: canvas/camera/screen commands require foreground",
         )
       }
     }
     if (command.startsWith(ClawdbotCameraCommand.NamespacePrefix) && !cameraEnabled.value) {
-      return BridgeSession.InvokeResult.error(
+      return GatewaySession.InvokeResult.error(
         code = "CAMERA_DISABLED",
         message = "CAMERA_DISABLED: enable Camera in Settings",
       )
@@ -800,7 +848,7 @@ class NodeRuntime(context: Context) {
     if (command.startsWith(ClawdbotLocationCommand.NamespacePrefix) &&
       locationMode.value == LocationMode.Off
     ) {
-      return BridgeSession.InvokeResult.error(
+      return GatewaySession.InvokeResult.error(
         code = "LOCATION_DISABLED",
         message = "LOCATION_DISABLED: enable Location in Settings",
       )
@@ -810,18 +858,18 @@ class NodeRuntime(context: Context) {
       ClawdbotCanvasCommand.Present.rawValue -> {
         val url = CanvasController.parseNavigateUrl(paramsJson)
         canvas.navigate(url)
-        BridgeSession.InvokeResult.ok(null)
+        GatewaySession.InvokeResult.ok(null)
       }
-      ClawdbotCanvasCommand.Hide.rawValue -> BridgeSession.InvokeResult.ok(null)
+      ClawdbotCanvasCommand.Hide.rawValue -> GatewaySession.InvokeResult.ok(null)
       ClawdbotCanvasCommand.Navigate.rawValue -> {
         val url = CanvasController.parseNavigateUrl(paramsJson)
         canvas.navigate(url)
-        BridgeSession.InvokeResult.ok(null)
+        GatewaySession.InvokeResult.ok(null)
       }
       ClawdbotCanvasCommand.Eval.rawValue -> {
         val js =
           CanvasController.parseEvalJs(paramsJson)
-            ?: return BridgeSession.InvokeResult.error(
+            ?: return GatewaySession.InvokeResult.error(
               code = "INVALID_REQUEST",
               message = "INVALID_REQUEST: javaScript required",
             )
@@ -829,12 +877,12 @@ class NodeRuntime(context: Context) {
           try {
             canvas.eval(js)
           } catch (err: Throwable) {
-            return BridgeSession.InvokeResult.error(
+            return GatewaySession.InvokeResult.error(
               code = "NODE_BACKGROUND_UNAVAILABLE",
               message = "NODE_BACKGROUND_UNAVAILABLE: canvas unavailable",
             )
           }
-        BridgeSession.InvokeResult.ok("""{"result":${result.toJsonString()}}""")
+        GatewaySession.InvokeResult.ok("""{"result":${result.toJsonString()}}""")
       }
       ClawdbotCanvasCommand.Snapshot.rawValue -> {
         val snapshotParams = CanvasController.parseSnapshotParams(paramsJson)
@@ -846,51 +894,51 @@ class NodeRuntime(context: Context) {
               maxWidth = snapshotParams.maxWidth,
             )
           } catch (err: Throwable) {
-            return BridgeSession.InvokeResult.error(
+            return GatewaySession.InvokeResult.error(
               code = "NODE_BACKGROUND_UNAVAILABLE",
               message = "NODE_BACKGROUND_UNAVAILABLE: canvas unavailable",
             )
           }
-        BridgeSession.InvokeResult.ok("""{"format":"${snapshotParams.format.rawValue}","base64":"$base64"}""")
+        GatewaySession.InvokeResult.ok("""{"format":"${snapshotParams.format.rawValue}","base64":"$base64"}""")
       }
       ClawdbotCanvasA2UICommand.Reset.rawValue -> {
         val a2uiUrl = resolveA2uiHostUrl()
-          ?: return BridgeSession.InvokeResult.error(
+          ?: return GatewaySession.InvokeResult.error(
             code = "A2UI_HOST_NOT_CONFIGURED",
             message = "A2UI_HOST_NOT_CONFIGURED: gateway did not advertise canvas host",
           )
         val ready = ensureA2uiReady(a2uiUrl)
         if (!ready) {
-          return BridgeSession.InvokeResult.error(
+          return GatewaySession.InvokeResult.error(
             code = "A2UI_HOST_UNAVAILABLE",
             message = "A2UI host not reachable",
           )
         }
         val res = canvas.eval(a2uiResetJS)
-        BridgeSession.InvokeResult.ok(res)
+        GatewaySession.InvokeResult.ok(res)
       }
       ClawdbotCanvasA2UICommand.Push.rawValue, ClawdbotCanvasA2UICommand.PushJSONL.rawValue -> {
         val messages =
           try {
             decodeA2uiMessages(command, paramsJson)
           } catch (err: Throwable) {
-            return BridgeSession.InvokeResult.error(code = "INVALID_REQUEST", message = err.message ?: "invalid A2UI payload")
+            return GatewaySession.InvokeResult.error(code = "INVALID_REQUEST", message = err.message ?: "invalid A2UI payload")
           }
         val a2uiUrl = resolveA2uiHostUrl()
-          ?: return BridgeSession.InvokeResult.error(
+          ?: return GatewaySession.InvokeResult.error(
             code = "A2UI_HOST_NOT_CONFIGURED",
             message = "A2UI_HOST_NOT_CONFIGURED: gateway did not advertise canvas host",
           )
         val ready = ensureA2uiReady(a2uiUrl)
         if (!ready) {
-          return BridgeSession.InvokeResult.error(
+          return GatewaySession.InvokeResult.error(
             code = "A2UI_HOST_UNAVAILABLE",
             message = "A2UI host not reachable",
           )
         }
         val js = a2uiApplyMessagesJS(messages)
         val res = canvas.eval(js)
-        BridgeSession.InvokeResult.ok(res)
+        GatewaySession.InvokeResult.ok(res)
       }
       ClawdbotCameraCommand.Snap.rawValue -> {
         showCameraHud(message = "Taking photo…", kind = CameraHudKind.Photo)
@@ -901,10 +949,10 @@ class NodeRuntime(context: Context) {
           } catch (err: Throwable) {
             val (code, message) = invokeErrorFromThrowable(err)
             showCameraHud(message = message, kind = CameraHudKind.Error, autoHideMs = 2200)
-            return BridgeSession.InvokeResult.error(code = code, message = message)
+            return GatewaySession.InvokeResult.error(code = code, message = message)
           }
         showCameraHud(message = "Photo captured", kind = CameraHudKind.Success, autoHideMs = 1600)
-        BridgeSession.InvokeResult.ok(res.payloadJson)
+        GatewaySession.InvokeResult.ok(res.payloadJson)
       }
       ClawdbotCameraCommand.Clip.rawValue -> {
         val includeAudio = paramsJson?.contains("\"includeAudio\":true") != false
@@ -917,10 +965,10 @@ class NodeRuntime(context: Context) {
             } catch (err: Throwable) {
               val (code, message) = invokeErrorFromThrowable(err)
               showCameraHud(message = message, kind = CameraHudKind.Error, autoHideMs = 2400)
-              return BridgeSession.InvokeResult.error(code = code, message = message)
+              return GatewaySession.InvokeResult.error(code = code, message = message)
             }
           showCameraHud(message = "Clip captured", kind = CameraHudKind.Success, autoHideMs = 1800)
-          BridgeSession.InvokeResult.ok(res.payloadJson)
+          GatewaySession.InvokeResult.ok(res.payloadJson)
         } finally {
           if (includeAudio) externalAudioCaptureActive.value = false
         }
@@ -928,19 +976,19 @@ class NodeRuntime(context: Context) {
       ClawdbotLocationCommand.Get.rawValue -> {
         val mode = locationMode.value
         if (!isForeground.value && mode != LocationMode.Always) {
-          return BridgeSession.InvokeResult.error(
+          return GatewaySession.InvokeResult.error(
             code = "LOCATION_BACKGROUND_UNAVAILABLE",
             message = "LOCATION_BACKGROUND_UNAVAILABLE: background location requires Always",
           )
         }
         if (!hasFineLocationPermission() && !hasCoarseLocationPermission()) {
-          return BridgeSession.InvokeResult.error(
+          return GatewaySession.InvokeResult.error(
             code = "LOCATION_PERMISSION_REQUIRED",
             message = "LOCATION_PERMISSION_REQUIRED: grant Location permission",
           )
         }
         if (!isForeground.value && mode == LocationMode.Always && !hasBackgroundLocationPermission()) {
-          return BridgeSession.InvokeResult.error(
+          return GatewaySession.InvokeResult.error(
             code = "LOCATION_PERMISSION_REQUIRED",
             message = "LOCATION_PERMISSION_REQUIRED: enable Always in system Settings",
           )
@@ -967,15 +1015,15 @@ class NodeRuntime(context: Context) {
               timeoutMs = timeoutMs,
               isPrecise = accuracy == "precise",
             )
-          BridgeSession.InvokeResult.ok(payload.payloadJson)
+          GatewaySession.InvokeResult.ok(payload.payloadJson)
         } catch (err: TimeoutCancellationException) {
-          BridgeSession.InvokeResult.error(
+          GatewaySession.InvokeResult.error(
             code = "LOCATION_TIMEOUT",
             message = "LOCATION_TIMEOUT: no fix in time",
           )
         } catch (err: Throwable) {
           val message = err.message ?: "LOCATION_UNAVAILABLE: no fix"
-          BridgeSession.InvokeResult.error(code = "LOCATION_UNAVAILABLE", message = message)
+          GatewaySession.InvokeResult.error(code = "LOCATION_UNAVAILABLE", message = message)
         }
       }
       ClawdbotScreenCommand.Record.rawValue -> {
@@ -987,9 +1035,9 @@ class NodeRuntime(context: Context) {
               screenRecorder.record(paramsJson)
             } catch (err: Throwable) {
               val (code, message) = invokeErrorFromThrowable(err)
-              return BridgeSession.InvokeResult.error(code = code, message = message)
+              return GatewaySession.InvokeResult.error(code = code, message = message)
             }
-          BridgeSession.InvokeResult.ok(res.payloadJson)
+          GatewaySession.InvokeResult.ok(res.payloadJson)
         } finally {
           _screenRecordActive.value = false
         }
@@ -997,16 +1045,16 @@ class NodeRuntime(context: Context) {
       ClawdbotSmsCommand.Send.rawValue -> {
         val res = sms.send(paramsJson)
         if (res.ok) {
-          BridgeSession.InvokeResult.ok(res.payloadJson)
+          GatewaySession.InvokeResult.ok(res.payloadJson)
         } else {
           val error = res.error ?: "SMS_SEND_FAILED"
           val idx = error.indexOf(':')
           val code = if (idx > 0) error.substring(0, idx).trim() else "SMS_SEND_FAILED"
-          BridgeSession.InvokeResult.error(code = code, message = error)
+          GatewaySession.InvokeResult.error(code = code, message = error)
         }
       }
       else ->
-        BridgeSession.InvokeResult.error(
+        GatewaySession.InvokeResult.error(
           code = "INVALID_REQUEST",
           message = "INVALID_REQUEST: unknown command",
         )
@@ -1062,7 +1110,9 @@ class NodeRuntime(context: Context) {
   }
 
   private fun resolveA2uiHostUrl(): String? {
-    val raw = session.currentCanvasHostUrl()?.trim().orEmpty()
+    val nodeRaw = nodeSession.currentCanvasHostUrl()?.trim().orEmpty()
+    val operatorRaw = operatorSession.currentCanvasHostUrl()?.trim().orEmpty()
+    val raw = if (nodeRaw.isNotBlank()) nodeRaw else operatorRaw
     if (raw.isBlank()) return null
     val base = raw.trimEnd('/')
     return "${base}/__clawdbot__/a2ui/?platform=android"

apps/android/app/src/main/java/com/clawdbot/android/SecurePrefs.kt

@@ -58,17 +58,30 @@ class SecurePrefs(context: Context) {
   private val _preventSleep = MutableStateFlow(prefs.getBoolean("screen.preventSleep", true))
   val preventSleep: StateFlow<Boolean> = _preventSleep
 
-  private val _manualEnabled = MutableStateFlow(prefs.getBoolean("bridge.manual.enabled", false))
+  private val _manualEnabled =
+    MutableStateFlow(readBoolWithMigration("gateway.manual.enabled", "bridge.manual.enabled", false))
   val manualEnabled: StateFlow<Boolean> = _manualEnabled
 
-  private val _manualHost = MutableStateFlow(prefs.getString("bridge.manual.host", "")!!)
+  private val _manualHost =
+    MutableStateFlow(readStringWithMigration("gateway.manual.host", "bridge.manual.host", ""))
   val manualHost: StateFlow<String> = _manualHost
 
-  private val _manualPort = MutableStateFlow(prefs.getInt("bridge.manual.port", 18790))
+  private val _manualPort =
+    MutableStateFlow(readIntWithMigration("gateway.manual.port", "bridge.manual.port", 18789))
   val manualPort: StateFlow<Int> = _manualPort
 
+  private val _manualTls =
+    MutableStateFlow(readBoolWithMigration("gateway.manual.tls", null, true))
+  val manualTls: StateFlow<Boolean> = _manualTls
+
   private val _lastDiscoveredStableId =
-    MutableStateFlow(prefs.getString("bridge.lastDiscoveredStableId", "")!!)
+    MutableStateFlow(
+      readStringWithMigration(
+        "gateway.lastDiscoveredStableID",
+        "bridge.lastDiscoveredStableId",
+        "",
+      ),
+    )
   val lastDiscoveredStableId: StateFlow<String> = _lastDiscoveredStableId
 
   private val _canvasDebugStatusEnabled =
@@ -86,7 +99,7 @@ class SecurePrefs(context: Context) {
 
   fun setLastDiscoveredStableId(value: String) {
     val trimmed = value.trim()
-    prefs.edit { putString("bridge.lastDiscoveredStableId", trimmed) }
+    prefs.edit { putString("gateway.lastDiscoveredStableID", trimmed) }
     _lastDiscoveredStableId.value = trimmed
   }
 
@@ -117,46 +130,77 @@ class SecurePrefs(context: Context) {
   }
 
   fun setManualEnabled(value: Boolean) {
-    prefs.edit { putBoolean("bridge.manual.enabled", value) }
+    prefs.edit { putBoolean("gateway.manual.enabled", value) }
     _manualEnabled.value = value
   }
 
   fun setManualHost(value: String) {
     val trimmed = value.trim()
-    prefs.edit { putString("bridge.manual.host", trimmed) }
+    prefs.edit { putString("gateway.manual.host", trimmed) }
     _manualHost.value = trimmed
   }
 
   fun setManualPort(value: Int) {
-    prefs.edit { putInt("bridge.manual.port", value) }
+    prefs.edit { putInt("gateway.manual.port", value) }
     _manualPort.value = value
   }
 
+  fun setManualTls(value: Boolean) {
+    prefs.edit { putBoolean("gateway.manual.tls", value) }
+    _manualTls.value = value
+  }
+
   fun setCanvasDebugStatusEnabled(value: Boolean) {
     prefs.edit { putBoolean("canvas.debugStatusEnabled", value) }
     _canvasDebugStatusEnabled.value = value
   }
 
-  fun loadBridgeToken(): String? {
-    val key = "bridge.token.${_instanceId.value}"
-    return prefs.getString(key, null)
+  fun loadGatewayToken(): String? {
+    val key = "gateway.token.${_instanceId.value}"
+    val stored = prefs.getString(key, null)?.trim()
+    if (!stored.isNullOrEmpty()) return stored
+    val legacy = prefs.getString("bridge.token.${_instanceId.value}", null)?.trim()
+    return legacy?.takeIf { it.isNotEmpty() }
   }
 
-  fun saveBridgeToken(token: String) {
-    val key = "bridge.token.${_instanceId.value}"
+  fun saveGatewayToken(token: String) {
+    val key = "gateway.token.${_instanceId.value}"
     prefs.edit { putString(key, token.trim()) }
   }
 
-  fun loadBridgeTlsFingerprint(stableId: String): String? {
-    val key = "bridge.tls.$stableId"
+  fun loadGatewayPassword(): String? {
+    val key = "gateway.password.${_instanceId.value}"
+    val stored = prefs.getString(key, null)?.trim()
+    return stored?.takeIf { it.isNotEmpty() }
+  }
+
+  fun saveGatewayPassword(password: String) {
+    val key = "gateway.password.${_instanceId.value}"
+    prefs.edit { putString(key, password.trim()) }
+  }
+
+  fun loadGatewayTlsFingerprint(stableId: String): String? {
+    val key = "gateway.tls.$stableId"
     return prefs.getString(key, null)?.trim()?.takeIf { it.isNotEmpty() }
   }
 
-  fun saveBridgeTlsFingerprint(stableId: String, fingerprint: String) {
-    val key = "bridge.tls.$stableId"
+  fun saveGatewayTlsFingerprint(stableId: String, fingerprint: String) {
+    val key = "gateway.tls.$stableId"
     prefs.edit { putString(key, fingerprint.trim()) }
   }
 
+  fun getString(key: String): String? {
+    return prefs.getString(key, null)
+  }
+
+  fun putString(key: String, value: String) {
+    prefs.edit { putString(key, value) }
+  }
+
+  fun remove(key: String) {
+    prefs.edit { remove(key) }
+  }
+
   private fun loadOrCreateInstanceId(): String {
     val existing = prefs.getString("node.instanceId", null)?.trim()
     if (!existing.isNullOrBlank()) return existing
@@ -225,4 +269,40 @@ class SecurePrefs(context: Context) {
       defaultWakeWords
     }
   }
+
+  private fun readBoolWithMigration(newKey: String, oldKey: String?, defaultValue: Boolean): Boolean {
+    if (prefs.contains(newKey)) {
+      return prefs.getBoolean(newKey, defaultValue)
+    }
+    if (oldKey != null && prefs.contains(oldKey)) {
+      val value = prefs.getBoolean(oldKey, defaultValue)
+      prefs.edit { putBoolean(newKey, value) }
+      return value
+    }
+    return defaultValue
+  }
+
+  private fun readStringWithMigration(newKey: String, oldKey: String?, defaultValue: String): String {
+    if (prefs.contains(newKey)) {
+      return prefs.getString(newKey, defaultValue) ?: defaultValue
+    }
+    if (oldKey != null && prefs.contains(oldKey)) {
+      val value = prefs.getString(oldKey, defaultValue) ?: defaultValue
+      prefs.edit { putString(newKey, value) }
+      return value
+    }
+    return defaultValue
+  }
+
+  private fun readIntWithMigration(newKey: String, oldKey: String?, defaultValue: Int): Int {
+    if (prefs.contains(newKey)) {
+      return prefs.getInt(newKey, defaultValue)
+    }
+    if (oldKey != null && prefs.contains(oldKey)) {
+      val value = prefs.getInt(oldKey, defaultValue)
+      prefs.edit { putInt(newKey, value) }
+      return value
+    }
+    return defaultValue
+  }
 }

apps/android/app/src/main/java/com/clawdbot/android/bridge/BridgePairingClient.kt

@@ -1,158 +0,0 @@
-package com.clawdbot.android.bridge
-
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonArray
-import kotlinx.serialization.json.JsonObject
-import kotlinx.serialization.json.JsonPrimitive
-import kotlinx.serialization.json.JsonNull
-import kotlinx.serialization.json.JsonElement
-import kotlinx.serialization.json.buildJsonObject
-import java.io.BufferedReader
-import java.io.BufferedWriter
-import java.io.InputStreamReader
-import java.io.OutputStreamWriter
-import java.net.InetSocketAddress
-
-class BridgePairingClient {
-  private val json = Json { ignoreUnknownKeys = true }
-
-  data class Hello(
-    val nodeId: String,
-    val displayName: String?,
-    val token: String?,
-    val platform: String?,
-    val version: String?,
-    val deviceFamily: String?,
-    val modelIdentifier: String?,
-    val caps: List<String>?,
-    val commands: List<String>?,
-  )
-
-  data class PairResult(val ok: Boolean, val token: String?, val error: String? = null)
-
-  suspend fun pairAndHello(
-    endpoint: BridgeEndpoint,
-    hello: Hello,
-    tls: BridgeTlsParams? = null,
-    onTlsFingerprint: ((String) -> Unit)? = null,
-  ): PairResult =
-    withContext(Dispatchers.IO) {
-      if (tls != null) {
-        try {
-          return@withContext pairAndHelloWithTls(endpoint, hello, tls, onTlsFingerprint)
-        } catch (e: Exception) {
-          if (tls.required) throw e
-        }
-      }
-      pairAndHelloWithTls(endpoint, hello, null, null)
-    }
-
-  private fun pairAndHelloWithTls(
-    endpoint: BridgeEndpoint,
-    hello: Hello,
-    tls: BridgeTlsParams?,
-    onTlsFingerprint: ((String) -> Unit)?,
-  ): PairResult {
-    val socket =
-      createBridgeSocket(tls) { fingerprint ->
-        onTlsFingerprint?.invoke(fingerprint)
-      }
-    socket.tcpNoDelay = true
-    try {
-      socket.connect(InetSocketAddress(endpoint.host, endpoint.port), 8_000)
-      socket.soTimeout = 60_000
-      startTlsHandshakeIfNeeded(socket)
-
-      val reader = BufferedReader(InputStreamReader(socket.getInputStream(), Charsets.UTF_8))
-      val writer = BufferedWriter(OutputStreamWriter(socket.getOutputStream(), Charsets.UTF_8))
-
-      fun send(line: String) {
-        writer.write(line)
-        writer.write("\n")
-        writer.flush()
-      }
-
-      fun sendJson(obj: JsonObject) = send(obj.toString())
-
-      sendJson(
-        buildJsonObject {
-          put("type", JsonPrimitive("hello"))
-          put("nodeId", JsonPrimitive(hello.nodeId))
-          hello.displayName?.let { put("displayName", JsonPrimitive(it)) }
-          hello.token?.let { put("token", JsonPrimitive(it)) }
-          hello.platform?.let { put("platform", JsonPrimitive(it)) }
-          hello.version?.let { put("version", JsonPrimitive(it)) }
-          hello.deviceFamily?.let { put("deviceFamily", JsonPrimitive(it)) }
-          hello.modelIdentifier?.let { put("modelIdentifier", JsonPrimitive(it)) }
-          hello.caps?.let { put("caps", JsonArray(it.map(::JsonPrimitive))) }
-          hello.commands?.let { put("commands", JsonArray(it.map(::JsonPrimitive))) }
-        },
-      )
-
-      val firstObj = json.parseToJsonElement(reader.readLine()).asObjectOrNull()
-        ?: return PairResult(ok = false, token = null, error = "unexpected bridge response")
-      return when (firstObj["type"].asStringOrNull()) {
-        "hello-ok" -> PairResult(ok = true, token = hello.token)
-        "error" -> {
-          val code = firstObj["code"].asStringOrNull() ?: "UNAVAILABLE"
-          val message = firstObj["message"].asStringOrNull() ?: "pairing required"
-          if (code != "NOT_PAIRED" && code != "UNAUTHORIZED") {
-            return PairResult(ok = false, token = null, error = "$code: $message")
-          }
-
-          sendJson(
-            buildJsonObject {
-              put("type", JsonPrimitive("pair-request"))
-              put("nodeId", JsonPrimitive(hello.nodeId))
-              hello.displayName?.let { put("displayName", JsonPrimitive(it)) }
-              hello.platform?.let { put("platform", JsonPrimitive(it)) }
-              hello.version?.let { put("version", JsonPrimitive(it)) }
-              hello.deviceFamily?.let { put("deviceFamily", JsonPrimitive(it)) }
-              hello.modelIdentifier?.let { put("modelIdentifier", JsonPrimitive(it)) }
-              hello.caps?.let { put("caps", JsonArray(it.map(::JsonPrimitive))) }
-              hello.commands?.let { put("commands", JsonArray(it.map(::JsonPrimitive))) }
-            },
-          )
-
-          while (true) {
-            val nextLine = reader.readLine() ?: break
-            val next = json.parseToJsonElement(nextLine).asObjectOrNull() ?: continue
-            when (next["type"].asStringOrNull()) {
-              "pair-ok" -> {
-                val token = next["token"].asStringOrNull()
-                return PairResult(ok = !token.isNullOrBlank(), token = token)
-              }
-              "error" -> {
-                val c = next["code"].asStringOrNull() ?: "UNAVAILABLE"
-                val m = next["message"].asStringOrNull() ?: "pairing failed"
-                return PairResult(ok = false, token = null, error = "$c: $m")
-              }
-            }
-          }
-          PairResult(ok = false, token = null, error = "pairing failed")
-        }
-        else -> PairResult(ok = false, token = null, error = "unexpected bridge response")
-      }
-    } catch (e: Exception) {
-      val message = e.message?.trim().orEmpty().ifEmpty { "gateway unreachable" }
-      return PairResult(ok = false, token = null, error = message)
-    } finally {
-      try {
-        socket.close()
-      } catch (_: Throwable) {
-        // ignore
-      }
-    }
-  }
-}
-
-private fun JsonElement?.asObjectOrNull(): JsonObject? = this as? JsonObject
-
-private fun JsonElement?.asStringOrNull(): String? =
-  when (this) {
-    is JsonNull -> null
-    is JsonPrimitive -> content
-    else -> null
-  }

apps/android/app/src/main/java/com/clawdbot/android/bridge/BridgeSession.kt

@@ -1,398 +0,0 @@
-package com.clawdbot.android.bridge
-
-import kotlinx.coroutines.CompletableDeferred
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.cancelAndJoin
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.isActive
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-import kotlinx.coroutines.withContext
-import com.clawdbot.android.BuildConfig
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonArray
-import kotlinx.serialization.json.JsonObject
-import kotlinx.serialization.json.JsonNull
-import kotlinx.serialization.json.JsonElement
-import kotlinx.serialization.json.JsonPrimitive
-import kotlinx.serialization.json.buildJsonObject
-import java.io.BufferedReader
-import java.io.BufferedWriter
-import java.io.InputStreamReader
-import java.io.OutputStreamWriter
-import java.net.InetSocketAddress
-import java.net.URI
-import java.net.Socket
-import java.util.UUID
-import java.util.concurrent.ConcurrentHashMap
-
-class BridgeSession(
-  private val scope: CoroutineScope,
-  private val onConnected: (serverName: String, remoteAddress: String?, mainSessionKey: String?) -> Unit,
-  private val onDisconnected: (message: String) -> Unit,
-  private val onEvent: (event: String, payloadJson: String?) -> Unit,
-  private val onInvoke: suspend (InvokeRequest) -> InvokeResult,
-  private val onTlsFingerprint: ((stableId: String, fingerprint: String) -> Unit)? = null,
-) {
-  data class Hello(
-    val nodeId: String,
-    val displayName: String?,
-    val token: String?,
-    val platform: String?,
-    val version: String?,
-    val deviceFamily: String?,
-    val modelIdentifier: String?,
-    val caps: List<String>?,
-    val commands: List<String>?,
-  )
-
-  data class InvokeRequest(val id: String, val command: String, val paramsJson: String?)
-
-  data class InvokeResult(val ok: Boolean, val payloadJson: String?, val error: ErrorShape?) {
-    companion object {
-      fun ok(payloadJson: String?) = InvokeResult(ok = true, payloadJson = payloadJson, error = null)
-      fun error(code: String, message: String) =
-        InvokeResult(ok = false, payloadJson = null, error = ErrorShape(code = code, message = message))
-    }
-  }
-
-  data class ErrorShape(val code: String, val message: String)
-
-  private val json = Json { ignoreUnknownKeys = true }
-  private val writeLock = Mutex()
-  private val pending = ConcurrentHashMap<String, CompletableDeferred<RpcResponse>>()
-  @Volatile private var canvasHostUrl: String? = null
-  @Volatile private var mainSessionKey: String? = null
-
-  private data class DesiredConnection(
-    val endpoint: BridgeEndpoint,
-    val hello: Hello,
-    val tls: BridgeTlsParams?,
-  )
-
-  private var desired: DesiredConnection? = null
-  private var job: Job? = null
-
-  fun connect(endpoint: BridgeEndpoint, hello: Hello, tls: BridgeTlsParams? = null) {
-    desired = DesiredConnection(endpoint, hello, tls)
-    if (job == null) {
-      job = scope.launch(Dispatchers.IO) { runLoop() }
-    }
-  }
-
-  suspend fun updateHello(hello: Hello) {
-    val target = desired ?: return
-    desired = target.copy(hello = hello)
-    val conn = currentConnection ?: return
-    conn.sendJson(buildHelloJson(hello))
-  }
-
-  fun disconnect() {
-    desired = null
-    // Unblock connectOnce() read loop. Coroutine cancellation alone won't interrupt BufferedReader.readLine().
-    currentConnection?.closeQuietly()
-    scope.launch(Dispatchers.IO) {
-      job?.cancelAndJoin()
-      job = null
-      canvasHostUrl = null
-      mainSessionKey = null
-      onDisconnected("Offline")
-    }
-  }
-
-  fun currentCanvasHostUrl(): String? = canvasHostUrl
-  fun currentMainSessionKey(): String? = mainSessionKey
-
-  suspend fun sendEvent(event: String, payloadJson: String?) {
-    val conn = currentConnection ?: return
-    conn.sendJson(
-      buildJsonObject {
-        put("type", JsonPrimitive("event"))
-        put("event", JsonPrimitive(event))
-        if (payloadJson != null) put("payloadJSON", JsonPrimitive(payloadJson)) else put("payloadJSON", JsonNull)
-      },
-    )
-  }
-
-  suspend fun request(method: String, paramsJson: String?): String {
-    val conn = currentConnection ?: throw IllegalStateException("not connected")
-    val id = UUID.randomUUID().toString()
-    val deferred = CompletableDeferred<RpcResponse>()
-    pending[id] = deferred
-    conn.sendJson(
-      buildJsonObject {
-        put("type", JsonPrimitive("req"))
-        put("id", JsonPrimitive(id))
-        put("method", JsonPrimitive(method))
-        if (paramsJson != null) put("paramsJSON", JsonPrimitive(paramsJson)) else put("paramsJSON", JsonNull)
-      },
-    )
-    val res = deferred.await()
-    if (res.ok) return res.payloadJson ?: ""
-    val err = res.error
-    throw IllegalStateException("${err?.code ?: "UNAVAILABLE"}: ${err?.message ?: "request failed"}")
-  }
-
-  private data class RpcResponse(val id: String, val ok: Boolean, val payloadJson: String?, val error: ErrorShape?)
-
-  private class Connection(private val socket: Socket, private val reader: BufferedReader, private val writer: BufferedWriter, private val writeLock: Mutex) {
-    val remoteAddress: String? =
-      socket.inetAddress?.hostAddress?.takeIf { it.isNotBlank() }?.let { "${it}:${socket.port}" }
-
-    suspend fun sendJson(obj: JsonObject) {
-      writeLock.withLock {
-        writer.write(obj.toString())
-        writer.write("\n")
-        writer.flush()
-      }
-    }
-
-    fun closeQuietly() {
-      try {
-        socket.close()
-      } catch (_: Throwable) {
-        // ignore
-      }
-    }
-  }
-
-  @Volatile private var currentConnection: Connection? = null
-
-  private suspend fun runLoop() {
-    var attempt = 0
-    while (scope.isActive) {
-      val target = desired
-      if (target == null) {
-        currentConnection?.closeQuietly()
-        currentConnection = null
-        delay(250)
-        continue
-      }
-
-      val (endpoint, hello, tls) = target
-      try {
-        onDisconnected(if (attempt == 0) "Connecting…" else "Reconnecting…")
-        connectOnce(endpoint, hello, tls)
-        attempt = 0
-      } catch (err: Throwable) {
-        attempt += 1
-        onDisconnected("Bridge error: ${err.message ?: err::class.java.simpleName}")
-        val sleepMs = minOf(8_000L, (350.0 * Math.pow(1.7, attempt.toDouble())).toLong())
-        delay(sleepMs)
-      }
-    }
-  }
-
-  private fun invokeErrorFromThrowable(err: Throwable): InvokeResult {
-    val msg = err.message?.trim().takeIf { !it.isNullOrEmpty() } ?: err::class.java.simpleName
-    val parts = msg.split(":", limit = 2)
-    if (parts.size == 2) {
-      val code = parts[0].trim()
-      val rest = parts[1].trim()
-      if (code.isNotEmpty() && code.all { it.isUpperCase() || it == '_' }) {
-        return InvokeResult.error(code = code, message = rest.ifEmpty { msg })
-      }
-    }
-    return InvokeResult.error(code = "UNAVAILABLE", message = msg)
-  }
-
-  private suspend fun connectOnce(endpoint: BridgeEndpoint, hello: Hello, tls: BridgeTlsParams?) =
-    withContext(Dispatchers.IO) {
-      if (tls != null) {
-        try {
-          connectWithSocket(endpoint, hello, tls)
-          return@withContext
-        } catch (err: Throwable) {
-          if (tls.required) throw err
-        }
-      }
-      connectWithSocket(endpoint, hello, null)
-    }
-
-  private suspend fun connectWithSocket(endpoint: BridgeEndpoint, hello: Hello, tls: BridgeTlsParams?) {
-    val socket =
-      createBridgeSocket(tls) { fingerprint ->
-        onTlsFingerprint?.invoke(tls?.stableId ?: endpoint.stableId, fingerprint)
-      }
-    socket.tcpNoDelay = true
-    socket.connect(InetSocketAddress(endpoint.host, endpoint.port), 8_000)
-    socket.soTimeout = 0
-    startTlsHandshakeIfNeeded(socket)
-
-    val reader = BufferedReader(InputStreamReader(socket.getInputStream(), Charsets.UTF_8))
-    val writer = BufferedWriter(OutputStreamWriter(socket.getOutputStream(), Charsets.UTF_8))
-
-    val conn = Connection(socket, reader, writer, writeLock)
-    currentConnection = conn
-
-    try {
-      conn.sendJson(buildHelloJson(hello))
-
-      val firstLine = reader.readLine() ?: throw IllegalStateException("bridge closed connection")
-      val first = json.parseToJsonElement(firstLine).asObjectOrNull()
-        ?: throw IllegalStateException("unexpected bridge response")
-      when (first["type"].asStringOrNull()) {
-        "hello-ok" -> {
-          val name = first["serverName"].asStringOrNull() ?: "Bridge"
-          val rawCanvasUrl = first["canvasHostUrl"].asStringOrNull()?.trim()?.ifEmpty { null }
-          val rawMainSessionKey = first["mainSessionKey"].asStringOrNull()?.trim()?.ifEmpty { null }
-          canvasHostUrl = normalizeCanvasHostUrl(rawCanvasUrl, endpoint)
-          mainSessionKey = rawMainSessionKey
-          if (BuildConfig.DEBUG) {
-            // Local JVM unit tests use android.jar stubs; Log.d can throw "not mocked".
-            runCatching {
-              android.util.Log.d(
-                "ClawdbotBridge",
-                "canvasHostUrl resolved=${canvasHostUrl ?: "none"} (raw=${rawCanvasUrl ?: "none"})",
-              )
-            }
-          }
-          onConnected(name, conn.remoteAddress, rawMainSessionKey)
-        }
-        "error" -> {
-          val code = first["code"].asStringOrNull() ?: "UNAVAILABLE"
-          val msg = first["message"].asStringOrNull() ?: "connect failed"
-          throw IllegalStateException("$code: $msg")
-        }
-        else -> throw IllegalStateException("unexpected bridge response")
-      }
-
-      while (scope.isActive) {
-        val line = reader.readLine() ?: break
-        val frame = json.parseToJsonElement(line).asObjectOrNull() ?: continue
-        when (frame["type"].asStringOrNull()) {
-          "event" -> {
-            val event = frame["event"].asStringOrNull() ?: continue
-            val payload = frame["payloadJSON"].asStringOrNull()
-            onEvent(event, payload)
-          }
-            "ping" -> {
-              val id = frame["id"].asStringOrNull() ?: ""
-              conn.sendJson(buildJsonObject { put("type", JsonPrimitive("pong")); put("id", JsonPrimitive(id)) })
-            }
-            "res" -> {
-              val id = frame["id"].asStringOrNull() ?: continue
-              val ok = frame["ok"].asBooleanOrNull() ?: false
-              val payloadJson = frame["payloadJSON"].asStringOrNull()
-              val error =
-                frame["error"]?.let {
-                  val obj = it.asObjectOrNull() ?: return@let null
-                  val code = obj["code"].asStringOrNull() ?: "UNAVAILABLE"
-                  val msg = obj["message"].asStringOrNull() ?: "request failed"
-                  ErrorShape(code, msg)
-                }
-              pending.remove(id)?.complete(RpcResponse(id, ok, payloadJson, error))
-            }
-            "invoke" -> {
-              val id = frame["id"].asStringOrNull() ?: continue
-              val command = frame["command"].asStringOrNull() ?: ""
-              val params = frame["paramsJSON"].asStringOrNull()
-              val result =
-                try {
-                  onInvoke(InvokeRequest(id, command, params))
-                } catch (err: Throwable) {
-                  invokeErrorFromThrowable(err)
-                }
-              conn.sendJson(
-                buildJsonObject {
-                  put("type", JsonPrimitive("invoke-res"))
-                  put("id", JsonPrimitive(id))
-                  put("ok", JsonPrimitive(result.ok))
-                  if (result.payloadJson != null) put("payloadJSON", JsonPrimitive(result.payloadJson))
-                  if (result.error != null) {
-                    put(
-                      "error",
-                      buildJsonObject {
-                        put("code", JsonPrimitive(result.error.code))
-                        put("message", JsonPrimitive(result.error.message))
-                      },
-                    )
-                  }
-                },
-              )
-            }
-          "invoke-res" -> {
-            // gateway->node only (ignore)
-          }
-        }
-      }
-    } finally {
-      currentConnection = null
-      for ((_, waiter) in pending) {
-        waiter.cancel()
-      }
-      pending.clear()
-      conn.closeQuietly()
-    }
-  }
-
-  private fun buildHelloJson(hello: Hello): JsonObject =
-    buildJsonObject {
-      put("type", JsonPrimitive("hello"))
-      put("nodeId", JsonPrimitive(hello.nodeId))
-      hello.displayName?.let { put("displayName", JsonPrimitive(it)) }
-      hello.token?.let { put("token", JsonPrimitive(it)) }
-      hello.platform?.let { put("platform", JsonPrimitive(it)) }
-      hello.version?.let { put("version", JsonPrimitive(it)) }
-      hello.deviceFamily?.let { put("deviceFamily", JsonPrimitive(it)) }
-      hello.modelIdentifier?.let { put("modelIdentifier", JsonPrimitive(it)) }
-      hello.caps?.let { put("caps", JsonArray(it.map(::JsonPrimitive))) }
-      hello.commands?.let { put("commands", JsonArray(it.map(::JsonPrimitive))) }
-    }
-
-  private fun normalizeCanvasHostUrl(raw: String?, endpoint: BridgeEndpoint): String? {
-    val trimmed = raw?.trim().orEmpty()
-    val parsed = trimmed.takeIf { it.isNotBlank() }?.let { runCatching { URI(it) }.getOrNull() }
-    val host = parsed?.host?.trim().orEmpty()
-    val port = parsed?.port ?: -1
-    val scheme = parsed?.scheme?.trim().orEmpty().ifBlank { "http" }
-
-    if (trimmed.isNotBlank() && !isLoopbackHost(host)) {
-      return trimmed
-    }
-
-    val fallbackHost =
-      endpoint.tailnetDns?.trim().takeIf { !it.isNullOrEmpty() }
-        ?: endpoint.lanHost?.trim().takeIf { !it.isNullOrEmpty() }
-        ?: endpoint.host.trim()
-    if (fallbackHost.isEmpty()) return trimmed.ifBlank { null }
-
-    val fallbackPort = endpoint.canvasPort ?: if (port > 0) port else 18793
-    val formattedHost = if (fallbackHost.contains(":")) "[${fallbackHost}]" else fallbackHost
-    return "$scheme://$formattedHost:$fallbackPort"
-  }
-
-  private fun isLoopbackHost(raw: String?): Boolean {
-    val host = raw?.trim()?.lowercase().orEmpty()
-    if (host.isEmpty()) return false
-    if (host == "localhost") return true
-    if (host == "::1") return true
-    if (host == "0.0.0.0" || host == "::") return true
-    return host.startsWith("127.")
-  }
-}
-
-private fun JsonElement?.asObjectOrNull(): JsonObject? = this as? JsonObject
-
-private fun JsonElement?.asStringOrNull(): String? =
-  when (this) {
-    is JsonNull -> null
-    is JsonPrimitive -> content
-    else -> null
-  }
-
-private fun JsonElement?.asBooleanOrNull(): Boolean? =
-  when (this) {
-    is JsonPrimitive -> {
-      val c = content.trim()
-      when {
-        c.equals("true", ignoreCase = true) -> true
-        c.equals("false", ignoreCase = true) -> false
-        else -> null
-      }
-    }
-    else -> null
-  }

apps/android/app/src/main/java/com/clawdbot/android/chat/ChatController.kt

@@ -1,6 +1,6 @@
 package com.clawdbot.android.chat
 
-import com.clawdbot.android.bridge.BridgeSession
+import com.clawdbot.android.gateway.GatewaySession
 import java.util.UUID
 import java.util.concurrent.ConcurrentHashMap
 import kotlinx.coroutines.CoroutineScope
@@ -20,8 +20,9 @@ import kotlinx.serialization.json.buildJsonObject
 
 class ChatController(
   private val scope: CoroutineScope,
-  private val session: BridgeSession,
+  private val session: GatewaySession,
   private val json: Json,
+  private val supportsChatSubscribe: Boolean,
 ) {
   private val _sessionKey = MutableStateFlow("main")
   val sessionKey: StateFlow<String> = _sessionKey.asStateFlow()
@@ -224,7 +225,7 @@ class ChatController(
     }
   }
 
-  fun handleBridgeEvent(event: String, payloadJson: String?) {
+  fun handleGatewayEvent(event: String, payloadJson: String?) {
     when (event) {
       "tick" -> {
         scope.launch { pollHealthIfNeeded(force = false) }
@@ -259,10 +260,12 @@ class ChatController(
 
     val key = _sessionKey.value
     try {
-      try {
-        session.sendEvent("chat.subscribe", """{"sessionKey":"$key"}""")
-      } catch (_: Throwable) {
-        // best-effort
+      if (supportsChatSubscribe) {
+        try {
+          session.sendNodeEvent("chat.subscribe", """{"sessionKey":"$key"}""")
+        } catch (_: Throwable) {
+          // best-effort
+        }
       }
 
       val historyJson = session.request("chat.history", """{"sessionKey":"$key"}""")

apps/android/app/src/main/java/com/clawdbot/android/gateway/BonjourEscapes.kt

@@ -1,4 +1,4 @@
-package com.clawdbot.android.bridge
+package com.clawdbot.android.gateway
 
 object BonjourEscapes {
   fun decode(input: String): String {

apps/android/app/src/main/java/com/clawdbot/android/gateway/DeviceAuthStore.kt

@@ -0,0 +1,26 @@
+package com.clawdbot.android.gateway
+
+import com.clawdbot.android.SecurePrefs
+
+class DeviceAuthStore(private val prefs: SecurePrefs) {
+  fun loadToken(deviceId: String, role: String): String? {
+    val key = tokenKey(deviceId, role)
+    return prefs.getString(key)?.trim()?.takeIf { it.isNotEmpty() }
+  }
+
+  fun saveToken(deviceId: String, role: String, token: String) {
+    val key = tokenKey(deviceId, role)
+    prefs.putString(key, token.trim())
+  }
+
+  fun clearToken(deviceId: String, role: String) {
+    val key = tokenKey(deviceId, role)
+    prefs.remove(key)
+  }
+
+  private fun tokenKey(deviceId: String, role: String): String {
+    val normalizedDevice = deviceId.trim().lowercase()
+    val normalizedRole = role.trim().lowercase()
+    return "gateway.deviceToken.$normalizedDevice.$normalizedRole"
+  }
+}

apps/android/app/src/main/java/com/clawdbot/android/gateway/DeviceIdentityStore.kt

@@ -0,0 +1,146 @@
+package com.clawdbot.android.gateway
+
+import android.content.Context
+import android.util.Base64
+import java.io.File
+import java.security.KeyFactory
+import java.security.KeyPairGenerator
+import java.security.MessageDigest
+import java.security.Signature
+import java.security.spec.PKCS8EncodedKeySpec
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.Json
+
+@Serializable
+data class DeviceIdentity(
+  val deviceId: String,
+  val publicKeyRawBase64: String,
+  val privateKeyPkcs8Base64: String,
+  val createdAtMs: Long,
+)
+
+class DeviceIdentityStore(context: Context) {
+  private val json = Json { ignoreUnknownKeys = true }
+  private val identityFile = File(context.filesDir, "clawdbot/identity/device.json")
+
+  @Synchronized
+  fun loadOrCreate(): DeviceIdentity {
+    val existing = load()
+    if (existing != null) {
+      val derived = deriveDeviceId(existing.publicKeyRawBase64)
+      if (derived != null && derived != existing.deviceId) {
+        val updated = existing.copy(deviceId = derived)
+        save(updated)
+        return updated
+      }
+      return existing
+    }
+    val fresh = generate()
+    save(fresh)
+    return fresh
+  }
+
+  fun signPayload(payload: String, identity: DeviceIdentity): String? {
+    return try {
+      val privateKeyBytes = Base64.decode(identity.privateKeyPkcs8Base64, Base64.DEFAULT)
+      val keySpec = PKCS8EncodedKeySpec(privateKeyBytes)
+      val keyFactory = KeyFactory.getInstance("Ed25519")
+      val privateKey = keyFactory.generatePrivate(keySpec)
+      val signature = Signature.getInstance("Ed25519")
+      signature.initSign(privateKey)
+      signature.update(payload.toByteArray(Charsets.UTF_8))
+      base64UrlEncode(signature.sign())
+    } catch (_: Throwable) {
+      null
+    }
+  }
+
+  fun publicKeyBase64Url(identity: DeviceIdentity): String? {
+    return try {
+      val raw = Base64.decode(identity.publicKeyRawBase64, Base64.DEFAULT)
+      base64UrlEncode(raw)
+    } catch (_: Throwable) {
+      null
+    }
+  }
+
+  private fun load(): DeviceIdentity? {
+    return try {
+      if (!identityFile.exists()) return null
+      val raw = identityFile.readText(Charsets.UTF_8)
+      val decoded = json.decodeFromString(DeviceIdentity.serializer(), raw)
+      if (decoded.deviceId.isBlank() ||
+        decoded.publicKeyRawBase64.isBlank() ||
+        decoded.privateKeyPkcs8Base64.isBlank()
+      ) {
+        null
+      } else {
+        decoded
+      }
+    } catch (_: Throwable) {
+      null
+    }
+  }
+
+  private fun save(identity: DeviceIdentity) {
+    try {
+      identityFile.parentFile?.mkdirs()
+      val encoded = json.encodeToString(DeviceIdentity.serializer(), identity)
+      identityFile.writeText(encoded, Charsets.UTF_8)
+    } catch (_: Throwable) {
+      // best-effort only
+    }
+  }
+
+  private fun generate(): DeviceIdentity {
+    val keyPair = KeyPairGenerator.getInstance("Ed25519").generateKeyPair()
+    val spki = keyPair.public.encoded
+    val rawPublic = stripSpkiPrefix(spki)
+    val deviceId = sha256Hex(rawPublic)
+    val privateKey = keyPair.private.encoded
+    return DeviceIdentity(
+      deviceId = deviceId,
+      publicKeyRawBase64 = Base64.encodeToString(rawPublic, Base64.NO_WRAP),
+      privateKeyPkcs8Base64 = Base64.encodeToString(privateKey, Base64.NO_WRAP),
+      createdAtMs = System.currentTimeMillis(),
+    )
+  }
+
+  private fun deriveDeviceId(publicKeyRawBase64: String): String? {
+    return try {
+      val raw = Base64.decode(publicKeyRawBase64, Base64.DEFAULT)
+      sha256Hex(raw)
+    } catch (_: Throwable) {
+      null
+    }
+  }
+
+  private fun stripSpkiPrefix(spki: ByteArray): ByteArray {
+    if (spki.size == ED25519_SPKI_PREFIX.size + 32 &&
+      spki.copyOfRange(0, ED25519_SPKI_PREFIX.size).contentEquals(ED25519_SPKI_PREFIX)
+    ) {
+      return spki.copyOfRange(ED25519_SPKI_PREFIX.size, spki.size)
+    }
+    return spki
+  }
+
+  private fun sha256Hex(data: ByteArray): String {
+    val digest = MessageDigest.getInstance("SHA-256").digest(data)
+    val out = StringBuilder(digest.size * 2)
+    for (byte in digest) {
+      out.append(String.format("%02x", byte))
+    }
+    return out.toString()
+  }
+
+  private fun base64UrlEncode(data: ByteArray): String {
+    return Base64.encodeToString(data, Base64.URL_SAFE or Base64.NO_WRAP or Base64.NO_PADDING)
+  }
+
+  companion object {
+    private val ED25519_SPKI_PREFIX =
+      byteArrayOf(
+        0x30, 0x2a, 0x30, 0x05, 0x06, 0x03, 0x2b, 0x65, 0x70, 0x03, 0x21, 0x00,
+      )
+  }
+}

apps/android/app/src/main/java/com/clawdbot/android/gateway/GatewayDiscovery.kt

@@ -1,4 +1,4 @@
-package com.clawdbot.android.bridge
+package com.clawdbot.android.gateway
 
 import android.content.Context
 import android.net.ConnectivityManager
@@ -44,21 +44,21 @@ import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
 
 @Suppress("DEPRECATION")
-class BridgeDiscovery(
+class GatewayDiscovery(
   context: Context,
   private val scope: CoroutineScope,
 ) {
   private val nsd = context.getSystemService(NsdManager::class.java)
   private val connectivity = context.getSystemService(ConnectivityManager::class.java)
   private val dns = DnsResolver.getInstance()
-  private val serviceType = "_clawdbot-bridge._tcp."
+  private val serviceType = "_clawdbot-gw._tcp."
   private val wideAreaDomain = "clawdbot.internal."
-  private val logTag = "Clawdbot/BridgeDiscovery"
+  private val logTag = "Clawdbot/GatewayDiscovery"
 
-  private val localById = ConcurrentHashMap<String, BridgeEndpoint>()
-  private val unicastById = ConcurrentHashMap<String, BridgeEndpoint>()
-  private val _bridges = MutableStateFlow<List<BridgeEndpoint>>(emptyList())
-  val bridges: StateFlow<List<BridgeEndpoint>> = _bridges.asStateFlow()
+  private val localById = ConcurrentHashMap<String, GatewayEndpoint>()
+  private val unicastById = ConcurrentHashMap<String, GatewayEndpoint>()
+  private val _gateways = MutableStateFlow<List<GatewayEndpoint>>(emptyList())
+  val gateways: StateFlow<List<GatewayEndpoint>> = _gateways.asStateFlow()
 
   private val _statusText = MutableStateFlow("Searching…")
   val statusText: StateFlow<String> = _statusText.asStateFlow()
@@ -77,7 +77,7 @@ class BridgeDiscovery(
       override fun onDiscoveryStopped(serviceType: String) {}
 
       override fun onServiceFound(serviceInfo: NsdServiceInfo) {
-        if (serviceInfo.serviceType != this@BridgeDiscovery.serviceType) return
+        if (serviceInfo.serviceType != this@GatewayDiscovery.serviceType) return
         resolve(serviceInfo)
       }
 
@@ -141,13 +141,12 @@ class BridgeDiscovery(
         val lanHost = txt(resolved, "lanHost")
         val tailnetDns = txt(resolved, "tailnetDns")
         val gatewayPort = txtInt(resolved, "gatewayPort")
-        val bridgePort = txtInt(resolved, "bridgePort")
         val canvasPort = txtInt(resolved, "canvasPort")
-        val tlsEnabled = txtBool(resolved, "bridgeTls")
-        val tlsFingerprint = txt(resolved, "bridgeTlsSha256")
+        val tlsEnabled = txtBool(resolved, "gatewayTls")
+        val tlsFingerprint = txt(resolved, "gatewayTlsSha256")
         val id = stableId(serviceName, "local.")
         localById[id] =
-          BridgeEndpoint(
+          GatewayEndpoint(
             stableId = id,
             name = displayName,
             host = host,
@@ -155,7 +154,6 @@ class BridgeDiscovery(
             lanHost = lanHost,
             tailnetDns = tailnetDns,
             gatewayPort = gatewayPort,
-            bridgePort = bridgePort,
             canvasPort = canvasPort,
             tlsEnabled = tlsEnabled,
             tlsFingerprintSha256 = tlsFingerprint,
@@ -167,7 +165,7 @@ class BridgeDiscovery(
   }
 
   private fun publish() {
-    _bridges.value =
+    _gateways.value =
       (localById.values + unicastById.values).sortedBy { it.name.lowercase() }
     _statusText.value = buildStatusText()
   }
@@ -186,7 +184,7 @@ class BridgeDiscovery(
       }
 
     return when {
-      localCount == 0 && wideRcode == null -> "Searching for bridges…"
+      localCount == 0 && wideRcode == null -> "Searching for gateways…"
       localCount == 0 -> "$wide"
       else -> "Local: $localCount • $wide"
     }
@@ -223,7 +221,7 @@ class BridgeDiscovery(
     val ptrMsg = lookupUnicastMessage(ptrName, Type.PTR) ?: return
     val ptrRecords = records(ptrMsg, Section.ANSWER).mapNotNull { it as? PTRRecord }
 
-    val next = LinkedHashMap<String, BridgeEndpoint>()
+    val next = LinkedHashMap<String, GatewayEndpoint>()
     for (ptr in ptrRecords) {
       val instanceFqdn = ptr.target.toString()
       val srv =
@@ -259,13 +257,12 @@ class BridgeDiscovery(
       val lanHost = txtValue(txt, "lanHost")
       val tailnetDns = txtValue(txt, "tailnetDns")
       val gatewayPort = txtIntValue(txt, "gatewayPort")
-      val bridgePort = txtIntValue(txt, "bridgePort")
       val canvasPort = txtIntValue(txt, "canvasPort")
-      val tlsEnabled = txtBoolValue(txt, "bridgeTls")
-      val tlsFingerprint = txtValue(txt, "bridgeTlsSha256")
+      val tlsEnabled = txtBoolValue(txt, "gatewayTls")
+      val tlsFingerprint = txtValue(txt, "gatewayTlsSha256")
       val id = stableId(instanceName, domain)
       next[id] =
-        BridgeEndpoint(
+        GatewayEndpoint(
           stableId = id,
           name = displayName,
           host = host,
@@ -273,7 +270,6 @@ class BridgeDiscovery(
           lanHost = lanHost,
           tailnetDns = tailnetDns,
           gatewayPort = gatewayPort,
-          bridgePort = bridgePort,
           canvasPort = canvasPort,
           tlsEnabled = tlsEnabled,
           tlsFingerprintSha256 = tlsFingerprint,

apps/android/app/src/main/java/com/clawdbot/android/gateway/GatewayEndpoint.kt

@@ -1,6 +1,6 @@
-package com.clawdbot.android.bridge
+package com.clawdbot.android.gateway
 
-data class BridgeEndpoint(
+data class GatewayEndpoint(
   val stableId: String,
   val name: String,
   val host: String,
@@ -8,15 +8,14 @@ data class BridgeEndpoint(
   val lanHost: String? = null,
   val tailnetDns: String? = null,
   val gatewayPort: Int? = null,
-  val bridgePort: Int? = null,
   val canvasPort: Int? = null,
   val tlsEnabled: Boolean = false,
   val tlsFingerprintSha256: String? = null,
 ) {
   companion object {
-    fun manual(host: String, port: Int): BridgeEndpoint =
-      BridgeEndpoint(
-        stableId = "manual|$host|$port",
+    fun manual(host: String, port: Int): GatewayEndpoint =
+      GatewayEndpoint(
+        stableId = "manual|${host.lowercase()}|$port",
         name = "$host:$port",
         host = host,
         port = port,

apps/android/app/src/main/java/com/clawdbot/android/gateway/GatewayProtocol.kt

@@ -0,0 +1,3 @@
+package com.clawdbot.android.gateway
+
+const val GATEWAY_PROTOCOL_VERSION = 3

apps/android/app/src/main/java/com/clawdbot/android/gateway/GatewaySession.kt

@@ -0,0 +1,683 @@
+package com.clawdbot.android.gateway
+
+import android.util.Log
+import java.util.Locale
+import java.util.UUID
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.atomic.AtomicBoolean
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.TimeoutCancellationException
+import kotlinx.coroutines.cancelAndJoin
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.withContext
+import kotlinx.coroutines.withTimeout
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonArray
+import kotlinx.serialization.json.JsonElement
+import kotlinx.serialization.json.JsonNull
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.JsonPrimitive
+import kotlinx.serialization.json.buildJsonObject
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.Response
+import okhttp3.WebSocket
+import okhttp3.WebSocketListener
+
+data class GatewayClientInfo(
+  val id: String,
+  val displayName: String?,
+  val version: String,
+  val platform: String,
+  val mode: String,
+  val instanceId: String?,
+  val deviceFamily: String?,
+  val modelIdentifier: String?,
+)
+
+data class GatewayConnectOptions(
+  val role: String,
+  val scopes: List<String>,
+  val caps: List<String>,
+  val commands: List<String>,
+  val permissions: Map<String, Boolean>,
+  val client: GatewayClientInfo,
+  val userAgent: String? = null,
+)
+
+class GatewaySession(
+  private val scope: CoroutineScope,
+  private val identityStore: DeviceIdentityStore,
+  private val deviceAuthStore: DeviceAuthStore,
+  private val onConnected: (serverName: String?, remoteAddress: String?, mainSessionKey: String?) -> Unit,
+  private val onDisconnected: (message: String) -> Unit,
+  private val onEvent: (event: String, payloadJson: String?) -> Unit,
+  private val onInvoke: (suspend (InvokeRequest) -> InvokeResult)? = null,
+  private val onTlsFingerprint: ((stableId: String, fingerprint: String) -> Unit)? = null,
+) {
+  data class InvokeRequest(
+    val id: String,
+    val nodeId: String,
+    val command: String,
+    val paramsJson: String?,
+    val timeoutMs: Long?,
+  )
+
+  data class InvokeResult(val ok: Boolean, val payloadJson: String?, val error: ErrorShape?) {
+    companion object {
+      fun ok(payloadJson: String?) = InvokeResult(ok = true, payloadJson = payloadJson, error = null)
+      fun error(code: String, message: String) =
+        InvokeResult(ok = false, payloadJson = null, error = ErrorShape(code = code, message = message))
+    }
+  }
+
+  data class ErrorShape(val code: String, val message: String)
+
+  private val json = Json { ignoreUnknownKeys = true }
+  private val writeLock = Mutex()
+  private val pending = ConcurrentHashMap<String, CompletableDeferred<RpcResponse>>()
+
+  @Volatile private var canvasHostUrl: String? = null
+  @Volatile private var mainSessionKey: String? = null
+
+  private data class DesiredConnection(
+    val endpoint: GatewayEndpoint,
+    val token: String?,
+    val password: String?,
+    val options: GatewayConnectOptions,
+    val tls: GatewayTlsParams?,
+  )
+
+  private var desired: DesiredConnection? = null
+  private var job: Job? = null
+  @Volatile private var currentConnection: Connection? = null
+
+  fun connect(
+    endpoint: GatewayEndpoint,
+    token: String?,
+    password: String?,
+    options: GatewayConnectOptions,
+    tls: GatewayTlsParams? = null,
+  ) {
+    desired = DesiredConnection(endpoint, token, password, options, tls)
+    if (job == null) {
+      job = scope.launch(Dispatchers.IO) { runLoop() }
+    }
+  }
+
+  fun disconnect() {
+    desired = null
+    currentConnection?.closeQuietly()
+    scope.launch(Dispatchers.IO) {
+      job?.cancelAndJoin()
+      job = null
+      canvasHostUrl = null
+      mainSessionKey = null
+      onDisconnected("Offline")
+    }
+  }
+
+  fun reconnect() {
+    currentConnection?.closeQuietly()
+  }
+
+  fun currentCanvasHostUrl(): String? = canvasHostUrl
+  fun currentMainSessionKey(): String? = mainSessionKey
+
+  suspend fun sendNodeEvent(event: String, payloadJson: String?) {
+    val conn = currentConnection ?: return
+    val parsedPayload = payloadJson?.let { parseJsonOrNull(it) }
+    val params =
+      buildJsonObject {
+        put("event", JsonPrimitive(event))
+        if (parsedPayload != null) {
+          put("payload", parsedPayload)
+        } else if (payloadJson != null) {
+          put("payloadJSON", JsonPrimitive(payloadJson))
+        } else {
+          put("payloadJSON", JsonNull)
+        }
+      }
+    try {
+      conn.request("node.event", params, timeoutMs = 8_000)
+    } catch (err: Throwable) {
+      Log.w("ClawdbotGateway", "node.event failed: ${err.message ?: err::class.java.simpleName}")
+    }
+  }
+
+  suspend fun request(method: String, paramsJson: String?, timeoutMs: Long = 15_000): String {
+    val conn = currentConnection ?: throw IllegalStateException("not connected")
+    val params =
+      if (paramsJson.isNullOrBlank()) {
+        null
+      } else {
+        json.parseToJsonElement(paramsJson)
+      }
+    val res = conn.request(method, params, timeoutMs)
+    if (res.ok) return res.payloadJson ?: ""
+    val err = res.error
+    throw IllegalStateException("${err?.code ?: "UNAVAILABLE"}: ${err?.message ?: "request failed"}")
+  }
+
+  private data class RpcResponse(val id: String, val ok: Boolean, val payloadJson: String?, val error: ErrorShape?)
+
+  private inner class Connection(
+    private val endpoint: GatewayEndpoint,
+    private val token: String?,
+    private val password: String?,
+    private val options: GatewayConnectOptions,
+    private val tls: GatewayTlsParams?,
+  ) {
+    private val connectDeferred = CompletableDeferred<Unit>()
+    private val closedDeferred = CompletableDeferred<Unit>()
+    private val isClosed = AtomicBoolean(false)
+    private val connectNonceDeferred = CompletableDeferred<String?>()
+    private val client: OkHttpClient = buildClient()
+    private var socket: WebSocket? = null
+    private val loggerTag = "ClawdbotGateway"
+
+    val remoteAddress: String =
+      if (endpoint.host.contains(":")) {
+        "[${endpoint.host}]:${endpoint.port}"
+      } else {
+        "${endpoint.host}:${endpoint.port}"
+      }
+
+    suspend fun connect() {
+      val scheme = if (tls != null) "wss" else "ws"
+      val url = "$scheme://${endpoint.host}:${endpoint.port}"
+      val request = Request.Builder().url(url).build()
+      socket = client.newWebSocket(request, Listener())
+      try {
+        connectDeferred.await()
+      } catch (err: Throwable) {
+        throw err
+      }
+    }
+
+    suspend fun request(method: String, params: JsonElement?, timeoutMs: Long): RpcResponse {
+      val id = UUID.randomUUID().toString()
+      val deferred = CompletableDeferred<RpcResponse>()
+      pending[id] = deferred
+      val frame =
+        buildJsonObject {
+          put("type", JsonPrimitive("req"))
+          put("id", JsonPrimitive(id))
+          put("method", JsonPrimitive(method))
+          if (params != null) put("params", params)
+        }
+      sendJson(frame)
+      return try {
+        withTimeout(timeoutMs) { deferred.await() }
+      } catch (err: TimeoutCancellationException) {
+        pending.remove(id)
+        throw IllegalStateException("request timeout")
+      }
+    }
+
+    suspend fun sendJson(obj: JsonObject) {
+      val jsonString = obj.toString()
+      writeLock.withLock {
+        socket?.send(jsonString)
+      }
+    }
+
+    suspend fun awaitClose() = closedDeferred.await()
+
+    fun closeQuietly() {
+      if (isClosed.compareAndSet(false, true)) {
+        socket?.close(1000, "bye")
+        socket = null
+        closedDeferred.complete(Unit)
+      }
+    }
+
+    private fun buildClient(): OkHttpClient {
+      val builder = OkHttpClient.Builder()
+      val tlsConfig = buildGatewayTlsConfig(tls) { fingerprint ->
+        onTlsFingerprint?.invoke(tls?.stableId ?: endpoint.stableId, fingerprint)
+      }
+      if (tlsConfig != null) {
+        builder.sslSocketFactory(tlsConfig.sslSocketFactory, tlsConfig.trustManager)
+        builder.hostnameVerifier(tlsConfig.hostnameVerifier)
+      }
+      return builder.build()
+    }
+
+    private inner class Listener : WebSocketListener() {
+      override fun onOpen(webSocket: WebSocket, response: Response) {
+        scope.launch {
+          try {
+            val nonce = awaitConnectNonce()
+            sendConnect(nonce)
+          } catch (err: Throwable) {
+            connectDeferred.completeExceptionally(err)
+            closeQuietly()
+          }
+        }
+      }
+
+      override fun onMessage(webSocket: WebSocket, text: String) {
+        scope.launch { handleMessage(text) }
+      }
+
+      override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {
+        if (!connectDeferred.isCompleted) {
+          connectDeferred.completeExceptionally(t)
+        }
+        if (isClosed.compareAndSet(false, true)) {
+          failPending()
+          closedDeferred.complete(Unit)
+          onDisconnected("Gateway error: ${t.message ?: t::class.java.simpleName}")
+        }
+      }
+
+      override fun onClosed(webSocket: WebSocket, code: Int, reason: String) {
+        if (!connectDeferred.isCompleted) {
+          connectDeferred.completeExceptionally(IllegalStateException("Gateway closed: $reason"))
+        }
+        if (isClosed.compareAndSet(false, true)) {
+          failPending()
+          closedDeferred.complete(Unit)
+          onDisconnected("Gateway closed: $reason")
+        }
+      }
+    }
+
+    private suspend fun sendConnect(connectNonce: String?) {
+      val identity = identityStore.loadOrCreate()
+      val storedToken = deviceAuthStore.loadToken(identity.deviceId, options.role)
+      val trimmedToken = token?.trim().orEmpty()
+      val authToken = if (storedToken.isNullOrBlank()) trimmedToken else storedToken
+      val canFallbackToShared = !storedToken.isNullOrBlank() && trimmedToken.isNotBlank()
+      val payload = buildConnectParams(identity, connectNonce, authToken, password?.trim())
+      val res = request("connect", payload, timeoutMs = 8_000)
+      if (!res.ok) {
+        val msg = res.error?.message ?: "connect failed"
+        if (canFallbackToShared) {
+          deviceAuthStore.clearToken(identity.deviceId, options.role)
+        }
+        throw IllegalStateException(msg)
+      }
+      val payloadJson = res.payloadJson ?: throw IllegalStateException("connect failed: missing payload")
+      val obj = json.parseToJsonElement(payloadJson).asObjectOrNull() ?: throw IllegalStateException("connect failed")
+      val serverName = obj["server"].asObjectOrNull()?.get("host").asStringOrNull()
+      val authObj = obj["auth"].asObjectOrNull()
+      val deviceToken = authObj?.get("deviceToken").asStringOrNull()
+      val authRole = authObj?.get("role").asStringOrNull() ?: options.role
+      if (!deviceToken.isNullOrBlank()) {
+        deviceAuthStore.saveToken(identity.deviceId, authRole, deviceToken)
+      }
+      val rawCanvas = obj["canvasHostUrl"].asStringOrNull()
+      canvasHostUrl = normalizeCanvasHostUrl(rawCanvas, endpoint)
+      val sessionDefaults =
+        obj["snapshot"].asObjectOrNull()
+          ?.get("sessionDefaults").asObjectOrNull()
+      mainSessionKey = sessionDefaults?.get("mainSessionKey").asStringOrNull()
+      onConnected(serverName, remoteAddress, mainSessionKey)
+      connectDeferred.complete(Unit)
+    }
+
+    private fun buildConnectParams(
+      identity: DeviceIdentity,
+      connectNonce: String?,
+      authToken: String,
+      authPassword: String?,
+    ): JsonObject {
+      val client = options.client
+      val locale = Locale.getDefault().toLanguageTag()
+      val clientObj =
+        buildJsonObject {
+          put("id", JsonPrimitive(client.id))
+          client.displayName?.let { put("displayName", JsonPrimitive(it)) }
+          put("version", JsonPrimitive(client.version))
+          put("platform", JsonPrimitive(client.platform))
+          put("mode", JsonPrimitive(client.mode))
+          client.instanceId?.let { put("instanceId", JsonPrimitive(it)) }
+          client.deviceFamily?.let { put("deviceFamily", JsonPrimitive(it)) }
+          client.modelIdentifier?.let { put("modelIdentifier", JsonPrimitive(it)) }
+        }
+
+      val password = authPassword?.trim().orEmpty()
+      val authJson =
+        when {
+          authToken.isNotEmpty() ->
+            buildJsonObject {
+              put("token", JsonPrimitive(authToken))
+            }
+          password.isNotEmpty() ->
+            buildJsonObject {
+              put("password", JsonPrimitive(password))
+            }
+          else -> null
+        }
+
+      val signedAtMs = System.currentTimeMillis()
+      val payload =
+        buildDeviceAuthPayload(
+          deviceId = identity.deviceId,
+          clientId = client.id,
+          clientMode = client.mode,
+          role = options.role,
+          scopes = options.scopes,
+          signedAtMs = signedAtMs,
+          token = if (authToken.isNotEmpty()) authToken else null,
+          nonce = connectNonce,
+        )
+      val signature = identityStore.signPayload(payload, identity)
+      val publicKey = identityStore.publicKeyBase64Url(identity)
+      val deviceJson =
+        if (!signature.isNullOrBlank() && !publicKey.isNullOrBlank()) {
+          buildJsonObject {
+            put("id", JsonPrimitive(identity.deviceId))
+            put("publicKey", JsonPrimitive(publicKey))
+            put("signature", JsonPrimitive(signature))
+            put("signedAt", JsonPrimitive(signedAtMs))
+            if (!connectNonce.isNullOrBlank()) {
+              put("nonce", JsonPrimitive(connectNonce))
+            }
+          }
+        } else {
+          null
+        }
+
+      return buildJsonObject {
+        put("minProtocol", JsonPrimitive(GATEWAY_PROTOCOL_VERSION))
+        put("maxProtocol", JsonPrimitive(GATEWAY_PROTOCOL_VERSION))
+        put("client", clientObj)
+        if (options.caps.isNotEmpty()) put("caps", JsonArray(options.caps.map(::JsonPrimitive)))
+        if (options.commands.isNotEmpty()) put("commands", JsonArray(options.commands.map(::JsonPrimitive)))
+        if (options.permissions.isNotEmpty()) {
+          put(
+            "permissions",
+            buildJsonObject {
+              options.permissions.forEach { (key, value) ->
+                put(key, JsonPrimitive(value))
+              }
+            },
+          )
+        }
+        put("role", JsonPrimitive(options.role))
+        if (options.scopes.isNotEmpty()) put("scopes", JsonArray(options.scopes.map(::JsonPrimitive)))
+        authJson?.let { put("auth", it) }
+        deviceJson?.let { put("device", it) }
+        put("locale", JsonPrimitive(locale))
+        options.userAgent?.trim()?.takeIf { it.isNotEmpty() }?.let {
+          put("userAgent", JsonPrimitive(it))
+        }
+      }
+    }
+
+    private suspend fun handleMessage(text: String) {
+      val frame = json.parseToJsonElement(text).asObjectOrNull() ?: return
+      when (frame["type"].asStringOrNull()) {
+        "res" -> handleResponse(frame)
+        "event" -> handleEvent(frame)
+      }
+    }
+
+    private fun handleResponse(frame: JsonObject) {
+      val id = frame["id"].asStringOrNull() ?: return
+      val ok = frame["ok"].asBooleanOrNull() ?: false
+      val payloadJson = frame["payload"]?.let { payload -> payload.toString() }
+      val error =
+        frame["error"]?.asObjectOrNull()?.let { obj ->
+          val code = obj["code"].asStringOrNull() ?: "UNAVAILABLE"
+          val msg = obj["message"].asStringOrNull() ?: "request failed"
+          ErrorShape(code, msg)
+        }
+      pending.remove(id)?.complete(RpcResponse(id, ok, payloadJson, error))
+    }
+
+    private fun handleEvent(frame: JsonObject) {
+      val event = frame["event"].asStringOrNull() ?: return
+      val payloadJson =
+        frame["payload"]?.let { it.toString() } ?: frame["payloadJSON"].asStringOrNull()
+      if (event == "connect.challenge") {
+        val nonce = extractConnectNonce(payloadJson)
+        if (!connectNonceDeferred.isCompleted) {
+          connectNonceDeferred.complete(nonce)
+        }
+        return
+      }
+      if (event == "node.invoke.request" && payloadJson != null && onInvoke != null) {
+        handleInvokeEvent(payloadJson)
+        return
+      }
+      onEvent(event, payloadJson)
+    }
+
+    private suspend fun awaitConnectNonce(): String? {
+      if (isLoopbackHost(endpoint.host)) return null
+      return try {
+        withTimeout(2_000) { connectNonceDeferred.await() }
+      } catch (_: Throwable) {
+        null
+      }
+    }
+
+    private fun extractConnectNonce(payloadJson: String?): String? {
+      if (payloadJson.isNullOrBlank()) return null
+      val obj = parseJsonOrNull(payloadJson)?.asObjectOrNull() ?: return null
+      return obj["nonce"].asStringOrNull()
+    }
+
+    private fun handleInvokeEvent(payloadJson: String) {
+      val payload =
+        try {
+          json.parseToJsonElement(payloadJson).asObjectOrNull()
+        } catch (_: Throwable) {
+          null
+        } ?: return
+      val id = payload["id"].asStringOrNull() ?: return
+      val nodeId = payload["nodeId"].asStringOrNull() ?: return
+      val command = payload["command"].asStringOrNull() ?: return
+      val params =
+        payload["paramsJSON"].asStringOrNull()
+          ?: payload["params"]?.let { value -> if (value is JsonNull) null else value.toString() }
+      val timeoutMs = payload["timeoutMs"].asLongOrNull()
+      scope.launch {
+        val result =
+          try {
+            onInvoke?.invoke(InvokeRequest(id, nodeId, command, params, timeoutMs))
+              ?: InvokeResult.error("UNAVAILABLE", "invoke handler missing")
+          } catch (err: Throwable) {
+            invokeErrorFromThrowable(err)
+          }
+        sendInvokeResult(id, nodeId, result)
+      }
+    }
+
+    private suspend fun sendInvokeResult(id: String, nodeId: String, result: InvokeResult) {
+      val parsedPayload = result.payloadJson?.let { parseJsonOrNull(it) }
+      val params =
+        buildJsonObject {
+          put("id", JsonPrimitive(id))
+          put("nodeId", JsonPrimitive(nodeId))
+          put("ok", JsonPrimitive(result.ok))
+          if (parsedPayload != null) {
+            put("payload", parsedPayload)
+          } else if (result.payloadJson != null) {
+            put("payloadJSON", JsonPrimitive(result.payloadJson))
+          }
+          result.error?.let { err ->
+            put(
+              "error",
+              buildJsonObject {
+                put("code", JsonPrimitive(err.code))
+                put("message", JsonPrimitive(err.message))
+              },
+            )
+          }
+        }
+      try {
+        request("node.invoke.result", params, timeoutMs = 15_000)
+      } catch (err: Throwable) {
+        Log.w(loggerTag, "node.invoke.result failed: ${err.message ?: err::class.java.simpleName}")
+      }
+    }
+
+    private fun invokeErrorFromThrowable(err: Throwable): InvokeResult {
+      val msg = err.message?.trim().takeIf { !it.isNullOrEmpty() } ?: err::class.java.simpleName
+      val parts = msg.split(":", limit = 2)
+      if (parts.size == 2) {
+        val code = parts[0].trim()
+        val rest = parts[1].trim()
+        if (code.isNotEmpty() && code.all { it.isUpperCase() || it == '_' }) {
+          return InvokeResult.error(code = code, message = rest.ifEmpty { msg })
+        }
+      }
+      return InvokeResult.error(code = "UNAVAILABLE", message = msg)
+    }
+
+    private fun failPending() {
+      for ((_, waiter) in pending) {
+        waiter.cancel()
+      }
+      pending.clear()
+    }
+  }
+
+  private suspend fun runLoop() {
+    var attempt = 0
+    while (scope.isActive) {
+      val target = desired
+      if (target == null) {
+        currentConnection?.closeQuietly()
+        currentConnection = null
+        delay(250)
+        continue
+      }
+
+      try {
+        onDisconnected(if (attempt == 0) "Connecting…" else "Reconnecting…")
+        connectOnce(target)
+        attempt = 0
+      } catch (err: Throwable) {
+        attempt += 1
+        onDisconnected("Gateway error: ${err.message ?: err::class.java.simpleName}")
+        val sleepMs = minOf(8_000L, (350.0 * Math.pow(1.7, attempt.toDouble())).toLong())
+        delay(sleepMs)
+      }
+    }
+  }
+
+  private suspend fun connectOnce(target: DesiredConnection) = withContext(Dispatchers.IO) {
+    val conn = Connection(target.endpoint, target.token, target.password, target.options, target.tls)
+    currentConnection = conn
+    try {
+      conn.connect()
+      conn.awaitClose()
+    } finally {
+      currentConnection = null
+      canvasHostUrl = null
+      mainSessionKey = null
+    }
+  }
+
+  private fun buildDeviceAuthPayload(
+    deviceId: String,
+    clientId: String,
+    clientMode: String,
+    role: String,
+    scopes: List<String>,
+    signedAtMs: Long,
+    token: String?,
+    nonce: String?,
+  ): String {
+    val scopeString = scopes.joinToString(",")
+    val authToken = token.orEmpty()
+    val version = if (nonce.isNullOrBlank()) "v1" else "v2"
+    val parts =
+      mutableListOf(
+        version,
+        deviceId,
+        clientId,
+        clientMode,
+        role,
+        scopeString,
+        signedAtMs.toString(),
+        authToken,
+      )
+    if (!nonce.isNullOrBlank()) {
+      parts.add(nonce)
+    }
+    return parts.joinToString("|")
+  }
+
+  private fun normalizeCanvasHostUrl(raw: String?, endpoint: GatewayEndpoint): String? {
+    val trimmed = raw?.trim().orEmpty()
+    val parsed = trimmed.takeIf { it.isNotBlank() }?.let { runCatching { java.net.URI(it) }.getOrNull() }
+    val host = parsed?.host?.trim().orEmpty()
+    val port = parsed?.port ?: -1
+    val scheme = parsed?.scheme?.trim().orEmpty().ifBlank { "http" }
+
+    if (trimmed.isNotBlank() && !isLoopbackHost(host)) {
+      return trimmed
+    }
+
+    val fallbackHost =
+      endpoint.tailnetDns?.trim().takeIf { !it.isNullOrEmpty() }
+        ?: endpoint.lanHost?.trim().takeIf { !it.isNullOrEmpty() }
+        ?: endpoint.host.trim()
+    if (fallbackHost.isEmpty()) return trimmed.ifBlank { null }
+
+    val fallbackPort = endpoint.canvasPort ?: if (port > 0) port else 18793
+    val formattedHost = if (fallbackHost.contains(":")) "[${fallbackHost}]" else fallbackHost
+    return "$scheme://$formattedHost:$fallbackPort"
+  }
+
+  private fun isLoopbackHost(raw: String?): Boolean {
+    val host = raw?.trim()?.lowercase().orEmpty()
+    if (host.isEmpty()) return false
+    if (host == "localhost") return true
+    if (host == "::1") return true
+    if (host == "0.0.0.0" || host == "::") return true
+    return host.startsWith("127.")
+  }
+}
+
+private fun JsonElement?.asObjectOrNull(): JsonObject? = this as? JsonObject
+
+private fun JsonElement?.asStringOrNull(): String? =
+  when (this) {
+    is JsonNull -> null
+    is JsonPrimitive -> content
+    else -> null
+  }
+
+private fun JsonElement?.asBooleanOrNull(): Boolean? =
+  when (this) {
+    is JsonPrimitive -> {
+      val c = content.trim()
+      when {
+        c.equals("true", ignoreCase = true) -> true
+        c.equals("false", ignoreCase = true) -> false
+        else -> null
+      }
+    }
+    else -> null
+  }
+
+private fun JsonElement?.asLongOrNull(): Long? =
+  when (this) {
+    is JsonPrimitive -> content.toLongOrNull()
+    else -> null
+  }
+
+private fun parseJsonOrNull(payload: String): JsonElement? {
+  val trimmed = payload.trim()
+  if (trimmed.isEmpty()) return null
+  return try {
+    Json.parseToJsonElement(trimmed)
+  } catch (_: Throwable) {
+    null
+  }
+}

apps/android/app/src/main/java/com/clawdbot/android/gateway/GatewayTls.kt

@@ -1,25 +1,34 @@
-package com.clawdbot.android.bridge
+package com.clawdbot.android.gateway
 
 import android.annotation.SuppressLint
-import java.net.Socket
 import java.security.MessageDigest
 import java.security.SecureRandom
 import java.security.cert.CertificateException
 import java.security.cert.X509Certificate
+import javax.net.ssl.HostnameVerifier
 import javax.net.ssl.SSLContext
-import javax.net.ssl.SSLSocket
+import javax.net.ssl.SSLSocketFactory
 import javax.net.ssl.TrustManagerFactory
 import javax.net.ssl.X509TrustManager
 
-data class BridgeTlsParams(
+data class GatewayTlsParams(
   val required: Boolean,
   val expectedFingerprint: String?,
   val allowTOFU: Boolean,
   val stableId: String,
 )
 
-fun createBridgeSocket(params: BridgeTlsParams?, onStore: ((String) -> Unit)? = null): Socket {
-  if (params == null) return Socket()
+data class GatewayTlsConfig(
+  val sslSocketFactory: SSLSocketFactory,
+  val trustManager: X509TrustManager,
+  val hostnameVerifier: HostnameVerifier,
+)
+
+fun buildGatewayTlsConfig(
+  params: GatewayTlsParams?,
+  onStore: ((String) -> Unit)? = null,
+): GatewayTlsConfig? {
+  if (params == null) return null
   val expected = params.expectedFingerprint?.let(::normalizeFingerprint)
   val defaultTrust = defaultTrustManager()
   @SuppressLint("CustomX509TrustManager")
@@ -34,7 +43,7 @@ fun createBridgeSocket(params: BridgeTlsParams?, onStore: ((String) -> Unit)? =
         val fingerprint = sha256Hex(chain[0].encoded)
         if (expected != null) {
           if (fingerprint != expected) {
-            throw CertificateException("bridge TLS fingerprint mismatch")
+            throw CertificateException("gateway TLS fingerprint mismatch")
           }
           return
         }
@@ -50,13 +59,11 @@ fun createBridgeSocket(params: BridgeTlsParams?, onStore: ((String) -> Unit)? =
 
   val context = SSLContext.getInstance("TLS")
   context.init(null, arrayOf(trustManager), SecureRandom())
-  return context.socketFactory.createSocket()
-}
-
-fun startTlsHandshakeIfNeeded(socket: Socket) {
-  if (socket is SSLSocket) {
-    socket.startHandshake()
-  }
+  return GatewayTlsConfig(
+    sslSocketFactory = context.socketFactory,
+    trustManager = trustManager,
+    hostnameVerifier = HostnameVerifier { _, _ -> true },
+  )
 }
 
 private fun defaultTrustManager(): X509TrustManager {
@@ -77,5 +84,7 @@ private fun sha256Hex(data: ByteArray): String {
 }
 
 private fun normalizeFingerprint(raw: String): String {
-  return raw.lowercase().filter { it in '0'..'9' || it in 'a'..'f' }
+  val stripped = raw.trim()
+    .replace(Regex("^sha-?256\\s*:?\\s*", RegexOption.IGNORE_CASE), "")
+  return stripped.lowercase().filter { it in '0'..'9' || it in 'a'..'f' }
 }

apps/android/app/src/main/java/com/clawdbot/android/ui/RootScreen.kt

@@ -118,7 +118,7 @@ fun RootScreen(viewModel: MainViewModel) {
           contentDescription = "Approval pending",
         )
       }
-      // Avoid duplicating the primary bridge status ("Connecting…") in the activity slot.
+      // Avoid duplicating the primary gateway status ("Connecting…") in the activity slot.
 
       if (screenRecordActive) {
         return@remember StatusActivity(
@@ -179,14 +179,14 @@ fun RootScreen(viewModel: MainViewModel) {
       null
     }
 
-  val bridgeState =
+  val gatewayState =
     remember(serverName, statusText) {
       when {
-        serverName != null -> BridgeState.Connected
+        serverName != null -> GatewayState.Connected
         statusText.contains("connecting", ignoreCase = true) ||
-          statusText.contains("reconnecting", ignoreCase = true) -> BridgeState.Connecting
-        statusText.contains("error", ignoreCase = true) -> BridgeState.Error
-        else -> BridgeState.Disconnected
+          statusText.contains("reconnecting", ignoreCase = true) -> GatewayState.Connecting
+        statusText.contains("error", ignoreCase = true) -> GatewayState.Error
+        else -> GatewayState.Disconnected
       }
     }
 
@@ -206,7 +206,7 @@ fun RootScreen(viewModel: MainViewModel) {
   // Keep the overlay buttons above the WebView canvas (AndroidView), otherwise they may not receive touches.
   Popup(alignment = Alignment.TopStart, properties = PopupProperties(focusable = false)) {
     StatusPill(
-      bridge = bridgeState,
+      gateway = gatewayState,
       voiceEnabled = voiceEnabled,
       activity = activity,
       onClick = { sheet = Sheet.Settings },

apps/android/app/src/main/java/com/clawdbot/android/ui/SettingsSheet.kt

@@ -48,6 +48,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
@@ -74,11 +75,12 @@ fun SettingsSheet(viewModel: MainViewModel) {
   val manualEnabled by viewModel.manualEnabled.collectAsState()
   val manualHost by viewModel.manualHost.collectAsState()
   val manualPort by viewModel.manualPort.collectAsState()
+  val manualTls by viewModel.manualTls.collectAsState()
   val canvasDebugStatusEnabled by viewModel.canvasDebugStatusEnabled.collectAsState()
   val statusText by viewModel.statusText.collectAsState()
   val serverName by viewModel.serverName.collectAsState()
   val remoteAddress by viewModel.remoteAddress.collectAsState()
-  val bridges by viewModel.bridges.collectAsState()
+  val gateways by viewModel.gateways.collectAsState()
   val discoveryStatusText by viewModel.discoveryStatusText.collectAsState()
 
   val listState = rememberLazyListState()
@@ -163,7 +165,7 @@ fun SettingsSheet(viewModel: MainViewModel) {
   val smsPermissionLauncher =
     rememberLauncherForActivityResult(ActivityResultContracts.RequestPermission()) { granted ->
       smsPermissionGranted = granted
-      viewModel.refreshBridgeHello()
+      viewModel.refreshGatewayConnection()
     }
 
   fun setCameraEnabledChecked(checked: Boolean) {
@@ -223,20 +225,20 @@ fun SettingsSheet(viewModel: MainViewModel) {
     }
   }
 
-  val visibleBridges =
+  val visibleGateways =
     if (isConnected && remoteAddress != null) {
-      bridges.filterNot { "${it.host}:${it.port}" == remoteAddress }
+      gateways.filterNot { "${it.host}:${it.port}" == remoteAddress }
     } else {
-      bridges
+      gateways
     }
 
-  val bridgeDiscoveryFooterText =
-    if (visibleBridges.isEmpty()) {
+  val gatewayDiscoveryFooterText =
+    if (visibleGateways.isEmpty()) {
       discoveryStatusText
     } else if (isConnected) {
-      "Discovery active • ${visibleBridges.size} other bridge${if (visibleBridges.size == 1) "" else "s"} found"
+      "Discovery active • ${visibleGateways.size} other gateway${if (visibleGateways.size == 1) "" else "s"} found"
     } else {
-      "Discovery active • ${visibleBridges.size} bridge${if (visibleBridges.size == 1) "" else "s"} found"
+      "Discovery active • ${visibleGateways.size} gateway${if (visibleGateways.size == 1) "" else "s"} found"
     }
 
   LazyColumn(
@@ -250,7 +252,7 @@ fun SettingsSheet(viewModel: MainViewModel) {
     contentPadding = PaddingValues(16.dp),
     verticalArrangement = Arrangement.spacedBy(6.dp),
   ) {
-    // Order parity: Node → Bridge → Voice → Camera → Messaging → Location → Screen.
+    // Order parity: Node → Gateway → Voice → Camera → Messaging → Location → Screen.
     item { Text("Node", style = MaterialTheme.typography.titleSmall) }
     item {
       OutlinedTextField(
@@ -266,8 +268,8 @@ fun SettingsSheet(viewModel: MainViewModel) {
 
     item { HorizontalDivider() }
 
-    // Bridge
-    item { Text("Bridge", style = MaterialTheme.typography.titleSmall) }
+    // Gateway
+    item { Text("Gateway", style = MaterialTheme.typography.titleSmall) }
     item { ListItem(headlineContent = { Text("Status") }, supportingContent = { Text(statusText) }) }
     if (serverName != null) {
       item { ListItem(headlineContent = { Text("Server") }, supportingContent = { Text(serverName!!) }) }
@@ -291,31 +293,30 @@ fun SettingsSheet(viewModel: MainViewModel) {
 
     item { HorizontalDivider() }
 
-    if (!isConnected || visibleBridges.isNotEmpty()) {
+    if (!isConnected || visibleGateways.isNotEmpty()) {
       item {
         Text(
-          if (isConnected) "Other Bridges" else "Discovered Bridges",
+          if (isConnected) "Other Gateways" else "Discovered Gateways",
           style = MaterialTheme.typography.titleSmall,
         )
       }
-      if (!isConnected && visibleBridges.isEmpty()) {
-        item { Text("No bridges found yet.", color = MaterialTheme.colorScheme.onSurfaceVariant) }
+      if (!isConnected && visibleGateways.isEmpty()) {
+        item { Text("No gateways found yet.", color = MaterialTheme.colorScheme.onSurfaceVariant) }
       } else {
-        items(items = visibleBridges, key = { it.stableId }) { bridge ->
+        items(items = visibleGateways, key = { it.stableId }) { gateway ->
           val detailLines =
             buildList {
-              add("IP: ${bridge.host}:${bridge.port}")
-              bridge.lanHost?.let { add("LAN: $it") }
-              bridge.tailnetDns?.let { add("Tailnet: $it") }
-              if (bridge.gatewayPort != null || bridge.bridgePort != null || bridge.canvasPort != null) {
-                val gw = bridge.gatewayPort?.toString() ?: "—"
-                val br = (bridge.bridgePort ?: bridge.port).toString()
-                val canvas = bridge.canvasPort?.toString() ?: "—"
-                add("Ports: gw $gw · bridge $br · canvas $canvas")
+              add("IP: ${gateway.host}:${gateway.port}")
+              gateway.lanHost?.let { add("LAN: $it") }
+              gateway.tailnetDns?.let { add("Tailnet: $it") }
+              if (gateway.gatewayPort != null || gateway.canvasPort != null) {
+                val gw = (gateway.gatewayPort ?: gateway.port).toString()
+                val canvas = gateway.canvasPort?.toString() ?: "—"
+                add("Ports: gw $gw · canvas $canvas")
               }
             }
           ListItem(
-            headlineContent = { Text(bridge.name) },
+            headlineContent = { Text(gateway.name) },
             supportingContent = {
               Column(verticalArrangement = Arrangement.spacedBy(2.dp)) {
                 detailLines.forEach { line ->
@@ -327,7 +328,7 @@ fun SettingsSheet(viewModel: MainViewModel) {
               Button(
                 onClick = {
                   NodeForegroundService.start(context)
-                  viewModel.connect(bridge)
+                  viewModel.connect(gateway)
                 },
               ) {
                 Text("Connect")
@@ -338,7 +339,7 @@ fun SettingsSheet(viewModel: MainViewModel) {
       }
       item {
         Text(
-          bridgeDiscoveryFooterText,
+          gatewayDiscoveryFooterText,
           modifier = Modifier.fillMaxWidth(),
           textAlign = TextAlign.Center,
           style = MaterialTheme.typography.labelMedium,
@@ -352,7 +353,7 @@ fun SettingsSheet(viewModel: MainViewModel) {
     item {
       ListItem(
         headlineContent = { Text("Advanced") },
-        supportingContent = { Text("Manual bridge connection") },
+        supportingContent = { Text("Manual gateway connection") },
         trailingContent = {
           Icon(
             imageVector = if (advancedExpanded) Icons.Filled.ExpandLess else Icons.Filled.ExpandMore,
@@ -369,7 +370,7 @@ fun SettingsSheet(viewModel: MainViewModel) {
       AnimatedVisibility(visible = advancedExpanded) {
         Column(verticalArrangement = Arrangement.spacedBy(10.dp), modifier = Modifier.fillMaxWidth()) {
           ListItem(
-            headlineContent = { Text("Use Manual Bridge") },
+            headlineContent = { Text("Use Manual Gateway") },
             supportingContent = { Text("Use this when discovery is blocked.") },
             trailingContent = { Switch(checked = manualEnabled, onCheckedChange = viewModel::setManualEnabled) },
           )
@@ -388,6 +389,12 @@ fun SettingsSheet(viewModel: MainViewModel) {
             modifier = Modifier.fillMaxWidth(),
             enabled = manualEnabled,
           )
+          ListItem(
+            headlineContent = { Text("Require TLS") },
+            supportingContent = { Text("Pin the gateway certificate on first connect.") },
+            trailingContent = { Switch(checked = manualTls, onCheckedChange = viewModel::setManualTls, enabled = manualEnabled) },
+            modifier = Modifier.alpha(if (manualEnabled) 1f else 0.5f),
+          )
 
           val hostOk = manualHost.trim().isNotEmpty()
           val portOk = manualPort in 1..65535
@@ -496,7 +503,7 @@ fun SettingsSheet(viewModel: MainViewModel) {
     item {
       Text(
         if (isConnected) {
-          "Any node can edit wake words. Changes sync via the gateway bridge."
+          "Any node can edit wake words. Changes sync via the gateway."
         } else {
           "Connect to a gateway to sync wake words globally."
         },
@@ -511,7 +518,7 @@ fun SettingsSheet(viewModel: MainViewModel) {
     item {
       ListItem(
         headlineContent = { Text("Allow Camera") },
-        supportingContent = { Text("Allows the bridge to request photos or short video clips (foreground only).") },
+        supportingContent = { Text("Allows the gateway to request photos or short video clips (foreground only).") },
         trailingContent = { Switch(checked = cameraEnabled, onCheckedChange = ::setCameraEnabledChecked) },
       )
     }
@@ -538,7 +545,7 @@ fun SettingsSheet(viewModel: MainViewModel) {
         supportingContent = {
           Text(
             if (smsPermissionAvailable) {
-              "Allow the bridge to send SMS from this device."
+              "Allow the gateway to send SMS from this device."
             } else {
               "SMS requires a device with telephony hardware."
             },

apps/android/app/src/main/java/com/clawdbot/android/ui/StatusPill.kt

@@ -26,7 +26,7 @@ import androidx.compose.ui.unit.dp
 
 @Composable
 fun StatusPill(
-  bridge: BridgeState,
+  gateway: GatewayState,
   voiceEnabled: Boolean,
   onClick: () -> Unit,
   modifier: Modifier = Modifier,
@@ -49,11 +49,11 @@ fun StatusPill(
         Surface(
           modifier = Modifier.size(9.dp),
           shape = CircleShape,
-          color = bridge.color,
+          color = gateway.color,
         ) {}
 
         Text(
-          text = bridge.title,
+          text = gateway.title,
           style = MaterialTheme.typography.labelLarge,
         )
       }
@@ -106,7 +106,7 @@ data class StatusActivity(
   val tint: Color? = null,
 )
 
-enum class BridgeState(val title: String, val color: Color) {
+enum class GatewayState(val title: String, val color: Color) {
   Connected("Connected", Color(0xFF2ECC71)),
   Connecting("Connecting…", Color(0xFFF1C40F)),
   Error("Error", Color(0xFFE74C3C)),

apps/android/app/src/main/java/com/clawdbot/android/voice/TalkModeManager.kt

@@ -20,7 +20,7 @@ import android.speech.tts.TextToSpeech
 import android.speech.tts.UtteranceProgressListener
 import android.util.Log
 import androidx.core.content.ContextCompat
-import com.clawdbot.android.bridge.BridgeSession
+import com.clawdbot.android.gateway.GatewaySession
 import com.clawdbot.android.isCanonicalMainSessionKey
 import com.clawdbot.android.normalizeMainKey
 import java.net.HttpURLConnection
@@ -46,6 +46,9 @@ import kotlin.math.max
 class TalkModeManager(
   private val context: Context,
   private val scope: CoroutineScope,
+  private val session: GatewaySession,
+  private val supportsChatSubscribe: Boolean,
+  private val isConnected: () -> Boolean,
 ) {
   companion object {
     private const val tag = "TalkMode"
@@ -99,7 +102,6 @@ class TalkModeManager(
   private var modelOverrideActive = false
   private var mainSessionKey: String = "main"
 
-  private var session: BridgeSession? = null
   private var pendingRunId: String? = null
   private var pendingFinal: CompletableDeferred<Boolean>? = null
   private var chatSubscribedSessionKey: String? = null
@@ -112,11 +114,6 @@ class TalkModeManager(
   private var systemTtsPending: CompletableDeferred<Unit>? = null
   private var systemTtsPendingId: String? = null
 
-  fun attachSession(session: BridgeSession) {
-    this.session = session
-    chatSubscribedSessionKey = null
-  }
-
   fun setMainSessionKey(sessionKey: String?) {
     val trimmed = sessionKey?.trim().orEmpty()
     if (trimmed.isEmpty()) return
@@ -136,7 +133,7 @@ class TalkModeManager(
     }
   }
 
-  fun handleBridgeEvent(event: String, payloadJson: String?) {
+  fun handleGatewayEvent(event: String, payloadJson: String?) {
     if (event != "chat") return
     if (payloadJson.isNullOrBlank()) return
     val pending = pendingRunId ?: return
@@ -306,25 +303,24 @@ class TalkModeManager(
 
     reloadConfig()
     val prompt = buildPrompt(transcript)
-    val bridge = session
-    if (bridge == null) {
-      _statusText.value = "Bridge not connected"
-      Log.w(tag, "finalize: bridge not connected")
+    if (!isConnected()) {
+      _statusText.value = "Gateway not connected"
+      Log.w(tag, "finalize: gateway not connected")
       start()
       return
     }
 
     try {
       val startedAt = System.currentTimeMillis().toDouble() / 1000.0
-      subscribeChatIfNeeded(bridge = bridge, sessionKey = mainSessionKey)
+      subscribeChatIfNeeded(session = session, sessionKey = mainSessionKey)
       Log.d(tag, "chat.send start sessionKey=${mainSessionKey.ifBlank { "main" }} chars=${prompt.length}")
-      val runId = sendChat(prompt, bridge)
+      val runId = sendChat(prompt, session)
       Log.d(tag, "chat.send ok runId=$runId")
       val ok = waitForChatFinal(runId)
       if (!ok) {
         Log.w(tag, "chat final timeout runId=$runId; attempting history fallback")
       }
-      val assistant = waitForAssistantText(bridge, startedAt, if (ok) 12_000 else 25_000)
+      val assistant = waitForAssistantText(session, startedAt, if (ok) 12_000 else 25_000)
       if (assistant.isNullOrBlank()) {
         _statusText.value = "No reply"
         Log.w(tag, "assistant text timeout runId=$runId")
@@ -343,12 +339,13 @@ class TalkModeManager(
     }
   }
 
-  private suspend fun subscribeChatIfNeeded(bridge: BridgeSession, sessionKey: String) {
+  private suspend fun subscribeChatIfNeeded(session: GatewaySession, sessionKey: String) {
+    if (!supportsChatSubscribe) return
     val key = sessionKey.trim()
     if (key.isEmpty()) return
     if (chatSubscribedSessionKey == key) return
     try {
-      bridge.sendEvent("chat.subscribe", """{"sessionKey":"$key"}""")
+      session.sendNodeEvent("chat.subscribe", """{"sessionKey":"$key"}""")
       chatSubscribedSessionKey = key
       Log.d(tag, "chat.subscribe ok sessionKey=$key")
     } catch (err: Throwable) {
@@ -370,7 +367,7 @@ class TalkModeManager(
     return lines.joinToString("\n")
   }
 
-  private suspend fun sendChat(message: String, bridge: BridgeSession): String {
+  private suspend fun sendChat(message: String, session: GatewaySession): String {
     val runId = UUID.randomUUID().toString()
     val params =
       buildJsonObject {
@@ -380,7 +377,7 @@ class TalkModeManager(
         put("timeoutMs", JsonPrimitive(30_000))
         put("idempotencyKey", JsonPrimitive(runId))
       }
-    val res = bridge.request("chat.send", params.toString())
+    val res = session.request("chat.send", params.toString())
     val parsed = parseRunId(res) ?: runId
     if (parsed != runId) {
       pendingRunId = parsed
@@ -411,13 +408,13 @@ class TalkModeManager(
   }
 
   private suspend fun waitForAssistantText(
-    bridge: BridgeSession,
+    session: GatewaySession,
     sinceSeconds: Double,
     timeoutMs: Long,
   ): String? {
     val deadline = SystemClock.elapsedRealtime() + timeoutMs
     while (SystemClock.elapsedRealtime() < deadline) {
-      val text = fetchLatestAssistantText(bridge, sinceSeconds)
+      val text = fetchLatestAssistantText(session, sinceSeconds)
       if (!text.isNullOrBlank()) return text
       delay(300)
     }
@@ -425,11 +422,11 @@ class TalkModeManager(
   }
 
   private suspend fun fetchLatestAssistantText(
-    bridge: BridgeSession,
+    session: GatewaySession,
     sinceSeconds: Double? = null,
   ): String? {
     val key = mainSessionKey.ifBlank { "main" }
-    val res = bridge.request("chat.history", "{\"sessionKey\":\"$key\"}")
+    val res = session.request("chat.history", "{\"sessionKey\":\"$key\"}")
     val root = json.parseToJsonElement(res).asObjectOrNull() ?: return null
     val messages = root["messages"] as? JsonArray ?: return null
     for (item in messages.reversed()) {
@@ -813,12 +810,11 @@ class TalkModeManager(
   }
 
   private suspend fun reloadConfig() {
-    val bridge = session ?: return
     val envVoice = System.getenv("ELEVENLABS_VOICE_ID")?.trim()
     val sagVoice = System.getenv("SAG_VOICE_ID")?.trim()
     val envKey = System.getenv("ELEVENLABS_API_KEY")?.trim()
     try {
-      val res = bridge.request("config.get", "{}")
+      val res = session.request("config.get", "{}")
       val root = json.parseToJsonElement(res).asObjectOrNull()
       val config = root?.get("config").asObjectOrNull()
       val talk = config?.get("talk").asObjectOrNull()

apps/android/app/src/test/java/com/clawdbot/android/bridge/BridgeEndpointKotestTest.kt

@@ -1,14 +0,0 @@
-package com.clawdbot.android.bridge
-
-import io.kotest.core.spec.style.StringSpec
-import io.kotest.matchers.shouldBe
-
-class BridgeEndpointKotestTest : StringSpec({
-  "manual endpoint builds stable id + name" {
-    val endpoint = BridgeEndpoint.manual("10.0.0.5", 18790)
-    endpoint.stableId shouldBe "manual|10.0.0.5|18790"
-    endpoint.name shouldBe "10.0.0.5:18790"
-    endpoint.host shouldBe "10.0.0.5"
-    endpoint.port shouldBe 18790
-  }
-})

apps/android/app/src/test/java/com/clawdbot/android/bridge/BridgePairingClientTest.kt

@@ -1,108 +0,0 @@
-package com.clawdbot.android.bridge
-
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.runBlocking
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
-import org.junit.Test
-import java.io.BufferedReader
-import java.io.BufferedWriter
-import java.io.InputStreamReader
-import java.io.OutputStreamWriter
-import java.net.ServerSocket
-
-class BridgePairingClientTest {
-  @Test
-  fun helloOkReturnsExistingToken() = runBlocking {
-    val serverSocket = ServerSocket(0)
-    val port = serverSocket.localPort
-
-    val server =
-      async(Dispatchers.IO) {
-        serverSocket.use { ss ->
-          val sock = ss.accept()
-          sock.use { s ->
-            val reader = BufferedReader(InputStreamReader(s.getInputStream(), Charsets.UTF_8))
-            val writer = BufferedWriter(OutputStreamWriter(s.getOutputStream(), Charsets.UTF_8))
-
-            val hello = reader.readLine()
-            assertTrue(hello.contains("\"type\":\"hello\""))
-            writer.write("""{"type":"hello-ok","serverName":"Test Bridge"}""")
-            writer.write("\n")
-            writer.flush()
-          }
-        }
-      }
-
-    val client = BridgePairingClient()
-    val res =
-      client.pairAndHello(
-        endpoint = BridgeEndpoint.manual(host = "127.0.0.1", port = port),
-        hello =
-          BridgePairingClient.Hello(
-            nodeId = "node-1",
-            displayName = "Android Node",
-            token = "token-123",
-            platform = "Android",
-            version = "test",
-            deviceFamily = "Android",
-            modelIdentifier = "SM-X000",
-            caps = null,
-            commands = null,
-          ),
-      )
-    assertTrue(res.ok)
-    assertEquals("token-123", res.token)
-    server.await()
-  }
-
-  @Test
-  fun notPairedTriggersPairRequestAndReturnsToken() = runBlocking {
-    val serverSocket = ServerSocket(0)
-    val port = serverSocket.localPort
-
-    val server =
-      async(Dispatchers.IO) {
-        serverSocket.use { ss ->
-          val sock = ss.accept()
-          sock.use { s ->
-            val reader = BufferedReader(InputStreamReader(s.getInputStream(), Charsets.UTF_8))
-            val writer = BufferedWriter(OutputStreamWriter(s.getOutputStream(), Charsets.UTF_8))
-
-            reader.readLine() // hello
-            writer.write("""{"type":"error","code":"NOT_PAIRED","message":"not paired"}""")
-            writer.write("\n")
-            writer.flush()
-
-            val pairReq = reader.readLine()
-            assertTrue(pairReq.contains("\"type\":\"pair-request\""))
-            writer.write("""{"type":"pair-ok","token":"new-token"}""")
-            writer.write("\n")
-            writer.flush()
-          }
-        }
-      }
-
-    val client = BridgePairingClient()
-    val res =
-      client.pairAndHello(
-        endpoint = BridgeEndpoint.manual(host = "127.0.0.1", port = port),
-        hello =
-          BridgePairingClient.Hello(
-            nodeId = "node-1",
-            displayName = "Android Node",
-            token = null,
-            platform = "Android",
-            version = "test",
-            deviceFamily = "Android",
-            modelIdentifier = "SM-X000",
-            caps = null,
-            commands = null,
-          ),
-      )
-    assertTrue(res.ok)
-    assertEquals("new-token", res.token)
-    server.await()
-  }
-}

apps/android/app/src/test/java/com/clawdbot/android/bridge/BridgeSessionTest.kt

@@ -1,307 +0,0 @@
-package com.clawdbot.android.bridge
-
-import kotlinx.coroutines.CompletableDeferred
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.async
-import kotlinx.coroutines.cancel
-import kotlinx.coroutines.runBlocking
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
-import org.junit.Test
-import java.io.BufferedReader
-import java.io.BufferedWriter
-import java.io.InputStreamReader
-import java.io.OutputStreamWriter
-import java.net.ServerSocket
-import java.util.concurrent.CountDownLatch
-import java.util.concurrent.TimeUnit
-
-class BridgeSessionTest {
-  @Test
-  fun requestReturnsPayloadJson() = runBlocking {
-    val serverSocket = ServerSocket(0)
-    val port = serverSocket.localPort
-
-    val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
-    val connected = CompletableDeferred<Unit>()
-
-    val session =
-      BridgeSession(
-        scope = scope,
-        onConnected = { _, _, _ -> connected.complete(Unit) },
-        onDisconnected = { /* ignore */ },
-        onEvent = { _, _ -> /* ignore */ },
-        onInvoke = { BridgeSession.InvokeResult.ok(null) },
-      )
-
-    val server =
-      async(Dispatchers.IO) {
-        serverSocket.use { ss ->
-          val sock = ss.accept()
-          sock.use { s ->
-            val reader = BufferedReader(InputStreamReader(s.getInputStream(), Charsets.UTF_8))
-            val writer = BufferedWriter(OutputStreamWriter(s.getOutputStream(), Charsets.UTF_8))
-
-            val hello = reader.readLine()
-            assertTrue(hello.contains("\"type\":\"hello\""))
-            writer.write("""{"type":"hello-ok","serverName":"Test Bridge","canvasHostUrl":"http://127.0.0.1:18789"}""")
-            writer.write("\n")
-            writer.flush()
-
-            val req = reader.readLine()
-            assertTrue(req.contains("\"type\":\"req\""))
-            val id = extractJsonString(req, "id")
-            writer.write("""{"type":"res","id":"$id","ok":true,"payloadJSON":"{\"value\":123}"}""")
-            writer.write("\n")
-            writer.flush()
-          }
-        }
-      }
-
-    session.connect(
-      endpoint = BridgeEndpoint.manual(host = "127.0.0.1", port = port),
-      hello =
-        BridgeSession.Hello(
-          nodeId = "node-1",
-          displayName = "Android Node",
-          token = null,
-          platform = "Android",
-          version = "test",
-          deviceFamily = null,
-          modelIdentifier = null,
-          caps = null,
-          commands = null,
-        ),
-    )
-
-    connected.await()
-    assertEquals("http://127.0.0.1:18789", session.currentCanvasHostUrl())
-    val payload = session.request(method = "health", paramsJson = null)
-    assertEquals("""{"value":123}""", payload)
-    server.await()
-
-    session.disconnect()
-    scope.cancel()
-  }
-
-  @Test
-  fun requestThrowsOnErrorResponse() = runBlocking {
-    val serverSocket = ServerSocket(0)
-    val port = serverSocket.localPort
-
-    val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
-    val connected = CompletableDeferred<Unit>()
-
-    val session =
-      BridgeSession(
-        scope = scope,
-        onConnected = { _, _, _ -> connected.complete(Unit) },
-        onDisconnected = { /* ignore */ },
-        onEvent = { _, _ -> /* ignore */ },
-        onInvoke = { BridgeSession.InvokeResult.ok(null) },
-      )
-
-    val server =
-      async(Dispatchers.IO) {
-        serverSocket.use { ss ->
-          val sock = ss.accept()
-          sock.use { s ->
-            val reader = BufferedReader(InputStreamReader(s.getInputStream(), Charsets.UTF_8))
-            val writer = BufferedWriter(OutputStreamWriter(s.getOutputStream(), Charsets.UTF_8))
-
-            reader.readLine() // hello
-            writer.write("""{"type":"hello-ok","serverName":"Test Bridge"}""")
-            writer.write("\n")
-            writer.flush()
-
-            val req = reader.readLine()
-            val id = extractJsonString(req, "id")
-            writer.write(
-              """{"type":"res","id":"$id","ok":false,"error":{"code":"FORBIDDEN","message":"nope"}}""",
-            )
-            writer.write("\n")
-            writer.flush()
-          }
-        }
-      }
-
-    session.connect(
-      endpoint = BridgeEndpoint.manual(host = "127.0.0.1", port = port),
-      hello =
-        BridgeSession.Hello(
-          nodeId = "node-1",
-          displayName = "Android Node",
-          token = null,
-          platform = "Android",
-          version = "test",
-          deviceFamily = null,
-          modelIdentifier = null,
-          caps = null,
-          commands = null,
-        ),
-    )
-    connected.await()
-
-    try {
-      session.request(method = "chat.history", paramsJson = """{"sessionKey":"main"}""")
-      throw AssertionError("expected request() to throw")
-    } catch (e: IllegalStateException) {
-      assertTrue(e.message?.contains("FORBIDDEN: nope") == true)
-    }
-    server.await()
-
-    session.disconnect()
-    scope.cancel()
-  }
-
-  @Test
-  fun invokeResReturnsErrorWhenHandlerThrows() = runBlocking {
-    val serverSocket = ServerSocket(0)
-    val port = serverSocket.localPort
-
-    val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
-    val connected = CompletableDeferred<Unit>()
-
-    val session =
-      BridgeSession(
-        scope = scope,
-        onConnected = { _, _, _ -> connected.complete(Unit) },
-        onDisconnected = { /* ignore */ },
-        onEvent = { _, _ -> /* ignore */ },
-        onInvoke = { throw IllegalStateException("FOO_BAR: boom") },
-      )
-
-    val invokeResLine = CompletableDeferred<String>()
-    val server =
-      async(Dispatchers.IO) {
-        serverSocket.use { ss ->
-          val sock = ss.accept()
-          sock.use { s ->
-            val reader = BufferedReader(InputStreamReader(s.getInputStream(), Charsets.UTF_8))
-            val writer = BufferedWriter(OutputStreamWriter(s.getOutputStream(), Charsets.UTF_8))
-
-            reader.readLine() // hello
-            writer.write("""{"type":"hello-ok","serverName":"Test Bridge"}""")
-            writer.write("\n")
-            writer.flush()
-
-            // Ask the node to invoke something; handler will throw.
-            writer.write("""{"type":"invoke","id":"i1","command":"canvas.snapshot","paramsJSON":null}""")
-            writer.write("\n")
-            writer.flush()
-
-            val res = reader.readLine()
-            invokeResLine.complete(res)
-          }
-        }
-      }
-
-    session.connect(
-      endpoint = BridgeEndpoint.manual(host = "127.0.0.1", port = port),
-      hello =
-        BridgeSession.Hello(
-          nodeId = "node-1",
-          displayName = "Android Node",
-          token = null,
-          platform = "Android",
-          version = "test",
-          deviceFamily = null,
-          modelIdentifier = null,
-          caps = null,
-          commands = null,
-        ),
-    )
-    connected.await()
-
-    // Give the reader loop time to process.
-    val line = invokeResLine.await()
-    assertTrue(line.contains("\"type\":\"invoke-res\""))
-    assertTrue(line.contains("\"ok\":false"))
-    assertTrue(line.contains("\"code\":\"FOO_BAR\""))
-    assertTrue(line.contains("\"message\":\"boom\""))
-    server.await()
-
-    session.disconnect()
-    scope.cancel()
-  }
-
-  @Test(timeout = 12_000)
-  fun reconnectsAfterBridgeClosesDuringHello() = runBlocking {
-    val serverSocket = ServerSocket(0)
-    val port = serverSocket.localPort
-
-    val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
-    val connected = CountDownLatch(1)
-    val connectionsSeen = CountDownLatch(2)
-
-    val session =
-      BridgeSession(
-        scope = scope,
-        onConnected = { _, _, _ -> connected.countDown() },
-        onDisconnected = { /* ignore */ },
-        onEvent = { _, _ -> /* ignore */ },
-        onInvoke = { BridgeSession.InvokeResult.ok(null) },
-      )
-
-    val server =
-      async(Dispatchers.IO) {
-        serverSocket.use { ss ->
-          // First connection: read hello, then close (no response).
-          val sock1 = ss.accept()
-          sock1.use { s ->
-            val reader = BufferedReader(InputStreamReader(s.getInputStream(), Charsets.UTF_8))
-            reader.readLine() // hello
-            connectionsSeen.countDown()
-          }
-
-          // Second connection: complete hello.
-          val sock2 = ss.accept()
-          sock2.use { s ->
-            val reader = BufferedReader(InputStreamReader(s.getInputStream(), Charsets.UTF_8))
-            val writer = BufferedWriter(OutputStreamWriter(s.getOutputStream(), Charsets.UTF_8))
-            reader.readLine() // hello
-            writer.write("""{"type":"hello-ok","serverName":"Test Bridge"}""")
-            writer.write("\n")
-            writer.flush()
-            connectionsSeen.countDown()
-            Thread.sleep(200)
-          }
-        }
-      }
-
-    session.connect(
-      endpoint = BridgeEndpoint.manual(host = "127.0.0.1", port = port),
-      hello =
-        BridgeSession.Hello(
-          nodeId = "node-1",
-          displayName = "Android Node",
-          token = null,
-          platform = "Android",
-          version = "test",
-          deviceFamily = null,
-          modelIdentifier = null,
-          caps = null,
-          commands = null,
-        ),
-    )
-
-    assertTrue("expected two connection attempts", connectionsSeen.await(8, TimeUnit.SECONDS))
-    assertTrue("expected session to connect", connected.await(8, TimeUnit.SECONDS))
-
-    session.disconnect()
-    scope.cancel()
-    server.await()
-  }
-}
-
-private fun extractJsonString(raw: String, key: String): String {
-  val needle = "\"$key\":\""
-  val start = raw.indexOf(needle)
-  if (start < 0) throw IllegalArgumentException("missing key $key in $raw")
-  val from = start + needle.length
-  val end = raw.indexOf('"', from)
-  if (end < 0) throw IllegalArgumentException("unterminated string for $key in $raw")
-  return raw.substring(from, end)
-}

apps/android/app/src/test/java/com/clawdbot/android/gateway/BonjourEscapesTest.kt

@@ -1,4 +1,4 @@
-package com.clawdbot.android.bridge
+package com.clawdbot.android.gateway
 
 import org.junit.Assert.assertEquals
 import org.junit.Test

apps/ios/Sources/Bridge/BridgeClient.swift

@@ -1,244 +0,0 @@
-import ClawdbotKit
-import Foundation
-import Network
-
-actor BridgeClient {
-    private let encoder = JSONEncoder()
-    private let decoder = JSONDecoder()
-    private var lineBuffer = Data()
-
-    func pairAndHello(
-        endpoint: NWEndpoint,
-        hello: BridgeHello,
-        tls: BridgeTLSParams? = nil,
-        onStatus: (@Sendable (String) -> Void)? = nil) async throws -> String
-    {
-        do {
-            return try await self.pairAndHelloOnce(
-                endpoint: endpoint,
-                hello: hello,
-                tls: tls,
-                onStatus: onStatus)
-        } catch {
-            if let tls, !tls.required {
-                return try await self.pairAndHelloOnce(
-                    endpoint: endpoint,
-                    hello: hello,
-                    tls: nil,
-                    onStatus: onStatus)
-            }
-            throw error
-        }
-    }
-
-    private func pairAndHelloOnce(
-        endpoint: NWEndpoint,
-        hello: BridgeHello,
-        tls: BridgeTLSParams?,
-        onStatus: (@Sendable (String) -> Void)? = nil) async throws -> String
-    {
-        self.lineBuffer = Data()
-        let params = self.makeParameters(tls: tls)
-        let connection = NWConnection(to: endpoint, using: params)
-        let queue = DispatchQueue(label: "com.clawdbot.ios.bridge-client")
-        defer { connection.cancel() }
-        try await self.withTimeout(seconds: 8, purpose: "connect") {
-            try await self.startAndWaitForReady(connection, queue: queue)
-        }
-
-        onStatus?("Authenticating…")
-        try await self.send(hello, over: connection)
-
-        let first = try await self.withTimeout(seconds: 10, purpose: "hello") { () -> ReceivedFrame in
-            guard let frame = try await self.receiveFrame(over: connection) else {
-                throw NSError(domain: "Bridge", code: 0, userInfo: [
-                    NSLocalizedDescriptionKey: "Bridge closed connection during hello",
-                ])
-            }
-            return frame
-        }
-
-        switch first.base.type {
-        case "hello-ok":
-            // We only return a token if we have one; callers should treat empty as "no token yet".
-            return hello.token ?? ""
-
-        case "error":
-            let err = try self.decoder.decode(BridgeErrorFrame.self, from: first.data)
-            if err.code != "NOT_PAIRED", err.code != "UNAUTHORIZED" {
-                throw NSError(domain: "Bridge", code: 1, userInfo: [
-                    NSLocalizedDescriptionKey: "\(err.code): \(err.message)",
-                ])
-            }
-
-            onStatus?("Requesting approval…")
-            try await self.send(
-                BridgePairRequest(
-                    nodeId: hello.nodeId,
-                    displayName: hello.displayName,
-                    platform: hello.platform,
-                    version: hello.version,
-                    deviceFamily: hello.deviceFamily,
-                    modelIdentifier: hello.modelIdentifier,
-                    caps: hello.caps,
-                    commands: hello.commands),
-                over: connection)
-
-            onStatus?("Waiting for approval…")
-            let ok = try await self.withTimeout(seconds: 60, purpose: "pairing approval") {
-                while let next = try await self.receiveFrame(over: connection) {
-                    switch next.base.type {
-                    case "pair-ok":
-                        return try self.decoder.decode(BridgePairOk.self, from: next.data)
-                    case "error":
-                        let e = try self.decoder.decode(BridgeErrorFrame.self, from: next.data)
-                        throw NSError(domain: "Bridge", code: 2, userInfo: [
-                            NSLocalizedDescriptionKey: "\(e.code): \(e.message)",
-                        ])
-                    default:
-                        continue
-                    }
-                }
-                throw NSError(domain: "Bridge", code: 3, userInfo: [
-                    NSLocalizedDescriptionKey: "Pairing failed: bridge closed connection",
-                ])
-            }
-
-            return ok.token
-
-        default:
-            throw NSError(domain: "Bridge", code: 0, userInfo: [
-                NSLocalizedDescriptionKey: "Unexpected bridge response",
-            ])
-        }
-    }
-
-    private func send(_ obj: some Encodable, over connection: NWConnection) async throws {
-        let data = try self.encoder.encode(obj)
-        var line = Data()
-        line.append(data)
-        line.append(0x0A)
-        try await withCheckedThrowingContinuation(isolation: nil) { (cont: CheckedContinuation<Void, Error>) in
-            connection.send(content: line, completion: .contentProcessed { err in
-                if let err { cont.resume(throwing: err) } else { cont.resume(returning: ()) }
-            })
-        }
-    }
-
-    private struct ReceivedFrame {
-        var base: BridgeBaseFrame
-        var data: Data
-    }
-
-    private func receiveFrame(over connection: NWConnection) async throws -> ReceivedFrame? {
-        guard let lineData = try await self.receiveLineData(over: connection) else {
-            return nil
-        }
-        let base = try self.decoder.decode(BridgeBaseFrame.self, from: lineData)
-        return ReceivedFrame(base: base, data: lineData)
-    }
-
-    private func receiveChunk(over connection: NWConnection) async throws -> Data {
-        try await withCheckedThrowingContinuation(isolation: nil) { (cont: CheckedContinuation<Data, Error>) in
-            connection.receive(minimumIncompleteLength: 1, maximumLength: 64 * 1024) { data, _, isComplete, error in
-                if let error {
-                    cont.resume(throwing: error)
-                    return
-                }
-                if isComplete {
-                    cont.resume(returning: Data())
-                    return
-                }
-                cont.resume(returning: data ?? Data())
-            }
-        }
-    }
-
-    private func receiveLineData(over connection: NWConnection) async throws -> Data? {
-        while true {
-            if let idx = self.lineBuffer.firstIndex(of: 0x0A) {
-                let line = self.lineBuffer.prefix(upTo: idx)
-                self.lineBuffer.removeSubrange(...idx)
-                return Data(line)
-            }
-
-            let chunk = try await self.receiveChunk(over: connection)
-            if chunk.isEmpty { return nil }
-            self.lineBuffer.append(chunk)
-        }
-    }
-
-    private func makeParameters(tls: BridgeTLSParams?) -> NWParameters {
-        if let tlsOptions = makeBridgeTLSOptions(tls) {
-            let tcpOptions = NWProtocolTCP.Options()
-            let params = NWParameters(tls: tlsOptions, tcp: tcpOptions)
-            params.includePeerToPeer = true
-            return params
-        }
-        let params = NWParameters.tcp
-        params.includePeerToPeer = true
-        return params
-    }
-
-    private struct TimeoutError: LocalizedError, Sendable {
-        var purpose: String
-        var seconds: Int
-
-        var errorDescription: String? {
-            if self.purpose == "pairing approval" {
-                return
-                    "Timed out waiting for approval (\(self.seconds)s). " +
-                    "Approve the node on your gateway and try again."
-            }
-            return "Timed out during \(self.purpose) (\(self.seconds)s)."
-        }
-    }
-
-    private func withTimeout<T: Sendable>(
-        seconds: Int,
-        purpose: String,
-        _ op: @escaping @Sendable () async throws -> T) async throws -> T
-    {
-        try await AsyncTimeout.withTimeout(
-            seconds: Double(seconds),
-            onTimeout: { TimeoutError(purpose: purpose, seconds: seconds) },
-            operation: op)
-    }
-
-    private func startAndWaitForReady(_ connection: NWConnection, queue: DispatchQueue) async throws {
-        try await withCheckedThrowingContinuation(isolation: nil) { (cont: CheckedContinuation<Void, Error>) in
-            final class ResumeFlag: @unchecked Sendable {
-                private let lock = NSLock()
-                private var value = false
-
-                func trySet() -> Bool {
-                    self.lock.lock()
-                    defer { self.lock.unlock() }
-                    if self.value { return false }
-                    self.value = true
-                    return true
-                }
-            }
-            let didResume = ResumeFlag()
-            connection.stateUpdateHandler = { state in
-                switch state {
-                case .ready:
-                    if didResume.trySet() { cont.resume(returning: ()) }
-                case let .failed(err):
-                    if didResume.trySet() { cont.resume(throwing: err) }
-                case let .waiting(err):
-                    if didResume.trySet() { cont.resume(throwing: err) }
-                case .cancelled:
-                    if didResume.trySet() {
-                        cont.resume(throwing: NSError(domain: "Bridge", code: 50, userInfo: [
-                            NSLocalizedDescriptionKey: "Connection cancelled",
-                        ]))
-                    }
-                default:
-                    break
-                }
-            }
-            connection.start(queue: queue)
-        }
-    }
-}

apps/ios/Sources/Bridge/BridgeEndpointID.swift

@@ -1,26 +0,0 @@
-import ClawdbotKit
-import Foundation
-import Network
-
-enum BridgeEndpointID {
-    static func stableID(_ endpoint: NWEndpoint) -> String {
-        switch endpoint {
-        case let .service(name, type, domain, _):
-            // Keep this stable across encode/decode differences (e.g. `\032` for spaces).
-            let normalizedName = Self.normalizeServiceNameForID(name)
-            return "\(type)|\(domain)|\(normalizedName)"
-        default:
-            return String(describing: endpoint)
-        }
-    }
-
-    static func prettyDescription(_ endpoint: NWEndpoint) -> String {
-        BonjourEscapes.decode(String(describing: endpoint))
-    }
-
-    private static func normalizeServiceNameForID(_ rawName: String) -> String {
-        let decoded = BonjourEscapes.decode(rawName)
-        let normalized = decoded.split(whereSeparator: \.isWhitespace).joined(separator: " ")
-        return normalized.trimmingCharacters(in: .whitespacesAndNewlines)
-    }
-}

apps/ios/Sources/Bridge/BridgeSession.swift

@@ -1,422 +0,0 @@
-import ClawdbotKit
-import Foundation
-import Network
-
-actor BridgeSession {
-    private struct TimeoutError: LocalizedError {
-        var message: String
-        var errorDescription: String? { self.message }
-    }
-
-    enum State: Sendable, Equatable {
-        case idle
-        case connecting
-        case connected(serverName: String)
-        case failed(message: String)
-    }
-
-    private let encoder = JSONEncoder()
-    private let decoder = JSONDecoder()
-
-    private var connection: NWConnection?
-    private var queue: DispatchQueue?
-    private var buffer = Data()
-    private var pendingRPC: [String: CheckedContinuation<BridgeRPCResponse, Error>] = [:]
-    private var serverEventSubscribers: [UUID: AsyncStream<BridgeEventFrame>.Continuation] = [:]
-
-    private(set) var state: State = .idle
-    private var canvasHostUrl: String?
-    private var mainSessionKey: String?
-
-    func currentCanvasHostUrl() -> String? {
-        self.canvasHostUrl
-    }
-
-    func currentRemoteAddress() -> String? {
-        guard let endpoint = self.connection?.currentPath?.remoteEndpoint else { return nil }
-        return Self.prettyRemoteEndpoint(endpoint)
-    }
-
-    private static func prettyRemoteEndpoint(_ endpoint: NWEndpoint) -> String? {
-        switch endpoint {
-        case let .hostPort(host, port):
-            let hostString = Self.prettyHostString(host)
-            if hostString.contains(":") {
-                return "[\(hostString)]:\(port)"
-            }
-            return "\(hostString):\(port)"
-        default:
-            return String(describing: endpoint)
-        }
-    }
-
-    private static func prettyHostString(_ host: NWEndpoint.Host) -> String {
-        var hostString = String(describing: host)
-        hostString = hostString.replacingOccurrences(of: "::ffff:", with: "")
-
-        guard let percentIndex = hostString.firstIndex(of: "%") else { return hostString }
-
-        let prefix = hostString[..<percentIndex]
-        let allowed = CharacterSet(charactersIn: "0123456789abcdefABCDEF:.")
-        let isIPAddressPrefix = prefix.unicodeScalars.allSatisfy { allowed.contains($0) }
-        if isIPAddressPrefix {
-            return String(prefix)
-        }
-
-        return hostString
-    }
-
-    func connect(
-        endpoint: NWEndpoint,
-        hello: BridgeHello,
-        tls: BridgeTLSParams? = nil,
-        onConnected: (@Sendable (String, String?) async -> Void)? = nil,
-        onInvoke: @escaping @Sendable (BridgeInvokeRequest) async -> BridgeInvokeResponse)
-        async throws
-    {
-        await self.disconnect()
-        self.state = .connecting
-        do {
-            try await self.connectOnce(
-                endpoint: endpoint,
-                hello: hello,
-                tls: tls,
-                onConnected: onConnected,
-                onInvoke: onInvoke)
-        } catch {
-            if let tls, !tls.required {
-                try await self.connectOnce(
-                    endpoint: endpoint,
-                    hello: hello,
-                    tls: nil,
-                    onConnected: onConnected,
-                    onInvoke: onInvoke)
-                return
-            }
-            throw error
-        }
-    }
-
-    private func connectOnce(
-        endpoint: NWEndpoint,
-        hello: BridgeHello,
-        tls: BridgeTLSParams?,
-        onConnected: (@Sendable (String, String?) async -> Void)?,
-        onInvoke: @escaping @Sendable (BridgeInvokeRequest) async -> BridgeInvokeResponse) async throws
-    {
-        let params = self.makeParameters(tls: tls)
-        let connection = NWConnection(to: endpoint, using: params)
-        let queue = DispatchQueue(label: "com.clawdbot.ios.bridge-session")
-        self.connection = connection
-        self.queue = queue
-
-        let stateStream = Self.makeStateStream(for: connection)
-        connection.start(queue: queue)
-
-        try await Self.waitForReady(stateStream, timeoutSeconds: 6)
-
-        try await Self.withTimeout(seconds: 6) {
-            try await self.send(hello)
-        }
-
-        guard let line = try await Self.withTimeout(seconds: 6, operation: {
-            try await self.receiveLine()
-        }),
-            let data = line.data(using: .utf8),
-            let base = try? self.decoder.decode(BridgeBaseFrame.self, from: data)
-        else {
-            await self.disconnect()
-            throw NSError(domain: "Bridge", code: 1, userInfo: [
-                NSLocalizedDescriptionKey: "Unexpected bridge response",
-            ])
-        }
-
-        if base.type == "hello-ok" {
-            let ok = try self.decoder.decode(BridgeHelloOk.self, from: data)
-            self.state = .connected(serverName: ok.serverName)
-            self.canvasHostUrl = ok.canvasHostUrl?.trimmingCharacters(in: .whitespacesAndNewlines)
-            let mainKey = ok.mainSessionKey?.trimmingCharacters(in: .whitespacesAndNewlines)
-            self.mainSessionKey = (mainKey?.isEmpty == false) ? mainKey : nil
-            await onConnected?(ok.serverName, self.mainSessionKey)
-        } else if base.type == "error" {
-            let err = try self.decoder.decode(BridgeErrorFrame.self, from: data)
-            self.state = .failed(message: "\(err.code): \(err.message)")
-            await self.disconnect()
-            throw NSError(domain: "Bridge", code: 2, userInfo: [
-                NSLocalizedDescriptionKey: "\(err.code): \(err.message)",
-            ])
-        } else {
-            self.state = .failed(message: "Unexpected bridge response")
-            await self.disconnect()
-            throw NSError(domain: "Bridge", code: 3, userInfo: [
-                NSLocalizedDescriptionKey: "Unexpected bridge response",
-            ])
-        }
-
-        while true {
-            guard let next = try await self.receiveLine() else { break }
-            guard let nextData = next.data(using: .utf8) else { continue }
-            guard let nextBase = try? self.decoder.decode(BridgeBaseFrame.self, from: nextData) else { continue }
-
-            switch nextBase.type {
-            case "res":
-                let res = try self.decoder.decode(BridgeRPCResponse.self, from: nextData)
-                if let cont = self.pendingRPC.removeValue(forKey: res.id) {
-                    cont.resume(returning: res)
-                }
-
-            case "event":
-                let evt = try self.decoder.decode(BridgeEventFrame.self, from: nextData)
-                self.broadcastServerEvent(evt)
-
-            case "ping":
-                let ping = try self.decoder.decode(BridgePing.self, from: nextData)
-                try await self.send(BridgePong(type: "pong", id: ping.id))
-
-            case "invoke":
-                let req = try self.decoder.decode(BridgeInvokeRequest.self, from: nextData)
-                let res = await onInvoke(req)
-                try await self.send(res)
-
-            default:
-                continue
-            }
-        }
-
-        await self.disconnect()
-    }
-
-    func sendEvent(event: String, payloadJSON: String?) async throws {
-        try await self.send(BridgeEventFrame(type: "event", event: event, payloadJSON: payloadJSON))
-    }
-
-    func request(method: String, paramsJSON: String?, timeoutSeconds: Int = 15) async throws -> Data {
-        guard self.connection != nil else {
-            throw NSError(domain: "Bridge", code: 11, userInfo: [
-                NSLocalizedDescriptionKey: "not connected",
-            ])
-        }
-
-        let id = UUID().uuidString
-        let req = BridgeRPCRequest(type: "req", id: id, method: method, paramsJSON: paramsJSON)
-
-        let timeoutTask = Task {
-            try await Task.sleep(nanoseconds: UInt64(timeoutSeconds) * 1_000_000_000)
-            await self.timeoutRPC(id: id)
-        }
-        defer { timeoutTask.cancel() }
-
-        let res: BridgeRPCResponse = try await withCheckedThrowingContinuation { cont in
-            Task { [weak self] in
-                guard let self else { return }
-                await self.beginRPC(id: id, request: req, continuation: cont)
-            }
-        }
-
-        if res.ok {
-            let payload = res.payloadJSON ?? ""
-            guard let data = payload.data(using: .utf8) else {
-                throw NSError(domain: "Bridge", code: 12, userInfo: [
-                    NSLocalizedDescriptionKey: "Bridge response not UTF-8",
-                ])
-            }
-            return data
-        }
-
-        let code = res.error?.code ?? "UNAVAILABLE"
-        let message = res.error?.message ?? "request failed"
-        throw NSError(domain: "Bridge", code: 13, userInfo: [
-            NSLocalizedDescriptionKey: "\(code): \(message)",
-        ])
-    }
-
-    func subscribeServerEvents(bufferingNewest: Int = 200) -> AsyncStream<BridgeEventFrame> {
-        let id = UUID()
-        let session = self
-        return AsyncStream(bufferingPolicy: .bufferingNewest(bufferingNewest)) { continuation in
-            self.serverEventSubscribers[id] = continuation
-            continuation.onTermination = { @Sendable _ in
-                Task { await session.removeServerEventSubscriber(id) }
-            }
-        }
-    }
-
-    func disconnect() async {
-        self.connection?.cancel()
-        self.connection = nil
-        self.queue = nil
-        self.buffer = Data()
-        self.canvasHostUrl = nil
-        self.mainSessionKey = nil
-
-        let pending = self.pendingRPC.values
-        self.pendingRPC.removeAll()
-        for cont in pending {
-            cont.resume(throwing: NSError(domain: "Bridge", code: 14, userInfo: [
-                NSLocalizedDescriptionKey: "UNAVAILABLE: connection closed",
-            ]))
-        }
-
-        for (_, cont) in self.serverEventSubscribers {
-            cont.finish()
-        }
-        self.serverEventSubscribers.removeAll()
-
-        self.state = .idle
-    }
-
-    func currentMainSessionKey() -> String? {
-        self.mainSessionKey
-    }
-
-    private func beginRPC(
-        id: String,
-        request: BridgeRPCRequest,
-        continuation: CheckedContinuation<BridgeRPCResponse, Error>) async
-    {
-        self.pendingRPC[id] = continuation
-        do {
-            try await self.send(request)
-        } catch {
-            await self.failRPC(id: id, error: error)
-        }
-    }
-
-    private func makeParameters(tls: BridgeTLSParams?) -> NWParameters {
-        if let tlsOptions = makeBridgeTLSOptions(tls) {
-            let tcpOptions = NWProtocolTCP.Options()
-            let params = NWParameters(tls: tlsOptions, tcp: tcpOptions)
-            params.includePeerToPeer = true
-            return params
-        }
-        let params = NWParameters.tcp
-        params.includePeerToPeer = true
-        return params
-    }
-
-    private func timeoutRPC(id: String) async {
-        guard let cont = self.pendingRPC.removeValue(forKey: id) else { return }
-        cont.resume(throwing: NSError(domain: "Bridge", code: 15, userInfo: [
-            NSLocalizedDescriptionKey: "UNAVAILABLE: request timeout",
-        ]))
-    }
-
-    private func failRPC(id: String, error: Error) async {
-        guard let cont = self.pendingRPC.removeValue(forKey: id) else { return }
-        cont.resume(throwing: error)
-    }
-
-    private func broadcastServerEvent(_ evt: BridgeEventFrame) {
-        for (_, cont) in self.serverEventSubscribers {
-            cont.yield(evt)
-        }
-    }
-
-    private func removeServerEventSubscriber(_ id: UUID) {
-        self.serverEventSubscribers[id] = nil
-    }
-
-    private func send(_ obj: some Encodable) async throws {
-        guard let connection = self.connection else {
-            throw NSError(domain: "Bridge", code: 10, userInfo: [
-                NSLocalizedDescriptionKey: "not connected",
-            ])
-        }
-        let data = try self.encoder.encode(obj)
-        var line = Data()
-        line.append(data)
-        line.append(0x0A)
-        try await withCheckedThrowingContinuation(isolation: nil) { (cont: CheckedContinuation<Void, Error>) in
-            connection.send(content: line, completion: .contentProcessed { err in
-                if let err { cont.resume(throwing: err) } else { cont.resume(returning: ()) }
-            })
-        }
-    }
-
-    private func receiveLine() async throws -> String? {
-        while true {
-            if let idx = self.buffer.firstIndex(of: 0x0A) {
-                let lineData = self.buffer.prefix(upTo: idx)
-                self.buffer.removeSubrange(...idx)
-                return String(data: lineData, encoding: .utf8)
-            }
-
-            let chunk = try await self.receiveChunk()
-            if chunk.isEmpty { return nil }
-            self.buffer.append(chunk)
-        }
-    }
-
-    private func receiveChunk() async throws -> Data {
-        guard let connection = self.connection else { return Data() }
-        return try await withCheckedThrowingContinuation(isolation: nil) { (cont: CheckedContinuation<Data, Error>) in
-            connection.receive(minimumIncompleteLength: 1, maximumLength: 64 * 1024) { data, _, isComplete, error in
-                if let error {
-                    cont.resume(throwing: error)
-                    return
-                }
-                if isComplete {
-                    cont.resume(returning: Data())
-                    return
-                }
-                cont.resume(returning: data ?? Data())
-            }
-        }
-    }
-
-    private static func withTimeout<T: Sendable>(
-        seconds: Double,
-        operation: @escaping @Sendable () async throws -> T) async throws -> T
-    {
-        try await AsyncTimeout.withTimeout(
-            seconds: seconds,
-            onTimeout: { TimeoutError(message: "UNAVAILABLE: connection timeout") },
-            operation: operation)
-    }
-
-    private static func makeStateStream(for connection: NWConnection) -> AsyncStream<NWConnection.State> {
-        AsyncStream { continuation in
-            continuation.onTermination = { @Sendable _ in
-                connection.stateUpdateHandler = nil
-            }
-
-            connection.stateUpdateHandler = { state in
-                continuation.yield(state)
-                switch state {
-                case .ready, .cancelled, .failed, .waiting:
-                    continuation.finish()
-                case .setup, .preparing:
-                    break
-                @unknown default:
-                    break
-                }
-            }
-        }
-    }
-
-    private static func waitForReady(
-        _ stateStream: AsyncStream<NWConnection.State>,
-        timeoutSeconds: Double) async throws
-    {
-        try await self.withTimeout(seconds: timeoutSeconds) {
-            for await state in stateStream {
-                switch state {
-                case .ready:
-                    return
-                case let .failed(error):
-                    throw error
-                case let .waiting(error):
-                    throw error
-                case .cancelled:
-                    throw TimeoutError(message: "UNAVAILABLE: connection cancelled")
-                case .setup, .preparing:
-                    break
-                @unknown default:
-                    break
-                }
-            }
-
-            throw TimeoutError(message: "UNAVAILABLE: connection ended")
-        }
-    }
-}

apps/ios/Sources/Bridge/BridgeSettingsStore.swift

@@ -1,112 +0,0 @@
-import Foundation
-
-enum BridgeSettingsStore {
-    private static let bridgeService = "com.clawdbot.bridge"
-    private static let nodeService = "com.clawdbot.node"
-
-    private static let instanceIdDefaultsKey = "node.instanceId"
-    private static let preferredBridgeStableIDDefaultsKey = "bridge.preferredStableID"
-    private static let lastDiscoveredBridgeStableIDDefaultsKey = "bridge.lastDiscoveredStableID"
-
-    private static let instanceIdAccount = "instanceId"
-    private static let preferredBridgeStableIDAccount = "preferredStableID"
-    private static let lastDiscoveredBridgeStableIDAccount = "lastDiscoveredStableID"
-
-    static func bootstrapPersistence() {
-        self.ensureStableInstanceID()
-        self.ensurePreferredBridgeStableID()
-        self.ensureLastDiscoveredBridgeStableID()
-    }
-
-    static func loadStableInstanceID() -> String? {
-        KeychainStore.loadString(service: self.nodeService, account: self.instanceIdAccount)?
-            .trimmingCharacters(in: .whitespacesAndNewlines)
-    }
-
-    static func saveStableInstanceID(_ instanceId: String) {
-        _ = KeychainStore.saveString(instanceId, service: self.nodeService, account: self.instanceIdAccount)
-    }
-
-    static func loadPreferredBridgeStableID() -> String? {
-        KeychainStore.loadString(service: self.bridgeService, account: self.preferredBridgeStableIDAccount)?
-            .trimmingCharacters(in: .whitespacesAndNewlines)
-    }
-
-    static func savePreferredBridgeStableID(_ stableID: String) {
-        _ = KeychainStore.saveString(
-            stableID,
-            service: self.bridgeService,
-            account: self.preferredBridgeStableIDAccount)
-    }
-
-    static func loadLastDiscoveredBridgeStableID() -> String? {
-        KeychainStore.loadString(service: self.bridgeService, account: self.lastDiscoveredBridgeStableIDAccount)?
-            .trimmingCharacters(in: .whitespacesAndNewlines)
-    }
-
-    static func saveLastDiscoveredBridgeStableID(_ stableID: String) {
-        _ = KeychainStore.saveString(
-            stableID,
-            service: self.bridgeService,
-            account: self.lastDiscoveredBridgeStableIDAccount)
-    }
-
-    private static func ensureStableInstanceID() {
-        let defaults = UserDefaults.standard
-
-        if let existing = defaults.string(forKey: self.instanceIdDefaultsKey)?
-            .trimmingCharacters(in: .whitespacesAndNewlines),
-            !existing.isEmpty
-        {
-            if self.loadStableInstanceID() == nil {
-                self.saveStableInstanceID(existing)
-            }
-            return
-        }
-
-        if let stored = self.loadStableInstanceID(), !stored.isEmpty {
-            defaults.set(stored, forKey: self.instanceIdDefaultsKey)
-            return
-        }
-
-        let fresh = UUID().uuidString
-        self.saveStableInstanceID(fresh)
-        defaults.set(fresh, forKey: self.instanceIdDefaultsKey)
-    }
-
-    private static func ensurePreferredBridgeStableID() {
-        let defaults = UserDefaults.standard
-
-        if let existing = defaults.string(forKey: self.preferredBridgeStableIDDefaultsKey)?
-            .trimmingCharacters(in: .whitespacesAndNewlines),
-            !existing.isEmpty
-        {
-            if self.loadPreferredBridgeStableID() == nil {
-                self.savePreferredBridgeStableID(existing)
-            }
-            return
-        }
-
-        if let stored = self.loadPreferredBridgeStableID(), !stored.isEmpty {
-            defaults.set(stored, forKey: self.preferredBridgeStableIDDefaultsKey)
-        }
-    }
-
-    private static func ensureLastDiscoveredBridgeStableID() {
-        let defaults = UserDefaults.standard
-
-        if let existing = defaults.string(forKey: self.lastDiscoveredBridgeStableIDDefaultsKey)?
-            .trimmingCharacters(in: .whitespacesAndNewlines),
-            !existing.isEmpty
-        {
-            if self.loadLastDiscoveredBridgeStableID() == nil {
-                self.saveLastDiscoveredBridgeStableID(existing)
-            }
-            return
-        }
-
-        if let stored = self.loadLastDiscoveredBridgeStableID(), !stored.isEmpty {
-            defaults.set(stored, forKey: self.lastDiscoveredBridgeStableIDDefaultsKey)
-        }
-    }
-}

apps/ios/Sources/Bridge/BridgeTLS.swift

@@ -1,66 +0,0 @@
-import CryptoKit
-import Foundation
-import Network
-import Security
-
-struct BridgeTLSParams: Sendable {
-    let required: Bool
-    let expectedFingerprint: String?
-    let allowTOFU: Bool
-    let storeKey: String?
-}
-
-enum BridgeTLSStore {
-    private static let service = "com.clawdbot.bridge.tls"
-
-    static func loadFingerprint(stableID: String) -> String? {
-        KeychainStore.loadString(service: service, account: stableID)?.trimmingCharacters(in: .whitespacesAndNewlines)
-    }
-
-    static func saveFingerprint(_ value: String, stableID: String) {
-        _ = KeychainStore.saveString(value, service: service, account: stableID)
-    }
-}
-
-func makeBridgeTLSOptions(_ params: BridgeTLSParams?) -> NWProtocolTLS.Options? {
-    guard let params else { return nil }
-    let options = NWProtocolTLS.Options()
-    let expected = params.expectedFingerprint.map(normalizeBridgeFingerprint)
-    let allowTOFU = params.allowTOFU
-    let storeKey = params.storeKey
-
-    sec_protocol_options_set_verify_block(
-        options.securityProtocolOptions,
-        { _, trust, complete in
-            let trustRef = sec_trust_copy_ref(trust).takeRetainedValue()
-            if let chain = SecTrustCopyCertificateChain(trustRef) as? [SecCertificate],
-               let cert = chain.first
-            {
-                let data = SecCertificateCopyData(cert) as Data
-                let fingerprint = sha256Hex(data)
-                if let expected {
-                    complete(fingerprint == expected)
-                    return
-                }
-                if allowTOFU {
-                    if let storeKey { BridgeTLSStore.saveFingerprint(fingerprint, stableID: storeKey) }
-                    complete(true)
-                    return
-                }
-            }
-            let ok = SecTrustEvaluateWithError(trustRef, nil)
-            complete(ok)
-        },
-        DispatchQueue(label: "com.clawdbot.bridge.tls.verify"))
-
-    return options
-}
-
-private func sha256Hex(_ data: Data) -> String {
-    let digest = SHA256.hash(data: data)
-    return digest.map { String(format: "%02x", $0) }.joined()
-}
-
-private func normalizeBridgeFingerprint(_ raw: String) -> String {
-    raw.lowercased().filter { $0.isHexDigit }
-}

apps/ios/Sources/Camera/CameraController.swift

@@ -44,7 +44,7 @@ actor CameraController {
     {
         let facing = params.facing ?? .front
         let format = params.format ?? .jpg
-        // Default to a reasonable max width to keep bridge payload sizes manageable.
+        // Default to a reasonable max width to keep gateway payload sizes manageable.
         // 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)
@@ -160,14 +160,14 @@ actor CameraController {
         defer { session.stopRunning() }
         await Self.warmUpCaptureSession()
 
-        let movURL = FileManager.default.temporaryDirectory
+        let movURL = FileManager().temporaryDirectory
             .appendingPathComponent("clawdbot-camera-\(UUID().uuidString).mov")
-        let mp4URL = FileManager.default.temporaryDirectory
+        let mp4URL = FileManager().temporaryDirectory
             .appendingPathComponent("clawdbot-camera-\(UUID().uuidString).mp4")
 
         defer {
-            try? FileManager.default.removeItem(at: movURL)
-            try? FileManager.default.removeItem(at: mp4URL)
+            try? FileManager().removeItem(at: movURL)
+            try? FileManager().removeItem(at: mp4URL)
         }
 
         var delegate: MovieFileDelegate?
@@ -270,7 +270,7 @@ actor CameraController {
 
     nonisolated static func clampDurationMs(_ ms: Int?) -> Int {
         let v = ms ?? 3000
-        // Keep clips short by default; avoid huge base64 payloads on the bridge.
+        // Keep clips short by default; avoid huge base64 payloads on the gateway.
         return min(60000, max(250, v))
     }
 

apps/ios/Sources/Chat/ChatSheet.swift

@@ -1,4 +1,5 @@
 import ClawdbotChatUI
+import ClawdbotKit
 import SwiftUI
 
 struct ChatSheet: View {
@@ -6,8 +7,8 @@ struct ChatSheet: View {
     @State private var viewModel: ClawdbotChatViewModel
     private let userAccent: Color?
 
-    init(bridge: BridgeSession, sessionKey: String, userAccent: Color? = nil) {
-        let transport = IOSBridgeChatTransport(bridge: bridge)
+    init(gateway: GatewayNodeSession, sessionKey: String, userAccent: Color? = nil) {
+        let transport = IOSGatewayChatTransport(gateway: gateway)
         self._viewModel = State(
             initialValue: ClawdbotChatViewModel(
                 sessionKey: sessionKey,

apps/ios/Sources/Chat/IOSGatewayChatTransport.swift

@@ -1,12 +1,13 @@
 import ClawdbotChatUI
 import ClawdbotKit
+import ClawdbotProtocol
 import Foundation
 
-struct IOSBridgeChatTransport: ClawdbotChatTransport, Sendable {
-    private let bridge: BridgeSession
+struct IOSGatewayChatTransport: ClawdbotChatTransport, Sendable {
+    private let gateway: GatewayNodeSession
 
-    init(bridge: BridgeSession) {
-        self.bridge = bridge
+    init(gateway: GatewayNodeSession) {
+        self.gateway = gateway
     }
 
     func abortRun(sessionKey: String, runId: String) async throws {
@@ -16,7 +17,7 @@ struct IOSBridgeChatTransport: ClawdbotChatTransport, Sendable {
         }
         let data = try JSONEncoder().encode(Params(sessionKey: sessionKey, runId: runId))
         let json = String(data: data, encoding: .utf8)
-        _ = try await self.bridge.request(method: "chat.abort", paramsJSON: json, timeoutSeconds: 10)
+        _ = try await self.gateway.request(method: "chat.abort", paramsJSON: json, timeoutSeconds: 10)
     }
 
     func listSessions(limit: Int?) async throws -> ClawdbotChatSessionsListResponse {
@@ -27,7 +28,7 @@ struct IOSBridgeChatTransport: ClawdbotChatTransport, Sendable {
         }
         let data = try JSONEncoder().encode(Params(includeGlobal: true, includeUnknown: false, limit: limit))
         let json = String(data: data, encoding: .utf8)
-        let res = try await self.bridge.request(method: "sessions.list", paramsJSON: json, timeoutSeconds: 15)
+        let res = try await self.gateway.request(method: "sessions.list", paramsJSON: json, timeoutSeconds: 15)
         return try JSONDecoder().decode(ClawdbotChatSessionsListResponse.self, from: res)
     }
 
@@ -35,14 +36,14 @@ struct IOSBridgeChatTransport: ClawdbotChatTransport, Sendable {
         struct Subscribe: Codable { var sessionKey: String }
         let data = try JSONEncoder().encode(Subscribe(sessionKey: sessionKey))
         let json = String(data: data, encoding: .utf8)
-        try await self.bridge.sendEvent(event: "chat.subscribe", payloadJSON: json)
+        await self.gateway.sendEvent(event: "chat.subscribe", payloadJSON: json)
     }
 
     func requestHistory(sessionKey: String) async throws -> ClawdbotChatHistoryPayload {
         struct Params: Codable { var sessionKey: String }
         let data = try JSONEncoder().encode(Params(sessionKey: sessionKey))
         let json = String(data: data, encoding: .utf8)
-        let res = try await self.bridge.request(method: "chat.history", paramsJSON: json, timeoutSeconds: 15)
+        let res = try await self.gateway.request(method: "chat.history", paramsJSON: json, timeoutSeconds: 15)
         return try JSONDecoder().decode(ClawdbotChatHistoryPayload.self, from: res)
     }
 
@@ -71,20 +72,20 @@ struct IOSBridgeChatTransport: ClawdbotChatTransport, Sendable {
             idempotencyKey: idempotencyKey)
         let data = try JSONEncoder().encode(params)
         let json = String(data: data, encoding: .utf8)
-        let res = try await self.bridge.request(method: "chat.send", paramsJSON: json, timeoutSeconds: 35)
+        let res = try await self.gateway.request(method: "chat.send", paramsJSON: json, timeoutSeconds: 35)
         return try JSONDecoder().decode(ClawdbotChatSendResponse.self, from: res)
     }
 
     func requestHealth(timeoutMs: Int) async throws -> Bool {
         let seconds = max(1, Int(ceil(Double(timeoutMs) / 1000.0)))
-        let res = try await self.bridge.request(method: "health", paramsJSON: nil, timeoutSeconds: seconds)
+        let res = try await self.gateway.request(method: "health", paramsJSON: nil, timeoutSeconds: seconds)
         return (try? JSONDecoder().decode(ClawdbotGatewayHealthOK.self, from: res))?.ok ?? true
     }
 
     func events() -> AsyncStream<ClawdbotChatTransportEvent> {
         AsyncStream { continuation in
             let task = Task {
-                let stream = await self.bridge.subscribeServerEvents()
+                let stream = await self.gateway.subscribeServerEvents()
                 for await evt in stream {
                     if Task.isCancelled { return }
                     switch evt.event {
@@ -93,18 +94,26 @@ struct IOSBridgeChatTransport: ClawdbotChatTransport, Sendable {
                     case "seqGap":
                         continuation.yield(.seqGap)
                     case "health":
-                        guard let json = evt.payloadJSON, let data = json.data(using: .utf8) else { break }
-                        let ok = (try? JSONDecoder().decode(ClawdbotGatewayHealthOK.self, from: data))?.ok ?? true
+                        guard let payload = evt.payload else { break }
+                        let ok = (try? GatewayPayloadDecoding.decode(
+                            payload,
+                            as: ClawdbotGatewayHealthOK.self))?.ok ?? true
                         continuation.yield(.health(ok: ok))
                     case "chat":
-                        guard let json = evt.payloadJSON, let data = json.data(using: .utf8) else { break }
-                        if let payload = try? JSONDecoder().decode(ClawdbotChatEventPayload.self, from: data) {
-                            continuation.yield(.chat(payload))
+                        guard let payload = evt.payload else { break }
+                        if let chatPayload = try? GatewayPayloadDecoding.decode(
+                            payload,
+                            as: ClawdbotChatEventPayload.self)
+                        {
+                            continuation.yield(.chat(chatPayload))
                         }
                     case "agent":
-                        guard let json = evt.payloadJSON, let data = json.data(using: .utf8) else { break }
-                        if let payload = try? JSONDecoder().decode(ClawdbotAgentEventPayload.self, from: data) {
-                            continuation.yield(.agent(payload))
+                        guard let payload = evt.payload else { break }
+                        if let agentPayload = try? GatewayPayloadDecoding.decode(
+                            payload,
+                            as: ClawdbotAgentEventPayload.self)
+                        {
+                            continuation.yield(.agent(agentPayload))
                         }
                     default:
                         break

apps/ios/Sources/ClawdbotApp.swift

@@ -3,14 +3,14 @@ import SwiftUI
 @main
 struct ClawdbotApp: App {
     @State private var appModel: NodeAppModel
-    @State private var bridgeController: BridgeConnectionController
+    @State private var gatewayController: GatewayConnectionController
     @Environment(\.scenePhase) private var scenePhase
 
     init() {
-        BridgeSettingsStore.bootstrapPersistence()
+        GatewaySettingsStore.bootstrapPersistence()
         let appModel = NodeAppModel()
         _appModel = State(initialValue: appModel)
-        _bridgeController = State(initialValue: BridgeConnectionController(appModel: appModel))
+        _gatewayController = State(initialValue: GatewayConnectionController(appModel: appModel))
     }
 
     var body: some Scene {
@@ -18,13 +18,13 @@ struct ClawdbotApp: App {
             RootCanvas()
                 .environment(self.appModel)
                 .environment(self.appModel.voiceWake)
-                .environment(self.bridgeController)
+                .environment(self.gatewayController)
                 .onOpenURL { url in
                     Task { await self.appModel.handleDeepLink(url: url) }
                 }
                 .onChange(of: self.scenePhase) { _, newValue in
                     self.appModel.setScenePhase(newValue)
-                    self.bridgeController.setScenePhase(newValue)
+                    self.gatewayController.setScenePhase(newValue)
                 }
         }
     }

apps/ios/Sources/Gateway/GatewayConnectionController.swift

@@ -6,40 +6,23 @@ import Observation
 import SwiftUI
 import UIKit
 
-protocol BridgePairingClient: Sendable {
-    func pairAndHello(
-        endpoint: NWEndpoint,
-        hello: BridgeHello,
-        tls: BridgeTLSParams?,
-        onStatus: (@Sendable (String) -> Void)?) async throws -> String
-}
-
-extension BridgeClient: BridgePairingClient {}
-
 @MainActor
 @Observable
-final class BridgeConnectionController {
-    private(set) var bridges: [BridgeDiscoveryModel.DiscoveredBridge] = []
+final class GatewayConnectionController {
+    private(set) var gateways: [GatewayDiscoveryModel.DiscoveredGateway] = []
     private(set) var discoveryStatusText: String = "Idle"
-    private(set) var discoveryDebugLog: [BridgeDiscoveryModel.DebugLogEntry] = []
+    private(set) var discoveryDebugLog: [GatewayDiscoveryModel.DebugLogEntry] = []
 
-    private let discovery = BridgeDiscoveryModel()
+    private let discovery = GatewayDiscoveryModel()
     private weak var appModel: NodeAppModel?
     private var didAutoConnect = false
 
-    private let bridgeClientFactory: @Sendable () -> any BridgePairingClient
-
-    init(
-        appModel: NodeAppModel,
-        startDiscovery: Bool = true,
-        bridgeClientFactory: @escaping @Sendable () -> any BridgePairingClient = { BridgeClient() })
-    {
+    init(appModel: NodeAppModel, startDiscovery: Bool = true) {
         self.appModel = appModel
-        self.bridgeClientFactory = bridgeClientFactory
 
-        BridgeSettingsStore.bootstrapPersistence()
+        GatewaySettingsStore.bootstrapPersistence()
         let defaults = UserDefaults.standard
-        self.discovery.setDebugLoggingEnabled(defaults.bool(forKey: "bridge.discovery.debugLogs"))
+        self.discovery.setDebugLoggingEnabled(defaults.bool(forKey: "gateway.discovery.debugLogs"))
 
         self.updateFromDiscovery()
         self.observeDiscovery()
@@ -64,18 +47,61 @@ final class BridgeConnectionController {
         }
     }
 
+    func connect(_ gateway: GatewayDiscoveryModel.DiscoveredGateway) async {
+        let instanceId = UserDefaults.standard.string(forKey: "node.instanceId")?
+            .trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+        let token = GatewaySettingsStore.loadGatewayToken(instanceId: instanceId)
+        let password = GatewaySettingsStore.loadGatewayPassword(instanceId: instanceId)
+        guard let host = self.resolveGatewayHost(gateway) else { return }
+        let port = gateway.gatewayPort ?? 18789
+        let tlsParams = self.resolveDiscoveredTLSParams(gateway: gateway)
+        guard let url = self.buildGatewayURL(
+            host: host,
+            port: port,
+            useTLS: tlsParams?.required == true)
+        else { return }
+        self.didAutoConnect = true
+        self.startAutoConnect(
+            url: url,
+            gatewayStableID: gateway.stableID,
+            tls: tlsParams,
+            token: token,
+            password: password)
+    }
+
+    func connectManual(host: String, port: Int, useTLS: Bool) async {
+        let instanceId = UserDefaults.standard.string(forKey: "node.instanceId")?
+            .trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+        let token = GatewaySettingsStore.loadGatewayToken(instanceId: instanceId)
+        let password = GatewaySettingsStore.loadGatewayPassword(instanceId: instanceId)
+        let stableID = self.manualStableID(host: host, port: port)
+        let tlsParams = self.resolveManualTLSParams(stableID: stableID, tlsEnabled: useTLS)
+        guard let url = self.buildGatewayURL(
+            host: host,
+            port: port,
+            useTLS: tlsParams?.required == true)
+        else { return }
+        self.didAutoConnect = true
+        self.startAutoConnect(
+            url: url,
+            gatewayStableID: stableID,
+            tls: tlsParams,
+            token: token,
+            password: password)
+    }
+
     private func updateFromDiscovery() {
-        let newBridges = self.discovery.bridges
-        self.bridges = newBridges
+        let newGateways = self.discovery.gateways
+        self.gateways = newGateways
         self.discoveryStatusText = self.discovery.statusText
         self.discoveryDebugLog = self.discovery.debugLog
-        self.updateLastDiscoveredBridge(from: newBridges)
+        self.updateLastDiscoveredGateway(from: newGateways)
         self.maybeAutoConnect()
     }
 
     private func observeDiscovery() {
         withObservationTracking {
-            _ = self.discovery.bridges
+            _ = self.discovery.gateways
             _ = self.discovery.statusText
             _ = self.discovery.debugLog
         } onChange: { [weak self] in
@@ -90,181 +116,176 @@ final class BridgeConnectionController {
     private func maybeAutoConnect() {
         guard !self.didAutoConnect else { return }
         guard let appModel = self.appModel else { return }
-        guard appModel.bridgeServerName == nil else { return }
+        guard appModel.gatewayServerName == nil else { return }
 
         let defaults = UserDefaults.standard
-        let manualEnabled = defaults.bool(forKey: "bridge.manual.enabled")
+        let manualEnabled = defaults.bool(forKey: "gateway.manual.enabled")
 
         let instanceId = defaults.string(forKey: "node.instanceId")?
             .trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
         guard !instanceId.isEmpty else { return }
 
-        let token = KeychainStore.loadString(
-            service: "com.clawdbot.bridge",
-            account: self.keychainAccount(instanceId: instanceId))?
-            .trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-        guard !token.isEmpty else { return }
+        let token = GatewaySettingsStore.loadGatewayToken(instanceId: instanceId)
+        let password = GatewaySettingsStore.loadGatewayPassword(instanceId: instanceId)
 
         if manualEnabled {
-            let manualHost = defaults.string(forKey: "bridge.manual.host")?
+            let manualHost = defaults.string(forKey: "gateway.manual.host")?
                 .trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
             guard !manualHost.isEmpty else { return }
 
-            let manualPort = defaults.integer(forKey: "bridge.manual.port")
-            let resolvedPort = manualPort > 0 ? manualPort : 18790
-            guard let port = NWEndpoint.Port(rawValue: UInt16(resolvedPort)) else { return }
+            let manualPort = defaults.integer(forKey: "gateway.manual.port")
+            let resolvedPort = manualPort > 0 ? manualPort : 18789
+            let manualTLS = defaults.bool(forKey: "gateway.manual.tls")
+
+            let stableID = self.manualStableID(host: manualHost, port: resolvedPort)
+            let tlsParams = self.resolveManualTLSParams(stableID: stableID, tlsEnabled: manualTLS)
+
+            guard let url = self.buildGatewayURL(
+                host: manualHost,
+                port: resolvedPort,
+                useTLS: tlsParams?.required == true)
+            else { return }
 
             self.didAutoConnect = true
-            let endpoint = NWEndpoint.hostPort(host: NWEndpoint.Host(manualHost), port: port)
-            let stableID = BridgeEndpointID.stableID(endpoint)
-            let tlsParams = self.resolveManualTLSParams(stableID: stableID)
             self.startAutoConnect(
-                endpoint: endpoint,
-                bridgeStableID: stableID,
+                url: url,
+                gatewayStableID: stableID,
                 tls: tlsParams,
                 token: token,
-                instanceId: instanceId)
+                password: password)
             return
         }
 
-        let preferredStableID = defaults.string(forKey: "bridge.preferredStableID")?
+        let preferredStableID = defaults.string(forKey: "gateway.preferredStableID")?
             .trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-        let lastDiscoveredStableID = defaults.string(forKey: "bridge.lastDiscoveredStableID")?
+        let lastDiscoveredStableID = defaults.string(forKey: "gateway.lastDiscoveredStableID")?
             .trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
 
         let candidates = [preferredStableID, lastDiscoveredStableID].filter { !$0.isEmpty }
         guard let targetStableID = candidates.first(where: { id in
-            self.bridges.contains(where: { $0.stableID == id })
+            self.gateways.contains(where: { $0.stableID == id })
         }) else { return }
 
-        guard let target = self.bridges.first(where: { $0.stableID == targetStableID }) else { return }
+        guard let target = self.gateways.first(where: { $0.stableID == targetStableID }) else { return }
+        guard let host = self.resolveGatewayHost(target) else { return }
+        let port = target.gatewayPort ?? 18789
+        let tlsParams = self.resolveDiscoveredTLSParams(gateway: target)
+        guard let url = self.buildGatewayURL(host: host, port: port, useTLS: tlsParams?.required == true)
+        else { return }
 
-        let tlsParams = self.resolveDiscoveredTLSParams(bridge: target)
         self.didAutoConnect = true
         self.startAutoConnect(
-            endpoint: target.endpoint,
-            bridgeStableID: target.stableID,
+            url: url,
+            gatewayStableID: target.stableID,
             tls: tlsParams,
             token: token,
-            instanceId: instanceId)
+            password: password)
     }
 
-    private func updateLastDiscoveredBridge(from bridges: [BridgeDiscoveryModel.DiscoveredBridge]) {
+    private func updateLastDiscoveredGateway(from gateways: [GatewayDiscoveryModel.DiscoveredGateway]) {
         let defaults = UserDefaults.standard
-        let preferred = defaults.string(forKey: "bridge.preferredStableID")?
+        let preferred = defaults.string(forKey: "gateway.preferredStableID")?
             .trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-        let existingLast = defaults.string(forKey: "bridge.lastDiscoveredStableID")?
+        let existingLast = defaults.string(forKey: "gateway.lastDiscoveredStableID")?
             .trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
 
         // Avoid overriding user intent (preferred/lastDiscovered are also set on manual Connect).
         guard preferred.isEmpty, existingLast.isEmpty else { return }
-        guard let first = bridges.first else { return }
+        guard let first = gateways.first else { return }
 
-        defaults.set(first.stableID, forKey: "bridge.lastDiscoveredStableID")
-        BridgeSettingsStore.saveLastDiscoveredBridgeStableID(first.stableID)
-    }
-
-    private func makeHello(token: String) -> BridgeHello {
-        let defaults = UserDefaults.standard
-        let nodeId = defaults.string(forKey: "node.instanceId") ?? "ios-node"
-        let displayName = self.resolvedDisplayName(defaults: defaults)
-
-        return BridgeHello(
-            nodeId: nodeId,
-            displayName: displayName,
-            token: token,
-            platform: self.platformString(),
-            version: self.appVersion(),
-            deviceFamily: self.deviceFamily(),
-            modelIdentifier: self.modelIdentifier(),
-            caps: self.currentCaps(),
-            commands: self.currentCommands())
-    }
-
-    private func keychainAccount(instanceId: String) -> String {
-        "bridge-token.\(instanceId)"
+        defaults.set(first.stableID, forKey: "gateway.lastDiscoveredStableID")
+        GatewaySettingsStore.saveLastDiscoveredGatewayStableID(first.stableID)
     }
 
     private func startAutoConnect(
-        endpoint: NWEndpoint,
-        bridgeStableID: String,
-        tls: BridgeTLSParams?,
-        token: String,
-        instanceId: String)
+        url: URL,
+        gatewayStableID: String,
+        tls: GatewayTLSParams?,
+        token: String?,
+        password: String?)
     {
         guard let appModel else { return }
+        let connectOptions = self.makeConnectOptions()
+
         Task { [weak self] in
             guard let self else { return }
-            do {
-                let hello = self.makeHello(token: token)
-                let refreshed = try await self.bridgeClientFactory().pairAndHello(
-                    endpoint: endpoint,
-                    hello: hello,
-                    tls: tls,
-                    onStatus: { status in
-                        Task { @MainActor in
-                            appModel.bridgeStatusText = status
-                        }
-                    })
-                let resolvedToken = refreshed.isEmpty ? token : refreshed
-                if !refreshed.isEmpty, refreshed != token {
-                    _ = KeychainStore.saveString(
-                        refreshed,
-                        service: "com.clawdbot.bridge",
-                        account: self.keychainAccount(instanceId: instanceId))
-                }
-                appModel.connectToBridge(
-                    endpoint: endpoint,
-                    bridgeStableID: bridgeStableID,
-                    tls: tls,
-                    hello: self.makeHello(token: resolvedToken))
-            } catch {
-                await MainActor.run {
-                    appModel.bridgeStatusText = "Bridge error: \(error.localizedDescription)"
-                }
+            await MainActor.run {
+                appModel.gatewayStatusText = "Connecting…"
             }
+            appModel.connectToGateway(
+                url: url,
+                gatewayStableID: gatewayStableID,
+                tls: tls,
+                token: token,
+                password: password,
+                connectOptions: connectOptions)
         }
     }
 
-    private func resolveDiscoveredTLSParams(
-        bridge: BridgeDiscoveryModel.DiscoveredBridge) -> BridgeTLSParams?
-    {
-        let stableID = bridge.stableID
-        let stored = BridgeTLSStore.loadFingerprint(stableID: stableID)
+    private func resolveDiscoveredTLSParams(gateway: GatewayDiscoveryModel.DiscoveredGateway) -> GatewayTLSParams? {
+        let stableID = gateway.stableID
+        let stored = GatewayTLSStore.loadFingerprint(stableID: stableID)
 
-        if bridge.tlsEnabled || bridge.tlsFingerprintSha256 != nil {
-            return BridgeTLSParams(
+        if gateway.tlsEnabled || gateway.tlsFingerprintSha256 != nil || stored != nil {
+            return GatewayTLSParams(
                 required: true,
-                expectedFingerprint: bridge.tlsFingerprintSha256 ?? stored,
+                expectedFingerprint: gateway.tlsFingerprintSha256 ?? stored,
                 allowTOFU: stored == nil,
                 storeKey: stableID)
         }
 
-        if let stored {
-            return BridgeTLSParams(
-                required: true,
-                expectedFingerprint: stored,
-                allowTOFU: false,
-                storeKey: stableID)
-        }
-
         return nil
     }
 
-    private func resolveManualTLSParams(stableID: String) -> BridgeTLSParams? {
-        if let stored = BridgeTLSStore.loadFingerprint(stableID: stableID) {
-            return BridgeTLSParams(
+    private func resolveManualTLSParams(stableID: String, tlsEnabled: Bool) -> GatewayTLSParams? {
+        let stored = GatewayTLSStore.loadFingerprint(stableID: stableID)
+        if tlsEnabled || stored != nil {
+            return GatewayTLSParams(
                 required: true,
                 expectedFingerprint: stored,
-                allowTOFU: false,
+                allowTOFU: stored == nil,
                 storeKey: stableID)
         }
 
-        return BridgeTLSParams(
-            required: false,
-            expectedFingerprint: nil,
-            allowTOFU: true,
-            storeKey: stableID)
+        return nil
+    }
+
+    private func resolveGatewayHost(_ gateway: GatewayDiscoveryModel.DiscoveredGateway) -> String? {
+        if let lanHost = gateway.lanHost?.trimmingCharacters(in: .whitespacesAndNewlines), !lanHost.isEmpty {
+            return lanHost
+        }
+        if let tailnet = gateway.tailnetDns?.trimmingCharacters(in: .whitespacesAndNewlines), !tailnet.isEmpty {
+            return tailnet
+        }
+        return nil
+    }
+
+    private func buildGatewayURL(host: String, port: Int, useTLS: Bool) -> URL? {
+        let scheme = useTLS ? "wss" : "ws"
+        var components = URLComponents()
+        components.scheme = scheme
+        components.host = host
+        components.port = port
+        return components.url
+    }
+
+    private func manualStableID(host: String, port: Int) -> String {
+        "manual|\(host.lowercased())|\(port)"
+    }
+
+    private func makeConnectOptions() -> GatewayConnectOptions {
+        let defaults = UserDefaults.standard
+        let displayName = self.resolvedDisplayName(defaults: defaults)
+
+        return GatewayConnectOptions(
+            role: "node",
+            scopes: [],
+            caps: self.currentCaps(),
+            commands: self.currentCommands(),
+            permissions: [:],
+            clientId: "clawdbot-ios",
+            clientMode: "node",
+            clientDisplayName: displayName)
     }
 
     private func resolvedDisplayName(defaults: UserDefaults) -> String {
@@ -313,6 +334,11 @@ final class BridgeConnectionController {
             ClawdbotCanvasA2UICommand.pushJSONL.rawValue,
             ClawdbotCanvasA2UICommand.reset.rawValue,
             ClawdbotScreenCommand.record.rawValue,
+            ClawdbotSystemCommand.notify.rawValue,
+            ClawdbotSystemCommand.which.rawValue,
+            ClawdbotSystemCommand.run.rawValue,
+            ClawdbotSystemCommand.execApprovalsGet.rawValue,
+            ClawdbotSystemCommand.execApprovalsSet.rawValue,
         ]
 
         let caps = Set(self.currentCaps())
@@ -368,11 +394,7 @@ final class BridgeConnectionController {
 }
 
 #if DEBUG
-extension BridgeConnectionController {
-    func _test_makeHello(token: String) -> BridgeHello {
-        self.makeHello(token: token)
-    }
-
+extension GatewayConnectionController {
     func _test_resolvedDisplayName(defaults: UserDefaults) -> String {
         self.resolvedDisplayName(defaults: defaults)
     }
@@ -401,8 +423,8 @@ extension BridgeConnectionController {
         self.appVersion()
     }
 
-    func _test_setBridges(_ bridges: [BridgeDiscoveryModel.DiscoveredBridge]) {
-        self.bridges = bridges
+    func _test_setGateways(_ gateways: [GatewayDiscoveryModel.DiscoveredGateway]) {
+        self.gateways = gateways
     }
 
     func _test_triggerAutoConnect() {

apps/ios/Sources/Gateway/GatewayDiscoveryDebugLogView.swift

@@ -1,9 +1,9 @@
 import SwiftUI
 import UIKit
 
-struct BridgeDiscoveryDebugLogView: View {
-    @Environment(BridgeConnectionController.self) private var bridgeController
-    @AppStorage("bridge.discovery.debugLogs") private var debugLogsEnabled: Bool = false
+struct GatewayDiscoveryDebugLogView: View {
+    @Environment(GatewayConnectionController.self) private var gatewayController
+    @AppStorage("gateway.discovery.debugLogs") private var debugLogsEnabled: Bool = false
 
     var body: some View {
         List {
@@ -12,11 +12,11 @@ struct BridgeDiscoveryDebugLogView: View {
                     .foregroundStyle(.secondary)
             }
 
-            if self.bridgeController.discoveryDebugLog.isEmpty {
+            if self.gatewayController.discoveryDebugLog.isEmpty {
                 Text("No log entries yet.")
                     .foregroundStyle(.secondary)
             } else {
-                ForEach(self.bridgeController.discoveryDebugLog) { entry in
+                ForEach(self.gatewayController.discoveryDebugLog) { entry in
                     VStack(alignment: .leading, spacing: 2) {
                         Text(Self.formatTime(entry.ts))
                             .font(.caption)
@@ -35,13 +35,13 @@ struct BridgeDiscoveryDebugLogView: View {
                 Button("Copy") {
                     UIPasteboard.general.string = self.formattedLog()
                 }
-                .disabled(self.bridgeController.discoveryDebugLog.isEmpty)
+                .disabled(self.gatewayController.discoveryDebugLog.isEmpty)
             }
         }
     }
 
     private func formattedLog() -> String {
-        self.bridgeController.discoveryDebugLog
+        self.gatewayController.discoveryDebugLog
             .map { "\(Self.formatISO($0.ts)) \($0.message)" }
             .joined(separator: "\n")
     }

apps/ios/Sources/Gateway/GatewayDiscoveryModel.swift

@@ -5,14 +5,14 @@ import Observation
 
 @MainActor
 @Observable
-final class BridgeDiscoveryModel {
+final class GatewayDiscoveryModel {
     struct DebugLogEntry: Identifiable, Equatable {
         var id = UUID()
         var ts: Date
         var message: String
     }
 
-    struct DiscoveredBridge: Identifiable, Equatable {
+    struct DiscoveredGateway: Identifiable, Equatable {
         var id: String { self.stableID }
         var name: String
         var endpoint: NWEndpoint
@@ -21,19 +21,18 @@ final class BridgeDiscoveryModel {
         var lanHost: String?
         var tailnetDns: String?
         var gatewayPort: Int?
-        var bridgePort: Int?
         var canvasPort: Int?
         var tlsEnabled: Bool
         var tlsFingerprintSha256: String?
         var cliPath: String?
     }
 
-    var bridges: [DiscoveredBridge] = []
+    var gateways: [DiscoveredGateway] = []
     var statusText: String = "Idle"
     private(set) var debugLog: [DebugLogEntry] = []
 
     private var browsers: [String: NWBrowser] = [:]
-    private var bridgesByDomain: [String: [DiscoveredBridge]] = [:]
+    private var gatewaysByDomain: [String: [DiscoveredGateway]] = [:]
     private var statesByDomain: [String: NWBrowser.State] = [:]
     private var debugLoggingEnabled = false
     private var lastStableIDs = Set<String>()
@@ -45,7 +44,7 @@ final class BridgeDiscoveryModel {
             self.debugLog = []
         } else if !wasEnabled {
             self.appendDebugLog("debug logging enabled")
-            self.appendDebugLog("snapshot: status=\(self.statusText) bridges=\(self.bridges.count)")
+            self.appendDebugLog("snapshot: status=\(self.statusText) gateways=\(self.gateways.count)")
         }
     }
 
@@ -53,11 +52,11 @@ final class BridgeDiscoveryModel {
         if !self.browsers.isEmpty { return }
         self.appendDebugLog("start()")
 
-        for domain in ClawdbotBonjour.bridgeServiceDomains {
+        for domain in ClawdbotBonjour.gatewayServiceDomains {
             let params = NWParameters.tcp
             params.includePeerToPeer = true
             let browser = NWBrowser(
-                for: .bonjour(type: ClawdbotBonjour.bridgeServiceType, domain: domain),
+                for: .bonjour(type: ClawdbotBonjour.gatewayServiceType, domain: domain),
                 using: params)
 
             browser.stateUpdateHandler = { [weak self] state in
@@ -72,7 +71,7 @@ final class BridgeDiscoveryModel {
             browser.browseResultsChangedHandler = { [weak self] results, _ in
                 Task { @MainActor in
                     guard let self else { return }
-                    self.bridgesByDomain[domain] = results.compactMap { result -> DiscoveredBridge? in
+                    self.gatewaysByDomain[domain] = results.compactMap { result -> DiscoveredGateway? in
                         switch result.endpoint {
                         case let .service(name, _, _, _):
                             let decodedName = BonjourEscapes.decode(name)
@@ -82,18 +81,17 @@ final class BridgeDiscoveryModel {
                                 .map(Self.prettifyInstanceName)
                                 .flatMap { $0.isEmpty ? nil : $0 }
                             let prettyName = prettyAdvertised ?? Self.prettifyInstanceName(decodedName)
-                            return DiscoveredBridge(
+                            return DiscoveredGateway(
                                 name: prettyName,
                                 endpoint: result.endpoint,
-                                stableID: BridgeEndpointID.stableID(result.endpoint),
-                                debugID: BridgeEndpointID.prettyDescription(result.endpoint),
+                                stableID: GatewayEndpointID.stableID(result.endpoint),
+                                debugID: GatewayEndpointID.prettyDescription(result.endpoint),
                                 lanHost: Self.txtValue(txt, key: "lanHost"),
                                 tailnetDns: Self.txtValue(txt, key: "tailnetDns"),
                                 gatewayPort: Self.txtIntValue(txt, key: "gatewayPort"),
-                                bridgePort: Self.txtIntValue(txt, key: "bridgePort"),
                                 canvasPort: Self.txtIntValue(txt, key: "canvasPort"),
-                                tlsEnabled: Self.txtBoolValue(txt, key: "bridgeTls"),
-                                tlsFingerprintSha256: Self.txtValue(txt, key: "bridgeTlsSha256"),
+                                tlsEnabled: Self.txtBoolValue(txt, key: "gatewayTls"),
+                                tlsFingerprintSha256: Self.txtValue(txt, key: "gatewayTlsSha256"),
                                 cliPath: Self.txtValue(txt, key: "cliPath"))
                         default:
                             return nil
@@ -101,12 +99,12 @@ final class BridgeDiscoveryModel {
                     }
                     .sorted { $0.name.localizedCaseInsensitiveCompare($1.name) == .orderedAscending }
 
-                    self.recomputeBridges()
+                    self.recomputeGateways()
                 }
             }
 
             self.browsers[domain] = browser
-            browser.start(queue: DispatchQueue(label: "com.clawdbot.ios.bridge-discovery.\(domain)"))
+            browser.start(queue: DispatchQueue(label: "com.clawdbot.ios.gateway-discovery.\(domain)"))
         }
     }
 
@@ -116,14 +114,14 @@ final class BridgeDiscoveryModel {
             browser.cancel()
         }
         self.browsers = [:]
-        self.bridgesByDomain = [:]
+        self.gatewaysByDomain = [:]
         self.statesByDomain = [:]
-        self.bridges = []
+        self.gateways = []
         self.statusText = "Stopped"
     }
 
-    private func recomputeBridges() {
-        let next = self.bridgesByDomain.values
+    private func recomputeGateways() {
+        let next = self.gatewaysByDomain.values
             .flatMap(\.self)
             .sorted { $0.name.localizedCaseInsensitiveCompare($1.name) == .orderedAscending }
 
@@ -134,7 +132,7 @@ final class BridgeDiscoveryModel {
             self.appendDebugLog("results: total=\(next.count) added=\(added.count) removed=\(removed.count)")
         }
         self.lastStableIDs = nextIDs
-        self.bridges = next
+        self.gateways = next
     }
 
     private func updateStatusText() {

apps/ios/Sources/Gateway/GatewaySettingsStore.swift

@@ -0,0 +1,226 @@
+import Foundation
+
+enum GatewaySettingsStore {
+    private static let gatewayService = "com.clawdbot.gateway"
+    private static let legacyBridgeService = "com.clawdbot.bridge"
+    private static let nodeService = "com.clawdbot.node"
+
+    private static let instanceIdDefaultsKey = "node.instanceId"
+    private static let preferredGatewayStableIDDefaultsKey = "gateway.preferredStableID"
+    private static let lastDiscoveredGatewayStableIDDefaultsKey = "gateway.lastDiscoveredStableID"
+    private static let manualEnabledDefaultsKey = "gateway.manual.enabled"
+    private static let manualHostDefaultsKey = "gateway.manual.host"
+    private static let manualPortDefaultsKey = "gateway.manual.port"
+    private static let manualTlsDefaultsKey = "gateway.manual.tls"
+    private static let discoveryDebugLogsDefaultsKey = "gateway.discovery.debugLogs"
+
+    private static let legacyPreferredBridgeStableIDDefaultsKey = "bridge.preferredStableID"
+    private static let legacyLastDiscoveredBridgeStableIDDefaultsKey = "bridge.lastDiscoveredStableID"
+    private static let legacyManualEnabledDefaultsKey = "bridge.manual.enabled"
+    private static let legacyManualHostDefaultsKey = "bridge.manual.host"
+    private static let legacyManualPortDefaultsKey = "bridge.manual.port"
+    private static let legacyDiscoveryDebugLogsDefaultsKey = "bridge.discovery.debugLogs"
+
+    private static let instanceIdAccount = "instanceId"
+    private static let preferredGatewayStableIDAccount = "preferredStableID"
+    private static let lastDiscoveredGatewayStableIDAccount = "lastDiscoveredStableID"
+
+    static func bootstrapPersistence() {
+        self.ensureStableInstanceID()
+        self.ensurePreferredGatewayStableID()
+        self.ensureLastDiscoveredGatewayStableID()
+        self.migrateLegacyDefaults()
+    }
+
+    static func loadStableInstanceID() -> String? {
+        KeychainStore.loadString(service: self.nodeService, account: self.instanceIdAccount)?
+            .trimmingCharacters(in: .whitespacesAndNewlines)
+    }
+
+    static func saveStableInstanceID(_ instanceId: String) {
+        _ = KeychainStore.saveString(instanceId, service: self.nodeService, account: self.instanceIdAccount)
+    }
+
+    static func loadPreferredGatewayStableID() -> String? {
+        KeychainStore.loadString(service: self.gatewayService, account: self.preferredGatewayStableIDAccount)?
+            .trimmingCharacters(in: .whitespacesAndNewlines)
+    }
+
+    static func savePreferredGatewayStableID(_ stableID: String) {
+        _ = KeychainStore.saveString(
+            stableID,
+            service: self.gatewayService,
+            account: self.preferredGatewayStableIDAccount)
+    }
+
+    static func loadLastDiscoveredGatewayStableID() -> String? {
+        KeychainStore.loadString(service: self.gatewayService, account: self.lastDiscoveredGatewayStableIDAccount)?
+            .trimmingCharacters(in: .whitespacesAndNewlines)
+    }
+
+    static func saveLastDiscoveredGatewayStableID(_ stableID: String) {
+        _ = KeychainStore.saveString(
+            stableID,
+            service: self.gatewayService,
+            account: self.lastDiscoveredGatewayStableIDAccount)
+    }
+
+    static func loadGatewayToken(instanceId: String) -> String? {
+        let account = self.gatewayTokenAccount(instanceId: instanceId)
+        let token = KeychainStore.loadString(service: self.gatewayService, account: account)?
+            .trimmingCharacters(in: .whitespacesAndNewlines)
+        if token?.isEmpty == false { return token }
+
+        let legacyAccount = self.legacyBridgeTokenAccount(instanceId: instanceId)
+        let legacy = KeychainStore.loadString(service: self.legacyBridgeService, account: legacyAccount)?
+            .trimmingCharacters(in: .whitespacesAndNewlines)
+        if let legacy, !legacy.isEmpty {
+            _ = KeychainStore.saveString(legacy, service: self.gatewayService, account: account)
+            return legacy
+        }
+        return nil
+    }
+
+    static func saveGatewayToken(_ token: String, instanceId: String) {
+        _ = KeychainStore.saveString(
+            token,
+            service: self.gatewayService,
+            account: self.gatewayTokenAccount(instanceId: instanceId))
+    }
+
+    static func loadGatewayPassword(instanceId: String) -> String? {
+        KeychainStore.loadString(
+            service: self.gatewayService,
+            account: self.gatewayPasswordAccount(instanceId: instanceId))?
+            .trimmingCharacters(in: .whitespacesAndNewlines)
+    }
+
+    static func saveGatewayPassword(_ password: String, instanceId: String) {
+        _ = KeychainStore.saveString(
+            password,
+            service: self.gatewayService,
+            account: self.gatewayPasswordAccount(instanceId: instanceId))
+    }
+
+    private static func gatewayTokenAccount(instanceId: String) -> String {
+        "gateway-token.\(instanceId)"
+    }
+
+    private static func legacyBridgeTokenAccount(instanceId: String) -> String {
+        "bridge-token.\(instanceId)"
+    }
+
+    private static func gatewayPasswordAccount(instanceId: String) -> String {
+        "gateway-password.\(instanceId)"
+    }
+
+    private static func ensureStableInstanceID() {
+        let defaults = UserDefaults.standard
+
+        if let existing = defaults.string(forKey: self.instanceIdDefaultsKey)?
+            .trimmingCharacters(in: .whitespacesAndNewlines),
+            !existing.isEmpty
+        {
+            if self.loadStableInstanceID() == nil {
+                self.saveStableInstanceID(existing)
+            }
+            return
+        }
+
+        if let stored = self.loadStableInstanceID(), !stored.isEmpty {
+            defaults.set(stored, forKey: self.instanceIdDefaultsKey)
+            return
+        }
+
+        let fresh = UUID().uuidString
+        self.saveStableInstanceID(fresh)
+        defaults.set(fresh, forKey: self.instanceIdDefaultsKey)
+    }
+
+    private static func ensurePreferredGatewayStableID() {
+        let defaults = UserDefaults.standard
+
+        if let existing = defaults.string(forKey: self.preferredGatewayStableIDDefaultsKey)?
+            .trimmingCharacters(in: .whitespacesAndNewlines),
+            !existing.isEmpty
+        {
+            if self.loadPreferredGatewayStableID() == nil {
+                self.savePreferredGatewayStableID(existing)
+            }
+            return
+        }
+
+        if let stored = self.loadPreferredGatewayStableID(), !stored.isEmpty {
+            defaults.set(stored, forKey: self.preferredGatewayStableIDDefaultsKey)
+        }
+    }
+
+    private static func ensureLastDiscoveredGatewayStableID() {
+        let defaults = UserDefaults.standard
+
+        if let existing = defaults.string(forKey: self.lastDiscoveredGatewayStableIDDefaultsKey)?
+            .trimmingCharacters(in: .whitespacesAndNewlines),
+            !existing.isEmpty
+        {
+            if self.loadLastDiscoveredGatewayStableID() == nil {
+                self.saveLastDiscoveredGatewayStableID(existing)
+            }
+            return
+        }
+
+        if let stored = self.loadLastDiscoveredGatewayStableID(), !stored.isEmpty {
+            defaults.set(stored, forKey: self.lastDiscoveredGatewayStableIDDefaultsKey)
+        }
+    }
+
+    private static func migrateLegacyDefaults() {
+        let defaults = UserDefaults.standard
+
+        if defaults.string(forKey: self.preferredGatewayStableIDDefaultsKey)?.isEmpty != false,
+           let legacy = defaults.string(forKey: self.legacyPreferredBridgeStableIDDefaultsKey),
+           !legacy.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
+        {
+            defaults.set(legacy, forKey: self.preferredGatewayStableIDDefaultsKey)
+            self.savePreferredGatewayStableID(legacy)
+        }
+
+        if defaults.string(forKey: self.lastDiscoveredGatewayStableIDDefaultsKey)?.isEmpty != false,
+           let legacy = defaults.string(forKey: self.legacyLastDiscoveredBridgeStableIDDefaultsKey),
+           !legacy.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
+        {
+            defaults.set(legacy, forKey: self.lastDiscoveredGatewayStableIDDefaultsKey)
+            self.saveLastDiscoveredGatewayStableID(legacy)
+        }
+
+        if defaults.object(forKey: self.manualEnabledDefaultsKey) == nil,
+           defaults.object(forKey: self.legacyManualEnabledDefaultsKey) != nil
+        {
+            defaults.set(
+                defaults.bool(forKey: self.legacyManualEnabledDefaultsKey),
+                forKey: self.manualEnabledDefaultsKey)
+        }
+
+        if defaults.string(forKey: self.manualHostDefaultsKey)?.isEmpty != false,
+           let legacy = defaults.string(forKey: self.legacyManualHostDefaultsKey),
+           !legacy.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
+        {
+            defaults.set(legacy, forKey: self.manualHostDefaultsKey)
+        }
+
+        if defaults.integer(forKey: self.manualPortDefaultsKey) == 0,
+           defaults.integer(forKey: self.legacyManualPortDefaultsKey) > 0
+        {
+            defaults.set(
+                defaults.integer(forKey: self.legacyManualPortDefaultsKey),
+                forKey: self.manualPortDefaultsKey)
+        }
+
+        if defaults.object(forKey: self.discoveryDebugLogsDefaultsKey) == nil,
+           defaults.object(forKey: self.legacyDiscoveryDebugLogsDefaultsKey) != nil
+        {
+            defaults.set(
+                defaults.bool(forKey: self.legacyDiscoveryDebugLogsDefaultsKey),
+                forKey: self.discoveryDebugLogsDefaultsKey)
+        }
+    }
+}

apps/ios/Sources/Info.plist

@@ -19,9 +19,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2026.1.11-4</string>
+	<string>2026.1.20</string>
 	<key>CFBundleVersion</key>
-	<string>202601113</string>
+	<string>20260120</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoadsInWebContent</key>
@@ -29,12 +29,12 @@
 	</dict>
 	<key>NSBonjourServices</key>
 	<array>
-		<string>_clawdbot-bridge._tcp</string>
+		<string>_clawdbot-gw._tcp</string>
 	</array>
 	<key>NSCameraUsageDescription</key>
-	<string>Clawdbot can capture photos or short video clips when requested via the bridge.</string>
+	<string>Clawdbot can capture photos or short video clips when requested via the gateway.</string>
 	<key>NSLocalNetworkUsageDescription</key>
-	<string>Clawdbot discovers and connects to your Clawdbot bridge on the local network.</string>
+	<string>Clawdbot discovers and connects to your Clawdbot gateway on the local network.</string>
 	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
 	<string>Clawdbot can share your location in the background when you enable Always.</string>
 	<key>NSLocationWhenInUseUsageDescription</key>

apps/ios/Sources/Model/NodeAppModel.swift

@@ -18,15 +18,15 @@ final class NodeAppModel {
     let screen = ScreenController()
     let camera = CameraController()
     private let screenRecorder = ScreenRecordService()
-    var bridgeStatusText: String = "Offline"
-    var bridgeServerName: String?
-    var bridgeRemoteAddress: String?
-    var connectedBridgeID: String?
+    var gatewayStatusText: String = "Offline"
+    var gatewayServerName: String?
+    var gatewayRemoteAddress: String?
+    var connectedGatewayID: String?
     var seamColorHex: String?
     var mainSessionKey: String = "main"
 
-    private let bridge = BridgeSession()
-    private var bridgeTask: Task<Void, Never>?
+    private let gateway = GatewayNodeSession()
+    private var gatewayTask: Task<Void, Never>?
     private var voiceWakeSyncTask: Task<Void, Never>?
     @ObservationIgnored private var cameraHUDDismissTask: Task<Void, Never>?
     let voiceWake = VoiceWakeManager()
@@ -34,7 +34,8 @@ final class NodeAppModel {
     private let locationService = LocationService()
     private var lastAutoA2uiURL: String?
 
-    var bridgeSession: BridgeSession { self.bridge }
+    private var gatewayConnected = false
+    var gatewaySession: GatewayNodeSession { self.gateway }
 
     var cameraHUDText: String?
     var cameraHUDKind: CameraHUDKind?
@@ -54,7 +55,7 @@ final class NodeAppModel {
 
         let enabled = UserDefaults.standard.bool(forKey: "voiceWake.enabled")
         self.voiceWake.setEnabled(enabled)
-        self.talkMode.attachBridge(self.bridge)
+        self.talkMode.attachGateway(self.gateway)
         let talkEnabled = UserDefaults.standard.bool(forKey: "talk.enabled")
         self.talkMode.setEnabled(talkEnabled)
 
@@ -120,9 +121,9 @@ final class NodeAppModel {
 
         let ok: Bool
         var errorText: String?
-        if await !self.isBridgeConnected() {
+        if await !self.isGatewayConnected() {
             ok = false
-            errorText = "bridge not connected"
+            errorText = "gateway not connected"
         } else {
             do {
                 try await self.sendAgentRequest(link: AgentDeepLink(
@@ -150,7 +151,7 @@ final class NodeAppModel {
     }
 
     private func resolveA2UIHostURL() async -> String? {
-        guard let raw = await self.bridge.currentCanvasHostUrl() else { return nil }
+        guard let raw = await self.gateway.currentCanvasHostUrl() else { return nil }
         let trimmed = raw.trimmingCharacters(in: .whitespacesAndNewlines)
         guard !trimmed.isEmpty, let base = URL(string: trimmed) else { return nil }
         return base.appendingPathComponent("__clawdbot__/a2ui/").absoluteString + "?platform=ios"
@@ -202,56 +203,70 @@ final class NodeAppModel {
         }
     }
 
-    func connectToBridge(
-        endpoint: NWEndpoint,
-        bridgeStableID: String,
-        tls: BridgeTLSParams?,
-        hello: BridgeHello)
+    func connectToGateway(
+        url: URL,
+        gatewayStableID: String,
+        tls: GatewayTLSParams?,
+        token: String?,
+        password: String?,
+        connectOptions: GatewayConnectOptions)
     {
-        self.bridgeTask?.cancel()
-        self.bridgeServerName = nil
-        self.bridgeRemoteAddress = nil
-        let id = bridgeStableID.trimmingCharacters(in: .whitespacesAndNewlines)
-        self.connectedBridgeID = id.isEmpty ? BridgeEndpointID.stableID(endpoint) : id
+        self.gatewayTask?.cancel()
+        self.gatewayServerName = nil
+        self.gatewayRemoteAddress = nil
+        let id = gatewayStableID.trimmingCharacters(in: .whitespacesAndNewlines)
+        self.connectedGatewayID = id.isEmpty ? url.absoluteString : id
+        self.gatewayConnected = false
         self.voiceWakeSyncTask?.cancel()
         self.voiceWakeSyncTask = nil
+        let sessionBox = tls.map { WebSocketSessionBox(session: GatewayTLSPinningSession(params: $0)) }
 
-        self.bridgeTask = Task {
+        self.gatewayTask = Task {
             var attempt = 0
             while !Task.isCancelled {
                 await MainActor.run {
                     if attempt == 0 {
-                        self.bridgeStatusText = "Connecting…"
+                        self.gatewayStatusText = "Connecting…"
                     } else {
-                        self.bridgeStatusText = "Reconnecting…"
+                        self.gatewayStatusText = "Reconnecting…"
                     }
-                    self.bridgeServerName = nil
-                    self.bridgeRemoteAddress = nil
+                    self.gatewayServerName = nil
+                    self.gatewayRemoteAddress = nil
                 }
 
                 do {
-                    try await self.bridge.connect(
-                        endpoint: endpoint,
-                        hello: hello,
-                        tls: tls,
-                        onConnected: { [weak self] serverName, mainSessionKey in
+                    try await self.gateway.connect(
+                        url: url,
+                        token: token,
+                        password: password,
+                        connectOptions: connectOptions,
+                        sessionBox: sessionBox,
+                        onConnected: { [weak self] in
                             guard let self else { return }
                             await MainActor.run {
-                                self.bridgeStatusText = "Connected"
-                                self.bridgeServerName = serverName
+                                self.gatewayStatusText = "Connected"
+                                self.gatewayServerName = url.host ?? "gateway"
+                                self.gatewayConnected = true
                             }
-                            await MainActor.run {
-                                self.applyMainSessionKey(mainSessionKey)
-                            }
-                            if let addr = await self.bridge.currentRemoteAddress() {
+                            if let addr = await self.gateway.currentRemoteAddress() {
                                 await MainActor.run {
-                                    self.bridgeRemoteAddress = addr
+                                    self.gatewayRemoteAddress = addr
                                 }
                             }
                             await self.refreshBrandingFromGateway()
                             await self.startVoiceWakeSync()
                             await self.showA2UIOnConnectIfNeeded()
                         },
+                        onDisconnected: { [weak self] reason in
+                            guard let self else { return }
+                            await MainActor.run {
+                                self.gatewayStatusText = "Disconnected"
+                                self.gatewayRemoteAddress = nil
+                                self.gatewayConnected = false
+                                self.showLocalCanvasOnDisconnect()
+                                self.gatewayStatusText = "Disconnected: \(reason)"
+                            }
+                        },
                         onInvoke: { [weak self] req in
                             guard let self else {
                                 return BridgeInvokeResponse(
@@ -265,19 +280,16 @@ final class NodeAppModel {
                         })
 
                     if Task.isCancelled { break }
-                    await MainActor.run {
-                        self.showLocalCanvasOnDisconnect()
-                    }
-                    attempt += 1
-                    let sleepSeconds = min(6.0, 0.35 * pow(1.7, Double(attempt)))
-                    try? await Task.sleep(nanoseconds: UInt64(sleepSeconds * 1_000_000_000))
+                    attempt = 0
+                    try? await Task.sleep(nanoseconds: 1_000_000_000)
                 } catch {
                     if Task.isCancelled { break }
                     attempt += 1
                     await MainActor.run {
-                        self.bridgeStatusText = "Bridge error: \(error.localizedDescription)"
-                        self.bridgeServerName = nil
-                        self.bridgeRemoteAddress = nil
+                        self.gatewayStatusText = "Gateway error: \(error.localizedDescription)"
+                        self.gatewayServerName = nil
+                        self.gatewayRemoteAddress = nil
+                        self.gatewayConnected = false
                         self.showLocalCanvasOnDisconnect()
                     }
                     let sleepSeconds = min(8.0, 0.5 * pow(1.7, Double(attempt)))
@@ -286,10 +298,11 @@ final class NodeAppModel {
             }
 
             await MainActor.run {
-                self.bridgeStatusText = "Offline"
-                self.bridgeServerName = nil
-                self.bridgeRemoteAddress = nil
-                self.connectedBridgeID = nil
+                self.gatewayStatusText = "Offline"
+                self.gatewayServerName = nil
+                self.gatewayRemoteAddress = nil
+                self.connectedGatewayID = nil
+                self.gatewayConnected = false
                 self.seamColorHex = nil
                 if !SessionKey.isCanonicalMainSessionKey(self.mainSessionKey) {
                     self.mainSessionKey = "main"
@@ -300,16 +313,17 @@ final class NodeAppModel {
         }
     }
 
-    func disconnectBridge() {
-        self.bridgeTask?.cancel()
-        self.bridgeTask = nil
+    func disconnectGateway() {
+        self.gatewayTask?.cancel()
+        self.gatewayTask = nil
         self.voiceWakeSyncTask?.cancel()
         self.voiceWakeSyncTask = nil
-        Task { await self.bridge.disconnect() }
-        self.bridgeStatusText = "Offline"
-        self.bridgeServerName = nil
-        self.bridgeRemoteAddress = nil
-        self.connectedBridgeID = nil
+        Task { await self.gateway.disconnect() }
+        self.gatewayStatusText = "Offline"
+        self.gatewayServerName = nil
+        self.gatewayRemoteAddress = nil
+        self.connectedGatewayID = nil
+        self.gatewayConnected = false
         self.seamColorHex = nil
         if !SessionKey.isCanonicalMainSessionKey(self.mainSessionKey) {
             self.mainSessionKey = "main"
@@ -347,7 +361,7 @@ final class NodeAppModel {
 
     private func refreshBrandingFromGateway() async {
         do {
-            let res = try await self.bridge.request(method: "config.get", paramsJSON: "{}", timeoutSeconds: 8)
+            let res = try await self.gateway.request(method: "config.get", paramsJSON: "{}", timeoutSeconds: 8)
             guard let json = try JSONSerialization.jsonObject(with: res) as? [String: Any] else { return }
             guard let config = json["config"] as? [String: Any] else { return }
             let ui = config["ui"] as? [String: Any]
@@ -378,7 +392,7 @@ final class NodeAppModel {
         else { return }
 
         do {
-            _ = try await self.bridge.request(method: "voicewake.set", paramsJSON: json, timeoutSeconds: 12)
+            _ = try await self.gateway.request(method: "voicewake.set", paramsJSON: json, timeoutSeconds: 12)
         } catch {
             // Best-effort only.
         }
@@ -391,12 +405,14 @@ final class NodeAppModel {
 
             await self.refreshWakeWordsFromGateway()
 
-            let stream = await self.bridge.subscribeServerEvents(bufferingNewest: 200)
+            let stream = await self.gateway.subscribeServerEvents(bufferingNewest: 200)
             for await evt in stream {
                 if Task.isCancelled { return }
                 guard evt.event == "voicewake.changed" else { continue }
-                guard let payloadJSON = evt.payloadJSON else { continue }
-                guard let triggers = VoiceWakePreferences.decodeGatewayTriggers(from: payloadJSON) else { continue }
+                guard let payload = evt.payload else { continue }
+                struct Payload: Decodable { var triggers: [String] }
+                guard let decoded = try? GatewayPayloadDecoding.decode(payload, as: Payload.self) else { continue }
+                let triggers = VoiceWakePreferences.sanitizeTriggerWords(decoded.triggers)
                 VoiceWakePreferences.saveTriggerWords(triggers)
             }
         }
@@ -404,7 +420,7 @@ final class NodeAppModel {
 
     private func refreshWakeWordsFromGateway() async {
         do {
-            let data = try await self.bridge.request(method: "voicewake.get", paramsJSON: "{}", timeoutSeconds: 8)
+            let data = try await self.gateway.request(method: "voicewake.get", paramsJSON: "{}", timeoutSeconds: 8)
             guard let triggers = VoiceWakePreferences.decodeGatewayTriggers(from: data) else { return }
             VoiceWakePreferences.saveTriggerWords(triggers)
         } catch {
@@ -413,6 +429,11 @@ final class NodeAppModel {
     }
 
     func sendVoiceTranscript(text: String, sessionKey: String?) async throws {
+        if await !self.isGatewayConnected() {
+            throw NSError(domain: "Gateway", code: 10, userInfo: [
+                NSLocalizedDescriptionKey: "Gateway not connected",
+            ])
+        }
         struct Payload: Codable {
             var text: String
             var sessionKey: String?
@@ -424,7 +445,7 @@ final class NodeAppModel {
                 NSLocalizedDescriptionKey: "Failed to encode voice transcript payload as UTF-8",
             ])
         }
-        try await self.bridge.sendEvent(event: "voice.transcript", payloadJSON: json)
+        await self.gateway.sendEvent(event: "voice.transcript", payloadJSON: json)
     }
 
     func handleDeepLink(url: URL) async {
@@ -445,8 +466,8 @@ final class NodeAppModel {
             return
         }
 
-        guard await self.isBridgeConnected() else {
-            self.screen.errorText = "Bridge not connected (cannot forward deep link)."
+        guard await self.isGatewayConnected() else {
+            self.screen.errorText = "Gateway not connected (cannot forward deep link)."
             return
         }
 
@@ -465,7 +486,7 @@ final class NodeAppModel {
             ])
         }
 
-        // iOS bridge forwards to the gateway; no local auth prompts here.
+        // iOS gateway forwards to the gateway; no local auth prompts here.
         // (Key-based unattended auth is handled on macOS for clawdbot:// links.)
         let data = try JSONEncoder().encode(link)
         guard let json = String(bytes: data, encoding: .utf8) else {
@@ -473,12 +494,11 @@ final class NodeAppModel {
                 NSLocalizedDescriptionKey: "Failed to encode agent request payload as UTF-8",
             ])
         }
-        try await self.bridge.sendEvent(event: "agent.request", payloadJSON: json)
+        await self.gateway.sendEvent(event: "agent.request", payloadJSON: json)
     }
 
-    private func isBridgeConnected() async -> Bool {
-        if case .connected = await self.bridge.state { return true }
-        return false
+    private func isGatewayConnected() async -> Bool {
+        self.gatewayConnected
     }
 
     private func handleInvoke(_ req: BridgeInvokeRequest) async -> BridgeInvokeResponse {
@@ -817,7 +837,7 @@ final class NodeAppModel {
             fps: params.fps,
             includeAudio: params.includeAudio,
             outPath: nil)
-        defer { try? FileManager.default.removeItem(atPath: path) }
+        defer { try? FileManager().removeItem(atPath: path) }
         let data = try Data(contentsOf: URL(fileURLWithPath: path))
         struct Payload: Codable {
             var format: String
@@ -837,26 +857,29 @@ final class NodeAppModel {
         return BridgeInvokeResponse(id: req.id, ok: true, payloadJSON: payload)
     }
 
-    private func locationMode() -> ClawdbotLocationMode {
+}
+
+private extension NodeAppModel {
+    func locationMode() -> ClawdbotLocationMode {
         let raw = UserDefaults.standard.string(forKey: "location.enabledMode") ?? "off"
         return ClawdbotLocationMode(rawValue: raw) ?? .off
     }
 
-    private func isLocationPreciseEnabled() -> Bool {
+    func isLocationPreciseEnabled() -> Bool {
         if UserDefaults.standard.object(forKey: "location.preciseEnabled") == nil { return true }
         return UserDefaults.standard.bool(forKey: "location.preciseEnabled")
     }
 
-    private static func decodeParams<T: Decodable>(_ type: T.Type, from json: String?) throws -> T {
+    static func decodeParams<T: Decodable>(_ type: T.Type, from json: String?) throws -> T {
         guard let json, let data = json.data(using: .utf8) else {
-            throw NSError(domain: "Bridge", code: 20, userInfo: [
+            throw NSError(domain: "Gateway", code: 20, userInfo: [
                 NSLocalizedDescriptionKey: "INVALID_REQUEST: paramsJSON required",
             ])
         }
         return try JSONDecoder().decode(type, from: data)
     }
 
-    private static func encodePayload(_ obj: some Encodable) throws -> String {
+    static func encodePayload(_ obj: some Encodable) throws -> String {
         let data = try JSONEncoder().encode(obj)
         guard let json = String(bytes: data, encoding: .utf8) else {
             throw NSError(domain: "NodeAppModel", code: 21, userInfo: [
@@ -866,17 +889,17 @@ final class NodeAppModel {
         return json
     }
 
-    private func isCameraEnabled() -> Bool {
+    func isCameraEnabled() -> Bool {
         // Default-on: if the key doesn't exist yet, treat it as enabled.
         if UserDefaults.standard.object(forKey: "camera.enabled") == nil { return true }
         return UserDefaults.standard.bool(forKey: "camera.enabled")
     }
 
-    private func triggerCameraFlash() {
+    func triggerCameraFlash() {
         self.cameraFlashNonce &+= 1
     }
 
-    private func showCameraHUD(text: String, kind: CameraHUDKind, autoHideSeconds: Double? = nil) {
+    func showCameraHUD(text: String, kind: CameraHUDKind, autoHideSeconds: Double? = nil) {
         self.cameraHUDDismissTask?.cancel()
 
         withAnimation(.spring(response: 0.25, dampingFraction: 0.85)) {

apps/ios/Sources/RootCanvas.swift

@@ -29,7 +29,7 @@ struct RootCanvas: View {
         ZStack {
             CanvasContent(
                 systemColorScheme: self.systemColorScheme,
-                bridgeStatus: self.bridgeStatus,
+                gatewayStatus: self.gatewayStatus,
                 voiceWakeEnabled: self.voiceWakeEnabled,
                 voiceWakeToastText: self.voiceWakeToastText,
                 cameraHUDText: self.appModel.cameraHUDText,
@@ -52,7 +52,7 @@ struct RootCanvas: View {
                 SettingsTab()
             case .chat:
                 ChatSheet(
-                    bridge: self.appModel.bridgeSession,
+                    gateway: self.appModel.gatewaySession,
                     sessionKey: self.appModel.mainSessionKey,
                     userAccent: self.appModel.seamColor)
             }
@@ -62,9 +62,9 @@ struct RootCanvas: View {
         .onChange(of: self.scenePhase) { _, _ in self.updateIdleTimer() }
         .onAppear { self.updateCanvasDebugStatus() }
         .onChange(of: self.canvasDebugStatusEnabled) { _, _ in self.updateCanvasDebugStatus() }
-        .onChange(of: self.appModel.bridgeStatusText) { _, _ in self.updateCanvasDebugStatus() }
-        .onChange(of: self.appModel.bridgeServerName) { _, _ in self.updateCanvasDebugStatus() }
-        .onChange(of: self.appModel.bridgeRemoteAddress) { _, _ in self.updateCanvasDebugStatus() }
+        .onChange(of: self.appModel.gatewayStatusText) { _, _ in self.updateCanvasDebugStatus() }
+        .onChange(of: self.appModel.gatewayServerName) { _, _ in self.updateCanvasDebugStatus() }
+        .onChange(of: self.appModel.gatewayRemoteAddress) { _, _ in self.updateCanvasDebugStatus() }
         .onChange(of: self.voiceWake.lastTriggeredCommand) { _, newValue in
             guard let newValue else { return }
             let trimmed = newValue.trimmingCharacters(in: .whitespacesAndNewlines)
@@ -91,10 +91,10 @@ struct RootCanvas: View {
         }
     }
 
-    private var bridgeStatus: StatusPill.BridgeState {
-        if self.appModel.bridgeServerName != nil { return .connected }
+    private var gatewayStatus: StatusPill.GatewayState {
+        if self.appModel.gatewayServerName != nil { return .connected }
 
-        let text = self.appModel.bridgeStatusText.trimmingCharacters(in: .whitespacesAndNewlines)
+        let text = self.appModel.gatewayStatusText.trimmingCharacters(in: .whitespacesAndNewlines)
         if text.localizedCaseInsensitiveContains("connecting") ||
             text.localizedCaseInsensitiveContains("reconnecting")
         {
@@ -115,8 +115,8 @@ struct RootCanvas: View {
     private func updateCanvasDebugStatus() {
         self.appModel.screen.setDebugStatusEnabled(self.canvasDebugStatusEnabled)
         guard self.canvasDebugStatusEnabled else { return }
-        let title = self.appModel.bridgeStatusText.trimmingCharacters(in: .whitespacesAndNewlines)
-        let subtitle = self.appModel.bridgeServerName ?? self.appModel.bridgeRemoteAddress
+        let title = self.appModel.gatewayStatusText.trimmingCharacters(in: .whitespacesAndNewlines)
+        let subtitle = self.appModel.gatewayServerName ?? self.appModel.gatewayRemoteAddress
         self.appModel.screen.updateDebugStatus(title: title, subtitle: subtitle)
     }
 }
@@ -126,7 +126,7 @@ private struct CanvasContent: View {
     @AppStorage("talk.enabled") private var talkEnabled: Bool = false
     @AppStorage("talk.button.enabled") private var talkButtonEnabled: Bool = true
     var systemColorScheme: ColorScheme
-    var bridgeStatus: StatusPill.BridgeState
+    var gatewayStatus: StatusPill.GatewayState
     var voiceWakeEnabled: Bool
     var voiceWakeToastText: String?
     var cameraHUDText: String?
@@ -177,7 +177,7 @@ private struct CanvasContent: View {
         }
         .overlay(alignment: .topLeading) {
             StatusPill(
-                bridge: self.bridgeStatus,
+                gateway: self.gatewayStatus,
                 voiceWakeEnabled: self.voiceWakeEnabled,
                 activity: self.statusActivity,
                 brighten: self.brightenButtons,
@@ -208,15 +208,15 @@ private struct CanvasContent: View {
                 tint: .orange)
         }
 
-        let bridgeStatus = self.appModel.bridgeStatusText.trimmingCharacters(in: .whitespacesAndNewlines)
-        let bridgeLower = bridgeStatus.lowercased()
-        if bridgeLower.contains("repair") {
+        let gatewayStatus = self.appModel.gatewayStatusText.trimmingCharacters(in: .whitespacesAndNewlines)
+        let gatewayLower = gatewayStatus.lowercased()
+        if gatewayLower.contains("repair") {
             return StatusPill.Activity(title: "Repairing…", systemImage: "wrench.and.screwdriver", tint: .orange)
         }
-        if bridgeLower.contains("approval") || bridgeLower.contains("pairing") {
+        if gatewayLower.contains("approval") || gatewayLower.contains("pairing") {
             return StatusPill.Activity(title: "Approval pending", systemImage: "person.crop.circle.badge.clock")
         }
-        // Avoid duplicating the primary bridge status ("Connecting…") in the activity slot.
+        // Avoid duplicating the primary gateway status ("Connecting…") in the activity slot.
 
         if self.appModel.screenRecordActive {
             return StatusPill.Activity(title: "Recording screen…", systemImage: "record.circle.fill", tint: .red)

apps/ios/Sources/RootTabs.swift

@@ -24,7 +24,7 @@ struct RootTabs: View {
         }
         .overlay(alignment: .topLeading) {
             StatusPill(
-                bridge: self.bridgeStatus,
+                gateway: self.gatewayStatus,
                 voiceWakeEnabled: self.voiceWakeEnabled,
                 activity: self.statusActivity,
                 onTap: { self.selectedTab = 2 })
@@ -64,10 +64,10 @@ struct RootTabs: View {
         }
     }
 
-    private var bridgeStatus: StatusPill.BridgeState {
-        if self.appModel.bridgeServerName != nil { return .connected }
+    private var gatewayStatus: StatusPill.GatewayState {
+        if self.appModel.gatewayServerName != nil { return .connected }
 
-        let text = self.appModel.bridgeStatusText.trimmingCharacters(in: .whitespacesAndNewlines)
+        let text = self.appModel.gatewayStatusText.trimmingCharacters(in: .whitespacesAndNewlines)
         if text.localizedCaseInsensitiveContains("connecting") ||
             text.localizedCaseInsensitiveContains("reconnecting")
         {
@@ -90,15 +90,15 @@ struct RootTabs: View {
                 tint: .orange)
         }
 
-        let bridgeStatus = self.appModel.bridgeStatusText.trimmingCharacters(in: .whitespacesAndNewlines)
-        let bridgeLower = bridgeStatus.lowercased()
-        if bridgeLower.contains("repair") {
+        let gatewayStatus = self.appModel.gatewayStatusText.trimmingCharacters(in: .whitespacesAndNewlines)
+        let gatewayLower = gatewayStatus.lowercased()
+        if gatewayLower.contains("repair") {
             return StatusPill.Activity(title: "Repairing…", systemImage: "wrench.and.screwdriver", tint: .orange)
         }
-        if bridgeLower.contains("approval") || bridgeLower.contains("pairing") {
+        if gatewayLower.contains("approval") || gatewayLower.contains("pairing") {
             return StatusPill.Activity(title: "Approval pending", systemImage: "person.crop.circle.badge.clock")
         }
-        // Avoid duplicating the primary bridge status ("Connecting…") in the activity slot.
+        // Avoid duplicating the primary gateway status ("Connecting…") in the activity slot.
 
         if self.appModel.screenRecordActive {
             return StatusPill.Activity(title: "Recording screen…", systemImage: "record.circle.fill", tint: .red)

apps/ios/Sources/Screen/ScreenRecordService.swift

@@ -91,7 +91,7 @@ final class ScreenRecordService: @unchecked Sendable {
         let includeAudio = includeAudio ?? true
 
         let outURL = self.makeOutputURL(outPath: outPath)
-        try? FileManager.default.removeItem(at: outURL)
+        try? FileManager().removeItem(at: outURL)
 
         return RecordConfig(
             durationMs: durationMs,
@@ -104,7 +104,7 @@ final class ScreenRecordService: @unchecked Sendable {
         if let outPath, !outPath.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
             return URL(fileURLWithPath: outPath)
         }
-        return FileManager.default.temporaryDirectory
+        return FileManager().temporaryDirectory
             .appendingPathComponent("clawdbot-screen-record-\(UUID().uuidString).mp4")
     }
 

apps/ios/Sources/Settings/SettingsTab.swift

@@ -15,7 +15,7 @@ extension ConnectStatusStore: @unchecked Sendable {}
 struct SettingsTab: View {
     @Environment(NodeAppModel.self) private var appModel: NodeAppModel
     @Environment(VoiceWakeManager.self) private var voiceWake: VoiceWakeManager
-    @Environment(BridgeConnectionController.self) private var bridgeController: BridgeConnectionController
+    @Environment(GatewayConnectionController.self) private var gatewayController: GatewayConnectionController
     @Environment(\.dismiss) private var dismiss
     @AppStorage("node.displayName") private var displayName: String = "iOS Node"
     @AppStorage("node.instanceId") private var instanceId: String = UUID().uuidString
@@ -26,17 +26,20 @@ struct SettingsTab: View {
     @AppStorage("location.enabledMode") private var locationEnabledModeRaw: String = ClawdbotLocationMode.off.rawValue
     @AppStorage("location.preciseEnabled") private var locationPreciseEnabled: Bool = true
     @AppStorage("screen.preventSleep") private var preventSleep: Bool = true
-    @AppStorage("bridge.preferredStableID") private var preferredBridgeStableID: String = ""
-    @AppStorage("bridge.lastDiscoveredStableID") private var lastDiscoveredBridgeStableID: String = ""
-    @AppStorage("bridge.manual.enabled") private var manualBridgeEnabled: Bool = false
-    @AppStorage("bridge.manual.host") private var manualBridgeHost: String = ""
-    @AppStorage("bridge.manual.port") private var manualBridgePort: Int = 18790
-    @AppStorage("bridge.discovery.debugLogs") private var discoveryDebugLogsEnabled: Bool = false
+    @AppStorage("gateway.preferredStableID") private var preferredGatewayStableID: String = ""
+    @AppStorage("gateway.lastDiscoveredStableID") private var lastDiscoveredGatewayStableID: String = ""
+    @AppStorage("gateway.manual.enabled") private var manualGatewayEnabled: Bool = false
+    @AppStorage("gateway.manual.host") private var manualGatewayHost: String = ""
+    @AppStorage("gateway.manual.port") private var manualGatewayPort: Int = 18789
+    @AppStorage("gateway.manual.tls") private var manualGatewayTLS: Bool = true
+    @AppStorage("gateway.discovery.debugLogs") private var discoveryDebugLogsEnabled: Bool = false
     @AppStorage("canvas.debugStatusEnabled") private var canvasDebugStatusEnabled: Bool = false
     @State private var connectStatus = ConnectStatusStore()
-    @State private var connectingBridgeID: String?
+    @State private var connectingGatewayID: String?
     @State private var localIPAddress: String?
     @State private var lastLocationModeRaw: String = ClawdbotLocationMode.off.rawValue
+    @State private var gatewayToken: String = ""
+    @State private var gatewayPassword: String = ""
 
     var body: some View {
         NavigationStack {
@@ -61,12 +64,12 @@ struct SettingsTab: View {
                     LabeledContent("Model", value: self.modelIdentifier())
                 }
 
-                Section("Bridge") {
-                    LabeledContent("Discovery", value: self.bridgeController.discoveryStatusText)
-                    LabeledContent("Status", value: self.appModel.bridgeStatusText)
-                    if let serverName = self.appModel.bridgeServerName {
+                Section("Gateway") {
+                    LabeledContent("Discovery", value: self.gatewayController.discoveryStatusText)
+                    LabeledContent("Status", value: self.appModel.gatewayStatusText)
+                    if let serverName = self.appModel.gatewayServerName {
                         LabeledContent("Server", value: serverName)
-                        if let addr = self.appModel.bridgeRemoteAddress {
+                        if let addr = self.appModel.gatewayRemoteAddress {
                             let parts = Self.parseHostPort(from: addr)
                             let urlString = Self.httpURLString(host: parts?.host, port: parts?.port, fallback: addr)
                             LabeledContent("Address") {
@@ -96,12 +99,12 @@ struct SettingsTab: View {
                         }
 
                         Button("Disconnect", role: .destructive) {
-                            self.appModel.disconnectBridge()
+                            self.appModel.disconnectGateway()
                         }
 
-                        self.bridgeList(showing: .availableOnly)
+                        self.gatewayList(showing: .availableOnly)
                     } else {
-                        self.bridgeList(showing: .all)
+                        self.gatewayList(showing: .all)
                     }
 
                     if let text = self.connectStatus.text {
@@ -111,19 +114,21 @@ struct SettingsTab: View {
                     }
 
                     DisclosureGroup("Advanced") {
-                        Toggle("Use Manual Bridge", isOn: self.$manualBridgeEnabled)
+                        Toggle("Use Manual Gateway", isOn: self.$manualGatewayEnabled)
 
-                        TextField("Host", text: self.$manualBridgeHost)
+                        TextField("Host", text: self.$manualGatewayHost)
                             .textInputAutocapitalization(.never)
                             .autocorrectionDisabled()
 
-                        TextField("Port", value: self.$manualBridgePort, format: .number)
+                        TextField("Port", value: self.$manualGatewayPort, format: .number)
                             .keyboardType(.numberPad)
 
+                        Toggle("Use TLS", isOn: self.$manualGatewayTLS)
+
                         Button {
                             Task { await self.connectManual() }
                         } label: {
-                            if self.connectingBridgeID == "manual" {
+                            if self.connectingGatewayID == "manual" {
                                 HStack(spacing: 8) {
                                     ProgressView()
                                         .progressViewStyle(.circular)
@@ -133,26 +138,32 @@ struct SettingsTab: View {
                                 Text("Connect (Manual)")
                             }
                         }
-                        .disabled(self.connectingBridgeID != nil || self.manualBridgeHost
+                        .disabled(self.connectingGatewayID != nil || self.manualGatewayHost
                             .trimmingCharacters(in: .whitespacesAndNewlines)
-                            .isEmpty || self.manualBridgePort <= 0 || self.manualBridgePort > 65535)
+                            .isEmpty || self.manualGatewayPort <= 0 || self.manualGatewayPort > 65535)
 
                         Text(
                             "Use this when mDNS/Bonjour discovery is blocked. "
-                                + "The bridge runs on the gateway (default port 18790).")
+                                + "The gateway WebSocket listens on port 18789 by default.")
                             .font(.footnote)
                             .foregroundStyle(.secondary)
 
                         Toggle("Discovery Debug Logs", isOn: self.$discoveryDebugLogsEnabled)
                             .onChange(of: self.discoveryDebugLogsEnabled) { _, newValue in
-                                self.bridgeController.setDiscoveryDebugLoggingEnabled(newValue)
+                                self.gatewayController.setDiscoveryDebugLoggingEnabled(newValue)
                             }
 
                         NavigationLink("Discovery Logs") {
-                            BridgeDiscoveryDebugLogView()
+                            GatewayDiscoveryDebugLogView()
                         }
 
                         Toggle("Debug Canvas Status", isOn: self.$canvasDebugStatusEnabled)
+
+                        TextField("Gateway Token", text: self.$gatewayToken)
+                            .textInputAutocapitalization(.never)
+                            .autocorrectionDisabled()
+
+                        SecureField("Gateway Password", text: self.$gatewayPassword)
                     }
                 }
 
@@ -179,7 +190,7 @@ struct SettingsTab: View {
 
                 Section("Camera") {
                     Toggle("Allow Camera", isOn: self.$cameraEnabled)
-                    Text("Allows the bridge to request photos or short video clips (foreground only).")
+                    Text("Allows the gateway to request photos or short video clips (foreground only).")
                         .font(.footnote)
                         .foregroundStyle(.secondary)
                 }
@@ -221,13 +232,30 @@ struct SettingsTab: View {
             .onAppear {
                 self.localIPAddress = Self.primaryIPv4Address()
                 self.lastLocationModeRaw = self.locationEnabledModeRaw
+                let trimmedInstanceId = self.instanceId.trimmingCharacters(in: .whitespacesAndNewlines)
+                if !trimmedInstanceId.isEmpty {
+                    self.gatewayToken = GatewaySettingsStore.loadGatewayToken(instanceId: trimmedInstanceId) ?? ""
+                    self.gatewayPassword = GatewaySettingsStore.loadGatewayPassword(instanceId: trimmedInstanceId) ?? ""
+                }
             }
-            .onChange(of: self.preferredBridgeStableID) { _, newValue in
+            .onChange(of: self.preferredGatewayStableID) { _, newValue in
                 let trimmed = newValue.trimmingCharacters(in: .whitespacesAndNewlines)
                 guard !trimmed.isEmpty else { return }
-                BridgeSettingsStore.savePreferredBridgeStableID(trimmed)
+                GatewaySettingsStore.savePreferredGatewayStableID(trimmed)
             }
-            .onChange(of: self.appModel.bridgeServerName) { _, _ in
+            .onChange(of: self.gatewayToken) { _, newValue in
+                let trimmed = newValue.trimmingCharacters(in: .whitespacesAndNewlines)
+                let instanceId = self.instanceId.trimmingCharacters(in: .whitespacesAndNewlines)
+                guard !instanceId.isEmpty else { return }
+                GatewaySettingsStore.saveGatewayToken(trimmed, instanceId: instanceId)
+            }
+            .onChange(of: self.gatewayPassword) { _, newValue in
+                let trimmed = newValue.trimmingCharacters(in: .whitespacesAndNewlines)
+                let instanceId = self.instanceId.trimmingCharacters(in: .whitespacesAndNewlines)
+                guard !instanceId.isEmpty else { return }
+                GatewaySettingsStore.saveGatewayPassword(trimmed, instanceId: instanceId)
+            }
+            .onChange(of: self.appModel.gatewayServerName) { _, _ in
                 self.connectStatus.text = nil
             }
             .onChange(of: self.locationEnabledModeRaw) { _, newValue in
@@ -248,14 +276,14 @@ struct SettingsTab: View {
     }
 
     @ViewBuilder
-    private func bridgeList(showing: BridgeListMode) -> some View {
-        if self.bridgeController.bridges.isEmpty {
-            Text("No bridges found yet.")
+    private func gatewayList(showing: GatewayListMode) -> some View {
+        if self.gatewayController.gateways.isEmpty {
+            Text("No gateways found yet.")
                 .foregroundStyle(.secondary)
         } else {
-            let connectedID = self.appModel.connectedBridgeID
-            let rows = self.bridgeController.bridges.filter { bridge in
-                let isConnected = bridge.stableID == connectedID
+            let connectedID = self.appModel.connectedGatewayID
+            let rows = self.gatewayController.gateways.filter { gateway in
+                let isConnected = gateway.stableID == connectedID
                 switch showing {
                 case .all:
                     return true
@@ -265,14 +293,14 @@ struct SettingsTab: View {
             }
 
             if rows.isEmpty, showing == .availableOnly {
-                Text("No other bridges found.")
+                Text("No other gateways found.")
                     .foregroundStyle(.secondary)
             } else {
-                ForEach(rows) { bridge in
+                ForEach(rows) { gateway in
                     HStack {
                         VStack(alignment: .leading, spacing: 2) {
-                            Text(bridge.name)
-                            let detailLines = self.bridgeDetailLines(bridge)
+                            Text(gateway.name)
+                            let detailLines = self.gatewayDetailLines(gateway)
                             ForEach(detailLines, id: \.self) { line in
                                 Text(line)
                                     .font(.footnote)
@@ -282,31 +310,27 @@ struct SettingsTab: View {
                         Spacer()
 
                         Button {
-                            Task { await self.connect(bridge) }
+                            Task { await self.connect(gateway) }
                         } label: {
-                            if self.connectingBridgeID == bridge.id {
+                            if self.connectingGatewayID == gateway.id {
                                 ProgressView()
                                     .progressViewStyle(.circular)
                             } else {
                                 Text("Connect")
                             }
                         }
-                        .disabled(self.connectingBridgeID != nil)
+                        .disabled(self.connectingGatewayID != nil)
                     }
                 }
             }
         }
     }
 
-    private enum BridgeListMode: Equatable {
+    private enum GatewayListMode: Equatable {
         case all
         case availableOnly
     }
 
-    private func keychainAccount() -> String {
-        "bridge-token.\(self.instanceId)"
-    }
-
     private func platformString() -> String {
         let v = ProcessInfo.processInfo.operatingSystemVersion
         return "iOS \(v.majorVersion).\(v.minorVersion).\(v.patchVersion)"
@@ -341,228 +365,37 @@ struct SettingsTab: View {
         return trimmed.isEmpty ? "unknown" : trimmed
     }
 
-    private func currentCaps() -> [String] {
-        var caps = [ClawdbotCapability.canvas.rawValue, ClawdbotCapability.screen.rawValue]
+    private func connect(_ gateway: GatewayDiscoveryModel.DiscoveredGateway) async {
+        self.connectingGatewayID = gateway.id
+        self.manualGatewayEnabled = false
+        self.preferredGatewayStableID = gateway.stableID
+        GatewaySettingsStore.savePreferredGatewayStableID(gateway.stableID)
+        self.lastDiscoveredGatewayStableID = gateway.stableID
+        GatewaySettingsStore.saveLastDiscoveredGatewayStableID(gateway.stableID)
+        defer { self.connectingGatewayID = nil }
 
-        let cameraEnabled =
-            UserDefaults.standard.object(forKey: "camera.enabled") == nil
-                ? true
-                : UserDefaults.standard.bool(forKey: "camera.enabled")
-        if cameraEnabled { caps.append(ClawdbotCapability.camera.rawValue) }
-
-        let voiceWakeEnabled = UserDefaults.standard.bool(forKey: VoiceWakePreferences.enabledKey)
-        if voiceWakeEnabled { caps.append(ClawdbotCapability.voiceWake.rawValue) }
-
-        return caps
-    }
-
-    private func currentCommands() -> [String] {
-        var commands: [String] = [
-            ClawdbotCanvasCommand.present.rawValue,
-            ClawdbotCanvasCommand.hide.rawValue,
-            ClawdbotCanvasCommand.navigate.rawValue,
-            ClawdbotCanvasCommand.evalJS.rawValue,
-            ClawdbotCanvasCommand.snapshot.rawValue,
-            ClawdbotCanvasA2UICommand.push.rawValue,
-            ClawdbotCanvasA2UICommand.pushJSONL.rawValue,
-            ClawdbotCanvasA2UICommand.reset.rawValue,
-            ClawdbotScreenCommand.record.rawValue,
-        ]
-
-        let caps = Set(self.currentCaps())
-        if caps.contains(ClawdbotCapability.camera.rawValue) {
-            commands.append(ClawdbotCameraCommand.list.rawValue)
-            commands.append(ClawdbotCameraCommand.snap.rawValue)
-            commands.append(ClawdbotCameraCommand.clip.rawValue)
-        }
-
-        return commands
-    }
-
-    private func connect(_ bridge: BridgeDiscoveryModel.DiscoveredBridge) async {
-        self.connectingBridgeID = bridge.id
-        self.manualBridgeEnabled = false
-        self.preferredBridgeStableID = bridge.stableID
-        BridgeSettingsStore.savePreferredBridgeStableID(bridge.stableID)
-        self.lastDiscoveredBridgeStableID = bridge.stableID
-        BridgeSettingsStore.saveLastDiscoveredBridgeStableID(bridge.stableID)
-        defer { self.connectingBridgeID = nil }
-
-        do {
-            let statusStore = self.connectStatus
-            let existing = KeychainStore.loadString(
-                service: "com.clawdbot.bridge",
-                account: self.keychainAccount())
-            let existingToken = (existing?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == false) ?
-                existing :
-                nil
-
-            let hello = BridgeHello(
-                nodeId: self.instanceId,
-                displayName: self.displayName,
-                token: existingToken,
-                platform: self.platformString(),
-                version: self.appVersion(),
-                deviceFamily: self.deviceFamily(),
-                modelIdentifier: self.modelIdentifier(),
-                caps: self.currentCaps(),
-                commands: self.currentCommands())
-            let tlsParams = self.resolveDiscoveredTLSParams(bridge: bridge)
-            let token = try await BridgeClient().pairAndHello(
-                endpoint: bridge.endpoint,
-                hello: hello,
-                tls: tlsParams,
-                onStatus: { status in
-                    Task { @MainActor in
-                        statusStore.text = status
-                    }
-                })
-
-            if !token.isEmpty, token != existingToken {
-                _ = KeychainStore.saveString(
-                    token,
-                    service: "com.clawdbot.bridge",
-                    account: self.keychainAccount())
-            }
-
-            self.appModel.connectToBridge(
-                endpoint: bridge.endpoint,
-                bridgeStableID: bridge.stableID,
-                tls: tlsParams,
-                hello: BridgeHello(
-                    nodeId: self.instanceId,
-                    displayName: self.displayName,
-                    token: token,
-                    platform: self.platformString(),
-                    version: self.appVersion(),
-                    deviceFamily: self.deviceFamily(),
-                    modelIdentifier: self.modelIdentifier(),
-                    caps: self.currentCaps(),
-                    commands: self.currentCommands()))
-
-        } catch {
-            self.connectStatus.text = "Failed: \(error.localizedDescription)"
-        }
+        await self.gatewayController.connect(gateway)
     }
 
     private func connectManual() async {
-        let host = self.manualBridgeHost.trimmingCharacters(in: .whitespacesAndNewlines)
+        let host = self.manualGatewayHost.trimmingCharacters(in: .whitespacesAndNewlines)
         guard !host.isEmpty else {
             self.connectStatus.text = "Failed: host required"
             return
         }
-        guard self.manualBridgePort > 0, self.manualBridgePort <= 65535 else {
-            self.connectStatus.text = "Failed: invalid port"
-            return
-        }
-        guard let port = NWEndpoint.Port(rawValue: UInt16(self.manualBridgePort)) else {
+        guard self.manualGatewayPort > 0, self.manualGatewayPort <= 65535 else {
             self.connectStatus.text = "Failed: invalid port"
             return
         }
 
-        self.connectingBridgeID = "manual"
-        self.manualBridgeEnabled = true
-        defer { self.connectingBridgeID = nil }
+        self.connectingGatewayID = "manual"
+        self.manualGatewayEnabled = true
+        defer { self.connectingGatewayID = nil }
 
-        let endpoint: NWEndpoint = .hostPort(host: NWEndpoint.Host(host), port: port)
-        let stableID = BridgeEndpointID.stableID(endpoint)
-        let tlsParams = self.resolveManualTLSParams(stableID: stableID)
-
-        do {
-            let statusStore = self.connectStatus
-            let existing = KeychainStore.loadString(
-                service: "com.clawdbot.bridge",
-                account: self.keychainAccount())
-            let existingToken = (existing?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == false) ?
-                existing :
-                nil
-
-            let hello = BridgeHello(
-                nodeId: self.instanceId,
-                displayName: self.displayName,
-                token: existingToken,
-                platform: self.platformString(),
-                version: self.appVersion(),
-                deviceFamily: self.deviceFamily(),
-                modelIdentifier: self.modelIdentifier(),
-                caps: self.currentCaps(),
-                commands: self.currentCommands())
-            let token = try await BridgeClient().pairAndHello(
-                endpoint: endpoint,
-                hello: hello,
-                tls: tlsParams,
-                onStatus: { status in
-                    Task { @MainActor in
-                        statusStore.text = status
-                    }
-                })
-
-            if !token.isEmpty, token != existingToken {
-                _ = KeychainStore.saveString(
-                    token,
-                    service: "com.clawdbot.bridge",
-                    account: self.keychainAccount())
-            }
-
-            self.appModel.connectToBridge(
-                endpoint: endpoint,
-                bridgeStableID: stableID,
-                tls: tlsParams,
-                hello: BridgeHello(
-                    nodeId: self.instanceId,
-                    displayName: self.displayName,
-                    token: token,
-                    platform: self.platformString(),
-                    version: self.appVersion(),
-                    deviceFamily: self.deviceFamily(),
-                    modelIdentifier: self.modelIdentifier(),
-                    caps: self.currentCaps(),
-                    commands: self.currentCommands()))
-
-        } catch {
-            self.connectStatus.text = "Failed: \(error.localizedDescription)"
-        }
-    }
-
-    private func resolveDiscoveredTLSParams(
-        bridge: BridgeDiscoveryModel.DiscoveredBridge) -> BridgeTLSParams?
-    {
-        let stableID = bridge.stableID
-        let stored = BridgeTLSStore.loadFingerprint(stableID: stableID)
-
-        if bridge.tlsEnabled || bridge.tlsFingerprintSha256 != nil {
-            return BridgeTLSParams(
-                required: true,
-                expectedFingerprint: bridge.tlsFingerprintSha256 ?? stored,
-                allowTOFU: stored == nil,
-                storeKey: stableID)
-        }
-
-        if let stored {
-            return BridgeTLSParams(
-                required: true,
-                expectedFingerprint: stored,
-                allowTOFU: false,
-                storeKey: stableID)
-        }
-
-        return nil
-    }
-
-    private func resolveManualTLSParams(stableID: String) -> BridgeTLSParams? {
-        if let stored = BridgeTLSStore.loadFingerprint(stableID: stableID) {
-            return BridgeTLSParams(
-                required: true,
-                expectedFingerprint: stored,
-                allowTOFU: false,
-                storeKey: stableID)
-        }
-
-        return BridgeTLSParams(
-            required: false,
-            expectedFingerprint: nil,
-            allowTOFU: true,
-            storeKey: stableID)
+        await self.gatewayController.connectManual(
+            host: host,
+            port: self.manualGatewayPort,
+            useTLS: self.manualGatewayTLS)
     }
 
     private static func primaryIPv4Address() -> String? {
@@ -611,23 +444,21 @@ struct SettingsTab: View {
         SettingsNetworkingHelpers.httpURLString(host: host, port: port, fallback: fallback)
     }
 
-    private func bridgeDetailLines(_ bridge: BridgeDiscoveryModel.DiscoveredBridge) -> [String] {
+    private func gatewayDetailLines(_ gateway: GatewayDiscoveryModel.DiscoveredGateway) -> [String] {
         var lines: [String] = []
-        if let lanHost = bridge.lanHost { lines.append("LAN: \(lanHost)") }
-        if let tailnet = bridge.tailnetDns { lines.append("Tailnet: \(tailnet)") }
+        if let lanHost = gateway.lanHost { lines.append("LAN: \(lanHost)") }
+        if let tailnet = gateway.tailnetDns { lines.append("Tailnet: \(tailnet)") }
 
-        let gatewayPort = bridge.gatewayPort
-        let bridgePort = bridge.bridgePort
-        let canvasPort = bridge.canvasPort
-        if gatewayPort != nil || bridgePort != nil || canvasPort != nil {
+        let gatewayPort = gateway.gatewayPort
+        let canvasPort = gateway.canvasPort
+        if gatewayPort != nil || canvasPort != nil {
             let gw = gatewayPort.map(String.init) ?? "—"
-            let br = bridgePort.map(String.init) ?? "—"
             let canvas = canvasPort.map(String.init) ?? "—"
-            lines.append("Ports: gw \(gw) · bridge \(br) · canvas \(canvas)")
+            lines.append("Ports: gateway \(gw) · canvas \(canvas)")
         }
 
         if lines.isEmpty {
-            lines.append(bridge.debugID)
+            lines.append(gateway.debugID)
         }
 
         return lines

apps/ios/Sources/Settings/VoiceWakeWordsSettingsView.swift

@@ -42,7 +42,7 @@ struct VoiceWakeWordsSettingsView: View {
             }
         }
         .onChange(of: self.triggerWords) { _, newValue in
-            // Keep local voice wake responsive even if bridge isn't connected yet.
+            // Keep local voice wake responsive even if the gateway isn't connected yet.
             VoiceWakePreferences.saveTriggerWords(newValue)
 
             let snapshot = VoiceWakePreferences.sanitizeTriggerWords(newValue)

apps/ios/Sources/Status/StatusPill.swift

@@ -3,7 +3,7 @@ import SwiftUI
 struct StatusPill: View {
     @Environment(\.scenePhase) private var scenePhase
 
-    enum BridgeState: Equatable {
+    enum GatewayState: Equatable {
         case connected
         case connecting
         case error
@@ -34,7 +34,7 @@ struct StatusPill: View {
         var tint: Color?
     }
 
-    var bridge: BridgeState
+    var gateway: GatewayState
     var voiceWakeEnabled: Bool
     var activity: Activity?
     var brighten: Bool = false
@@ -47,12 +47,12 @@ struct StatusPill: View {
             HStack(spacing: 10) {
                 HStack(spacing: 8) {
                     Circle()
-                        .fill(self.bridge.color)
+                        .fill(self.gateway.color)
                         .frame(width: 9, height: 9)
-                        .scaleEffect(self.bridge == .connecting ? (self.pulse ? 1.15 : 0.85) : 1.0)
-                        .opacity(self.bridge == .connecting ? (self.pulse ? 1.0 : 0.6) : 1.0)
+                        .scaleEffect(self.gateway == .connecting ? (self.pulse ? 1.15 : 0.85) : 1.0)
+                        .opacity(self.gateway == .connecting ? (self.pulse ? 1.0 : 0.6) : 1.0)
 
-                    Text(self.bridge.title)
+                    Text(self.gateway.title)
                         .font(.system(size: 13, weight: .semibold))
                         .foregroundStyle(.primary)
                 }
@@ -95,26 +95,26 @@ struct StatusPill: View {
         .buttonStyle(.plain)
         .accessibilityLabel("Status")
         .accessibilityValue(self.accessibilityValue)
-        .onAppear { self.updatePulse(for: self.bridge, scenePhase: self.scenePhase) }
+        .onAppear { self.updatePulse(for: self.gateway, scenePhase: self.scenePhase) }
         .onDisappear { self.pulse = false }
-        .onChange(of: self.bridge) { _, newValue in
+        .onChange(of: self.gateway) { _, newValue in
             self.updatePulse(for: newValue, scenePhase: self.scenePhase)
         }
         .onChange(of: self.scenePhase) { _, newValue in
-            self.updatePulse(for: self.bridge, scenePhase: newValue)
+            self.updatePulse(for: self.gateway, scenePhase: newValue)
         }
         .animation(.easeInOut(duration: 0.18), value: self.activity?.title)
     }
 
     private var accessibilityValue: String {
         if let activity {
-            return "\(self.bridge.title), \(activity.title)"
+            return "\(self.gateway.title), \(activity.title)"
         }
-        return "\(self.bridge.title), Voice Wake \(self.voiceWakeEnabled ? "enabled" : "disabled")"
+        return "\(self.gateway.title), Voice Wake \(self.voiceWakeEnabled ? "enabled" : "disabled")"
     }
 
-    private func updatePulse(for bridge: BridgeState, scenePhase: ScenePhase) {
-        guard bridge == .connecting, scenePhase == .active else {
+    private func updatePulse(for gateway: GatewayState, scenePhase: ScenePhase) {
+        guard gateway == .connecting, scenePhase == .active else {
             withAnimation(.easeOut(duration: 0.2)) { self.pulse = false }
             return
         }

apps/ios/Sources/Voice/TalkModeManager.swift

@@ -1,5 +1,6 @@
 import AVFAudio
 import ClawdbotKit
+import ClawdbotProtocol
 import Foundation
 import Observation
 import OSLog
@@ -42,15 +43,15 @@ final class TalkModeManager: NSObject {
     var pcmPlayer: PCMStreamingAudioPlaying = PCMStreamingAudioPlayer.shared
     var mp3Player: StreamingAudioPlaying = StreamingAudioPlayer.shared
 
-    private var bridge: BridgeSession?
+    private var gateway: GatewayNodeSession?
     private let silenceWindow: TimeInterval = 0.7
 
     private var chatSubscribedSessionKeys = Set<String>()
 
     private let logger = Logger(subsystem: "com.clawdbot", category: "TalkMode")
 
-    func attachBridge(_ bridge: BridgeSession) {
-        self.bridge = bridge
+    func attachGateway(_ gateway: GatewayNodeSession) {
+        self.gateway = gateway
     }
 
     func updateMainSessionKey(_ sessionKey: String?) {
@@ -232,9 +233,9 @@ final class TalkModeManager: NSObject {
 
         await self.reloadConfig()
         let prompt = self.buildPrompt(transcript: transcript)
-        guard let bridge else {
-            self.statusText = "Bridge not connected"
-            self.logger.warning("finalize: bridge not connected")
+        guard let gateway else {
+            self.statusText = "Gateway not connected"
+            self.logger.warning("finalize: gateway not connected")
             await self.start()
             return
         }
@@ -245,9 +246,9 @@ final class TalkModeManager: NSObject {
             await self.subscribeChatIfNeeded(sessionKey: sessionKey)
             self.logger.info(
                 "chat.send start sessionKey=\(sessionKey, privacy: .public) chars=\(prompt.count, privacy: .public)")
-            let runId = try await self.sendChat(prompt, bridge: bridge)
+            let runId = try await self.sendChat(prompt, gateway: gateway)
             self.logger.info("chat.send ok runId=\(runId, privacy: .public)")
-            let completion = await self.waitForChatCompletion(runId: runId, bridge: bridge, timeoutSeconds: 120)
+            let completion = await self.waitForChatCompletion(runId: runId, gateway: gateway, timeoutSeconds: 120)
             if completion == .timeout {
                 self.logger.warning(
                     "chat completion timeout runId=\(runId, privacy: .public); attempting history fallback")
@@ -264,7 +265,7 @@ final class TalkModeManager: NSObject {
             }
 
             guard let assistantText = try await self.waitForAssistantText(
-                bridge: bridge,
+                gateway: gateway,
                 since: startedAt,
                 timeoutSeconds: completion == .final ? 12 : 25)
             else {
@@ -286,31 +287,22 @@ final class TalkModeManager: NSObject {
     private func subscribeChatIfNeeded(sessionKey: String) async {
         let key = sessionKey.trimmingCharacters(in: .whitespacesAndNewlines)
         guard !key.isEmpty else { return }
-        guard let bridge else { return }
+        guard let gateway else { return }
         guard !self.chatSubscribedSessionKeys.contains(key) else { return }
 
-        do {
-            let payload = "{\"sessionKey\":\"\(key)\"}"
-            try await bridge.sendEvent(event: "chat.subscribe", payloadJSON: payload)
-            self.chatSubscribedSessionKeys.insert(key)
-            self.logger.info("chat.subscribe ok sessionKey=\(key, privacy: .public)")
-        } catch {
-            let err = error.localizedDescription
-            self.logger.warning("chat.subscribe failed key=\(key, privacy: .public) err=\(err, privacy: .public)")
-        }
+        let payload = "{\"sessionKey\":\"\(key)\"}"
+        await gateway.sendEvent(event: "chat.subscribe", payloadJSON: payload)
+        self.chatSubscribedSessionKeys.insert(key)
+        self.logger.info("chat.subscribe ok sessionKey=\(key, privacy: .public)")
     }
 
     private func unsubscribeAllChats() async {
-        guard let bridge else { return }
+        guard let gateway else { return }
         let keys = self.chatSubscribedSessionKeys
         self.chatSubscribedSessionKeys.removeAll()
         for key in keys {
-            do {
-                let payload = "{\"sessionKey\":\"\(key)\"}"
-                try await bridge.sendEvent(event: "chat.unsubscribe", payloadJSON: payload)
-            } catch {
-                // ignore
-            }
+            let payload = "{\"sessionKey\":\"\(key)\"}"
+            await gateway.sendEvent(event: "chat.unsubscribe", payloadJSON: payload)
         }
     }
 
@@ -336,7 +328,7 @@ final class TalkModeManager: NSObject {
         }
     }
 
-    private func sendChat(_ message: String, bridge: BridgeSession) async throws -> String {
+    private func sendChat(_ message: String, gateway: GatewayNodeSession) async throws -> String {
         struct SendResponse: Decodable { let runId: String }
         let payload: [String: Any] = [
             "sessionKey": self.mainSessionKey,
@@ -352,26 +344,27 @@ final class TalkModeManager: NSObject {
                 code: 1,
                 userInfo: [NSLocalizedDescriptionKey: "Failed to encode chat payload"])
         }
-        let res = try await bridge.request(method: "chat.send", paramsJSON: json, timeoutSeconds: 30)
+        let res = try await gateway.request(method: "chat.send", paramsJSON: json, timeoutSeconds: 30)
         let decoded = try JSONDecoder().decode(SendResponse.self, from: res)
         return decoded.runId
     }
 
     private func waitForChatCompletion(
         runId: String,
-        bridge: BridgeSession,
+        gateway: GatewayNodeSession,
         timeoutSeconds: Int = 120) async -> ChatCompletionState
     {
-        let stream = await bridge.subscribeServerEvents(bufferingNewest: 200)
+        let stream = await gateway.subscribeServerEvents(bufferingNewest: 200)
         return await withTaskGroup(of: ChatCompletionState.self) { group in
             group.addTask { [runId] in
                 for await evt in stream {
                     if Task.isCancelled { return .timeout }
-                    guard evt.event == "chat", let payload = evt.payloadJSON else { continue }
-                    guard let data = payload.data(using: .utf8) else { continue }
-                    guard let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any] else { continue }
-                    if (json["runId"] as? String) != runId { continue }
-                    if let state = json["state"] as? String {
+                    guard evt.event == "chat", let payload = evt.payload else { continue }
+                    guard let chatEvent = try? GatewayPayloadDecoding.decode(payload, as: ChatEvent.self) else {
+                        continue
+                    }
+                    guard chatEvent.runid == runId else { continue }
+                    if let state = chatEvent.state.value as? String {
                         switch state {
                         case "final": return .final
                         case "aborted": return .aborted
@@ -393,13 +386,13 @@ final class TalkModeManager: NSObject {
     }
 
     private func waitForAssistantText(
-        bridge: BridgeSession,
+        gateway: GatewayNodeSession,
         since: Double,
         timeoutSeconds: Int) async throws -> String?
     {
         let deadline = Date().addingTimeInterval(TimeInterval(timeoutSeconds))
         while Date() < deadline {
-            if let text = try await self.fetchLatestAssistantText(bridge: bridge, since: since) {
+            if let text = try await self.fetchLatestAssistantText(gateway: gateway, since: since) {
                 return text
             }
             try? await Task.sleep(nanoseconds: 300_000_000)
@@ -407,8 +400,8 @@ final class TalkModeManager: NSObject {
         return nil
     }
 
-    private func fetchLatestAssistantText(bridge: BridgeSession, since: Double? = nil) async throws -> String? {
-        let res = try await bridge.request(
+    private func fetchLatestAssistantText(gateway: GatewayNodeSession, since: Double? = nil) async throws -> String? {
+        let res = try await gateway.request(
             method: "chat.history",
             paramsJSON: "{\"sessionKey\":\"\(self.mainSessionKey)\"}",
             timeoutSeconds: 15)
@@ -649,9 +642,9 @@ final class TalkModeManager: NSObject {
     }
 
     private func reloadConfig() async {
-        guard let bridge else { return }
+        guard let gateway else { return }
         do {
-            let res = try await bridge.request(method: "config.get", paramsJSON: "{}", timeoutSeconds: 8)
+            let res = try await gateway.request(method: "config.get", paramsJSON: "{}", timeoutSeconds: 8)
             guard let json = try JSONSerialization.jsonObject(with: res) as? [String: Any] else { return }
             guard let config = json["config"] as? [String: Any] else { return }
             let talk = config["talk"] as? [String: Any]

apps/ios/SwiftSources.input.xcfilelist

@@ -1,15 +1,13 @@
-Sources/Bridge/BridgeClient.swift
-Sources/Bridge/BridgeConnectionController.swift
-Sources/Bridge/BridgeDiscoveryDebugLogView.swift
-Sources/Bridge/BridgeDiscoveryModel.swift
-Sources/Bridge/BridgeEndpointID.swift
-Sources/Bridge/BridgeSession.swift
-Sources/Bridge/BridgeSettingsStore.swift
-Sources/Bridge/KeychainStore.swift
+Sources/Gateway/GatewayConnectionController.swift
+Sources/Gateway/GatewayDiscoveryDebugLogView.swift
+Sources/Gateway/GatewayDiscoveryModel.swift
+Sources/Gateway/GatewaySettingsStore.swift
+Sources/Gateway/KeychainStore.swift
 Sources/Camera/CameraController.swift
 Sources/Chat/ChatSheet.swift
-Sources/Chat/IOSBridgeChatTransport.swift
+Sources/Chat/IOSGatewayChatTransport.swift
 Sources/ClawdbotApp.swift
+Sources/Location/LocationService.swift
 Sources/Model/NodeAppModel.swift
 Sources/RootCanvas.swift
 Sources/RootTabs.swift
@@ -17,6 +15,7 @@ Sources/Screen/ScreenController.swift
 Sources/Screen/ScreenRecordService.swift
 Sources/Screen/ScreenTab.swift
 Sources/Screen/ScreenWebView.swift
+Sources/SessionKey.swift
 Sources/Settings/SettingsNetworkingHelpers.swift
 Sources/Settings/SettingsTab.swift
 Sources/Settings/VoiceWakeWordsSettingsView.swift

apps/ios/Tests/BridgeClientTests.swift

@@ -1,196 +0,0 @@
-import ClawdbotKit
-import Foundation
-import Network
-import Testing
-@testable import Clawdbot
-
-@Suite struct BridgeClientTests {
-    private final class LineServer: @unchecked Sendable {
-        private let queue = DispatchQueue(label: "com.clawdbot.tests.bridge-client-server")
-        private let listener: NWListener
-        private var connection: NWConnection?
-        private var buffer = Data()
-
-        init() throws {
-            self.listener = try NWListener(using: .tcp, on: .any)
-        }
-
-        func start() async throws -> NWEndpoint.Port {
-            try await withCheckedThrowingContinuation(isolation: nil) { cont in
-                self.listener.stateUpdateHandler = { state in
-                    switch state {
-                    case .ready:
-                        if let port = self.listener.port {
-                            cont.resume(returning: port)
-                        } else {
-                            cont.resume(
-                                throwing: NSError(domain: "LineServer", code: 1, userInfo: [
-                                    NSLocalizedDescriptionKey: "listener missing port",
-                                ]))
-                        }
-                    case let .failed(err):
-                        cont.resume(throwing: err)
-                    default:
-                        break
-                    }
-                }
-
-                self.listener.newConnectionHandler = { [weak self] conn in
-                    guard let self else { return }
-                    self.connection = conn
-                    conn.start(queue: self.queue)
-                }
-
-                self.listener.start(queue: self.queue)
-            }
-        }
-
-        func stop() {
-            self.connection?.cancel()
-            self.connection = nil
-            self.listener.cancel()
-        }
-
-        func waitForConnection(timeoutMs: Int = 2000) async throws -> NWConnection {
-            let deadline = Date().addingTimeInterval(Double(timeoutMs) / 1000.0)
-            while Date() < deadline {
-                if let connection = self.connection { return connection }
-                try await Task.sleep(nanoseconds: 10_000_000)
-            }
-            throw NSError(domain: "LineServer", code: 2, userInfo: [
-                NSLocalizedDescriptionKey: "timed out waiting for connection",
-            ])
-        }
-
-        func receiveLine(timeoutMs: Int = 2000) async throws -> Data? {
-            let connection = try await self.waitForConnection(timeoutMs: timeoutMs)
-            let deadline = Date().addingTimeInterval(Double(timeoutMs) / 1000.0)
-
-            while Date() < deadline {
-                if let idx = self.buffer.firstIndex(of: 0x0A) {
-                    let line = self.buffer.prefix(upTo: idx)
-                    self.buffer.removeSubrange(...idx)
-                    return Data(line)
-                }
-
-                let chunk = try await withCheckedThrowingContinuation(isolation: nil) { (cont: CheckedContinuation<
-                    Data,
-                    Error,
-                >) in
-                    connection
-                        .receive(minimumIncompleteLength: 1, maximumLength: 64 * 1024) { data, _, isComplete, error in
-                            if let error {
-                                cont.resume(throwing: error)
-                                return
-                            }
-                            if isComplete {
-                                cont.resume(returning: Data())
-                                return
-                            }
-                            cont.resume(returning: data ?? Data())
-                        }
-                }
-
-                if chunk.isEmpty { return nil }
-                self.buffer.append(chunk)
-            }
-
-            throw NSError(domain: "LineServer", code: 3, userInfo: [
-                NSLocalizedDescriptionKey: "timed out waiting for line",
-            ])
-        }
-
-        func sendLine(_ line: String) async throws {
-            let connection = try await self.waitForConnection()
-            var data = Data(line.utf8)
-            data.append(0x0A)
-            try await withCheckedThrowingContinuation(isolation: nil) { (cont: CheckedContinuation<Void, Error>) in
-                connection.send(content: data, completion: .contentProcessed { err in
-                    if let err { cont.resume(throwing: err) } else { cont.resume(returning: ()) }
-                })
-            }
-        }
-    }
-
-    @Test func helloOkReturnsExistingToken() async throws {
-        let server = try LineServer()
-        let port = try await server.start()
-        defer { server.stop() }
-
-        let serverTask = Task {
-            let line = try await server.receiveLine()
-            #expect(line != nil)
-            _ = try JSONDecoder().decode(BridgeHello.self, from: line ?? Data())
-            try await server.sendLine(#"{"type":"hello-ok","serverName":"Test Gateway"}"#)
-        }
-        defer { serverTask.cancel() }
-
-        let client = BridgeClient()
-        let token = try await client.pairAndHello(
-            endpoint: .hostPort(host: NWEndpoint.Host("127.0.0.1"), port: port),
-            hello: BridgeHello(
-                nodeId: "ios-node",
-                displayName: "iOS",
-                token: "existing-token",
-                platform: "ios",
-                version: "1"),
-            onStatus: nil)
-
-        #expect(token == "existing-token")
-        _ = try await serverTask.value
-    }
-
-    @Test func notPairedTriggersPairRequestAndReturnsToken() async throws {
-        let server = try LineServer()
-        let port = try await server.start()
-        defer { server.stop() }
-
-        let serverTask = Task {
-            let helloLine = try await server.receiveLine()
-            #expect(helloLine != nil)
-            _ = try JSONDecoder().decode(BridgeHello.self, from: helloLine ?? Data())
-            try await server.sendLine(#"{"type":"error","code":"NOT_PAIRED","message":"not paired"}"#)
-
-            let pairLine = try await server.receiveLine()
-            #expect(pairLine != nil)
-            _ = try JSONDecoder().decode(BridgePairRequest.self, from: pairLine ?? Data())
-            try await server.sendLine(#"{"type":"pair-ok","token":"paired-token"}"#)
-        }
-        defer { serverTask.cancel() }
-
-        let client = BridgeClient()
-        let token = try await client.pairAndHello(
-            endpoint: .hostPort(host: NWEndpoint.Host("127.0.0.1"), port: port),
-            hello: BridgeHello(nodeId: "ios-node", displayName: "iOS", token: nil, platform: "ios", version: "1"),
-            onStatus: nil)
-
-        #expect(token == "paired-token")
-        _ = try await serverTask.value
-    }
-
-    @Test func unexpectedErrorIsSurfaced() async {
-        do {
-            let server = try LineServer()
-            let port = try await server.start()
-            defer { server.stop() }
-
-            let serverTask = Task {
-                let helloLine = try await server.receiveLine()
-                #expect(helloLine != nil)
-                _ = try JSONDecoder().decode(BridgeHello.self, from: helloLine ?? Data())
-                try await server.sendLine(#"{"type":"error","code":"NOPE","message":"nope"}"#)
-            }
-            defer { serverTask.cancel() }
-
-            let client = BridgeClient()
-            _ = try await client.pairAndHello(
-                endpoint: .hostPort(host: NWEndpoint.Host("127.0.0.1"), port: port),
-                hello: BridgeHello(nodeId: "ios-node", displayName: "iOS", token: nil, platform: "ios", version: "1"),
-                onStatus: nil)
-
-            Issue.record("Expected pairAndHello to throw for unexpected error code")
-        } catch {
-            #expect(error.localizedDescription.contains("NOPE"))
-        }
-    }
-}

apps/ios/Tests/BridgeConnectionControllerTests.swift

@@ -1,347 +0,0 @@
-import ClawdbotKit
-import Foundation
-import Network
-import Testing
-import UIKit
-@testable import Clawdbot
-
-private struct KeychainEntry: Hashable {
-    let service: String
-    let account: String
-}
-
-private let bridgeService = "com.clawdbot.bridge"
-private let nodeService = "com.clawdbot.node"
-private let instanceIdEntry = KeychainEntry(service: nodeService, account: "instanceId")
-private let preferredBridgeEntry = KeychainEntry(service: bridgeService, account: "preferredStableID")
-private let lastBridgeEntry = KeychainEntry(service: bridgeService, account: "lastDiscoveredStableID")
-
-private actor MockBridgePairingClient: BridgePairingClient {
-    private(set) var lastToken: String?
-    private let resultToken: String
-
-    init(resultToken: String) {
-        self.resultToken = resultToken
-    }
-
-    func pairAndHello(
-        endpoint: NWEndpoint,
-        hello: BridgeHello,
-        tls: BridgeTLSParams?,
-        onStatus: (@Sendable (String) -> Void)?) async throws -> String
-    {
-        self.lastToken = hello.token
-        onStatus?("Testing…")
-        return self.resultToken
-    }
-}
-
-private func withUserDefaults<T>(_ updates: [String: Any?], _ body: () throws -> T) rethrows -> T {
-    let defaults = UserDefaults.standard
-    var snapshot: [String: Any?] = [:]
-    for key in updates.keys {
-        snapshot[key] = defaults.object(forKey: key)
-    }
-    for (key, value) in updates {
-        if let value {
-            defaults.set(value, forKey: key)
-        } else {
-            defaults.removeObject(forKey: key)
-        }
-    }
-    defer {
-        for (key, value) in snapshot {
-            if let value {
-                defaults.set(value, forKey: key)
-            } else {
-                defaults.removeObject(forKey: key)
-            }
-        }
-    }
-    return try body()
-}
-
-@MainActor
-private func withUserDefaults<T>(
-    _ updates: [String: Any?],
-    _ body: () async throws -> T) async rethrows -> T
-{
-    let defaults = UserDefaults.standard
-    var snapshot: [String: Any?] = [:]
-    for key in updates.keys {
-        snapshot[key] = defaults.object(forKey: key)
-    }
-    for (key, value) in updates {
-        if let value {
-            defaults.set(value, forKey: key)
-        } else {
-            defaults.removeObject(forKey: key)
-        }
-    }
-    defer {
-        for (key, value) in snapshot {
-            if let value {
-                defaults.set(value, forKey: key)
-            } else {
-                defaults.removeObject(forKey: key)
-            }
-        }
-    }
-    return try await body()
-}
-
-private func withKeychainValues<T>(_ updates: [KeychainEntry: String?], _ body: () throws -> T) rethrows -> T {
-    var snapshot: [KeychainEntry: String?] = [:]
-    for entry in updates.keys {
-        snapshot[entry] = KeychainStore.loadString(service: entry.service, account: entry.account)
-    }
-    for (entry, value) in updates {
-        if let value {
-            _ = KeychainStore.saveString(value, service: entry.service, account: entry.account)
-        } else {
-            _ = KeychainStore.delete(service: entry.service, account: entry.account)
-        }
-    }
-    defer {
-        for (entry, value) in snapshot {
-            if let value {
-                _ = KeychainStore.saveString(value, service: entry.service, account: entry.account)
-            } else {
-                _ = KeychainStore.delete(service: entry.service, account: entry.account)
-            }
-        }
-    }
-    return try body()
-}
-
-@MainActor
-private func withKeychainValues<T>(
-    _ updates: [KeychainEntry: String?],
-    _ body: () async throws -> T) async rethrows -> T
-{
-    var snapshot: [KeychainEntry: String?] = [:]
-    for entry in updates.keys {
-        snapshot[entry] = KeychainStore.loadString(service: entry.service, account: entry.account)
-    }
-    for (entry, value) in updates {
-        if let value {
-            _ = KeychainStore.saveString(value, service: entry.service, account: entry.account)
-        } else {
-            _ = KeychainStore.delete(service: entry.service, account: entry.account)
-        }
-    }
-    defer {
-        for (entry, value) in snapshot {
-            if let value {
-                _ = KeychainStore.saveString(value, service: entry.service, account: entry.account)
-            } else {
-                _ = KeychainStore.delete(service: entry.service, account: entry.account)
-            }
-        }
-    }
-    return try await body()
-}
-
-@Suite(.serialized) struct BridgeConnectionControllerTests {
-    @Test @MainActor func resolvedDisplayNameSetsDefaultWhenMissing() {
-        let defaults = UserDefaults.standard
-        let displayKey = "node.displayName"
-
-        withKeychainValues([instanceIdEntry: nil, preferredBridgeEntry: nil, lastBridgeEntry: nil]) {
-            withUserDefaults([displayKey: nil, "node.instanceId": "ios-test"]) {
-                let appModel = NodeAppModel()
-                let controller = BridgeConnectionController(appModel: appModel, startDiscovery: false)
-
-                let resolved = controller._test_resolvedDisplayName(defaults: defaults)
-                #expect(!resolved.isEmpty)
-                #expect(defaults.string(forKey: displayKey) == resolved)
-            }
-        }
-    }
-
-    @Test @MainActor func resolvedDisplayNamePreservesCustomValue() {
-        let defaults = UserDefaults.standard
-        let displayKey = "node.displayName"
-
-        withKeychainValues([instanceIdEntry: nil, preferredBridgeEntry: nil, lastBridgeEntry: nil]) {
-            withUserDefaults([displayKey: "My iOS Node", "node.instanceId": "ios-test"]) {
-                let appModel = NodeAppModel()
-                let controller = BridgeConnectionController(appModel: appModel, startDiscovery: false)
-
-                let resolved = controller._test_resolvedDisplayName(defaults: defaults)
-                #expect(resolved == "My iOS Node")
-                #expect(defaults.string(forKey: displayKey) == "My iOS Node")
-            }
-        }
-    }
-
-    @Test @MainActor func makeHelloBuildsCapsAndCommands() {
-        let voiceWakeKey = VoiceWakePreferences.enabledKey
-
-        withKeychainValues([instanceIdEntry: nil, preferredBridgeEntry: nil, lastBridgeEntry: nil]) {
-            withUserDefaults([
-                "node.instanceId": "ios-test",
-                "node.displayName": "Test Node",
-                "camera.enabled": false,
-                voiceWakeKey: true,
-            ]) {
-                let appModel = NodeAppModel()
-                let controller = BridgeConnectionController(appModel: appModel, startDiscovery: false)
-                let hello = controller._test_makeHello(token: "token-123")
-
-                #expect(hello.nodeId == "ios-test")
-                #expect(hello.displayName == "Test Node")
-                #expect(hello.token == "token-123")
-
-                let caps = Set(hello.caps ?? [])
-                #expect(caps.contains(ClawdbotCapability.canvas.rawValue))
-                #expect(caps.contains(ClawdbotCapability.screen.rawValue))
-                #expect(caps.contains(ClawdbotCapability.voiceWake.rawValue))
-                #expect(!caps.contains(ClawdbotCapability.camera.rawValue))
-
-                let commands = Set(hello.commands ?? [])
-                #expect(commands.contains(ClawdbotCanvasCommand.present.rawValue))
-                #expect(commands.contains(ClawdbotScreenCommand.record.rawValue))
-                #expect(!commands.contains(ClawdbotCameraCommand.snap.rawValue))
-
-                #expect(!(hello.platform ?? "").isEmpty)
-                #expect(!(hello.deviceFamily ?? "").isEmpty)
-                #expect(!(hello.modelIdentifier ?? "").isEmpty)
-                #expect(!(hello.version ?? "").isEmpty)
-            }
-        }
-    }
-
-    @Test @MainActor func makeHelloIncludesCameraCommandsWhenEnabled() {
-        withKeychainValues([instanceIdEntry: nil, preferredBridgeEntry: nil, lastBridgeEntry: nil]) {
-            withUserDefaults([
-                "node.instanceId": "ios-test",
-                "node.displayName": "Test Node",
-                "camera.enabled": true,
-                VoiceWakePreferences.enabledKey: false,
-            ]) {
-                let appModel = NodeAppModel()
-                let controller = BridgeConnectionController(appModel: appModel, startDiscovery: false)
-                let hello = controller._test_makeHello(token: "token-456")
-
-                let caps = Set(hello.caps ?? [])
-                #expect(caps.contains(ClawdbotCapability.camera.rawValue))
-
-                let commands = Set(hello.commands ?? [])
-                #expect(commands.contains(ClawdbotCameraCommand.snap.rawValue))
-                #expect(commands.contains(ClawdbotCameraCommand.clip.rawValue))
-            }
-        }
-    }
-
-    @Test @MainActor func autoConnectRefreshesTokenOnUnauthorized() async {
-        let bridge = BridgeDiscoveryModel.DiscoveredBridge(
-            name: "Gateway",
-            endpoint: .hostPort(host: NWEndpoint.Host("127.0.0.1"), port: 18790),
-            stableID: "bridge-1",
-            debugID: "bridge-debug",
-            lanHost: "Mac.local",
-            tailnetDns: nil,
-            gatewayPort: 18789,
-            bridgePort: 18790,
-            canvasPort: 18793,
-            tlsEnabled: false,
-            tlsFingerprintSha256: nil,
-            cliPath: nil)
-        let mock = MockBridgePairingClient(resultToken: "new-token")
-        let account = "bridge-token.ios-test"
-
-        await withKeychainValues([
-            instanceIdEntry: nil,
-            preferredBridgeEntry: nil,
-            lastBridgeEntry: nil,
-            KeychainEntry(service: bridgeService, account: account): "old-token",
-        ]) {
-            await withUserDefaults([
-                "node.instanceId": "ios-test",
-                "bridge.lastDiscoveredStableID": "bridge-1",
-                "bridge.manual.enabled": false,
-            ]) {
-                let appModel = NodeAppModel()
-                let controller = BridgeConnectionController(
-                    appModel: appModel,
-                    startDiscovery: false,
-                    bridgeClientFactory: { mock })
-                controller._test_setBridges([bridge])
-                controller._test_triggerAutoConnect()
-
-                for _ in 0..<20 {
-                    if appModel.connectedBridgeID == bridge.stableID { break }
-                    try? await Task.sleep(nanoseconds: 50_000_000)
-                }
-
-                #expect(appModel.connectedBridgeID == bridge.stableID)
-                let stored = KeychainStore.loadString(service: bridgeService, account: account)
-                #expect(stored == "new-token")
-                let lastToken = await mock.lastToken
-                #expect(lastToken == "old-token")
-            }
-        }
-    }
-
-    @Test @MainActor func autoConnectPrefersPreferredBridgeOverLastDiscovered() async {
-        let bridgeA = BridgeDiscoveryModel.DiscoveredBridge(
-            name: "Gateway A",
-            endpoint: .hostPort(host: NWEndpoint.Host("127.0.0.1"), port: 18790),
-            stableID: "bridge-1",
-            debugID: "bridge-a",
-            lanHost: "MacA.local",
-            tailnetDns: nil,
-            gatewayPort: 18789,
-            bridgePort: 18790,
-            canvasPort: 18793,
-            tlsEnabled: false,
-            tlsFingerprintSha256: nil,
-            cliPath: nil)
-        let bridgeB = BridgeDiscoveryModel.DiscoveredBridge(
-            name: "Gateway B",
-            endpoint: .hostPort(host: NWEndpoint.Host("127.0.0.1"), port: 28790),
-            stableID: "bridge-2",
-            debugID: "bridge-b",
-            lanHost: "MacB.local",
-            tailnetDns: nil,
-            gatewayPort: 28789,
-            bridgePort: 28790,
-            canvasPort: 28793,
-            tlsEnabled: false,
-            tlsFingerprintSha256: nil,
-            cliPath: nil)
-
-        let mock = MockBridgePairingClient(resultToken: "token-ok")
-        let account = "bridge-token.ios-test"
-
-        await withKeychainValues([
-            instanceIdEntry: nil,
-            preferredBridgeEntry: nil,
-            lastBridgeEntry: nil,
-            KeychainEntry(service: bridgeService, account: account): "old-token",
-        ]) {
-            await withUserDefaults([
-                "node.instanceId": "ios-test",
-                "bridge.preferredStableID": "bridge-2",
-                "bridge.lastDiscoveredStableID": "bridge-1",
-                "bridge.manual.enabled": false,
-            ]) {
-                let appModel = NodeAppModel()
-                let controller = BridgeConnectionController(
-                    appModel: appModel,
-                    startDiscovery: false,
-                    bridgeClientFactory: { mock })
-                controller._test_setBridges([bridgeA, bridgeB])
-                controller._test_triggerAutoConnect()
-
-                for _ in 0..<20 {
-                    if appModel.connectedBridgeID == bridgeB.stableID { break }
-                    try? await Task.sleep(nanoseconds: 50_000_000)
-                }
-
-                #expect(appModel.connectedBridgeID == bridgeB.stableID)
-            }
-        }
-    }
-}

apps/ios/Tests/BridgeSessionTests.swift

@@ -1,48 +0,0 @@
-import Foundation
-import Testing
-@testable import Clawdbot
-
-@Suite struct BridgeSessionTests {
-    @Test func initialStateIsIdle() async {
-        let session = BridgeSession()
-        #expect(await session.state == .idle)
-    }
-
-    @Test func requestFailsWhenNotConnected() async {
-        let session = BridgeSession()
-
-        do {
-            _ = try await session.request(method: "health", paramsJSON: nil, timeoutSeconds: 1)
-            Issue.record("Expected request to throw when not connected")
-        } catch let error as NSError {
-            #expect(error.domain == "Bridge")
-            #expect(error.code == 11)
-        }
-    }
-
-    @Test func sendEventFailsWhenNotConnected() async {
-        let session = BridgeSession()
-
-        do {
-            try await session.sendEvent(event: "tick", payloadJSON: nil)
-            Issue.record("Expected sendEvent to throw when not connected")
-        } catch let error as NSError {
-            #expect(error.domain == "Bridge")
-            #expect(error.code == 10)
-        }
-    }
-
-    @Test func disconnectFinishesServerEventStreams() async throws {
-        let session = BridgeSession()
-        let stream = await session.subscribeServerEvents(bufferingNewest: 1)
-
-        let consumer = Task { @Sendable in
-            for await _ in stream {}
-        }
-
-        await session.disconnect()
-
-        _ = await consumer.result
-        #expect(await session.state == .idle)
-    }
-}

apps/ios/Tests/GatewayConnectionControllerTests.swift

@@ -0,0 +1,79 @@
+import ClawdbotKit
+import Foundation
+import Testing
+import UIKit
+@testable import Clawdbot
+
+private func withUserDefaults<T>(_ updates: [String: Any?], _ body: () throws -> T) rethrows -> T {
+    let defaults = UserDefaults.standard
+    var snapshot: [String: Any?] = [:]
+    for key in updates.keys {
+        snapshot[key] = defaults.object(forKey: key)
+    }
+    for (key, value) in updates {
+        if let value {
+            defaults.set(value, forKey: key)
+        } else {
+            defaults.removeObject(forKey: key)
+        }
+    }
+    defer {
+        for (key, value) in snapshot {
+            if let value {
+                defaults.set(value, forKey: key)
+            } else {
+                defaults.removeObject(forKey: key)
+            }
+        }
+    }
+    return try body()
+}
+
+@Suite(.serialized) struct GatewayConnectionControllerTests {
+    @Test @MainActor func resolvedDisplayNameSetsDefaultWhenMissing() {
+        let defaults = UserDefaults.standard
+        let displayKey = "node.displayName"
+
+        withUserDefaults([displayKey: nil, "node.instanceId": "ios-test"]) {
+            let appModel = NodeAppModel()
+            let controller = GatewayConnectionController(appModel: appModel, startDiscovery: false)
+
+            let resolved = controller._test_resolvedDisplayName(defaults: defaults)
+            #expect(!resolved.isEmpty)
+            #expect(defaults.string(forKey: displayKey) == resolved)
+        }
+    }
+
+    @Test @MainActor func currentCapsReflectToggles() {
+        withUserDefaults([
+            "node.instanceId": "ios-test",
+            "node.displayName": "Test Node",
+            "camera.enabled": true,
+            "location.enabledMode": ClawdbotLocationMode.always.rawValue,
+            VoiceWakePreferences.enabledKey: true,
+        ]) {
+            let appModel = NodeAppModel()
+            let controller = GatewayConnectionController(appModel: appModel, startDiscovery: false)
+            let caps = Set(controller._test_currentCaps())
+
+            #expect(caps.contains(ClawdbotCapability.canvas.rawValue))
+            #expect(caps.contains(ClawdbotCapability.screen.rawValue))
+            #expect(caps.contains(ClawdbotCapability.camera.rawValue))
+            #expect(caps.contains(ClawdbotCapability.location.rawValue))
+            #expect(caps.contains(ClawdbotCapability.voiceWake.rawValue))
+        }
+    }
+
+    @Test @MainActor func currentCommandsIncludeLocationWhenEnabled() {
+        withUserDefaults([
+            "node.instanceId": "ios-test",
+            "location.enabledMode": ClawdbotLocationMode.whileUsing.rawValue,
+        ]) {
+            let appModel = NodeAppModel()
+            let controller = GatewayConnectionController(appModel: appModel, startDiscovery: false)
+            let commands = Set(controller._test_currentCommands())
+
+            #expect(commands.contains(ClawdbotLocationCommand.get.rawValue))
+        }
+    }
+}

apps/ios/Tests/GatewayDiscoveryModelTests.swift

@@ -1,9 +1,9 @@
 import Testing
 @testable import Clawdbot
 
-@Suite(.serialized) struct BridgeDiscoveryModelTests {
+@Suite(.serialized) struct GatewayDiscoveryModelTests {
     @Test @MainActor func debugLoggingCapturesLifecycleAndResets() {
-        let model = BridgeDiscoveryModel()
+        let model = GatewayDiscoveryModel()
 
         #expect(model.debugLog.isEmpty)
         #expect(model.statusText == "Idle")
@@ -13,7 +13,7 @@ import Testing
 
         model.stop()
         #expect(model.statusText == "Stopped")
-        #expect(model.bridges.isEmpty)
+        #expect(model.gateways.isEmpty)
         #expect(model.debugLog.count >= 3)
 
         model.setDebugLoggingEnabled(false)

apps/ios/Tests/GatewayEndpointIDTests.swift

@@ -3,30 +3,30 @@ import Network
 import Testing
 @testable import Clawdbot
 
-@Suite struct BridgeEndpointIDTests {
+@Suite struct GatewayEndpointIDTests {
     @Test func stableIDForServiceDecodesAndNormalizesName() {
         let endpoint = NWEndpoint.service(
-            name: "Clawdbot\\032Bridge   \\032  Node\n",
-            type: "_clawdbot-bridge._tcp",
+            name: "Clawdbot\\032Gateway   \\032  Node\n",
+            type: "_clawdbot-gw._tcp",
             domain: "local.",
             interface: nil)
 
-        #expect(BridgeEndpointID.stableID(endpoint) == "_clawdbot-bridge._tcp|local.|Clawdbot Bridge Node")
+        #expect(GatewayEndpointID.stableID(endpoint) == "_clawdbot-gw._tcp|local.|Clawdbot Gateway Node")
     }
 
     @Test func stableIDForNonServiceUsesEndpointDescription() {
         let endpoint = NWEndpoint.hostPort(host: NWEndpoint.Host("127.0.0.1"), port: 4242)
-        #expect(BridgeEndpointID.stableID(endpoint) == String(describing: endpoint))
+        #expect(GatewayEndpointID.stableID(endpoint) == String(describing: endpoint))
     }
 
     @Test func prettyDescriptionDecodesBonjourEscapes() {
         let endpoint = NWEndpoint.service(
-            name: "Clawdbot\\032Bridge",
-            type: "_clawdbot-bridge._tcp",
+            name: "Clawdbot\\032Gateway",
+            type: "_clawdbot-gw._tcp",
             domain: "local.",
             interface: nil)
 
-        let pretty = BridgeEndpointID.prettyDescription(endpoint)
+        let pretty = GatewayEndpointID.prettyDescription(endpoint)
         #expect(pretty == BonjourEscapes.decode(String(describing: endpoint)))
         #expect(!pretty.localizedCaseInsensitiveContains("\\032"))
     }

apps/ios/Tests/GatewaySettingsStoreTests.swift

@@ -7,11 +7,11 @@ private struct KeychainEntry: Hashable {
     let account: String
 }
 
-private let bridgeService = "com.clawdbot.bridge"
+private let gatewayService = "com.clawdbot.gateway"
 private let nodeService = "com.clawdbot.node"
 private let instanceIdEntry = KeychainEntry(service: nodeService, account: "instanceId")
-private let preferredBridgeEntry = KeychainEntry(service: bridgeService, account: "preferredStableID")
-private let lastBridgeEntry = KeychainEntry(service: bridgeService, account: "lastDiscoveredStableID")
+private let preferredGatewayEntry = KeychainEntry(service: gatewayService, account: "preferredStableID")
+private let lastGatewayEntry = KeychainEntry(service: gatewayService, account: "lastDiscoveredStableID")
 
 private func snapshotDefaults(_ keys: [String]) -> [String: Any?] {
     let defaults = UserDefaults.standard
@@ -59,14 +59,14 @@ private func restoreKeychain(_ snapshot: [KeychainEntry: String?]) {
     applyKeychain(snapshot)
 }
 
-@Suite(.serialized) struct BridgeSettingsStoreTests {
+@Suite(.serialized) struct GatewaySettingsStoreTests {
     @Test func bootstrapCopiesDefaultsToKeychainWhenMissing() {
         let defaultsKeys = [
             "node.instanceId",
-            "bridge.preferredStableID",
-            "bridge.lastDiscoveredStableID",
+            "gateway.preferredStableID",
+            "gateway.lastDiscoveredStableID",
         ]
-        let entries = [instanceIdEntry, preferredBridgeEntry, lastBridgeEntry]
+        let entries = [instanceIdEntry, preferredGatewayEntry, lastGatewayEntry]
         let defaultsSnapshot = snapshotDefaults(defaultsKeys)
         let keychainSnapshot = snapshotKeychain(entries)
         defer {
@@ -76,29 +76,29 @@ private func restoreKeychain(_ snapshot: [KeychainEntry: String?]) {
 
         applyDefaults([
             "node.instanceId": "node-test",
-            "bridge.preferredStableID": "preferred-test",
-            "bridge.lastDiscoveredStableID": "last-test",
+            "gateway.preferredStableID": "preferred-test",
+            "gateway.lastDiscoveredStableID": "last-test",
         ])
         applyKeychain([
             instanceIdEntry: nil,
-            preferredBridgeEntry: nil,
-            lastBridgeEntry: nil,
+            preferredGatewayEntry: nil,
+            lastGatewayEntry: nil,
         ])
 
-        BridgeSettingsStore.bootstrapPersistence()
+        GatewaySettingsStore.bootstrapPersistence()
 
         #expect(KeychainStore.loadString(service: nodeService, account: "instanceId") == "node-test")
-        #expect(KeychainStore.loadString(service: bridgeService, account: "preferredStableID") == "preferred-test")
-        #expect(KeychainStore.loadString(service: bridgeService, account: "lastDiscoveredStableID") == "last-test")
+        #expect(KeychainStore.loadString(service: gatewayService, account: "preferredStableID") == "preferred-test")
+        #expect(KeychainStore.loadString(service: gatewayService, account: "lastDiscoveredStableID") == "last-test")
     }
 
     @Test func bootstrapCopiesKeychainToDefaultsWhenMissing() {
         let defaultsKeys = [
             "node.instanceId",
-            "bridge.preferredStableID",
-            "bridge.lastDiscoveredStableID",
+            "gateway.preferredStableID",
+            "gateway.lastDiscoveredStableID",
         ]
-        let entries = [instanceIdEntry, preferredBridgeEntry, lastBridgeEntry]
+        let entries = [instanceIdEntry, preferredGatewayEntry, lastGatewayEntry]
         let defaultsSnapshot = snapshotDefaults(defaultsKeys)
         let keychainSnapshot = snapshotKeychain(entries)
         defer {
@@ -108,20 +108,20 @@ private func restoreKeychain(_ snapshot: [KeychainEntry: String?]) {
 
         applyDefaults([
             "node.instanceId": nil,
-            "bridge.preferredStableID": nil,
-            "bridge.lastDiscoveredStableID": nil,
+            "gateway.preferredStableID": nil,
+            "gateway.lastDiscoveredStableID": nil,
         ])
         applyKeychain([
             instanceIdEntry: "node-from-keychain",
-            preferredBridgeEntry: "preferred-from-keychain",
-            lastBridgeEntry: "last-from-keychain",
+            preferredGatewayEntry: "preferred-from-keychain",
+            lastGatewayEntry: "last-from-keychain",
         ])
 
-        BridgeSettingsStore.bootstrapPersistence()
+        GatewaySettingsStore.bootstrapPersistence()
 
         let defaults = UserDefaults.standard
         #expect(defaults.string(forKey: "node.instanceId") == "node-from-keychain")
-        #expect(defaults.string(forKey: "bridge.preferredStableID") == "preferred-from-keychain")
-        #expect(defaults.string(forKey: "bridge.lastDiscoveredStableID") == "last-from-keychain")
+        #expect(defaults.string(forKey: "gateway.preferredStableID") == "preferred-from-keychain")
+        #expect(defaults.string(forKey: "gateway.lastDiscoveredStableID") == "last-from-keychain")
     }
 }

apps/ios/Tests/IOSGatewayChatTransportTests.swift

@@ -1,19 +1,15 @@
+import ClawdbotKit
 import Testing
 @testable import Clawdbot
 
-@Suite struct IOSBridgeChatTransportTests {
-    @Test func requestsFailFastWhenBridgeNotConnected() async {
-        let bridge = BridgeSession()
-        let transport = IOSBridgeChatTransport(bridge: bridge)
-
-        do {
-            try await transport.setActiveSessionKey("node-test")
-            Issue.record("Expected setActiveSessionKey to throw when bridge not connected")
-        } catch {}
+@Suite struct IOSGatewayChatTransportTests {
+    @Test func requestsFailFastWhenGatewayNotConnected() async {
+        let gateway = GatewayNodeSession()
+        let transport = IOSGatewayChatTransport(gateway: gateway)
 
         do {
             _ = try await transport.requestHistory(sessionKey: "node-test")
-            Issue.record("Expected requestHistory to throw when bridge not connected")
+            Issue.record("Expected requestHistory to throw when gateway not connected")
         } catch {}
 
         do {
@@ -23,11 +19,12 @@ import Testing
                 thinking: "low",
                 idempotencyKey: "idempotency",
                 attachments: [])
-            Issue.record("Expected sendMessage to throw when bridge not connected")
+            Issue.record("Expected sendMessage to throw when gateway not connected")
         } catch {}
 
         do {
             _ = try await transport.requestHealth(timeoutMs: 250)
+            Issue.record("Expected requestHealth to throw when gateway not connected")
         } catch {}
     }
 }

apps/ios/Tests/Info.plist

@@ -17,8 +17,8 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2026.1.11-4</string>
+	<string>2026.1.20</string>
 	<key>CFBundleVersion</key>
-	<string>202601113</string>
+	<string>20260120</string>
 </dict>
 </plist>

apps/ios/Tests/NodeAppModelInvokeTests.swift

@@ -159,7 +159,7 @@ private func withUserDefaults<T>(_ updates: [String: Any?], _ body: () throws ->
         let appModel = NodeAppModel()
         let url = URL(string: "clawdbot://agent?message=hello")!
         await appModel.handleDeepLink(url: url)
-        #expect(appModel.screen.errorText?.contains("Bridge not connected") == true)
+        #expect(appModel.screen.errorText?.contains("Gateway not connected") == true)
     }
 
     @Test @MainActor func handleDeepLinkRejectsOversizedMessage() async {
@@ -170,7 +170,7 @@ private func withUserDefaults<T>(_ updates: [String: Any?], _ body: () throws ->
         #expect(appModel.screen.errorText?.contains("Deep link too large") == true)
     }
 
-    @Test @MainActor func sendVoiceTranscriptThrowsWhenBridgeOffline() async {
+    @Test @MainActor func sendVoiceTranscriptThrowsWhenGatewayOffline() async {
         let appModel = NodeAppModel()
         await #expect(throws: Error.self) {
             try await appModel.sendVoiceTranscript(text: "hello", sessionKey: "main")

apps/ios/Tests/SwiftUIRenderSmokeTests.swift

@@ -1,3 +1,4 @@
+import ClawdbotKit
 import SwiftUI
 import Testing
 import UIKit
@@ -14,35 +15,35 @@ import UIKit
     }
 
     @Test @MainActor func statusPillConnectingBuildsAViewHierarchy() {
-        let root = StatusPill(bridge: .connecting, voiceWakeEnabled: true, brighten: true) {}
+        let root = StatusPill(gateway: .connecting, voiceWakeEnabled: true, brighten: true) {}
         _ = Self.host(root)
     }
 
     @Test @MainActor func statusPillDisconnectedBuildsAViewHierarchy() {
-        let root = StatusPill(bridge: .disconnected, voiceWakeEnabled: false) {}
+        let root = StatusPill(gateway: .disconnected, voiceWakeEnabled: false) {}
         _ = Self.host(root)
     }
 
     @Test @MainActor func settingsTabBuildsAViewHierarchy() {
         let appModel = NodeAppModel()
-        let bridgeController = BridgeConnectionController(appModel: appModel, startDiscovery: false)
+        let gatewayController = GatewayConnectionController(appModel: appModel, startDiscovery: false)
 
         let root = SettingsTab()
             .environment(appModel)
             .environment(appModel.voiceWake)
-            .environment(bridgeController)
+            .environment(gatewayController)
 
         _ = Self.host(root)
     }
 
     @Test @MainActor func rootTabsBuildAViewHierarchy() {
         let appModel = NodeAppModel()
-        let bridgeController = BridgeConnectionController(appModel: appModel, startDiscovery: false)
+        let gatewayController = GatewayConnectionController(appModel: appModel, startDiscovery: false)
 
         let root = RootTabs()
             .environment(appModel)
             .environment(appModel.voiceWake)
-            .environment(bridgeController)
+            .environment(gatewayController)
 
         _ = Self.host(root)
     }
@@ -66,8 +67,8 @@ import UIKit
 
     @Test @MainActor func chatSheetBuildsAViewHierarchy() {
         let appModel = NodeAppModel()
-        let bridge = BridgeSession()
-        let root = ChatSheet(bridge: bridge, sessionKey: "test")
+        let gateway = GatewayNodeSession()
+        let root = ChatSheet(gateway: gateway, sessionKey: "test")
             .environment(appModel)
             .environment(appModel.voiceWake)
         _ = Self.host(root)

apps/ios/project.yml

@@ -35,6 +35,8 @@ targets:
       - package: ClawdbotKit
       - package: ClawdbotKit
         product: ClawdbotChatUI
+      - package: ClawdbotKit
+        product: ClawdbotProtocol
       - package: Swabble
         product: SwabbleKit
       - sdk: AppIntents.framework
@@ -79,19 +81,19 @@ targets:
       properties:
         CFBundleDisplayName: Clawdbot
         CFBundleIconName: AppIcon
-        CFBundleShortVersionString: "2026.1.9"
-        CFBundleVersion: "20260109"
+        CFBundleShortVersionString: "2026.1.20"
+        CFBundleVersion: "20260120"
         UILaunchScreen: {}
         UIApplicationSceneManifest:
           UIApplicationSupportsMultipleScenes: false
         UIBackgroundModes:
           - audio
-        NSLocalNetworkUsageDescription: Clawdbot discovers and connects to your Clawdbot bridge on the local network.
+        NSLocalNetworkUsageDescription: Clawdbot discovers and connects to your Clawdbot gateway on the local network.
         NSAppTransportSecurity:
           NSAllowsArbitraryLoadsInWebContent: true
         NSBonjourServices:
-          - _clawdbot-bridge._tcp
-        NSCameraUsageDescription: Clawdbot can capture photos or short video clips when requested via the bridge.
+          - _clawdbot-gw._tcp
+        NSCameraUsageDescription: Clawdbot can capture photos or short video clips when requested via the gateway.
         NSLocationWhenInUseUsageDescription: Clawdbot uses your location when you allow location sharing.
         NSLocationAlwaysAndWhenInUseUsageDescription: Clawdbot can share your location in the background when you enable Always.
         NSMicrophoneUsageDescription: Clawdbot needs microphone access for voice wake.
@@ -128,5 +130,5 @@ targets:
       path: Tests/Info.plist
       properties:
         CFBundleDisplayName: ClawdbotTests
-        CFBundleShortVersionString: "2026.1.9"
-        CFBundleVersion: "20260109"
+        CFBundleShortVersionString: "2026.1.20"
+        CFBundleVersion: "20260120"

apps/macos/Package.resolved

@@ -1,5 +1,5 @@
 {
-  "originHash" : "4ed05a95fa9feada29b97f81b3194392e59a0c7b9edf24851f922bc2b72b0438",
+  "originHash" : "550d4ea41d4bb2546b99a7bfa1c5cba7e28a13862bc226727ea7426c61555a33",
   "pins" : [
     {
       "identity" : "axorcist",
@@ -24,7 +24,7 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/steipete/ElevenLabsKit",
       "state" : {
-        "revision" : "c8679fbd37416a8780fe43be88a497ff16209e2d",
+        "revision" : "7e3c948d8340abe3977014f3de020edf221e9269",
         "version" : "0.1.0"
       }
     },

apps/macos/Package.swift

@@ -12,8 +12,7 @@ let package = Package(
         .library(name: "ClawdbotIPC", targets: ["ClawdbotIPC"]),
         .library(name: "ClawdbotDiscovery", targets: ["ClawdbotDiscovery"]),
         .executable(name: "Clawdbot", targets: ["Clawdbot"]),
-        .executable(name: "clawdbot-mac-discovery", targets: ["ClawdbotDiscoveryCLI"]),
-        .executable(name: "clawdbot-mac-wizard", targets: ["ClawdbotWizardCLI"]),
+        .executable(name: "clawdbot-mac", targets: ["ClawdbotMacCLI"]),
     ],
     dependencies: [
         .package(url: "https://github.com/orchetect/MenuBarExtraAccess", exact: "1.2.2"),
@@ -25,13 +24,6 @@ let package = Package(
         .package(path: "../../Swabble"),
     ],
     targets: [
-        .target(
-            name: "ClawdbotProtocol",
-            dependencies: [],
-            path: "Sources/ClawdbotProtocol",
-            swiftSettings: [
-                .enableUpcomingFeature("StrictConcurrency"),
-            ]),
         .target(
             name: "ClawdbotIPC",
             dependencies: [],
@@ -52,9 +44,9 @@ let package = Package(
             dependencies: [
                 "ClawdbotIPC",
                 "ClawdbotDiscovery",
-                "ClawdbotProtocol",
                 .product(name: "ClawdbotKit", package: "ClawdbotKit"),
                 .product(name: "ClawdbotChatUI", package: "ClawdbotKit"),
+                .product(name: "ClawdbotProtocol", package: "ClawdbotKit"),
                 .product(name: "SwabbleKit", package: "swabble"),
                 .product(name: "MenuBarExtraAccess", package: "MenuBarExtraAccess"),
                 .product(name: "Subprocess", package: "swift-subprocess"),
@@ -74,20 +66,13 @@ let package = Package(
                 .enableUpcomingFeature("StrictConcurrency"),
             ]),
         .executableTarget(
-            name: "ClawdbotDiscoveryCLI",
+            name: "ClawdbotMacCLI",
             dependencies: [
                 "ClawdbotDiscovery",
+                .product(name: "ClawdbotKit", package: "ClawdbotKit"),
+                .product(name: "ClawdbotProtocol", package: "ClawdbotKit"),
             ],
-            path: "Sources/ClawdbotDiscoveryCLI",
-            swiftSettings: [
-                .enableUpcomingFeature("StrictConcurrency"),
-            ]),
-        .executableTarget(
-            name: "ClawdbotWizardCLI",
-            dependencies: [
-                "ClawdbotProtocol",
-            ],
-            path: "Sources/ClawdbotWizardCLI",
+            path: "Sources/ClawdbotMacCLI",
             swiftSettings: [
                 .enableUpcomingFeature("StrictConcurrency"),
             ]),
@@ -97,7 +82,7 @@ let package = Package(
                 "ClawdbotIPC",
                 "Clawdbot",
                 "ClawdbotDiscovery",
-                "ClawdbotProtocol",
+                .product(name: "ClawdbotProtocol", package: "ClawdbotKit"),
                 .product(name: "SwabbleKit", package: "swabble"),
             ],
             swiftSettings: [

apps/macos/README.md

@@ -0,0 +1,64 @@
+# Clawdbot macOS app (dev + signing)
+
+## Quick dev run
+
+```bash
+# from repo root
+scripts/restart-mac.sh
+```
+
+Options:
+
+```bash
+scripts/restart-mac.sh --no-sign   # fastest dev; ad-hoc signing (TCC permissions do not stick)
+scripts/restart-mac.sh --sign      # force code signing (requires cert)
+```
+
+## Packaging flow
+
+```bash
+scripts/package-mac-app.sh
+```
+
+Creates `dist/Clawdbot.app` and signs it via `scripts/codesign-mac-app.sh`.
+
+## Signing behavior
+
+Auto-selects identity (first match):
+1) Developer ID Application
+2) Apple Distribution
+3) Apple Development
+4) first available identity
+
+If none found:
+- errors by default
+- set `ALLOW_ADHOC_SIGNING=1` or `SIGN_IDENTITY="-"` to ad-hoc sign
+
+## Team ID audit (Sparkle mismatch guard)
+
+After signing, we read the app bundle Team ID and compare every Mach-O inside the app.
+If any embedded binary has a different Team ID, signing fails.
+
+Skip the audit:
+```bash
+SKIP_TEAM_ID_CHECK=1 scripts/package-mac-app.sh
+```
+
+## Library validation workaround (dev only)
+
+If Sparkle Team ID mismatch blocks loading (common with Apple Development certs), opt in:
+
+```bash
+DISABLE_LIBRARY_VALIDATION=1 scripts/package-mac-app.sh
+```
+
+This adds `com.apple.security.cs.disable-library-validation` to app entitlements.
+Use for local dev only; keep off for release builds.
+
+## Useful env flags
+
+- `SIGN_IDENTITY="Apple Development: Your Name (TEAMID)"`
+- `ALLOW_ADHOC_SIGNING=1` (ad-hoc, TCC permissions do not persist)
+- `CODESIGN_TIMESTAMP=off` (offline debug)
+- `DISABLE_LIBRARY_VALIDATION=1` (dev-only Sparkle workaround)
+- `SKIP_TEAM_ID_CHECK=1` (bypass audit)

apps/macos/Sources/Clawdbot/AgentEventsWindow.swift

@@ -81,7 +81,7 @@ private struct EventRow: View {
         return f.string(from: date)
     }
 
-    private func prettyJSON(_ dict: [String: AnyCodable]) -> String? {
+    private func prettyJSON(_ dict: [String: ClawdbotProtocol.AnyCodable]) -> String? {
         let normalized = dict.mapValues { $0.value }
         guard JSONSerialization.isValidJSONObject(normalized),
               let data = try? JSONSerialization.data(withJSONObject: normalized, options: [.prettyPrinted]),
@@ -98,7 +98,10 @@ struct AgentEventsWindow_Previews: PreviewProvider {
             seq: 1,
             stream: "tool",
             ts: Date().timeIntervalSince1970 * 1000,
-            data: ["phase": AnyCodable("start"), "name": AnyCodable("bash")],
+            data: [
+                "phase": ClawdbotProtocol.AnyCodable("start"),
+                "name": ClawdbotProtocol.AnyCodable("bash"),
+            ],
             summary: nil)
         AgentEventStore.shared.append(sample)
         return AgentEventsWindow()

apps/macos/Sources/Clawdbot/AgentWorkspace.swift

@@ -23,7 +23,7 @@ enum AgentWorkspace {
     }
 
     static func displayPath(for url: URL) -> String {
-        let home = FileManager.default.homeDirectoryForCurrentUser.path
+        let home = FileManager().homeDirectoryForCurrentUser.path
         let path = url.path
         if path == home { return "~" }
         if path.hasPrefix(home + "/") {
@@ -44,12 +44,12 @@ enum AgentWorkspace {
     }
 
     static func workspaceEntries(workspaceURL: URL) throws -> [String] {
-        let contents = try FileManager.default.contentsOfDirectory(atPath: workspaceURL.path)
+        let contents = try FileManager().contentsOfDirectory(atPath: workspaceURL.path)
         return contents.filter { !self.ignoredEntries.contains($0) }
     }
 
     static func isWorkspaceEmpty(workspaceURL: URL) -> Bool {
-        let fm = FileManager.default
+        let fm = FileManager()
         var isDir: ObjCBool = false
         if !fm.fileExists(atPath: workspaceURL.path, isDirectory: &isDir) {
             return true
@@ -66,7 +66,7 @@ enum AgentWorkspace {
     }
 
     static func bootstrapSafety(for workspaceURL: URL) -> BootstrapSafety {
-        let fm = FileManager.default
+        let fm = FileManager()
         var isDir: ObjCBool = false
         if !fm.fileExists(atPath: workspaceURL.path, isDirectory: &isDir) {
             return .safe
@@ -90,29 +90,29 @@ enum AgentWorkspace {
 
     static func bootstrap(workspaceURL: URL) throws -> URL {
         let shouldSeedBootstrap = self.isWorkspaceEmpty(workspaceURL: workspaceURL)
-        try FileManager.default.createDirectory(at: workspaceURL, withIntermediateDirectories: true)
+        try FileManager().createDirectory(at: workspaceURL, withIntermediateDirectories: true)
         let agentsURL = self.agentsURL(workspaceURL: workspaceURL)
-        if !FileManager.default.fileExists(atPath: agentsURL.path) {
+        if !FileManager().fileExists(atPath: agentsURL.path) {
             try self.defaultTemplate().write(to: agentsURL, atomically: true, encoding: .utf8)
             self.logger.info("Created AGENTS.md at \(agentsURL.path, privacy: .public)")
         }
         let soulURL = workspaceURL.appendingPathComponent(self.soulFilename)
-        if !FileManager.default.fileExists(atPath: soulURL.path) {
+        if !FileManager().fileExists(atPath: soulURL.path) {
             try self.defaultSoulTemplate().write(to: soulURL, atomically: true, encoding: .utf8)
             self.logger.info("Created SOUL.md at \(soulURL.path, privacy: .public)")
         }
         let identityURL = workspaceURL.appendingPathComponent(self.identityFilename)
-        if !FileManager.default.fileExists(atPath: identityURL.path) {
+        if !FileManager().fileExists(atPath: identityURL.path) {
             try self.defaultIdentityTemplate().write(to: identityURL, atomically: true, encoding: .utf8)
             self.logger.info("Created IDENTITY.md at \(identityURL.path, privacy: .public)")
         }
         let userURL = workspaceURL.appendingPathComponent(self.userFilename)
-        if !FileManager.default.fileExists(atPath: userURL.path) {
+        if !FileManager().fileExists(atPath: userURL.path) {
             try self.defaultUserTemplate().write(to: userURL, atomically: true, encoding: .utf8)
             self.logger.info("Created USER.md at \(userURL.path, privacy: .public)")
         }
         let bootstrapURL = workspaceURL.appendingPathComponent(self.bootstrapFilename)
-        if shouldSeedBootstrap, !FileManager.default.fileExists(atPath: bootstrapURL.path) {
+        if shouldSeedBootstrap, !FileManager().fileExists(atPath: bootstrapURL.path) {
             try self.defaultBootstrapTemplate().write(to: bootstrapURL, atomically: true, encoding: .utf8)
             self.logger.info("Created BOOTSTRAP.md at \(bootstrapURL.path, privacy: .public)")
         }
@@ -120,7 +120,7 @@ enum AgentWorkspace {
     }
 
     static func needsBootstrap(workspaceURL: URL) -> Bool {
-        let fm = FileManager.default
+        let fm = FileManager()
         var isDir: ObjCBool = false
         if !fm.fileExists(atPath: workspaceURL.path, isDirectory: &isDir) {
             return true
@@ -305,7 +305,7 @@ enum AgentWorkspace {
         if let dev = self.devTemplateURL(named: named) {
             urls.append(dev)
         }
-        let cwd = URL(fileURLWithPath: FileManager.default.currentDirectoryPath)
+        let cwd = URL(fileURLWithPath: FileManager().currentDirectoryPath)
         urls.append(cwd.appendingPathComponent("docs")
             .appendingPathComponent(self.templateDirname)
             .appendingPathComponent(named))

apps/macos/Sources/Clawdbot/AnthropicAuthControls.swift

@@ -45,7 +45,7 @@ struct AnthropicAuthControls: View {
                     NSWorkspace.shared.activateFileViewerSelecting([ClawdbotOAuthStore.oauthURL()])
                 }
                 .buttonStyle(.bordered)
-                .disabled(!FileManager.default.fileExists(atPath: ClawdbotOAuthStore.oauthURL().path))
+                .disabled(!FileManager().fileExists(atPath: ClawdbotOAuthStore.oauthURL().path))
 
                 Button("Refresh") {
                     self.refresh()

apps/macos/Sources/Clawdbot/AnthropicOAuth.swift

@@ -234,7 +234,7 @@ enum ClawdbotOAuthStore {
             return URL(fileURLWithPath: expanded, isDirectory: true)
         }
 
-        return FileManager.default.homeDirectoryForCurrentUser
+        return FileManager().homeDirectoryForCurrentUser
             .appendingPathComponent(".clawdbot", isDirectory: true)
             .appendingPathComponent("credentials", isDirectory: true)
     }
@@ -253,7 +253,7 @@ enum ClawdbotOAuthStore {
             urls.append(URL(fileURLWithPath: expanded, isDirectory: true).appendingPathComponent(self.oauthFilename))
         }
 
-        let home = FileManager.default.homeDirectoryForCurrentUser
+        let home = FileManager().homeDirectoryForCurrentUser
         urls.append(home.appendingPathComponent(".pi/agent/\(self.oauthFilename)"))
         urls.append(home.appendingPathComponent(".claude/\(self.oauthFilename)"))
         urls.append(home.appendingPathComponent(".config/claude/\(self.oauthFilename)"))
@@ -270,10 +270,10 @@ enum ClawdbotOAuthStore {
 
     static func importLegacyAnthropicOAuthIfNeeded() -> URL? {
         let dest = self.oauthURL()
-        guard !FileManager.default.fileExists(atPath: dest.path) else { return nil }
+        guard !FileManager().fileExists(atPath: dest.path) else { return nil }
 
         for url in self.legacyOAuthURLs() {
-            guard FileManager.default.fileExists(atPath: url.path) else { continue }
+            guard FileManager().fileExists(atPath: url.path) else { continue }
             guard self.anthropicOAuthStatus(at: url).isConnected else { continue }
             guard let storage = self.loadStorage(at: url) else { continue }
             do {
@@ -296,7 +296,7 @@ enum ClawdbotOAuthStore {
     }
 
     static func anthropicOAuthStatus(at url: URL) -> AnthropicOAuthStatus {
-        guard FileManager.default.fileExists(atPath: url.path) else { return .missingFile }
+        guard FileManager().fileExists(atPath: url.path) else { return .missingFile }
 
         guard let data = try? Data(contentsOf: url) else { return .unreadableFile }
         guard let json = try? JSONSerialization.jsonObject(with: data, options: []) else { return .invalidJSON }
@@ -360,7 +360,7 @@ enum ClawdbotOAuthStore {
 
     private static func saveStorage(_ storage: [String: Any]) throws {
         let dir = self.oauthDir()
-        try FileManager.default.createDirectory(
+        try FileManager().createDirectory(
             at: dir,
             withIntermediateDirectories: true,
             attributes: [.posixPermissions: 0o700])
@@ -370,7 +370,7 @@ enum ClawdbotOAuthStore {
             withJSONObject: storage,
             options: [.prettyPrinted, .sortedKeys])
         try data.write(to: url, options: [.atomic])
-        try FileManager.default.setAttributes([.posixPermissions: 0o600], ofItemAtPath: url.path)
+        try FileManager().setAttributes([.posixPermissions: 0o600], ofItemAtPath: url.path)
     }
 }
 

apps/macos/Sources/Clawdbot/AnyCodable+Helpers.swift

@@ -1,6 +1,11 @@
+import ClawdbotKit
 import ClawdbotProtocol
 import Foundation
 
+// Prefer the ClawdbotKit wrapper to keep gateway request payloads consistent.
+typealias AnyCodable = ClawdbotKit.AnyCodable
+typealias InstanceIdentity = ClawdbotKit.InstanceIdentity
+
 extension AnyCodable {
     var stringValue: String? { self.value as? String }
     var boolValue: Bool? { self.value as? Bool }
@@ -20,3 +25,23 @@ extension AnyCodable {
         }
     }
 }
+
+extension ClawdbotProtocol.AnyCodable {
+    var stringValue: String? { self.value as? String }
+    var boolValue: Bool? { self.value as? Bool }
+    var intValue: Int? { self.value as? Int }
+    var doubleValue: Double? { self.value as? Double }
+    var dictionaryValue: [String: ClawdbotProtocol.AnyCodable]? { self.value as? [String: ClawdbotProtocol.AnyCodable] }
+    var arrayValue: [ClawdbotProtocol.AnyCodable]? { self.value as? [ClawdbotProtocol.AnyCodable] }
+
+    var foundationValue: Any {
+        switch self.value {
+        case let dict as [String: ClawdbotProtocol.AnyCodable]:
+            dict.mapValues { $0.foundationValue }
+        case let array as [ClawdbotProtocol.AnyCodable]:
+            array.map(\.foundationValue)
+        default:
+            self.value
+        }
+    }
+}

apps/macos/Sources/Clawdbot/Bridge/BridgeConnectionHandler.swift

@@ -1,462 +0,0 @@
-import ClawdbotKit
-import Foundation
-import Network
-import OSLog
-
-struct BridgeNodeInfo: Sendable {
-    var nodeId: String
-    var displayName: String?
-    var platform: String?
-    var version: String?
-    var coreVersion: String?
-    var uiVersion: String?
-    var deviceFamily: String?
-    var modelIdentifier: String?
-    var remoteAddress: String?
-    var caps: [String]?
-}
-
-actor BridgeConnectionHandler {
-    private let connection: NWConnection
-    private let logger: Logger
-    private let decoder = JSONDecoder()
-    private let encoder = JSONEncoder()
-    private let queue = DispatchQueue(label: "com.clawdbot.bridge.connection")
-
-    private var buffer = Data()
-    private var isAuthenticated = false
-    private var nodeId: String?
-    private var pendingInvokes: [String: CheckedContinuation<BridgeInvokeResponse, Error>] = [:]
-    private var isClosed = false
-
-    init(connection: NWConnection, logger: Logger) {
-        self.connection = connection
-        self.logger = logger
-    }
-
-    enum AuthResult: Sendable {
-        case ok
-        case notPaired
-        case unauthorized
-        case error(code: String, message: String)
-    }
-
-    enum PairResult: Sendable {
-        case ok(token: String)
-        case rejected
-        case error(code: String, message: String)
-    }
-
-    private struct FrameContext: Sendable {
-        var serverName: String
-        var resolveAuth: @Sendable (BridgeHello) async -> AuthResult
-        var handlePair: @Sendable (BridgePairRequest) async -> PairResult
-        var onAuthenticated: (@Sendable (BridgeNodeInfo) async -> Void)?
-        var onEvent: (@Sendable (String, BridgeEventFrame) async -> Void)?
-        var onRequest: (@Sendable (String, BridgeRPCRequest) async -> BridgeRPCResponse)?
-    }
-
-    func run(
-        resolveAuth: @escaping @Sendable (BridgeHello) async -> AuthResult,
-        handlePair: @escaping @Sendable (BridgePairRequest) async -> PairResult,
-        onAuthenticated: (@Sendable (BridgeNodeInfo) async -> Void)? = nil,
-        onDisconnected: (@Sendable (String) async -> Void)? = nil,
-        onEvent: (@Sendable (String, BridgeEventFrame) async -> Void)? = nil,
-        onRequest: (@Sendable (String, BridgeRPCRequest) async -> BridgeRPCResponse)? = nil) async
-    {
-        self.configureStateLogging()
-        self.connection.start(queue: self.queue)
-
-        let context = FrameContext(
-            serverName: Host.current().localizedName ?? ProcessInfo.processInfo.hostName,
-            resolveAuth: resolveAuth,
-            handlePair: handlePair,
-            onAuthenticated: onAuthenticated,
-            onEvent: onEvent,
-            onRequest: onRequest)
-
-        while true {
-            do {
-                guard let line = try await self.receiveLine() else { break }
-                guard let data = line.data(using: .utf8) else { continue }
-                let base = try self.decoder.decode(BridgeBaseFrame.self, from: data)
-                try await self.handleFrame(
-                    baseType: base.type,
-                    data: data,
-                    context: context)
-            } catch {
-                await self.sendError(code: "INVALID_REQUEST", message: error.localizedDescription)
-            }
-        }
-
-        await self.close(with: onDisconnected)
-    }
-
-    private func configureStateLogging() {
-        self.connection.stateUpdateHandler = { [logger] state in
-            switch state {
-            case .ready:
-                logger.debug("bridge conn ready")
-            case let .failed(err):
-                logger.error("bridge conn failed: \(err.localizedDescription, privacy: .public)")
-            default:
-                break
-            }
-        }
-    }
-
-    private func handleFrame(
-        baseType: String,
-        data: Data,
-        context: FrameContext) async throws
-    {
-        switch baseType {
-        case "hello":
-            await self.handleHelloFrame(
-                data: data,
-                context: context)
-        case "pair-request":
-            await self.handlePairRequestFrame(
-                data: data,
-                context: context)
-        case "event":
-            await self.handleEventFrame(data: data, onEvent: context.onEvent)
-        case "req":
-            try await self.handleRPCRequestFrame(data: data, onRequest: context.onRequest)
-        case "ping":
-            try await self.handlePingFrame(data: data)
-        case "invoke-res":
-            await self.handleInvokeResponseFrame(data: data)
-        default:
-            await self.sendError(code: "INVALID_REQUEST", message: "unknown type")
-        }
-    }
-
-    private func handleHelloFrame(
-        data: Data,
-        context: FrameContext) async
-    {
-        do {
-            let hello = try self.decoder.decode(BridgeHello.self, from: data)
-            let nodeId = hello.nodeId.trimmingCharacters(in: .whitespacesAndNewlines)
-            self.nodeId = nodeId
-            let result = await context.resolveAuth(hello)
-            await self.handleAuthResult(result, serverName: context.serverName)
-            if case .ok = result {
-                await context.onAuthenticated?(
-                    BridgeNodeInfo(
-                        nodeId: nodeId,
-                        displayName: hello.displayName,
-                        platform: hello.platform,
-                        version: hello.version,
-                        coreVersion: hello.coreVersion,
-                        uiVersion: hello.uiVersion,
-                        deviceFamily: hello.deviceFamily,
-                        modelIdentifier: hello.modelIdentifier,
-                        remoteAddress: self.remoteAddressString(),
-                        caps: hello.caps))
-            }
-        } catch {
-            await self.sendError(code: "INVALID_REQUEST", message: error.localizedDescription)
-        }
-    }
-
-    private func handlePairRequestFrame(
-        data: Data,
-        context: FrameContext) async
-    {
-        do {
-            let req = try self.decoder.decode(BridgePairRequest.self, from: data)
-            let nodeId = req.nodeId.trimmingCharacters(in: .whitespacesAndNewlines)
-            self.nodeId = nodeId
-            let enriched = BridgePairRequest(
-                type: req.type,
-                nodeId: nodeId,
-                displayName: req.displayName,
-                platform: req.platform,
-                version: req.version,
-                coreVersion: req.coreVersion,
-                uiVersion: req.uiVersion,
-                deviceFamily: req.deviceFamily,
-                modelIdentifier: req.modelIdentifier,
-                caps: req.caps,
-                commands: req.commands,
-                remoteAddress: self.remoteAddressString(),
-                silent: req.silent)
-            let result = await context.handlePair(enriched)
-            await self.handlePairResult(result, serverName: context.serverName)
-            if case .ok = result {
-                await context.onAuthenticated?(
-                    BridgeNodeInfo(
-                        nodeId: nodeId,
-                        displayName: enriched.displayName,
-                        platform: enriched.platform,
-                        version: enriched.version,
-                        coreVersion: enriched.coreVersion,
-                        uiVersion: enriched.uiVersion,
-                        deviceFamily: enriched.deviceFamily,
-                        modelIdentifier: enriched.modelIdentifier,
-                        remoteAddress: enriched.remoteAddress,
-                        caps: enriched.caps))
-            }
-        } catch {
-            await self.sendError(code: "INVALID_REQUEST", message: error.localizedDescription)
-        }
-    }
-
-    private func handleEventFrame(
-        data: Data,
-        onEvent: (@Sendable (String, BridgeEventFrame) async -> Void)?) async
-    {
-        guard self.isAuthenticated, let nodeId = self.nodeId else {
-            await self.sendError(code: "UNAUTHORIZED", message: "not authenticated")
-            return
-        }
-        do {
-            let evt = try self.decoder.decode(BridgeEventFrame.self, from: data)
-            await onEvent?(nodeId, evt)
-        } catch {
-            await self.sendError(code: "INVALID_REQUEST", message: error.localizedDescription)
-        }
-    }
-
-    private func handleRPCRequestFrame(
-        data: Data,
-        onRequest: (@Sendable (String, BridgeRPCRequest) async -> BridgeRPCResponse)?) async throws
-    {
-        let req = try self.decoder.decode(BridgeRPCRequest.self, from: data)
-        guard self.isAuthenticated, let nodeId = self.nodeId else {
-            try await self.send(
-                BridgeRPCResponse(
-                    id: req.id,
-                    ok: false,
-                    error: BridgeRPCError(code: "UNAUTHORIZED", message: "not authenticated")))
-            return
-        }
-
-        if let onRequest {
-            let res = await onRequest(nodeId, req)
-            try await self.send(res)
-        } else {
-            try await self.send(
-                BridgeRPCResponse(
-                    id: req.id,
-                    ok: false,
-                    error: BridgeRPCError(code: "UNAVAILABLE", message: "RPC not supported")))
-        }
-    }
-
-    private func handlePingFrame(data: Data) async throws {
-        guard self.isAuthenticated else {
-            await self.sendError(code: "UNAUTHORIZED", message: "not authenticated")
-            return
-        }
-        let ping = try self.decoder.decode(BridgePing.self, from: data)
-        try await self.send(BridgePong(type: "pong", id: ping.id))
-    }
-
-    private func handleInvokeResponseFrame(data: Data) async {
-        guard self.isAuthenticated else {
-            await self.sendError(code: "UNAUTHORIZED", message: "not authenticated")
-            return
-        }
-        do {
-            let res = try self.decoder.decode(BridgeInvokeResponse.self, from: data)
-            if let cont = self.pendingInvokes.removeValue(forKey: res.id) {
-                cont.resume(returning: res)
-            }
-        } catch {
-            await self.sendError(code: "INVALID_REQUEST", message: error.localizedDescription)
-        }
-    }
-
-    private func remoteAddressString() -> String? {
-        switch self.connection.endpoint {
-        case let .hostPort(host: host, port: _):
-            let value = String(describing: host)
-            return value.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty ? nil : value
-        default:
-            return nil
-        }
-    }
-
-    func remoteAddress() -> String? {
-        self.remoteAddressString()
-    }
-
-    private func handlePairResult(_ result: PairResult, serverName: String) async {
-        switch result {
-        case let .ok(token):
-            do {
-                try await self.send(BridgePairOk(type: "pair-ok", token: token))
-                self.isAuthenticated = true
-                let mainSessionKey = await GatewayConnection.shared.mainSessionKey()
-                try await self.send(
-                    BridgeHelloOk(
-                        type: "hello-ok",
-                        serverName: serverName,
-                        mainSessionKey: mainSessionKey))
-            } catch {
-                self.logger.error("bridge send pair-ok failed: \(error.localizedDescription, privacy: .public)")
-            }
-        case .rejected:
-            await self.sendError(code: "UNAUTHORIZED", message: "pairing rejected")
-        case let .error(code, message):
-            await self.sendError(code: code, message: message)
-        }
-    }
-
-    private func handleAuthResult(_ result: AuthResult, serverName: String) async {
-        switch result {
-        case .ok:
-            self.isAuthenticated = true
-            do {
-                let mainSessionKey = await GatewayConnection.shared.mainSessionKey()
-                try await self.send(
-                    BridgeHelloOk(
-                        type: "hello-ok",
-                        serverName: serverName,
-                        mainSessionKey: mainSessionKey))
-            } catch {
-                self.logger.error("bridge send hello-ok failed: \(error.localizedDescription, privacy: .public)")
-            }
-        case .notPaired:
-            await self.sendError(code: "NOT_PAIRED", message: "pairing required")
-        case .unauthorized:
-            await self.sendError(code: "UNAUTHORIZED", message: "invalid token")
-        case let .error(code, message):
-            await self.sendError(code: code, message: message)
-        }
-    }
-
-    private func sendError(code: String, message: String) async {
-        do {
-            try await self.send(BridgeErrorFrame(type: "error", code: code, message: message))
-        } catch {
-            self.logger.error("bridge send error failed: \(error.localizedDescription, privacy: .public)")
-        }
-    }
-
-    func invoke(command: String, paramsJSON: String?) async throws -> BridgeInvokeResponse {
-        guard self.isAuthenticated else {
-            throw NSError(domain: "Bridge", code: 1, userInfo: [
-                NSLocalizedDescriptionKey: "UNAUTHORIZED: not authenticated",
-            ])
-        }
-        let id = UUID().uuidString
-        let req = BridgeInvokeRequest(type: "invoke", id: id, command: command, paramsJSON: paramsJSON)
-
-        let timeoutTask = Task {
-            try await Task.sleep(nanoseconds: 15 * 1_000_000_000)
-            await self.timeoutInvoke(id: id)
-        }
-        defer { timeoutTask.cancel() }
-
-        return try await withCheckedThrowingContinuation { cont in
-            Task { [weak self] in
-                guard let self else { return }
-                await self.beginInvoke(id: id, request: req, continuation: cont)
-            }
-        }
-    }
-
-    private func beginInvoke(
-        id: String,
-        request: BridgeInvokeRequest,
-        continuation: CheckedContinuation<BridgeInvokeResponse, Error>) async
-    {
-        self.pendingInvokes[id] = continuation
-        do {
-            try await self.send(request)
-        } catch {
-            await self.failInvoke(id: id, error: error)
-        }
-    }
-
-    private func timeoutInvoke(id: String) async {
-        guard let cont = self.pendingInvokes.removeValue(forKey: id) else { return }
-        cont.resume(throwing: NSError(domain: "Bridge", code: 3, userInfo: [
-            NSLocalizedDescriptionKey: "UNAVAILABLE: invoke timeout",
-        ]))
-    }
-
-    private func failInvoke(id: String, error: Error) async {
-        guard let cont = self.pendingInvokes.removeValue(forKey: id) else { return }
-        cont.resume(throwing: error)
-    }
-
-    private func send(_ obj: some Encodable) async throws {
-        let data = try self.encoder.encode(obj)
-        var line = Data()
-        line.append(data)
-        line.append(0x0A) // \n
-        let _: Void = try await withCheckedThrowingContinuation { cont in
-            self.connection.send(content: line, completion: .contentProcessed { err in
-                if let err {
-                    cont.resume(throwing: err)
-                } else {
-                    cont.resume(returning: ())
-                }
-            })
-        }
-    }
-
-    func sendServerEvent(event: String, payloadJSON: String?) async {
-        guard self.isAuthenticated else { return }
-        do {
-            try await self.send(BridgeEventFrame(type: "event", event: event, payloadJSON: payloadJSON))
-        } catch {
-            self.logger.error("bridge send event failed: \(error.localizedDescription, privacy: .public)")
-        }
-    }
-
-    private func receiveLine() async throws -> String? {
-        while true {
-            if let idx = self.buffer.firstIndex(of: 0x0A) {
-                let lineData = self.buffer.prefix(upTo: idx)
-                self.buffer.removeSubrange(...idx)
-                return String(data: lineData, encoding: .utf8)
-            }
-
-            let chunk = try await self.receiveChunk()
-            if chunk.isEmpty { return nil }
-            self.buffer.append(chunk)
-        }
-    }
-
-    private func receiveChunk() async throws -> Data {
-        try await withCheckedThrowingContinuation { cont in
-            self.connection
-                .receive(minimumIncompleteLength: 1, maximumLength: 64 * 1024) { data, _, isComplete, error in
-                    if let error {
-                        cont.resume(throwing: error)
-                        return
-                    }
-                    if isComplete {
-                        cont.resume(returning: Data())
-                        return
-                    }
-                    cont.resume(returning: data ?? Data())
-                }
-        }
-    }
-
-    private func close(with onDisconnected: (@Sendable (String) async -> Void)? = nil) async {
-        if self.isClosed { return }
-        self.isClosed = true
-
-        let nodeId = self.nodeId
-        let pending = self.pendingInvokes.values
-        self.pendingInvokes.removeAll()
-        for cont in pending {
-            cont.resume(throwing: NSError(domain: "Bridge", code: 4, userInfo: [
-                NSLocalizedDescriptionKey: "UNAVAILABLE: connection closed",
-            ]))
-        }
-
-        self.connection.cancel()
-        if let nodeId {
-            await onDisconnected?(nodeId)
-        }
-    }
-}

apps/macos/Sources/Clawdbot/Bridge/BridgeServer.swift

@@ -1,542 +0,0 @@
-import AppKit
-import ClawdbotKit
-import ClawdbotProtocol
-import Foundation
-import Network
-import OSLog
-
-actor BridgeServer {
-    static let shared = BridgeServer()
-
-    private let logger = Logger(subsystem: "com.clawdbot", category: "bridge")
-    private var listener: NWListener?
-    private var isRunning = false
-    private var store: PairedNodesStore?
-    private var connections: [String: BridgeConnectionHandler] = [:]
-    private var nodeInfoById: [String: BridgeNodeInfo] = [:]
-    private var presenceTasks: [String: Task<Void, Never>] = [:]
-    private var chatSubscriptions: [String: Set<String>] = [:]
-    private var gatewayPushTask: Task<Void, Never>?
-
-    func start() async {
-        if self.isRunning { return }
-        self.isRunning = true
-
-        do {
-            let storeURL = try Self.defaultStoreURL()
-            let store = PairedNodesStore(fileURL: storeURL)
-            await store.load()
-            self.store = store
-
-            let params = NWParameters.tcp
-            params.includePeerToPeer = true
-            let listener = try NWListener(using: params, on: .any)
-
-            listener.newConnectionHandler = { [weak self] connection in
-                guard let self else { return }
-                Task { await self.handle(connection: connection) }
-            }
-
-            listener.stateUpdateHandler = { [weak self] state in
-                guard let self else { return }
-                Task { await self.handleListenerState(state) }
-            }
-
-            listener.start(queue: DispatchQueue(label: "com.clawdbot.bridge"))
-            self.listener = listener
-        } catch {
-            self.logger.error("bridge start failed: \(error.localizedDescription, privacy: .public)")
-            self.isRunning = false
-        }
-    }
-
-    func stop() async {
-        self.isRunning = false
-        self.listener?.cancel()
-        self.listener = nil
-    }
-
-    private func handleListenerState(_ state: NWListener.State) {
-        switch state {
-        case .ready:
-            self.logger.info("bridge listening")
-        case let .failed(err):
-            self.logger.error("bridge listener failed: \(err.localizedDescription, privacy: .public)")
-        case .cancelled:
-            self.logger.info("bridge listener cancelled")
-        case .waiting:
-            self.logger.info("bridge listener waiting")
-        case .setup:
-            break
-        @unknown default:
-            break
-        }
-    }
-
-    private func handle(connection: NWConnection) async {
-        let handler = BridgeConnectionHandler(connection: connection, logger: self.logger)
-        await handler.run(
-            resolveAuth: { [weak self] hello in
-                await self?.authorize(hello: hello) ?? .error(code: "UNAVAILABLE", message: "bridge unavailable")
-            },
-            handlePair: { [weak self] request in
-                await self?.pair(request: request) ?? .error(code: "UNAVAILABLE", message: "bridge unavailable")
-            },
-            onAuthenticated: { [weak self] node in
-                await self?.registerConnection(handler: handler, node: node)
-            },
-            onDisconnected: { [weak self] nodeId in
-                await self?.unregisterConnection(nodeId: nodeId)
-            },
-            onEvent: { [weak self] nodeId, evt in
-                await self?.handleEvent(nodeId: nodeId, evt: evt)
-            },
-            onRequest: { [weak self] nodeId, req in
-                await self?.handleRequest(nodeId: nodeId, req: req)
-                    ?? BridgeRPCResponse(
-                        id: req.id,
-                        ok: false,
-                        error: BridgeRPCError(code: "UNAVAILABLE", message: "bridge unavailable"))
-            })
-    }
-
-    func invoke(nodeId: String, command: String, paramsJSON: String?) async throws -> BridgeInvokeResponse {
-        guard let handler = self.connections[nodeId] else {
-            throw NSError(domain: "Bridge", code: 10, userInfo: [
-                NSLocalizedDescriptionKey: "UNAVAILABLE: node not connected",
-            ])
-        }
-        return try await handler.invoke(command: command, paramsJSON: paramsJSON)
-    }
-
-    func connectedNodeIds() -> [String] {
-        Array(self.connections.keys).sorted()
-    }
-
-    func connectedNodes() -> [BridgeNodeInfo] {
-        self.nodeInfoById.values.sorted { a, b in
-            (a.displayName ?? a.nodeId) < (b.displayName ?? b.nodeId)
-        }
-    }
-
-    func pairedNodes() async -> [PairedNode] {
-        guard let store = self.store else { return [] }
-        return await store.all()
-    }
-
-    private func registerConnection(handler: BridgeConnectionHandler, node: BridgeNodeInfo) async {
-        self.connections[node.nodeId] = handler
-        self.nodeInfoById[node.nodeId] = node
-        await self.beaconPresence(nodeId: node.nodeId, reason: "connect")
-        self.startPresenceTask(nodeId: node.nodeId)
-        self.ensureGatewayPushTask()
-    }
-
-    private func unregisterConnection(nodeId: String) async {
-        await self.beaconPresence(nodeId: nodeId, reason: "disconnect")
-        self.stopPresenceTask(nodeId: nodeId)
-        self.connections.removeValue(forKey: nodeId)
-        self.nodeInfoById.removeValue(forKey: nodeId)
-        self.chatSubscriptions[nodeId] = nil
-        self.stopGatewayPushTaskIfIdle()
-    }
-
-    private struct VoiceTranscriptPayload: Codable, Sendable {
-        var text: String
-        var sessionKey: String?
-    }
-
-    private func handleEvent(nodeId: String, evt: BridgeEventFrame) async {
-        switch evt.event {
-        case "chat.subscribe":
-            guard let json = evt.payloadJSON, let data = json.data(using: .utf8) else { return }
-            struct Subscribe: Codable { var sessionKey: String }
-            guard let payload = try? JSONDecoder().decode(Subscribe.self, from: data) else { return }
-            let key = payload.sessionKey.trimmingCharacters(in: .whitespacesAndNewlines)
-            guard !key.isEmpty else { return }
-            var set = self.chatSubscriptions[nodeId] ?? Set<String>()
-            set.insert(key)
-            self.chatSubscriptions[nodeId] = set
-
-        case "chat.unsubscribe":
-            guard let json = evt.payloadJSON, let data = json.data(using: .utf8) else { return }
-            struct Unsubscribe: Codable { var sessionKey: String }
-            guard let payload = try? JSONDecoder().decode(Unsubscribe.self, from: data) else { return }
-            let key = payload.sessionKey.trimmingCharacters(in: .whitespacesAndNewlines)
-            guard !key.isEmpty else { return }
-            var set = self.chatSubscriptions[nodeId] ?? Set<String>()
-            set.remove(key)
-            self.chatSubscriptions[nodeId] = set.isEmpty ? nil : set
-
-        case "voice.transcript":
-            guard let json = evt.payloadJSON, let data = json.data(using: .utf8) else {
-                return
-            }
-            guard let payload = try? JSONDecoder().decode(VoiceTranscriptPayload.self, from: data) else {
-                return
-            }
-            let text = payload.text.trimmingCharacters(in: .whitespacesAndNewlines)
-            guard !text.isEmpty else { return }
-
-            let sessionKey = payload.sessionKey?.trimmingCharacters(in: .whitespacesAndNewlines).nonEmpty
-                ?? "main"
-
-            _ = await GatewayConnection.shared.sendAgent(GatewayAgentInvocation(
-                message: text,
-                sessionKey: sessionKey,
-                thinking: "low",
-                deliver: false,
-                to: nil,
-                channel: .last))
-
-        case "agent.request":
-            guard let json = evt.payloadJSON, let data = json.data(using: .utf8) else {
-                return
-            }
-            guard let link = try? JSONDecoder().decode(AgentDeepLink.self, from: data) else {
-                return
-            }
-
-            let message = link.message.trimmingCharacters(in: .whitespacesAndNewlines)
-            guard !message.isEmpty else { return }
-            guard message.count <= 20000 else { return }
-
-            let sessionKey = link.sessionKey?.trimmingCharacters(in: .whitespacesAndNewlines).nonEmpty
-                ?? "node-\(nodeId)"
-            let thinking = link.thinking?.trimmingCharacters(in: .whitespacesAndNewlines).nonEmpty
-            let to = link.to?.trimmingCharacters(in: .whitespacesAndNewlines).nonEmpty
-            let channel = GatewayAgentChannel(raw: link.channel)
-
-            _ = await GatewayConnection.shared.sendAgent(GatewayAgentInvocation(
-                message: message,
-                sessionKey: sessionKey,
-                thinking: thinking,
-                deliver: link.deliver,
-                to: to,
-                channel: channel))
-
-        default:
-            break
-        }
-    }
-
-    private func handleRequest(nodeId: String, req: BridgeRPCRequest) async -> BridgeRPCResponse {
-        let allowed: Set<String> = ["chat.history", "chat.send", "health"]
-        guard allowed.contains(req.method) else {
-            return BridgeRPCResponse(
-                id: req.id,
-                ok: false,
-                error: BridgeRPCError(code: "FORBIDDEN", message: "Method not allowed"))
-        }
-
-        let params: [String: ClawdbotProtocol.AnyCodable]?
-        if let json = req.paramsJSON?.trimmingCharacters(in: .whitespacesAndNewlines), !json.isEmpty {
-            guard let data = json.data(using: .utf8) else {
-                return BridgeRPCResponse(
-                    id: req.id,
-                    ok: false,
-                    error: BridgeRPCError(code: "INVALID_REQUEST", message: "paramsJSON not UTF-8"))
-            }
-            do {
-                params = try JSONDecoder().decode([String: ClawdbotProtocol.AnyCodable].self, from: data)
-            } catch {
-                return BridgeRPCResponse(
-                    id: req.id,
-                    ok: false,
-                    error: BridgeRPCError(code: "INVALID_REQUEST", message: error.localizedDescription))
-            }
-        } else {
-            params = nil
-        }
-
-        do {
-            let data = try await GatewayConnection.shared.request(method: req.method, params: params, timeoutMs: 30000)
-            guard let json = String(data: data, encoding: .utf8) else {
-                return BridgeRPCResponse(
-                    id: req.id,
-                    ok: false,
-                    error: BridgeRPCError(code: "UNAVAILABLE", message: "Response not UTF-8"))
-            }
-            return BridgeRPCResponse(id: req.id, ok: true, payloadJSON: json)
-        } catch {
-            return BridgeRPCResponse(
-                id: req.id,
-                ok: false,
-                error: BridgeRPCError(code: "UNAVAILABLE", message: error.localizedDescription))
-        }
-    }
-
-    private func ensureGatewayPushTask() {
-        if self.gatewayPushTask != nil { return }
-        self.gatewayPushTask = Task { [weak self] in
-            guard let self else { return }
-            do {
-                try await GatewayConnection.shared.refresh()
-            } catch {
-                // We'll still forward events once the gateway comes up.
-            }
-            let stream = await GatewayConnection.shared.subscribe()
-            for await push in stream {
-                if Task.isCancelled { return }
-                await self.forwardGatewayPush(push)
-            }
-        }
-    }
-
-    private func stopGatewayPushTaskIfIdle() {
-        guard self.connections.isEmpty else { return }
-        self.gatewayPushTask?.cancel()
-        self.gatewayPushTask = nil
-    }
-
-    private func forwardGatewayPush(_ push: GatewayPush) async {
-        let subscribedNodes = self.chatSubscriptions.keys.filter { self.connections[$0] != nil }
-        guard !subscribedNodes.isEmpty else { return }
-
-        switch push {
-        case let .snapshot(hello):
-            let payloadJSON = (try? JSONEncoder().encode(hello.snapshot.health))
-                .flatMap { String(data: $0, encoding: .utf8) }
-            for nodeId in subscribedNodes {
-                await self.connections[nodeId]?.sendServerEvent(event: "health", payloadJSON: payloadJSON)
-            }
-        case let .event(evt):
-            switch evt.event {
-            case "health":
-                guard let payload = evt.payload else { return }
-                let payloadJSON = (try? JSONEncoder().encode(payload))
-                    .flatMap { String(data: $0, encoding: .utf8) }
-                for nodeId in subscribedNodes {
-                    await self.connections[nodeId]?.sendServerEvent(event: "health", payloadJSON: payloadJSON)
-                }
-            case "tick":
-                for nodeId in subscribedNodes {
-                    await self.connections[nodeId]?.sendServerEvent(event: "tick", payloadJSON: nil)
-                }
-            case "chat":
-                guard let payload = evt.payload else { return }
-                let payloadData = try? JSONEncoder().encode(payload)
-                let payloadJSON = payloadData.flatMap { String(data: $0, encoding: .utf8) }
-
-                struct MinimalChat: Codable { var sessionKey: String }
-                let sessionKey = payloadData.flatMap { try? JSONDecoder().decode(MinimalChat.self, from: $0) }?
-                    .sessionKey
-                if let sessionKey {
-                    for nodeId in subscribedNodes {
-                        guard self.chatSubscriptions[nodeId]?.contains(sessionKey) == true else { continue }
-                        await self.connections[nodeId]?.sendServerEvent(event: "chat", payloadJSON: payloadJSON)
-                    }
-                } else {
-                    for nodeId in subscribedNodes {
-                        await self.connections[nodeId]?.sendServerEvent(event: "chat", payloadJSON: payloadJSON)
-                    }
-                }
-            default:
-                break
-            }
-        case .seqGap:
-            for nodeId in subscribedNodes {
-                await self.connections[nodeId]?.sendServerEvent(event: "seqGap", payloadJSON: nil)
-            }
-        }
-    }
-
-    private func beaconPresence(nodeId: String, reason: String) async {
-        let paired = await self.store?.find(nodeId: nodeId)
-        let host = paired?.displayName?.trimmingCharacters(in: .whitespacesAndNewlines).nonEmpty
-            ?? nodeId
-        let version = paired?.version?.trimmingCharacters(in: .whitespacesAndNewlines).nonEmpty
-        let platform = paired?.platform?.trimmingCharacters(in: .whitespacesAndNewlines).nonEmpty
-        let ip = await self.connections[nodeId]?.remoteAddress()
-
-        var tags: [String] = ["node", "ios"]
-        if let platform { tags.append(platform) }
-
-        let summary = [
-            "Node: \(host)\(ip.map { " (\($0))" } ?? "")",
-            platform.map { "platform \($0)" },
-            version.map { "app \($0)" },
-            "mode node",
-            "reason \(reason)",
-        ].compactMap(\.self).joined(separator: " · ")
-
-        var params: [String: ClawdbotProtocol.AnyCodable] = [
-            "text": ClawdbotProtocol.AnyCodable(summary),
-            "instanceId": ClawdbotProtocol.AnyCodable(nodeId),
-            "host": ClawdbotProtocol.AnyCodable(host),
-            "mode": ClawdbotProtocol.AnyCodable("node"),
-            "reason": ClawdbotProtocol.AnyCodable(reason),
-            "tags": ClawdbotProtocol.AnyCodable(tags),
-        ]
-        if let ip { params["ip"] = ClawdbotProtocol.AnyCodable(ip) }
-        if let version { params["version"] = ClawdbotProtocol.AnyCodable(version) }
-        await GatewayConnection.shared.sendSystemEvent(params)
-    }
-
-    private func startPresenceTask(nodeId: String) {
-        self.presenceTasks[nodeId]?.cancel()
-        self.presenceTasks[nodeId] = Task.detached { [weak self] in
-            while !Task.isCancelled {
-                try? await Task.sleep(nanoseconds: 180 * 1_000_000_000)
-                if Task.isCancelled { return }
-                await self?.beaconPresence(nodeId: nodeId, reason: "periodic")
-            }
-        }
-    }
-
-    private func stopPresenceTask(nodeId: String) {
-        self.presenceTasks[nodeId]?.cancel()
-        self.presenceTasks.removeValue(forKey: nodeId)
-    }
-
-    private func authorize(hello: BridgeHello) async -> BridgeConnectionHandler.AuthResult {
-        let nodeId = hello.nodeId.trimmingCharacters(in: .whitespacesAndNewlines)
-        if nodeId.isEmpty {
-            return .error(code: "INVALID_REQUEST", message: "nodeId required")
-        }
-        guard let store = self.store else {
-            return .error(code: "UNAVAILABLE", message: "store unavailable")
-        }
-        guard let paired = await store.find(nodeId: nodeId) else {
-            return .notPaired
-        }
-        guard let token = hello.token, token == paired.token else {
-            return .unauthorized
-        }
-
-        do {
-            var updated = paired
-            let name = hello.displayName?.trimmingCharacters(in: .whitespacesAndNewlines).nonEmpty
-            let platform = hello.platform?.trimmingCharacters(in: .whitespacesAndNewlines).nonEmpty
-            let version = hello.version?.trimmingCharacters(in: .whitespacesAndNewlines).nonEmpty
-            let deviceFamily = hello.deviceFamily?.trimmingCharacters(in: .whitespacesAndNewlines).nonEmpty
-            let modelIdentifier = hello.modelIdentifier?.trimmingCharacters(in: .whitespacesAndNewlines).nonEmpty
-
-            if updated.displayName != name { updated.displayName = name }
-            if updated.platform != platform { updated.platform = platform }
-            if updated.version != version { updated.version = version }
-            if updated.deviceFamily != deviceFamily { updated.deviceFamily = deviceFamily }
-            if updated.modelIdentifier != modelIdentifier { updated.modelIdentifier = modelIdentifier }
-
-            if updated != paired {
-                try await store.upsert(updated)
-            } else {
-                try await store.touchSeen(nodeId: nodeId)
-            }
-        } catch {
-            // ignore
-        }
-        return .ok
-    }
-
-    private func pair(request: BridgePairRequest) async -> BridgeConnectionHandler.PairResult {
-        let nodeId = request.nodeId.trimmingCharacters(in: .whitespacesAndNewlines)
-        if nodeId.isEmpty {
-            return .error(code: "INVALID_REQUEST", message: "nodeId required")
-        }
-        guard let store = self.store else {
-            return .error(code: "UNAVAILABLE", message: "store unavailable")
-        }
-        let existing = await store.find(nodeId: nodeId)
-
-        let approved = await BridgePairingApprover.approve(request: request, isRepair: existing != nil)
-        if !approved {
-            return .rejected
-        }
-
-        let token = UUID().uuidString.replacingOccurrences(of: "-", with: "")
-        let nowMs = Int(Date().timeIntervalSince1970 * 1000)
-        let node = PairedNode(
-            nodeId: nodeId,
-            displayName: request.displayName,
-            platform: request.platform,
-            version: request.version,
-            deviceFamily: request.deviceFamily,
-            modelIdentifier: request.modelIdentifier,
-            token: token,
-            createdAtMs: nowMs,
-            lastSeenAtMs: nowMs)
-        do {
-            try await store.upsert(node)
-            return .ok(token: token)
-        } catch {
-            return .error(code: "UNAVAILABLE", message: "failed to persist pairing")
-        }
-    }
-
-    private static func defaultStoreURL() throws -> URL {
-        let base = FileManager.default.urls(for: .applicationSupportDirectory, in: .userDomainMask).first
-        guard let base else {
-            throw NSError(
-                domain: "Bridge",
-                code: 1,
-                userInfo: [NSLocalizedDescriptionKey: "Application Support unavailable"])
-        }
-        return base
-            .appendingPathComponent("Clawdbot", isDirectory: true)
-            .appendingPathComponent("bridge", isDirectory: true)
-            .appendingPathComponent("paired-nodes.json", isDirectory: false)
-    }
-}
-
-@MainActor
-enum BridgePairingApprover {
-    static func approve(request: BridgePairRequest, isRepair: Bool) async -> Bool {
-        await withCheckedContinuation { cont in
-            let name = request.displayName ?? request.nodeId
-            let remote = request.remoteAddress?.trimmingCharacters(in: .whitespacesAndNewlines).nonEmpty
-            let alert = NSAlert()
-            alert.messageText = isRepair ? "Re-pair Clawdbot Node?" : "Pair Clawdbot Node?"
-            alert.informativeText = """
-            Node: \(name)
-            IP: \(remote ?? "unknown")
-            Platform: \(request.platform ?? "unknown")
-            Version: \(request.version ?? "unknown")
-            """
-            alert.addButton(withTitle: "Approve")
-            alert.addButton(withTitle: "Reject")
-            if #available(macOS 11.0, *), alert.buttons.indices.contains(1) {
-                alert.buttons[1].hasDestructiveAction = true
-            }
-            let resp = alert.runModal()
-            cont.resume(returning: resp == .alertFirstButtonReturn)
-        }
-    }
-}
-
-#if DEBUG
-extension BridgeServer {
-    func exerciseForTesting() async {
-        let conn = NWConnection(to: .hostPort(host: "127.0.0.1", port: 22), using: .tcp)
-        let handler = BridgeConnectionHandler(connection: conn, logger: self.logger)
-        self.connections["node-1"] = handler
-        self.nodeInfoById["node-1"] = BridgeNodeInfo(
-            nodeId: "node-1",
-            displayName: "Node One",
-            platform: "macOS",
-            version: "1.0.0",
-            deviceFamily: "Mac",
-            modelIdentifier: "MacBookPro18,1",
-            remoteAddress: "127.0.0.1",
-            caps: ["chat", "voice"])
-
-        _ = self.connectedNodeIds()
-        _ = self.connectedNodes()
-
-        self.handleListenerState(.ready)
-        self.handleListenerState(.failed(NWError.posix(.ECONNREFUSED)))
-        self.handleListenerState(.waiting(NWError.posix(.ETIMEDOUT)))
-        self.handleListenerState(.cancelled)
-        self.handleListenerState(.setup)
-
-        let subscribe = BridgeEventFrame(event: "chat.subscribe", payloadJSON: "{\"sessionKey\":\"main\"}")
-        await self.handleEvent(nodeId: "node-1", evt: subscribe)
-
-        let unsubscribe = BridgeEventFrame(event: "chat.unsubscribe", payloadJSON: "{\"sessionKey\":\"main\"}")
-        await self.handleEvent(nodeId: "node-1", evt: unsubscribe)
-
-        let invalid = BridgeRPCRequest(id: "req-1", method: "invalid.method", paramsJSON: nil)
-        _ = await self.handleRequest(nodeId: "node-1", req: invalid)
-    }
-}
-#endif

apps/macos/Sources/Clawdbot/Bridge/PairedNodesStore.swift

@@ -1,59 +0,0 @@
-import Foundation
-
-struct PairedNode: Codable, Equatable {
-    var nodeId: String
-    var displayName: String?
-    var platform: String?
-    var version: String?
-    var deviceFamily: String?
-    var modelIdentifier: String?
-    var token: String
-    var createdAtMs: Int
-    var lastSeenAtMs: Int?
-}
-
-actor PairedNodesStore {
-    private let fileURL: URL
-    private var nodes: [String: PairedNode] = [:]
-
-    init(fileURL: URL) {
-        self.fileURL = fileURL
-    }
-
-    func load() {
-        do {
-            let data = try Data(contentsOf: self.fileURL)
-            let decoded = try JSONDecoder().decode([String: PairedNode].self, from: data)
-            self.nodes = decoded
-        } catch {
-            self.nodes = [:]
-        }
-    }
-
-    func all() -> [PairedNode] {
-        self.nodes.values.sorted { a, b in (a.displayName ?? a.nodeId) < (b.displayName ?? b.nodeId) }
-    }
-
-    func find(nodeId: String) -> PairedNode? {
-        self.nodes[nodeId]
-    }
-
-    func upsert(_ node: PairedNode) async throws {
-        self.nodes[node.nodeId] = node
-        try await self.persist()
-    }
-
-    func touchSeen(nodeId: String) async throws {
-        guard var node = self.nodes[nodeId] else { return }
-        node.lastSeenAtMs = Int(Date().timeIntervalSince1970 * 1000)
-        self.nodes[nodeId] = node
-        try await self.persist()
-    }
-
-    private func persist() async throws {
-        let dir = self.fileURL.deletingLastPathComponent()
-        try FileManager.default.createDirectory(at: dir, withIntermediateDirectories: true)
-        let data = try JSONEncoder().encode(self.nodes)
-        try data.write(to: self.fileURL, options: [.atomic])
-    }
-}

apps/macos/Sources/Clawdbot/CLIInstaller.swift

@@ -61,7 +61,7 @@ enum CLIInstaller {
     }
 
     private static func installPrefix() -> String {
-        FileManager.default.homeDirectoryForCurrentUser
+        FileManager().homeDirectoryForCurrentUser
             .appendingPathComponent(".clawdbot")
             .path
     }

apps/macos/Sources/Clawdbot/CameraCaptureService.swift

@@ -167,20 +167,20 @@ actor CameraCaptureService {
         defer { session.stopRunning() }
         await Self.warmUpCaptureSession()
 
-        let tmpMovURL = FileManager.default.temporaryDirectory
+        let tmpMovURL = FileManager().temporaryDirectory
             .appendingPathComponent("clawdbot-camera-\(UUID().uuidString).mov")
-        defer { try? FileManager.default.removeItem(at: tmpMovURL) }
+        defer { try? FileManager().removeItem(at: tmpMovURL) }
 
         let outputURL: URL = {
             if let outPath, !outPath.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
                 return URL(fileURLWithPath: outPath)
             }
-            return FileManager.default.temporaryDirectory
+            return FileManager().temporaryDirectory
                 .appendingPathComponent("clawdbot-camera-\(UUID().uuidString).mp4")
         }()
 
         // Ensure we don't fail exporting due to an existing file.
-        try? FileManager.default.removeItem(at: outputURL)
+        try? FileManager().removeItem(at: outputURL)
 
         let logger = self.logger
         var delegate: MovieFileDelegate?

apps/macos/Sources/Clawdbot/CanvasManager.swift

@@ -1,5 +1,6 @@
 import AppKit
 import ClawdbotIPC
+import ClawdbotKit
 import Foundation
 import OSLog
 
@@ -24,7 +25,7 @@ final class CanvasManager {
     var defaultAnchorProvider: (() -> NSRect?)?
 
     private nonisolated static let canvasRoot: URL = {
-        let base = FileManager.default.urls(for: .applicationSupportDirectory, in: .userDomainMask).first!
+        let base = FileManager().urls(for: .applicationSupportDirectory, in: .userDomainMask).first!
         return base.appendingPathComponent("Clawdbot/canvas", isDirectory: true)
     }()
 
@@ -82,7 +83,7 @@ final class CanvasManager {
         self.panelSessionKey = nil
 
         Self.logger.debug("showDetailed ensure canvas root dir")
-        try FileManager.default.createDirectory(at: Self.canvasRoot, withIntermediateDirectories: true)
+        try FileManager().createDirectory(at: Self.canvasRoot, withIntermediateDirectories: true)
         Self.logger.debug("showDetailed init CanvasWindowController")
         let controller = try CanvasWindowController(
             sessionKey: session,
@@ -257,7 +258,7 @@ final class CanvasManager {
         // (Avoid treating Canvas routes like "/" as filesystem paths.)
         if trimmed.hasPrefix("/") {
             var isDir: ObjCBool = false
-            if FileManager.default.fileExists(atPath: trimmed, isDirectory: &isDir), !isDir.boolValue {
+            if FileManager().fileExists(atPath: trimmed, isDirectory: &isDir), !isDir.boolValue {
                 return URL(fileURLWithPath: trimmed)
             }
         }
@@ -292,7 +293,7 @@ final class CanvasManager {
     }
 
     private static func localStatus(sessionDir: URL, target: String) -> CanvasShowStatus {
-        let fm = FileManager.default
+        let fm = FileManager()
         let trimmed = target.trimmingCharacters(in: .whitespacesAndNewlines)
         let withoutQuery = trimmed.split(separator: "?", maxSplits: 1, omittingEmptySubsequences: false).first
             .map(String.init) ?? trimmed
@@ -330,7 +331,7 @@ final class CanvasManager {
     }
 
     private static func indexExists(in dir: URL) -> Bool {
-        let fm = FileManager.default
+        let fm = FileManager()
         let a = dir.appendingPathComponent("index.html", isDirectory: false)
         if fm.fileExists(atPath: a.path) { return true }
         let b = dir.appendingPathComponent("index.htm", isDirectory: false)

apps/macos/Sources/Clawdbot/CanvasSchemeHandler.swift

@@ -69,8 +69,8 @@ final class CanvasSchemeHandler: NSObject, WKURLSchemeHandler {
         if path.isEmpty {
             let indexA = sessionRoot.appendingPathComponent("index.html", isDirectory: false)
             let indexB = sessionRoot.appendingPathComponent("index.htm", isDirectory: false)
-            if !FileManager.default.fileExists(atPath: indexA.path),
-               !FileManager.default.fileExists(atPath: indexB.path)
+            if !FileManager().fileExists(atPath: indexA.path),
+               !FileManager().fileExists(atPath: indexB.path)
             {
                 return self.scaffoldPage(sessionRoot: sessionRoot)
             }
@@ -106,7 +106,7 @@ final class CanvasSchemeHandler: NSObject, WKURLSchemeHandler {
     }
 
     private func resolveFileURL(sessionRoot: URL, requestPath: String) -> URL? {
-        let fm = FileManager.default
+        let fm = FileManager()
         var candidate = sessionRoot.appendingPathComponent(requestPath, isDirectory: false)
 
         var isDir: ObjCBool = false
@@ -137,7 +137,7 @@ final class CanvasSchemeHandler: NSObject, WKURLSchemeHandler {
     }
 
     private func resolveIndex(in dir: URL) -> URL? {
-        let fm = FileManager.default
+        let fm = FileManager()
         let a = dir.appendingPathComponent("index.html", isDirectory: false)
         if fm.fileExists(atPath: a.path) { return a }
         let b = dir.appendingPathComponent("index.htm", isDirectory: false)

apps/macos/Sources/Clawdbot/CanvasWindowController.swift

@@ -32,7 +32,7 @@ final class CanvasWindowController: NSWindowController, WKNavigationDelegate, NS
         let safeSessionKey = CanvasWindowController.sanitizeSessionKey(sessionKey)
         canvasWindowLogger.debug("CanvasWindowController init sanitized session=\(safeSessionKey, privacy: .public)")
         self.sessionDir = root.appendingPathComponent(safeSessionKey, isDirectory: true)
-        try FileManager.default.createDirectory(at: self.sessionDir, withIntermediateDirectories: true)
+        try FileManager().createDirectory(at: self.sessionDir, withIntermediateDirectories: true)
         canvasWindowLogger.debug("CanvasWindowController init session dir ready")
 
         self.schemeHandler = CanvasSchemeHandler(root: root)
@@ -143,8 +143,8 @@ final class CanvasWindowController: NSWindowController, WKNavigationDelegate, NS
                 if path == "/" || path.isEmpty {
                     let indexA = sessionDir.appendingPathComponent("index.html", isDirectory: false)
                     let indexB = sessionDir.appendingPathComponent("index.htm", isDirectory: false)
-                    if !FileManager.default.fileExists(atPath: indexA.path),
-                       !FileManager.default.fileExists(atPath: indexB.path)
+                    if !FileManager().fileExists(atPath: indexA.path),
+                       !FileManager().fileExists(atPath: indexB.path)
                     {
                         return
                     }
@@ -233,7 +233,7 @@ final class CanvasWindowController: NSWindowController, WKNavigationDelegate, NS
         // (Avoid treating Canvas routes like "/" as filesystem paths.)
         if trimmed.hasPrefix("/") {
             var isDir: ObjCBool = false
-            if FileManager.default.fileExists(atPath: trimmed, isDirectory: &isDir), !isDir.boolValue {
+            if FileManager().fileExists(atPath: trimmed, isDirectory: &isDir), !isDir.boolValue {
                 let url = URL(fileURLWithPath: trimmed)
                 canvasWindowLogger.debug("canvas load file \(url.absoluteString, privacy: .public)")
                 self.loadFile(url)

apps/macos/Sources/Clawdbot/ChannelsSettings+ChannelState.swift

@@ -426,34 +426,17 @@ extension ChannelsSettings {
     }
 
     private func resolveChannelTitle(_ id: String) -> String {
-        if let label = self.store.snapshot?.channelLabels[id], !label.isEmpty {
-            return label
-        }
+        let label = self.store.resolveChannelLabel(id)
+        if label != id { return label }
         return id.prefix(1).uppercased() + id.dropFirst()
     }
 
     private func resolveChannelDetailTitle(_ id: String) -> String {
-        switch id {
-        case "whatsapp": "WhatsApp Web"
-        case "telegram": "Telegram Bot"
-        case "discord": "Discord Bot"
-        case "slack": "Slack Bot"
-        case "signal": "Signal REST"
-        case "imessage": "iMessage"
-        default: self.resolveChannelTitle(id)
-        }
+        self.store.resolveChannelDetailLabel(id)
     }
 
     private func resolveChannelSystemImage(_ id: String) -> String {
-        switch id {
-        case "whatsapp": "message"
-        case "telegram": "paperplane"
-        case "discord": "bubble.left.and.bubble.right"
-        case "slack": "number"
-        case "signal": "antenna.radiowaves.left.and.right"
-        case "imessage": "message.fill"
-        default: "message"
-        }
+        self.store.resolveChannelSystemImage(id)
     }
 
     private func channelStatusDictionary(_ id: String) -> [String: AnyCodable]? {

apps/macos/Sources/Clawdbot/ChannelsStore.swift

@@ -153,9 +153,19 @@ struct ChannelsStatusSnapshot: Codable {
         let application: AnyCodable?
     }
 
+    struct ChannelUiMetaEntry: Codable {
+        let id: String
+        let label: String
+        let detailLabel: String
+        let systemImage: String?
+    }
+
     let ts: Double
     let channelOrder: [String]
     let channelLabels: [String: String]
+    let channelDetailLabels: [String: String]?
+    let channelSystemImages: [String: String]?
+    let channelMeta: [ChannelUiMetaEntry]?
     let channels: [String: AnyCodable]
     let channelAccounts: [String: [ChannelAccountSnapshot]]
     let channelDefaultAccountId: [String: String]
@@ -217,6 +227,47 @@ final class ChannelsStore {
     var configRoot: [String: Any] = [:]
     var configLoaded = false
 
+    func channelMetaEntry(_ id: String) -> ChannelsStatusSnapshot.ChannelUiMetaEntry? {
+        self.snapshot?.channelMeta?.first(where: { $0.id == id })
+    }
+
+    func resolveChannelLabel(_ id: String) -> String {
+        if let meta = self.channelMetaEntry(id), !meta.label.isEmpty {
+            return meta.label
+        }
+        if let label = self.snapshot?.channelLabels[id], !label.isEmpty {
+            return label
+        }
+        return id
+    }
+
+    func resolveChannelDetailLabel(_ id: String) -> String {
+        if let meta = self.channelMetaEntry(id), !meta.detailLabel.isEmpty {
+            return meta.detailLabel
+        }
+        if let detail = self.snapshot?.channelDetailLabels?[id], !detail.isEmpty {
+            return detail
+        }
+        return self.resolveChannelLabel(id)
+    }
+
+    func resolveChannelSystemImage(_ id: String) -> String {
+        if let meta = self.channelMetaEntry(id), let symbol = meta.systemImage, !symbol.isEmpty {
+            return symbol
+        }
+        if let symbol = self.snapshot?.channelSystemImages?[id], !symbol.isEmpty {
+            return symbol
+        }
+        return "message"
+    }
+
+    func orderedChannelIds() -> [String] {
+        if let meta = self.snapshot?.channelMeta, !meta.isEmpty {
+            return meta.map(\.id)
+        }
+        return self.snapshot?.channelOrder ?? []
+    }
+
     init(isPreview: Bool = ProcessInfo.processInfo.isPreview) {
         self.isPreview = isPreview
     }

apps/macos/Sources/Clawdbot/ClawdbotConfigFile.swift

@@ -18,7 +18,7 @@ enum ClawdbotConfigFile {
 
     static func loadDict() -> [String: Any] {
         let url = self.url()
-        guard FileManager.default.fileExists(atPath: url.path) else { return [:] }
+        guard FileManager().fileExists(atPath: url.path) else { return [:] }
         do {
             let data = try Data(contentsOf: url)
             guard let root = self.parseConfigData(data) else {
@@ -38,7 +38,7 @@ enum ClawdbotConfigFile {
         do {
             let data = try JSONSerialization.data(withJSONObject: dict, options: [.prettyPrinted, .sortedKeys])
             let url = self.url()
-            try FileManager.default.createDirectory(
+            try FileManager().createDirectory(
                 at: url.deletingLastPathComponent(),
                 withIntermediateDirectories: true)
             try data.write(to: url, options: [.atomic])

apps/macos/Sources/Clawdbot/ClawdbotPaths.swift

@@ -21,7 +21,7 @@ enum ClawdbotPaths {
         if let override = ClawdbotEnv.path(self.stateDirEnv) {
             return URL(fileURLWithPath: override, isDirectory: true)
         }
-        return FileManager.default.homeDirectoryForCurrentUser
+        return FileManager().homeDirectoryForCurrentUser
             .appendingPathComponent(".clawdbot", isDirectory: true)
     }
 

apps/macos/Sources/Clawdbot/CommandResolver.swift

@@ -6,9 +6,9 @@ enum CommandResolver {
 
     static func gatewayEntrypoint(in root: URL) -> String? {
         let distEntry = root.appendingPathComponent("dist/index.js").path
-        if FileManager.default.isReadableFile(atPath: distEntry) { return distEntry }
+        if FileManager().isReadableFile(atPath: distEntry) { return distEntry }
         let binEntry = root.appendingPathComponent("bin/clawdbot.js").path
-        if FileManager.default.isReadableFile(atPath: binEntry) { return binEntry }
+        if FileManager().isReadableFile(atPath: binEntry) { return binEntry }
         return nil
     }
 
@@ -47,16 +47,16 @@ enum CommandResolver {
     static func projectRoot() -> URL {
         if let stored = UserDefaults.standard.string(forKey: self.projectRootDefaultsKey),
            let url = self.expandPath(stored),
-           FileManager.default.fileExists(atPath: url.path)
+           FileManager().fileExists(atPath: url.path)
         {
             return url
         }
-        let fallback = FileManager.default.homeDirectoryForCurrentUser
+        let fallback = FileManager().homeDirectoryForCurrentUser
             .appendingPathComponent("Projects/clawdbot")
-        if FileManager.default.fileExists(atPath: fallback.path) {
+        if FileManager().fileExists(atPath: fallback.path) {
             return fallback
         }
-        return FileManager.default.homeDirectoryForCurrentUser
+        return FileManager().homeDirectoryForCurrentUser
     }
 
     static func setProjectRoot(_ path: String) {
@@ -70,7 +70,7 @@ enum CommandResolver {
     static func preferredPaths() -> [String] {
         let current = ProcessInfo.processInfo.environment["PATH"]?
             .split(separator: ":").map(String.init) ?? []
-        let home = FileManager.default.homeDirectoryForCurrentUser
+        let home = FileManager().homeDirectoryForCurrentUser
         let projectRoot = self.projectRoot()
         return self.preferredPaths(home: home, current: current, projectRoot: projectRoot)
     }
@@ -99,10 +99,10 @@ enum CommandResolver {
         let bin = base.appendingPathComponent("bin")
         let nodeBin = base.appendingPathComponent("tools/node/bin")
         var paths: [String] = []
-        if FileManager.default.fileExists(atPath: bin.path) {
+        if FileManager().fileExists(atPath: bin.path) {
             paths.append(bin.path)
         }
-        if FileManager.default.fileExists(atPath: nodeBin.path) {
+        if FileManager().fileExists(atPath: nodeBin.path) {
             paths.append(nodeBin.path)
         }
         return paths
@@ -113,13 +113,13 @@ enum CommandResolver {
 
         // Volta
         let volta = home.appendingPathComponent(".volta/bin")
-        if FileManager.default.fileExists(atPath: volta.path) {
+        if FileManager().fileExists(atPath: volta.path) {
             bins.append(volta.path)
         }
 
         // asdf
         let asdf = home.appendingPathComponent(".asdf/shims")
-        if FileManager.default.fileExists(atPath: asdf.path) {
+        if FileManager().fileExists(atPath: asdf.path) {
             bins.append(asdf.path)
         }
 
@@ -137,10 +137,10 @@ enum CommandResolver {
     }
 
     private static func versionedNodeBinPaths(base: URL, suffix: String) -> [String] {
-        guard FileManager.default.fileExists(atPath: base.path) else { return [] }
+        guard FileManager().fileExists(atPath: base.path) else { return [] }
         let entries: [String]
         do {
-            entries = try FileManager.default.contentsOfDirectory(atPath: base.path)
+            entries = try FileManager().contentsOfDirectory(atPath: base.path)
         } catch {
             return []
         }
@@ -167,7 +167,7 @@ enum CommandResolver {
         for entry in sorted {
             let binDir = base.appendingPathComponent(entry).appendingPathComponent(suffix)
             let node = binDir.appendingPathComponent("node")
-            if FileManager.default.isExecutableFile(atPath: node.path) {
+            if FileManager().isExecutableFile(atPath: node.path) {
                 paths.append(binDir.path)
             }
         }
@@ -177,7 +177,7 @@ enum CommandResolver {
     static func findExecutable(named name: String, searchPaths: [String]? = nil) -> String? {
         for dir in searchPaths ?? self.preferredPaths() {
             let candidate = (dir as NSString).appendingPathComponent(name)
-            if FileManager.default.isExecutableFile(atPath: candidate) {
+            if FileManager().isExecutableFile(atPath: candidate) {
                 return candidate
             }
         }
@@ -191,12 +191,12 @@ enum CommandResolver {
     static func projectClawdbotExecutable(projectRoot: URL? = nil) -> String? {
         let root = projectRoot ?? self.projectRoot()
         let candidate = root.appendingPathComponent("node_modules/.bin").appendingPathComponent(self.helperName).path
-        return FileManager.default.isExecutableFile(atPath: candidate) ? candidate : nil
+        return FileManager().isExecutableFile(atPath: candidate) ? candidate : nil
     }
 
     static func nodeCliPath() -> String? {
         let candidate = self.projectRoot().appendingPathComponent("bin/clawdbot.js").path
-        return FileManager.default.isReadableFile(atPath: candidate) ? candidate : nil
+        return FileManager().isReadableFile(atPath: candidate) ? candidate : nil
     }
 
     static func hasAnyClawdbotInvoker(searchPaths: [String]? = nil) -> Bool {
@@ -459,7 +459,7 @@ enum CommandResolver {
     private static func expandPath(_ path: String) -> URL? {
         var expanded = path
         if expanded.hasPrefix("~") {
-            let home = FileManager.default.homeDirectoryForCurrentUser.path
+            let home = FileManager().homeDirectoryForCurrentUser.path
             expanded.replaceSubrange(expanded.startIndex...expanded.startIndex, with: home)
         }
         return URL(fileURLWithPath: expanded)

apps/macos/Sources/Clawdbot/ConfigSettings.swift

@@ -6,15 +6,19 @@ struct ConfigSettings: View {
     private let isNixMode = ProcessInfo.processInfo.isNixMode
     @Bindable var store: ChannelsStore
     @State private var hasLoaded = false
+    @State private var activeSectionKey: String?
+    @State private var activeSubsection: SubsectionSelection?
 
     init(store: ChannelsStore = .shared) {
         self.store = store
     }
 
     var body: some View {
-        ScrollView {
-            self.content
+        HStack(spacing: 16) {
+            self.sidebar
+            self.detail
         }
+        .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
         .task {
             guard !self.hasLoaded else { return }
             guard !self.isPreview else { return }
@@ -22,42 +26,125 @@ struct ConfigSettings: View {
             await self.store.loadConfigSchema()
             await self.store.loadConfig()
         }
+        .onAppear { self.ensureSelection() }
+        .onChange(of: self.store.configSchemaLoading) { _, loading in
+            if !loading { self.ensureSelection() }
+        }
     }
 }
 
 extension ConfigSettings {
-    private var content: some View {
-        VStack(alignment: .leading, spacing: 16) {
-            self.header
-            if let status = self.store.configStatus {
-                Text(status)
-                    .font(.callout)
-                    .foregroundStyle(.secondary)
-            }
-            self.actionRow
-            Group {
-                if self.store.configSchemaLoading {
-                    ProgressView().controlSize(.small)
-                } else if let schema = self.store.configSchema {
-                    ConfigSchemaForm(store: self.store, schema: schema, path: [])
-                        .disabled(self.isNixMode)
-                } else {
-                    Text("Schema unavailable.")
+    private enum SubsectionSelection: Hashable {
+        case all
+        case key(String)
+    }
+
+    private struct ConfigSection: Identifiable {
+        let key: String
+        let label: String
+        let help: String?
+        let node: ConfigSchemaNode
+
+        var id: String { self.key }
+    }
+
+    private struct ConfigSubsection: Identifiable {
+        let key: String
+        let label: String
+        let help: String?
+        let node: ConfigSchemaNode
+        let path: ConfigPath
+
+        var id: String { self.key }
+    }
+
+    private var sections: [ConfigSection] {
+        guard let schema = self.store.configSchema else { return [] }
+        return self.resolveSections(schema)
+    }
+
+    private var activeSection: ConfigSection? {
+        self.sections.first { $0.key == self.activeSectionKey }
+    }
+
+    private var sidebar: some View {
+        ScrollView {
+            LazyVStack(alignment: .leading, spacing: 8) {
+                if self.sections.isEmpty {
+                    Text("No config sections available.")
                         .font(.caption)
                         .foregroundStyle(.secondary)
+                        .padding(.horizontal, 6)
+                        .padding(.vertical, 4)
+                } else {
+                    ForEach(self.sections) { section in
+                        self.sidebarRow(section)
+                    }
                 }
             }
-            if self.store.configDirty, !self.isNixMode {
-                Text("Unsaved changes")
+            .padding(.vertical, 10)
+            .padding(.horizontal, 10)
+        }
+        .frame(minWidth: 220, idealWidth: 240, maxWidth: 280, maxHeight: .infinity, alignment: .topLeading)
+        .background(
+            RoundedRectangle(cornerRadius: 12, style: .continuous)
+                .fill(Color(nsColor: .windowBackgroundColor)))
+        .clipShape(RoundedRectangle(cornerRadius: 12, style: .continuous))
+    }
+
+    private var detail: some View {
+        VStack(alignment: .leading, spacing: 16) {
+            if self.store.configSchemaLoading {
+                ProgressView().controlSize(.small)
+            } else if let section = self.activeSection {
+                self.sectionDetail(section)
+            } else if self.store.configSchema != nil {
+                self.emptyDetail
+            } else {
+                Text("Schema unavailable.")
                     .font(.caption)
                     .foregroundStyle(.secondary)
             }
-            Spacer(minLength: 0)
         }
-        .frame(maxWidth: .infinity, alignment: .leading)
+        .frame(minWidth: 460, maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
+    }
+
+    private var emptyDetail: some View {
+        VStack(alignment: .leading, spacing: 8) {
+            self.header
+            Text("Select a config section to view settings.")
+                .font(.callout)
+                .foregroundStyle(.secondary)
+        }
         .padding(.horizontal, 24)
         .padding(.vertical, 18)
-        .groupBoxStyle(PlainSettingsGroupBoxStyle())
+    }
+
+    private func sectionDetail(_ section: ConfigSection) -> some View {
+        ScrollView(.vertical) {
+            VStack(alignment: .leading, spacing: 16) {
+                self.header
+                if let status = self.store.configStatus {
+                    Text(status)
+                        .font(.callout)
+                        .foregroundStyle(.secondary)
+                }
+                self.actionRow
+                self.sectionHeader(section)
+                self.subsectionNav(section)
+                self.sectionForm(section)
+                if self.store.configDirty, !self.isNixMode {
+                    Text("Unsaved changes")
+                        .font(.caption)
+                        .foregroundStyle(.secondary)
+                }
+                Spacer(minLength: 0)
+            }
+            .frame(maxWidth: .infinity, alignment: .leading)
+            .padding(.horizontal, 24)
+            .padding(.vertical, 18)
+            .groupBoxStyle(PlainSettingsGroupBoxStyle())
+        }
     }
 
     @ViewBuilder
@@ -71,6 +158,18 @@ extension ConfigSettings {
             .foregroundStyle(.secondary)
     }
 
+    private func sectionHeader(_ section: ConfigSection) -> some View {
+        VStack(alignment: .leading, spacing: 6) {
+            Text(section.label)
+                .font(.title3.weight(.semibold))
+            if let help = section.help {
+                Text(help)
+                    .font(.callout)
+                    .foregroundStyle(.secondary)
+            }
+        }
+    }
+
     private var actionRow: some View {
         HStack(spacing: 10) {
             Button("Reload") {
@@ -85,6 +184,204 @@ extension ConfigSettings {
         }
         .buttonStyle(.bordered)
     }
+
+    private func sidebarRow(_ section: ConfigSection) -> some View {
+        let isSelected = self.activeSectionKey == section.key
+        return Button {
+            self.selectSection(section)
+        } label: {
+            VStack(alignment: .leading, spacing: 2) {
+                Text(section.label)
+                if let help = section.help {
+                    Text(help)
+                        .font(.caption)
+                        .foregroundStyle(.secondary)
+                        .lineLimit(2)
+                }
+            }
+            .padding(.vertical, 6)
+            .padding(.horizontal, 8)
+            .frame(maxWidth: .infinity, alignment: .leading)
+            .background(isSelected ? Color.accentColor.opacity(0.18) : Color.clear)
+            .clipShape(RoundedRectangle(cornerRadius: 10, style: .continuous))
+            .background(Color.clear)
+            .contentShape(Rectangle())
+        }
+        .frame(maxWidth: .infinity, alignment: .leading)
+        .buttonStyle(.plain)
+        .contentShape(Rectangle())
+    }
+
+    @ViewBuilder
+    private func subsectionNav(_ section: ConfigSection) -> some View {
+        let subsections = self.resolveSubsections(for: section)
+        if subsections.isEmpty {
+            EmptyView()
+        } else {
+            ScrollView(.horizontal, showsIndicators: false) {
+                HStack(spacing: 8) {
+                    self.subsectionButton(
+                        title: "All",
+                        isSelected: self.activeSubsection == .all)
+                    {
+                        self.activeSubsection = .all
+                    }
+                    ForEach(subsections) { subsection in
+                        self.subsectionButton(
+                            title: subsection.label,
+                            isSelected: self.activeSubsection == .key(subsection.key))
+                        {
+                            self.activeSubsection = .key(subsection.key)
+                        }
+                    }
+                }
+                .padding(.vertical, 2)
+            }
+        }
+    }
+
+    private func subsectionButton(
+        title: String,
+        isSelected: Bool,
+        action: @escaping () -> Void) -> some View
+    {
+        Button(action: action) {
+            Text(title)
+                .font(.callout.weight(.semibold))
+                .foregroundStyle(isSelected ? Color.accentColor : .primary)
+                .padding(.horizontal, 10)
+                .padding(.vertical, 6)
+                .background(isSelected ? Color.accentColor.opacity(0.18) : Color(nsColor: .controlBackgroundColor))
+                .clipShape(Capsule())
+        }
+        .buttonStyle(.plain)
+    }
+
+    private func sectionForm(_ section: ConfigSection) -> some View {
+        let subsection = self.activeSubsection
+        let defaultPath: ConfigPath = [.key(section.key)]
+        let subsections = self.resolveSubsections(for: section)
+        let resolved: (ConfigSchemaNode, ConfigPath) = {
+            if case let .key(key) = subsection,
+               let match = subsections.first(where: { $0.key == key })
+            {
+                return (match.node, match.path)
+            }
+            return (self.resolvedSchemaNode(section.node), defaultPath)
+        }()
+
+        return ConfigSchemaForm(store: self.store, schema: resolved.0, path: resolved.1)
+            .disabled(self.isNixMode)
+    }
+
+    private func ensureSelection() {
+        guard let schema = self.store.configSchema else { return }
+        let sections = self.resolveSections(schema)
+        guard !sections.isEmpty else { return }
+
+        let active = sections.first { $0.key == self.activeSectionKey } ?? sections[0]
+        if self.activeSectionKey != active.key {
+            self.activeSectionKey = active.key
+        }
+        self.ensureSubsection(for: active)
+    }
+
+    private func ensureSubsection(for section: ConfigSection) {
+        let subsections = self.resolveSubsections(for: section)
+        guard !subsections.isEmpty else {
+            self.activeSubsection = nil
+            return
+        }
+
+        switch self.activeSubsection {
+        case .all:
+            return
+        case let .key(key):
+            if subsections.contains(where: { $0.key == key }) { return }
+        case .none:
+            break
+        }
+
+        if let first = subsections.first {
+            self.activeSubsection = .key(first.key)
+        }
+    }
+
+    private func selectSection(_ section: ConfigSection) {
+        guard self.activeSectionKey != section.key else { return }
+        self.activeSectionKey = section.key
+        let subsections = self.resolveSubsections(for: section)
+        if let first = subsections.first {
+            self.activeSubsection = .key(first.key)
+        } else {
+            self.activeSubsection = nil
+        }
+    }
+
+    private func resolveSections(_ root: ConfigSchemaNode) -> [ConfigSection] {
+        let node = self.resolvedSchemaNode(root)
+        let hints = self.store.configUiHints
+        let keys = node.properties.keys.sorted { lhs, rhs in
+            let orderA = hintForPath([.key(lhs)], hints: hints)?.order ?? 0
+            let orderB = hintForPath([.key(rhs)], hints: hints)?.order ?? 0
+            if orderA != orderB { return orderA < orderB }
+            return lhs < rhs
+        }
+
+        return keys.compactMap { key in
+            guard let child = node.properties[key] else { return nil }
+            let path: ConfigPath = [.key(key)]
+            let hint = hintForPath(path, hints: hints)
+            let label = hint?.label
+                ?? child.title
+                ?? self.humanize(key)
+            let help = hint?.help ?? child.description
+            return ConfigSection(key: key, label: label, help: help, node: child)
+        }
+    }
+
+    private func resolveSubsections(for section: ConfigSection) -> [ConfigSubsection] {
+        let node = self.resolvedSchemaNode(section.node)
+        guard node.schemaType == "object" else { return [] }
+        let hints = self.store.configUiHints
+        let keys = node.properties.keys.sorted { lhs, rhs in
+            let orderA = hintForPath([.key(section.key), .key(lhs)], hints: hints)?.order ?? 0
+            let orderB = hintForPath([.key(section.key), .key(rhs)], hints: hints)?.order ?? 0
+            if orderA != orderB { return orderA < orderB }
+            return lhs < rhs
+        }
+
+        return keys.compactMap { key in
+            guard let child = node.properties[key] else { return nil }
+            let path: ConfigPath = [.key(section.key), .key(key)]
+            let hint = hintForPath(path, hints: hints)
+            let label = hint?.label
+                ?? child.title
+                ?? self.humanize(key)
+            let help = hint?.help ?? child.description
+            return ConfigSubsection(
+                key: key,
+                label: label,
+                help: help,
+                node: child,
+                path: path)
+        }
+    }
+
+    private func resolvedSchemaNode(_ node: ConfigSchemaNode) -> ConfigSchemaNode {
+        let variants = node.anyOf.isEmpty ? node.oneOf : node.anyOf
+        if !variants.isEmpty {
+            let nonNull = variants.filter { !$0.isNullSchema }
+            if nonNull.count == 1, let only = nonNull.first { return only }
+        }
+        return node
+    }
+
+    private func humanize(_ key: String) -> String {
+        key.replacingOccurrences(of: "_", with: " ")
+            .replacingOccurrences(of: "-", with: " ")
+            .capitalized
+    }
 }
 
 struct ConfigSettings_Previews: PreviewProvider {

apps/macos/Sources/Clawdbot/ConnectionModeCoordinator.swift

@@ -12,6 +12,9 @@ final class ConnectionModeCoordinator {
     func apply(mode: AppState.ConnectionMode, paused: Bool) async {
         switch mode {
         case .unconfigured:
+            if let error = await NodeServiceManager.stop() {
+                NodesStore.shared.lastError = "Node service stop failed: \(error)"
+            }
             await RemoteTunnelManager.shared.stopAll()
             WebChatManager.shared.resetTunnels()
             GatewayProcessManager.shared.stop()
@@ -20,6 +23,9 @@ final class ConnectionModeCoordinator {
             Task.detached { await PortGuardian.shared.sweep(mode: .unconfigured) }
 
         case .local:
+            if let error = await NodeServiceManager.stop() {
+                NodesStore.shared.lastError = "Node service stop failed: \(error)"
+            }
             await RemoteTunnelManager.shared.stopAll()
             WebChatManager.shared.resetTunnels()
             let shouldStart = GatewayAutostartPolicy.shouldStartGateway(mode: .local, paused: paused)
@@ -50,6 +56,9 @@ final class ConnectionModeCoordinator {
             WebChatManager.shared.resetTunnels()
 
             do {
+                if let error = await NodeServiceManager.start() {
+                    NodesStore.shared.lastError = "Node service start failed: \(error)"
+                }
                 _ = try await GatewayEndpointStore.shared.ensureRemoteControlTunnel()
                 let settings = CommandResolver.connectionSettings()
                 try await ControlChannel.shared.configure(mode: .remote(

apps/macos/Sources/Clawdbot/ControlChannel.swift

@@ -1,3 +1,4 @@
+import ClawdbotKit
 import ClawdbotProtocol
 import Foundation
 import Observation
@@ -19,7 +20,7 @@ struct ControlAgentEvent: Codable, Sendable, Identifiable {
     let seq: Int
     let stream: String
     let ts: Double
-    let data: [String: AnyCodable]
+    let data: [String: ClawdbotProtocol.AnyCodable]
     let summary: String?
 }
 
@@ -86,15 +87,7 @@ final class ControlChannel {
 
     func configure() async {
         self.logger.info("control channel configure mode=local")
-        self.state = .connecting
-        do {
-            try await GatewayConnection.shared.refresh()
-            self.state = .connected
-            PresenceReporter.shared.sendImmediate(reason: "connect")
-        } catch {
-            let message = self.friendlyGatewayMessage(error)
-            self.state = .degraded(message)
-        }
+        await self.refreshEndpoint(reason: "configure")
     }
 
     func configure(mode: Mode = .local) async throws {
@@ -110,7 +103,7 @@ final class ControlChannel {
                         "target=\(target, privacy: .public) identitySet=\(idSet, privacy: .public)")
                 self.state = .connecting
                 _ = try await GatewayEndpointStore.shared.ensureRemoteControlTunnel()
-                await self.configure()
+                await self.refreshEndpoint(reason: "configure")
             } catch {
                 self.state = .degraded(error.localizedDescription)
                 throw error
@@ -118,6 +111,19 @@ final class ControlChannel {
         }
     }
 
+    func refreshEndpoint(reason: String) async {
+        self.logger.info("control channel refresh endpoint reason=\(reason, privacy: .public)")
+        self.state = .connecting
+        do {
+            try await self.establishGatewayConnection()
+            self.state = .connected
+            PresenceReporter.shared.sendImmediate(reason: "connect")
+        } catch {
+            let message = self.friendlyGatewayMessage(error)
+            self.state = .degraded(message)
+        }
+    }
+
     func disconnect() async {
         await GatewayConnection.shared.shutdown()
         self.state = .disconnected
@@ -155,8 +161,8 @@ final class ControlChannel {
         timeoutMs: Double? = nil) async throws -> Data
     {
         do {
-            let rawParams = params?.reduce(into: [String: AnyCodable]()) {
-                $0[$1.key] = AnyCodable($1.value.base)
+            let rawParams = params?.reduce(into: [String: ClawdbotKit.AnyCodable]()) {
+                $0[$1.key] = ClawdbotKit.AnyCodable($1.value.base)
             }
             let data = try await GatewayConnection.shared.request(
                 method: method,
@@ -274,18 +280,28 @@ final class ControlChannel {
                 }
             }
 
-            do {
-                try await GatewayConnection.shared.refresh()
+            await self.refreshEndpoint(reason: "recovery:\(reasonText)")
+            if case .connected = self.state {
                 self.logger.info("control channel recovery finished")
-            } catch {
-                self.logger.error(
-                    "control channel recovery failed \(error.localizedDescription, privacy: .public)")
+            } else if case let .degraded(message) = self.state {
+                self.logger.error("control channel recovery failed \(message, privacy: .public)")
             }
 
             self.recoveryTask = nil
         }
     }
 
+    private func establishGatewayConnection(timeoutMs: Int = 5000) async throws {
+        try await GatewayConnection.shared.refresh()
+        let ok = try await GatewayConnection.shared.healthOK(timeoutMs: timeoutMs)
+        if ok == false {
+            throw NSError(
+                domain: "Gateway",
+                code: 0,
+                userInfo: [NSLocalizedDescriptionKey: "gateway health not ok"])
+        }
+    }
+
     func sendSystemEvent(_ text: String, params: [String: AnyHashable] = [:]) async throws {
         var merged = params
         merged["text"] = AnyHashable(text)
@@ -345,7 +361,7 @@ final class ControlChannel {
             let phase = event.data["phase"]?.value as? String ?? ""
             let name = event.data["name"]?.value as? String
             let meta = event.data["meta"]?.value as? String
-            let args = event.data["args"]?.value as? [String: AnyCodable]
+            let args = Self.bridgeToProtocolArgs(event.data["args"])
             WorkActivityStore.shared.handleTool(
                 sessionKey: sessionKey,
                 phase: phase,
@@ -356,6 +372,27 @@ final class ControlChannel {
             break
         }
     }
+
+    private static func bridgeToProtocolArgs(
+        _ value: ClawdbotProtocol.AnyCodable?) -> [String: ClawdbotProtocol.AnyCodable]?
+    {
+        guard let value else { return nil }
+        if let dict = value.value as? [String: ClawdbotProtocol.AnyCodable] {
+            return dict
+        }
+        if let dict = value.value as? [String: ClawdbotKit.AnyCodable],
+           let data = try? JSONEncoder().encode(dict),
+           let decoded = try? JSONDecoder().decode([String: ClawdbotProtocol.AnyCodable].self, from: data)
+        {
+            return decoded
+        }
+        if let data = try? JSONEncoder().encode(value),
+           let decoded = try? JSONDecoder().decode([String: ClawdbotProtocol.AnyCodable].self, from: data)
+        {
+            return decoded
+        }
+        return nil
+    }
 }
 
 extension Notification.Name {

apps/macos/Sources/Clawdbot/CostUsageMenuView.swift

@@ -0,0 +1,99 @@
+import Charts
+import SwiftUI
+
+struct CostUsageHistoryMenuView: View {
+    let summary: GatewayCostUsageSummary
+    let width: CGFloat
+
+    var body: some View {
+        VStack(alignment: .leading, spacing: 10) {
+            self.header
+            self.chart
+            self.footer
+        }
+        .padding(.horizontal, 12)
+        .padding(.vertical, 10)
+        .frame(width: max(1, self.width), alignment: .leading)
+    }
+
+    private var header: some View {
+        let todayKey = CostUsageMenuDateParser.format(Date())
+        let todayEntry = self.summary.daily.first { $0.date == todayKey }
+        let todayCost = CostUsageFormatting.formatUsd(todayEntry?.totalCost) ?? "n/a"
+        let totalCost = CostUsageFormatting.formatUsd(self.summary.totals.totalCost) ?? "n/a"
+
+        return HStack(alignment: .firstTextBaseline, spacing: 12) {
+            VStack(alignment: .leading, spacing: 2) {
+                Text("Today")
+                    .font(.caption2)
+                    .foregroundStyle(.secondary)
+                Text(todayCost)
+                    .font(.system(size: 14, weight: .semibold))
+            }
+            VStack(alignment: .leading, spacing: 2) {
+                Text("Last \(self.summary.days)d")
+                    .font(.caption2)
+                    .foregroundStyle(.secondary)
+                Text(totalCost)
+                    .font(.system(size: 14, weight: .semibold))
+            }
+            Spacer()
+        }
+    }
+
+    private var chart: some View {
+        let entries = self.summary.daily.compactMap { entry -> (Date, Double)? in
+            guard let date = CostUsageMenuDateParser.parse(entry.date) else { return nil }
+            return (date, entry.totalCost)
+        }
+
+        return Chart(entries, id: \.0) { entry in
+            BarMark(
+                x: .value("Day", entry.0),
+                y: .value("Cost", entry.1))
+                .foregroundStyle(Color.accentColor)
+                .cornerRadius(3)
+        }
+        .chartXAxis {
+            AxisMarks(values: .stride(by: .day, count: 7)) {
+                AxisGridLine().foregroundStyle(.clear)
+                AxisValueLabel(format: .dateTime.month().day())
+            }
+        }
+        .chartYAxis {
+            AxisMarks(position: .leading) {
+                AxisGridLine()
+                AxisValueLabel()
+            }
+        }
+        .frame(height: 110)
+    }
+
+    private var footer: some View {
+        if self.summary.totals.missingCostEntries == 0 {
+            return AnyView(EmptyView())
+        }
+        return AnyView(
+            Text("Partial: \(self.summary.totals.missingCostEntries) entries missing cost")
+                .font(.caption2)
+                .foregroundStyle(.secondary))
+    }
+}
+
+private enum CostUsageMenuDateParser {
+    static let formatter: DateFormatter = {
+        let formatter = DateFormatter()
+        formatter.dateFormat = "yyyy-MM-dd"
+        formatter.locale = Locale(identifier: "en_US_POSIX")
+        formatter.timeZone = TimeZone.current
+        return formatter
+    }()
+
+    static func parse(_ value: String) -> Date? {
+        self.formatter.date(from: value)
+    }
+
+    static func format(_ date: Date) -> String {
+        self.formatter.string(from: date)
+    }
+}

apps/macos/Sources/Clawdbot/CronJobEditor+Helpers.swift

@@ -42,7 +42,8 @@ extension CronJobEditor {
             self.thinking = thinking ?? ""
             self.timeoutSeconds = timeoutSeconds.map(String.init) ?? ""
             self.deliver = deliver ?? false
-            self.channel = GatewayAgentChannel(raw: channel)
+            let trimmed = (channel ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
+            self.channel = trimmed.isEmpty ? "last" : trimmed
             self.to = to ?? ""
             self.bestEffortDeliver = bestEffortDeliver ?? false
         }
@@ -210,7 +211,8 @@ extension CronJobEditor {
         if let n = Int(self.timeoutSeconds), n > 0 { payload["timeoutSeconds"] = n }
         payload["deliver"] = self.deliver
         if self.deliver {
-            payload["channel"] = self.channel.rawValue
+            let trimmed = self.channel.trimmingCharacters(in: .whitespacesAndNewlines)
+            payload["channel"] = trimmed.isEmpty ? "last" : trimmed
             let to = self.to.trimmingCharacters(in: .whitespacesAndNewlines)
             if !to.isEmpty { payload["to"] = to }
             payload["bestEffortDeliver"] = self.bestEffortDeliver

apps/macos/Sources/Clawdbot/CronJobEditor+Testing.swift

@@ -14,7 +14,7 @@ extension CronJobEditor {
         self.payloadKind = .agentTurn
         self.agentMessage = "Run diagnostic"
         self.deliver = true
-        self.channel = .last
+        self.channel = "last"
         self.to = "+15551230000"
         self.thinking = "low"
         self.timeoutSeconds = "90"

apps/macos/Sources/Clawdbot/CronJobEditor.swift

@@ -1,10 +1,12 @@
 import ClawdbotProtocol
+import Observation
 import SwiftUI
 
 struct CronJobEditor: View {
     let job: CronJob?
     @Binding var isSaving: Bool
     @Binding var error: String?
+    @Bindable var channelsStore: ChannelsStore
     let onCancel: () -> Void
     let onSave: ([String: AnyCodable]) -> Void
 
@@ -45,13 +47,29 @@ struct CronJobEditor: View {
     @State var systemEventText: String = ""
     @State var agentMessage: String = ""
     @State var deliver: Bool = false
-    @State var channel: GatewayAgentChannel = .last
+    @State var channel: String = "last"
     @State var to: String = ""
     @State var thinking: String = ""
     @State var timeoutSeconds: String = ""
     @State var bestEffortDeliver: Bool = false
     @State var postPrefix: String = "Cron"
 
+    var channelOptions: [String] {
+        let ordered = self.channelsStore.orderedChannelIds()
+        var options = ["last"] + ordered
+        let trimmed = self.channel.trimmingCharacters(in: .whitespacesAndNewlines)
+        if !trimmed.isEmpty, !options.contains(trimmed) {
+            options.append(trimmed)
+        }
+        var seen = Set<String>()
+        return options.filter { seen.insert($0).inserted }
+    }
+
+    func channelLabel(for id: String) -> String {
+        if id == "last" { return "last" }
+        return self.channelsStore.resolveChannelLabel(id)
+    }
+
     var body: some View {
         VStack(alignment: .leading, spacing: 16) {
             VStack(alignment: .leading, spacing: 6) {
@@ -333,13 +351,9 @@ struct CronJobEditor: View {
                     GridRow {
                         self.gridLabel("Channel")
                         Picker("", selection: self.$channel) {
-                            Text("last").tag(GatewayAgentChannel.last)
-                            Text("whatsapp").tag(GatewayAgentChannel.whatsapp)
-                            Text("telegram").tag(GatewayAgentChannel.telegram)
-                            Text("discord").tag(GatewayAgentChannel.discord)
-                            Text("slack").tag(GatewayAgentChannel.slack)
-                            Text("signal").tag(GatewayAgentChannel.signal)
-                            Text("imessage").tag(GatewayAgentChannel.imessage)
+                            ForEach(self.channelOptions, id: \.self) { channel in
+                                Text(self.channelLabel(for: channel)).tag(channel)
+                            }
                         }
                         .labelsHidden()
                         .pickerStyle(.segmented)