fix(web): show all WhatsApp shared contacts

fix(agents): require raw for gateway config.apply (#566 ) (thanks @sircrumpet)
fix(tools): flatten gateway tool schema for Vertex AI compatibility
2026-01-10 00:16:54 +00:00 · 2026-01-10 00:16:17 +00:00 · 2026-01-10 00:16:17 +00:00
2503 changed files with 129599 additions and 258790 deletions
@@ -1,26 +0,0 @@
 # detect-secrets exclusion patterns (regex)
 #
 # Note: detect-secrets does not read this file by default. If you want these
 # applied, wire them into your scan command (e.g. translate to --exclude-files
 # / --exclude-lines) or into a baseline's filters_used.
 [exclude-files]
 # pnpm lockfiles contain lots of high-entropy package integrity blobs.
 pattern = (^|/)pnpm-lock\.yaml$
 [exclude-lines]
 # Fastlane checks for private key marker; not a real key.
 pattern = key_content\.include\?\("BEGIN PRIVATE KEY"\)
 # UI label string for Anthropic auth mode.
 pattern = case \.apiKeyEnv: "API key \(env var\)"
 # CodingKeys mapping uses apiKey literal.
 pattern = case apikey = "apiKey"
 # Schema labels referencing password fields (not actual secrets).
 pattern = "gateway\.remote\.password"
 pattern = "gateway\.auth\.password"
 # Schema label for talk API key (label text only).
 pattern = "talk\.apiKey"
 # checking for typeof is not something we care about.
 pattern = === "string"
 # specific optional-chaining password check that didn't match the line above.
 pattern = typeof remote\?\.password === "string"
@@ -5,57 +5,6 @@ on:
  pull_request:
 jobs:
  install-check:
    runs-on: blacksmith-4vcpu-ubuntu-2404
    steps:
      - name: Checkout
        uses: actions/checkout@v4
        with:
          submodules: false
      - name: Checkout submodules (retry)
        run: |
          set -euo pipefail
          git submodule sync --recursive
          for attempt in 1 2 3 4 5; do
            if git -c protocol.version=2 submodule update --init --force --depth=1 --recursive; then
              exit 0
            fi
            echo "Submodule update failed (attempt $attempt/5). Retrying…"
            sleep $((attempt * 10))
          done
          exit 1
      - name: Setup Node.js
        uses: actions/setup-node@v4
        with:
          node-version: 22.x
          check-latest: true
      - name: Runtime versions
        run: |
          node -v
          npm -v
      - name: Capture node path
        run: echo "NODE_BIN=$(dirname \"$(node -p \"process.execPath\")\")" >> "$GITHUB_ENV"
      - name: Enable corepack and pin pnpm
        run: |
          corepack enable
          corepack prepare pnpm@10.23.0 --activate
          pnpm -v
      - name: Install dependencies (frozen)
        env:
          CI: true
        run: |
          export PATH="$NODE_BIN:$PATH"
          which node
          node -v
          pnpm -v
          pnpm install --frozen-lockfile --ignore-scripts=false --config.engine-strict=false --config.enable-pre-post-scripts=true
  checks:
    runs-on: blacksmith-4vcpu-ubuntu-2404
    strategy:
@@ -74,9 +23,9 @@ jobs:
          - runtime: node
            task: protocol
            command: pnpm protocol:check
-          - runtime: node
+          - runtime: bun
-            task: format
+            task: lint
-            command: pnpm format
+            command: bunx biome check src
          - runtime: bun
            task: test
            command: bunx vitest run
@@ -105,7 +54,7 @@ jobs:
      - name: Setup Node.js
        uses: actions/setup-node@v4
        with:
-          node-version: 22.x
+          node-version: 24
          check-latest: true
      - name: Setup Bun
@@ -136,36 +85,11 @@ jobs:
          which node
          node -v
          pnpm -v
-          pnpm install --frozen-lockfile --ignore-scripts=false --config.engine-strict=false --config.enable-pre-post-scripts=true || pnpm install --frozen-lockfile --ignore-scripts=false --config.engine-strict=false --config.enable-pre-post-scripts=true
+          pnpm install --ignore-scripts=false --config.engine-strict=false --config.enable-pre-post-scripts=true || pnpm install --ignore-scripts=false --config.engine-strict=false --config.enable-pre-post-scripts=true
      - name: Run ${{ matrix.task }} (${{ matrix.runtime }})
        run: ${{ matrix.command }}
  secrets:
    runs-on: blacksmith-4vcpu-ubuntu-2404
    steps:
      - name: Checkout
        uses: actions/checkout@v4
        with:
          submodules: false
      - name: Setup Python
        uses: actions/setup-python@v5
        with:
          python-version: "3.12"
      - name: Install detect-secrets
        run: |
          python -m pip install --upgrade pip
          python -m pip install detect-secrets==1.5.0
      - name: Detect secrets
        run: |
          if ! detect-secrets scan --baseline .secrets.baseline; then
            echo "::error::Secret scanning failed. See docs/gateway/security.md#secret-scanning-detect-secrets"
            exit 1
          fi
  checks-windows:
    runs-on: blacksmith-4vcpu-windows-2025
    defaults:
@@ -209,7 +133,7 @@ jobs:
      - name: Setup Node.js
        uses: actions/setup-node@v4
        with:
-          node-version: 22.x
+          node-version: 24
          check-latest: true
      - name: Setup Bun
@@ -240,7 +164,7 @@ jobs:
          which node
          node -v
          pnpm -v
-          pnpm install --frozen-lockfile --ignore-scripts=false --config.engine-strict=false --config.enable-pre-post-scripts=true || pnpm install --frozen-lockfile --ignore-scripts=false --config.engine-strict=false --config.enable-pre-post-scripts=true
+          pnpm install --ignore-scripts=false --config.engine-strict=false --config.enable-pre-post-scripts=true || pnpm install --ignore-scripts=false --config.engine-strict=false --config.enable-pre-post-scripts=true
      - name: Run ${{ matrix.task }} (${{ matrix.runtime }})
        run: ${{ matrix.command }}
@@ -276,7 +200,7 @@ jobs:
      - name: Setup Node.js
        uses: actions/setup-node@v4
        with:
-          node-version: 22.x
+          node-version: 24
          check-latest: true
      - name: Runtime versions
@@ -301,7 +225,7 @@ jobs:
          which node
          node -v
          pnpm -v
-          pnpm install --frozen-lockfile --ignore-scripts=false --config.engine-strict=false --config.enable-pre-post-scripts=true || pnpm install --frozen-lockfile --ignore-scripts=false --config.engine-strict=false --config.enable-pre-post-scripts=true
+          pnpm install --ignore-scripts=false --config.engine-strict=false --config.enable-pre-post-scripts=true || pnpm install --ignore-scripts=false --config.engine-strict=false --config.enable-pre-post-scripts=true
      - name: Run ${{ matrix.task }}
        run: ${{ matrix.command }}
@@ -1,33 +0,0 @@
 name: Install Smoke
 on:
  push:
    branches: [main]
  pull_request:
  workflow_dispatch:
 jobs:
  install-smoke:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout CLI
        uses: actions/checkout@v4
      - name: Setup pnpm
        uses: pnpm/action-setup@v3
        with:
          version: 10
      - name: Enable Corepack
        run: corepack enable
      - name: Install pnpm deps (minimal)
        run: pnpm install --ignore-scripts --frozen-lockfile
      - name: Run installer docker tests
        env:
          CLAWDBOT_INSTALL_URL: https://clawd.bot/install.sh
          CLAWDBOT_INSTALL_CLI_URL: https://clawd.bot/install-cli.sh
          CLAWDBOT_NO_ONBOARD: "1"
          CLAWDBOT_INSTALL_SMOKE_SKIP_CLI: "1"
          CLAWDBOT_INSTALL_SMOKE_PREVIOUS: "2026.1.11-4"
        run: pnpm test:install:smoke
@@ -1,6 +1,5 @@
 node_modules
 .env
 docker-compose.extra.yml
 dist
 *.bun-build
 pnpm-lock.yaml
@@ -1,5 +0,0 @@
 {
  "$schema": "./node_modules/oxfmt/configuration_schema.json",
  "indentWidth": 2,
  "printWidth": 100
 }
@@ -1,4 +0,0 @@
 {
  "$schema": "https://json.schemastore.org/oxlintrc",
  "extends": ["recommended"]
 }
@@ -1,518 +0,0 @@
 {
  "version": "1.5.0",
  "plugins_used": [
    {
      "name": "ArtifactoryDetector"
    },
    {
      "name": "AWSKeyDetector"
    },
    {
      "name": "AzureStorageKeyDetector"
    },
    {
      "name": "Base64HighEntropyString",
      "limit": 4.5
    },
    {
      "name": "BasicAuthDetector"
    },
    {
      "name": "CloudantDetector"
    },
    {
      "name": "DiscordBotTokenDetector"
    },
    {
      "name": "GitHubTokenDetector"
    },
    {
      "name": "GitLabTokenDetector"
    },
    {
      "name": "HexHighEntropyString",
      "limit": 3.0
    },
    {
      "name": "IbmCloudIamDetector"
    },
    {
      "name": "IbmCosHmacDetector"
    },
    {
      "name": "IPPublicDetector"
    },
    {
      "name": "JwtTokenDetector"
    },
    {
      "name": "KeywordDetector",
      "keyword_exclude": ""
    },
    {
      "name": "MailchimpDetector"
    },
    {
      "name": "NpmDetector"
    },
    {
      "name": "OpenAIDetector"
    },
    {
      "name": "PrivateKeyDetector"
    },
    {
      "name": "PypiTokenDetector"
    },
    {
      "name": "SendGridDetector"
    },
    {
      "name": "SlackDetector"
    },
    {
      "name": "SoftlayerDetector"
    },
    {
      "name": "SquareOAuthDetector"
    },
    {
      "name": "StripeDetector"
    },
    {
      "name": "TelegramBotTokenDetector"
    },
    {
      "name": "TwilioKeyDetector"
    }
  ],
  "filters_used": [
    {
      "path": "detect_secrets.filters.allowlist.is_line_allowlisted"
    },
    {
      "path": "detect_secrets.filters.common.is_baseline_file",
      "filename": ".secrets.baseline"
    },
    {
      "path": "detect_secrets.filters.common.is_ignored_due_to_verification_policies",
      "min_level": 2
    },
    {
      "path": "detect_secrets.filters.heuristic.is_indirect_reference"
    },
    {
      "path": "detect_secrets.filters.heuristic.is_likely_id_string"
    },
    {
      "path": "detect_secrets.filters.heuristic.is_lock_file"
    },
    {
      "path": "detect_secrets.filters.heuristic.is_not_alphanumeric_string"
    },
    {
      "path": "detect_secrets.filters.heuristic.is_potential_uuid"
    },
    {
      "path": "detect_secrets.filters.heuristic.is_prefixed_with_dollar_sign"
    },
    {
      "path": "detect_secrets.filters.heuristic.is_sequential_string"
    },
    {
      "path": "detect_secrets.filters.heuristic.is_swagger_file"
    },
    {
      "path": "detect_secrets.filters.heuristic.is_templated_secret"
    },
    {
      "path": "detect_secrets.filters.regex.should_exclude_file",
      "pattern": [
        "(^|/)pnpm-lock\\.yaml$"
      ]
    },
    {
      "path": "detect_secrets.filters.regex.should_exclude_line",
      "pattern": [
        "key_content\\.include\\?\\(\"BEGIN PRIVATE KEY\"\\)",
        "case \\.apiKeyEnv: \"API key \\(env var\\)\"",
        "case apikey = \"apiKey\"",
        "\"gateway\\.remote\\.password\"",
        "\"gateway\\.auth\\.password\"",
        "\"talk\\.apiKey\"",
        "=== \"string\"",
        "typeof remote\\?\\.password === \"string\""
      ]
    }
  ],
  "results": {
    ".env.example": [
      {
        "type": "Twilio API Key",
        "filename": ".env.example",
        "hashed_secret": "3c7206eff845bc69cf12d904d0f95f9aec15535e",
        "is_verified": false,
        "line_number": 2
      }
    ],
    "appcast.xml": [
      {
        "type": "Base64 High Entropy String",
        "filename": "appcast.xml",
        "hashed_secret": "1b1c2b73eca84e441a823c37a06c71c9fadcfe24",
        "is_verified": false,
        "line_number": 19
      },
      {
        "type": "Base64 High Entropy String",
        "filename": "appcast.xml",
        "hashed_secret": "5c47736fee5151b26b3bb61bb38955da0e8937c6",
        "is_verified": false,
        "line_number": 35
      },
      {
        "type": "Base64 High Entropy String",
        "filename": "appcast.xml",
        "hashed_secret": "bbbca47179268f154c63affa0ca441c6e49e650f",
        "is_verified": false,
        "line_number": 52
      }
    ],
    "apps/macos/Tests/ClawdbotIPCTests/AnthropicAuthResolverTests.swift": [
      {
        "type": "Secret Keyword",
        "filename": "apps/macos/Tests/ClawdbotIPCTests/AnthropicAuthResolverTests.swift",
        "hashed_secret": "e761624445731fcb8b15da94343c6b92e507d190",
        "is_verified": false,
        "line_number": 26
      },
      {
        "type": "Secret Keyword",
        "filename": "apps/macos/Tests/ClawdbotIPCTests/AnthropicAuthResolverTests.swift",
        "hashed_secret": "a23c8630c8a5fbaa21f095e0269c135c20d21689",
        "is_verified": false,
        "line_number": 42
      }
    ],
    "apps/macos/Tests/ClawdbotIPCTests/ConnectionsSettingsSmokeTests.swift": [
      {
        "type": "Secret Keyword",
        "filename": "apps/macos/Tests/ClawdbotIPCTests/ConnectionsSettingsSmokeTests.swift",
        "hashed_secret": "e5e9fa1ba31ecd1ae84f75caaa474f3a663f05f4",
        "is_verified": false,
        "line_number": 83
      }
    ],
    "apps/macos/Tests/ClawdbotIPCTests/TailscaleIntegrationSectionTests.swift": [
      {
        "type": "Secret Keyword",
        "filename": "apps/macos/Tests/ClawdbotIPCTests/TailscaleIntegrationSectionTests.swift",
        "hashed_secret": "e5e9fa1ba31ecd1ae84f75caaa474f3a663f05f4",
        "is_verified": false,
        "line_number": 27
      }
    ],
    "docs/configuration.md": [
      {
        "type": "Secret Keyword",
        "filename": "docs/configuration.md",
        "hashed_secret": "e5e9fa1ba31ecd1ae84f75caaa474f3a663f05f4",
        "is_verified": false,
        "line_number": 268
      },
      {
        "type": "Secret Keyword",
        "filename": "docs/configuration.md",
        "hashed_secret": "1188d5a8ed7edcff5144a9472af960243eacf12e",
        "is_verified": false,
        "line_number": 465
      },
      {
        "type": "Secret Keyword",
        "filename": "docs/configuration.md",
        "hashed_secret": "22af290a1a3d5e941193a41a3d3a9e4ca8da5e27",
        "is_verified": false,
        "line_number": 718
      },
      {
        "type": "Secret Keyword",
        "filename": "docs/configuration.md",
        "hashed_secret": "16c249e04e2be318050cb883c40137361c0c7209",
        "is_verified": false,
        "line_number": 760
      },
      {
        "type": "Secret Keyword",
        "filename": "docs/configuration.md",
        "hashed_secret": "c1e6ee547fd492df1441ac492e8bb294974712bd",
        "is_verified": false,
        "line_number": 859
      },
      {
        "type": "Secret Keyword",
        "filename": "docs/configuration.md",
        "hashed_secret": "45d676e7c6ab44cf4b8fa366ef2d8fccd3e6d6e6",
        "is_verified": false,
        "line_number": 982
      }
    ],
    "docs/faq.md": [
      {
        "type": "Secret Keyword",
        "filename": "docs/faq.md",
        "hashed_secret": "a219d7693c25cd2d93313512e200ff3eb374d281",
        "is_verified": false,
        "line_number": 593
      },
      {
        "type": "Secret Keyword",
        "filename": "docs/faq.md",
        "hashed_secret": "ec3810e10fb78db55ce38b9c18d1c3eb1db739e0",
        "is_verified": false,
        "line_number": 650
      }
    ],
    "docs/skills-config.md": [
      {
        "type": "Secret Keyword",
        "filename": "docs/skills-config.md",
        "hashed_secret": "c1e6ee547fd492df1441ac492e8bb294974712bd",
        "is_verified": false,
        "line_number": 28
      }
    ],
    "docs/skills.md": [
      {
        "type": "Secret Keyword",
        "filename": "docs/skills.md",
        "hashed_secret": "c1e6ee547fd492df1441ac492e8bb294974712bd",
        "is_verified": false,
        "line_number": 97
      }
    ],
    "docs/tailscale.md": [
      {
        "type": "Secret Keyword",
        "filename": "docs/tailscale.md",
        "hashed_secret": "9cb0dc5383312aa15b9dc6745645bde18ff5ade9",
        "is_verified": false,
        "line_number": 52
      }
    ],
    "docs/talk.md": [
      {
        "type": "Secret Keyword",
        "filename": "docs/talk.md",
        "hashed_secret": "1188d5a8ed7edcff5144a9472af960243eacf12e",
        "is_verified": false,
        "line_number": 50
      }
    ],
    "docs/telegram.md": [
      {
        "type": "Secret Keyword",
        "filename": "docs/telegram.md",
        "hashed_secret": "e9fe51f94eadabf54dbf2fbbd57188b9abee436e",
        "is_verified": false,
        "line_number": 57
      }
    ],
    "skills/local-places/SERVER_README.md": [
      {
        "type": "Secret Keyword",
        "filename": "skills/local-places/SERVER_README.md",
        "hashed_secret": "6d9c68c603e465077bdd49c62347fe54717f83a3",
        "is_verified": false,
        "line_number": 28
      }
    ],
    "skills/openai-whisper-api/SKILL.md": [
      {
        "type": "Secret Keyword",
        "filename": "skills/openai-whisper-api/SKILL.md",
        "hashed_secret": "1077361f94d70e1ddcc7c6dc581a489532a81d03",
        "is_verified": false,
        "line_number": 39
      }
    ],
    "skills/trello/SKILL.md": [
      {
        "type": "Secret Keyword",
        "filename": "skills/trello/SKILL.md",
        "hashed_secret": "11fa7c37d697f30e6aee828b4426a10f83ab2380",
        "is_verified": false,
        "line_number": 18
      }
    ],
    "src/agents/models-config.test.ts": [
      {
        "type": "Secret Keyword",
        "filename": "src/agents/models-config.test.ts",
        "hashed_secret": "7cf31e8b6cda49f70c31f1f25af05d46f924142d",
        "is_verified": false,
        "line_number": 25
      },
      {
        "type": "Secret Keyword",
        "filename": "src/agents/models-config.test.ts",
        "hashed_secret": "3a81eb091f80c845232225be5663d270e90dacb7",
        "is_verified": false,
        "line_number": 90
      }
    ],
    "src/agents/skills.test.ts": [
      {
        "type": "Secret Keyword",
        "filename": "src/agents/skills.test.ts",
        "hashed_secret": "3acfb2c2b433c0ea7ff107e33df91b18e52f960f",
        "is_verified": false,
        "line_number": 158
      },
      {
        "type": "Secret Keyword",
        "filename": "src/agents/skills.test.ts",
        "hashed_secret": "7a85f4764bbd6daf1c3545efbbf0f279a6dc0beb",
        "is_verified": false,
        "line_number": 265
      },
      {
        "type": "Secret Keyword",
        "filename": "src/agents/skills.test.ts",
        "hashed_secret": "5df3a673d724e8a1eb673a8baf623e183940804d",
        "is_verified": false,
        "line_number": 462
      },
      {
        "type": "Secret Keyword",
        "filename": "src/agents/skills.test.ts",
        "hashed_secret": "8921daaa546693e52bc1f9c40bdcf15e816e0448",
        "is_verified": false,
        "line_number": 490
      }
    ],
    "src/browser/target-id.test.ts": [
      {
        "type": "Hex High Entropy String",
        "filename": "src/browser/target-id.test.ts",
        "hashed_secret": "4e126c049580d66ca1549fa534d95a7263f27f46",
        "is_verified": false,
        "line_number": 16
      }
    ],
    "src/commands/antigravity-oauth.ts": [
      {
        "type": "Base64 High Entropy String",
        "filename": "src/commands/antigravity-oauth.ts",
        "hashed_secret": "709d0f232b6ac4f8d24dec3e4fabfdb14257174f",
        "is_verified": false,
        "line_number": 17
      },
      {
        "type": "Base64 High Entropy String",
        "filename": "src/commands/antigravity-oauth.ts",
        "hashed_secret": "3848603b8e866f62d07c206ff622279b9dcb0238",
        "is_verified": false,
        "line_number": 20
      }
    ],
    "src/commands/onboard-auth.ts": [
      {
        "type": "Secret Keyword",
        "filename": "src/commands/onboard-auth.ts",
        "hashed_secret": "16c249e04e2be318050cb883c40137361c0c7209",
        "is_verified": false,
        "line_number": 50
      }
    ],
    "src/config/config.test.ts": [
      {
        "type": "Secret Keyword",
        "filename": "src/config/config.test.ts",
        "hashed_secret": "bea2f7b64fab8d1d414d0449530b1e088d36d5b1",
        "is_verified": false,
        "line_number": 520
      }
    ],
    "src/gateway/server.auth.test.ts": [
      {
        "type": "Secret Keyword",
        "filename": "src/gateway/server.auth.test.ts",
        "hashed_secret": "e5e9fa1ba31ecd1ae84f75caaa474f3a663f05f4",
        "is_verified": false,
        "line_number": 89
      },
      {
        "type": "Secret Keyword",
        "filename": "src/gateway/server.auth.test.ts",
        "hashed_secret": "a4b48a81cdab1e1a5dd37907d6c85ca1c61ddc7c",
        "is_verified": false,
        "line_number": 109
      }
    ],
    "src/infra/env.test.ts": [
      {
        "type": "Secret Keyword",
        "filename": "src/infra/env.test.ts",
        "hashed_secret": "df98a117ddabf85991b9fe0e268214dc0e1254dc",
        "is_verified": false,
        "line_number": 10
      },
      {
        "type": "Secret Keyword",
        "filename": "src/infra/env.test.ts",
        "hashed_secret": "6d811dc1f59a55ca1a3d38b5042a062b9f79e8ec",
        "is_verified": false,
        "line_number": 25
      }
    ],
    "src/infra/shell-env.test.ts": [
      {
        "type": "Secret Keyword",
        "filename": "src/infra/shell-env.test.ts",
        "hashed_secret": "65c10dc3549fe07424148a8a4790a3341ecbc253",
        "is_verified": false,
        "line_number": 35
      },
      {
        "type": "Base64 High Entropy String",
        "filename": "src/infra/shell-env.test.ts",
        "hashed_secret": "64db6bf7f0e5a0491df4419f0eb1bbcc402989e8",
        "is_verified": false,
        "line_number": 56
      },
      {
        "type": "Secret Keyword",
        "filename": "src/infra/shell-env.test.ts",
        "hashed_secret": "e013ffda590d2178607c16d11b1ea42f75ceb0e7",
        "is_verified": false,
        "line_number": 73
      },
      {
        "type": "Base64 High Entropy String",
        "filename": "src/infra/shell-env.test.ts",
        "hashed_secret": "be6ee9a6bf9f2dad84a5a67d6c0576a5bacc391e",
        "is_verified": false,
        "line_number": 75
      }
    ],
    "src/web/qr-image.test.ts": [
      {
        "type": "Hex High Entropy String",
        "filename": "src/web/qr-image.test.ts",
        "hashed_secret": "564666dc1ca6e7318b2d5feeb1ce7b5bf717411e",
        "is_verified": false,
        "line_number": 12
      }
    ],
    "vendor/a2ui/README.md": [
      {
        "type": "Secret Keyword",
        "filename": "vendor/a2ui/README.md",
        "hashed_secret": "2619a5397a5d054dab3fe24e6a8da1fbd76ec3a6",
        "is_verified": false,
        "line_number": 123
      }
    ]
  },
  "generated_at": "2026-01-05T13:01:00Z"
 }
@@ -1,22 +1,15 @@
 # Repository Guidelines
 - Repo: https://github.com/clawdbot/clawdbot
 - GitHub issues: use literal multiline strings or $'...' for newlines; avoid "\\n" escapes in `gh issue create/edit`.
 ## Project Structure & Module Organization
 - Source code: `src/` (CLI wiring in `src/cli`, commands in `src/commands`, web provider in `src/provider-web.ts`, infra in `src/infra`, media pipeline in `src/media`).
 - Tests: colocated `*.test.ts`.
 - 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`).
 ## Docs Linking (Mintlify)
 - Docs are hosted on Mintlify (docs.clawd.bot).
 - Internal doc links in `docs/**/*.md`: root-relative, no `.md`/`.mdx` (example: `[Config](/configuration)`).
 - Section cross-references: use anchors on root-relative paths (example: `[Hooks](/configuration#hooks)`).
 - When Peter asks for links, reply with full `https://docs.clawd.bot/...` URLs (not root-relative).
 - When you touch docs, end the reply with the `https://docs.clawd.bot/...` URLs you referenced.
 - README (GitHub): keep absolute docs URLs (`https://docs.clawd.bot/...`) so links work on GitHub.
 - Docs content must be generic: no personal device names/hostnames/paths; use placeholders like `user@gateway-host` and “gateway host”.
 ## Build, Test, and Development Commands
 - Runtime baseline: Node **22+** (keep Node + Bun paths working).
@@ -26,12 +19,12 @@
 - Run CLI in dev: `pnpm clawdbot ...` (bun) or `pnpm dev`.
 - Node remains supported for running built output (`dist/*`) and production installs.
 - Type-check/build: `pnpm build` (tsc)
- Lint/format: `pnpm lint` (oxlint), `pnpm format` (oxfmt)
+- Lint/format: `pnpm lint` (biome check), `pnpm format` (biome format)
 - Tests: `pnpm test` (vitest); coverage: `pnpm test:coverage`
 ## Coding Style & Naming Conventions
 - Language: TypeScript (ESM). Prefer strict typing; avoid `any`.
- Formatting/linting via Oxlint and Oxfmt; run `pnpm lint` before commits.
+- Formatting/linting via Biome; run `pnpm lint` before commits.
 - Add brief code comments for tricky or non-obvious logic.
 - Keep files concise; extract helpers instead of “V2” copies. Use existing patterns for CLI options and dependency injection via `createDefaultDeps`.
 - Aim to keep files under ~700 LOC; guideline only (not a hard guardrail). Split/refactor when it improves clarity or testability.
@@ -41,8 +34,6 @@
 - Framework: Vitest with V8 coverage thresholds (70% lines/branches/functions/statements).
 - Naming: match source names with `*.test.ts`; e2e in `*.e2e.test.ts`.
 - Run `pnpm test` (or `pnpm test:coverage`) before pushing when you touch logic.
 - Live tests (real keys): `CLAWDBOT_LIVE_TEST=1 pnpm test:live` (Clawdbot-only) or `LIVE=1 pnpm test:live` (includes provider live tests). Docker: `pnpm test:docker:live-models`, `pnpm test:docker:live-gateway`. Onboarding Docker E2E: `pnpm test:docker:onboard`.
 - Full kit + what’s covered: `docs/testing.md`.
 - Pure test additions/fixes generally do **not** need a changelog entry unless they alter user-facing behavior or the user asks for one.
 - Mobile: before using a simulator, check for connected real devices (iOS + Android) and prefer them when available.
@@ -50,7 +41,6 @@
 - Create commits with `scripts/committer "<msg>" <file...>`; avoid manual `git add`/`git commit` so staging stays scoped.
 - Follow concise, action-oriented commit messages (e.g., `CLI: add verbose flag to send`).
 - Group related changes; avoid bundling unrelated refactors.
 - 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 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`.
@@ -60,9 +50,6 @@
 - When merging a PR from a new contributor: add their avatar to the README “Thanks to all clawtributors” thumbnail list.
 - 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`.
 ### PR Workflow (Review vs Land)
 - **Review mode (PR link only):** read `gh pr view/diff`; **do not** switch branches; **do not** change code.
 - **Landing mode:** create an integration branch from `main`, bring in PR commits (**prefer rebase** for linear history; **merge allowed** when complexity/conflicts make it safer), apply fixes, add changelog (+ thanks + PR #), run full gate **locally before committing** (`pnpm lint && pnpm build && pnpm test`), commit, merge back to `main`, then `git switch main` (never stay on a topic branch after landing). Important: contributor needs to be in git graph after this!
@@ -70,20 +57,15 @@
 ## Security & Configuration Tips
 - Web provider stores creds at `~/.clawdbot/credentials/`; rerun `clawdbot login` if logged out.
 - Pi sessions live under `~/.clawdbot/sessions/` by default; the base directory is not configurable.
 - Environment variables: see `~/.profile`.
 - Never commit or publish real phone numbers, videos, or live configuration values. Use obviously fake placeholders in docs, tests, and examples.
 ## Troubleshooting
- Rebrand/migration issues or legacy config/service warnings: run `clawdbot doctor` (see `docs/gateway/doctor.md`).
+- Rebrand/migration issues (Clawdis → Clawdbot) or legacy config/service warnings: run `clawdbot doctor` (see `docs/gateway/doctor.md`).
 ## Agent-Specific Notes
 - Vocabulary: "makeup" = "mac app".
 - 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.
 - Any dependency with `pnpm.patchedDependencies` must use an exact version (no `^`/`~`).
 - CLI progress: use `src/cli/progress.ts` (`osc-progress` + `@clack/prompts` spinner); don’t hand-roll spinners/bars.
 - Status output: keep tables + ANSI-safe wrapping (`src/terminal/table.ts`); `status --all` = read-only/pasteable, `status --deep` = probes.
 - Gateway currently runs only as the menubar app; there is no separate LaunchAgent/helper label installed. Restart via the Clawdbot Mac app or `scripts/restart-mac.sh`; to verify/kill use `launchctl print gui/$UID | grep clawdbot` rather than assuming a fixed label. **When debugging on macOS, start/stop the gateway via the app, not ad-hoc tmux sessions; kill any temporary tunnels before handoff.**
 - macOS logs: use `./scripts/clawlog.sh` (aka `vtlog`) to query unified logs for the Clawdbot subsystem; it supports follow/tail/category filters and expects passwordless sudo for `/usr/bin/log`.
 - If shared guardrails are available locally, review them; otherwise follow this repo's guidance.
@@ -106,7 +88,6 @@
 - **Multi-agent safety:** focus reports on your edits; avoid guard-rail disclaimers unless truly blocked; when multiple agents touch the same file, continue if safe; end with a brief “other files present” note only if relevant.
 - Bug investigations: read source code of relevant npm dependencies and all related local code before concluding; aim for high-confidence root cause.
 - 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`.
 - 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.
 - Do not rebuild the macOS app over SSH; rebuilds must be run directly on the Mac.
@@ -1,446 +1,185 @@
 # Changelog
-## 2026.1.15 (unreleased)
+## Unreleased
- **BREAKING:** Microsoft Teams is now a plugin; install `@clawdbot/msteams` via `clawdbot plugins install @clawdbot/msteams`.
+- Models/Auth: add OpenCode Zen (multi-model proxy) onboarding. (#623) — thanks @magimetal
- CLI: set process titles to `clawdbot-<command>` for clearer process listings.
+- WhatsApp: refactor vCard parsing helper and improve empty contact card summaries. (#624) — thanks @steipete
- Heartbeat: tighten prompt guidance + suppress duplicate alerts for 24h. (#980) — thanks @voidserf.
+- WhatsApp: include phone numbers when multiple contacts are shared. (#625) — thanks @mahmoudashraf93
- Sessions/Security: add `session.dmScope` for multi-user DM isolation and audit warnings. (#948) — thanks @Alphonse-arianee.
+- Agents: warn on small context windows (<32k) and block unusable ones (<16k). — thanks @steipete
- Plugins: add provider auth registry + `clawdbot models auth login` for plugin-driven OAuth/API key flows.
+- Pairing: cap pending DM pairing requests at 3 per provider and avoid pairing replies for outbound DMs. — thanks @steipete
- Onboarding: switch channels setup to a single-select loop with per-channel actions and disabled hints in the picker.
+- macOS: replace relay smoke test with version check in packaging script. (#615) — thanks @YuriNachos
- TUI: show provider/model labels for the active session and default model.
+- macOS: avoid clearing Launch at Login during app initialization. (#607) — thanks @wes-davis
- Heartbeat: add per-agent heartbeat configuration and multi-agent docs example.
+- Onboarding: skip systemd checks/daemon installs when systemd user services are unavailable; add onboarding flags to skip flow steps and stabilize Docker E2E. (#573) — thanks @steipete
- Fix: list model picker entries as provider/model pairs for explicit selection. (#970) — thanks @mcinteerj.
+- Onboarding: QuickStart provider picker uses single-select to avoid accidental Telegram token prompts when choosing WhatsApp. (#485) — thanks @frankstallone
- Fix: persist `gateway.mode=local` after selecting Local run mode in `clawdbot configure`, even if no other sections are chosen.
+- macOS: add node bridge heartbeat pings to detect half-open sockets and reconnect cleanly. (#572) — thanks @ngutman
- Daemon: fix profile-aware service label resolution (env-driven) and add coverage for launchd/systemd/schtasks. (#969) — thanks @bjesuiter.
+- Node bridge: harden keepalive + heartbeat handling (TCP keepalive, better disconnects, and keepalive config tests). (#577) — thanks @steipete
- Daemon: share profile/state-dir resolution across service helpers and honor `CLAWDBOT_STATE_DIR` for Windows task scripts.
+- Control UI: improve mobile responsiveness. (#558) — thanks @carlulsoe
- Docs: clarify multi-gateway rescue bot guidance. (#969) — thanks @bjesuiter.
+- Control UI: persist per-session verbose off and hide tool cards unless verbose is on. (#262) — thanks @steipete
- Agents: add Current Date & Time system prompt section with configurable time format (auto/12/24).
+- Gateway: centralize verbose overrides and gate tool stream events at the server. (#262) — thanks @steipete
- Agents: avoid false positives when logging unsupported Google tool schema keywords.
+- CLI: add `sandbox list` and `sandbox recreate` commands for managing Docker sandbox containers after image/config updates. (#563) — thanks @pasogott
- Status: restore usage summary line for current provider when no OAuth profiles exist.
+- Sandbox: allow `session_status` tool in sandboxed sessions by default. — thanks @steipete
- Tools: normalize Slack/Discord message timestamps with `timestampMs`/`timestampUtc` while keeping raw provider fields.
+- CLI: add `clawdbot config --section <name>` to jump straight into a wizard section (repeatable).
- Docs: add Date & Time guide and update prompt/timezone configuration docs.
+- Docs: add Hetzner Docker VPS guide. (#556) — thanks @Iamadig
- Messages: debounce rapid inbound messages across channels with per-connector overrides. (#971) — thanks @juanpablodlc.
+- Docs: link Hetzner guide from install + platforms docs. (#592) — thanks @steipete
- Messages: allow media-only sends (CLI/tool) and show Telegram voice recording status for voice notes. (#957) — thanks @rdev.
+- Providers: add Microsoft Teams provider with polling, attachments, and CLI send support. (#404) — thanks @onutc
- Auth/Status: keep auth profiles sticky per session (rotate on compaction/new), surface provider usage headers in `/status` and `clawdbot models status`, and update docs.
+- Slack: honor reply tags + replyToMode while keeping threaded replies in-thread. (#574) — thanks @bolismauro
- Fix: guard model fallback against undefined provider/model values. (#954) — thanks @roshanasingh4.
+- Slack: configurable reply threading (`slack.replyToMode`) + proper mrkdwn formatting for outbound messages. (#464) — thanks @austinm911
- Fix: refactor session store updates, add chat.inject, and harden subagent cleanup flow. (#944) — thanks @tyler6204.
+- Discord: avoid category parent overrides for channel allowlists and refactor thread context helpers. (#588) — thanks @steipete
- Fix: clean up suspended CLI processes across backends. (#978) — thanks @Nachx639.
+- Discord: fix forum thread starters and cache channel lookups for thread context. (#585) — thanks @thewilloftheshadow
- Fix: parse systemd ExecStart arguments when whitespace is present. (#995) — thanks @roshanasingh4.
+- Discord: log gateway disconnect/reconnect events at info and add verbose gateway metrics. (#595) — thanks @steipete
- CLI: add `--json` output for `clawdbot daemon` lifecycle/install commands.
+- Commands: accept /models as an alias for /model.
- Memory: make `node-llama-cpp` an optional dependency (avoid Node 25 install failures) and improve local-embeddings fallback/errors.
+- Commands: add `/usage` as an alias for `/status`. (#492) — thanks @lc0rp
- Browser: add `snapshot refs=aria` (Playwright aria-ref ids) for self-resolving refs across `snapshot` → `act`.
+- Models/Auth: add MiniMax Anthropic-compatible API onboarding (minimax-api). (#590) — thanks @mneves75
- Browser: `profile="chrome"` now defaults to host control and returns clearer “attach a tab” errors.
+- Models: centralize model override validation + hooks Gmail warnings in doctor. (#602) — thanks @steipete
- Browser: extension mode recovers when only one tab is attached (stale targetId fallback).
+- Agents: avoid base-to-string error stringification in model fallback. (#604) — thanks @steipete
- Browser: prefer stable Chrome for auto-detect, with Brave/Edge fallbacks and updated docs. (#983) — thanks @cpojer.
+- Agents: `sessions_spawn` inherits the requester's provider for child runs (avoid WhatsApp fallback). (#528) — thanks @rlmestre
- Browser: fix `tab not found` for extension relay snapshots/actions when Playwright blocks `newCDPSession` (use the single available Page).
+- Agents: sub-agent context now injects only AGENTS.md + TOOLS.md (omits identity/user/soul/heartbeat/bootstrap). — thanks @steipete
- Telegram: add bidirectional reaction support with configurable notifications and agent guidance. (#964) — thanks @bohdanpodvirnyi.
+- Gateway/CLI: harden agent provider routing + validation (Slack/MS Teams + aliases). (follow-up #528) — thanks @steipete
- Telegram: skip `message_thread_id=1` for General topic sends while keeping typing indicators. (#848) — thanks @azade-c.
+- Agents: treat billing/insufficient-credits errors as failover-worthy so model fallbacks kick in. (#486) — thanks @steipete
- Discord: allow allowlisted guilds without channel lists to receive messages when `groupPolicy="allowlist"`. — thanks @thewilloftheshadow.
+- Auth: default billing disable backoff to 5h (doubling, 24h cap) and surface disabled/cooldown profiles in `models list` + doctor. (#486) — thanks @steipete
- Fix: sanitize user-facing error text + strip `<final>` tags across reply pipelines. (#975) — thanks @ThomsenDrake.
+- Commands: harden slash command registry and list text-only commands in `/commands`.
- Fix: normalize pairing CLI aliases, allow extension channels, and harden Zalo webhook payload parsing. (#991) — thanks @longmaba.
+- Models/Auth: show per-agent auth candidates in `/model status`, and add `clawdbot models auth order {get,set,clear}` (per-agent auth rotation overrides). — thanks @steipete
-
+- Telegram: keep streamMode draft-only; avoid forcing block streaming. (#619) — thanks @rubyrunsstuff
-## 2026.1.14-1
+- Debugging: add raw model stream logging flags and document gateway watch mode.
-
+- Gateway: decode dns-sd escaped UTF-8 in discovery output and show scan progress immediately. — thanks @steipete
-### Highlights
+- Agent: add claude-cli/opus-4.5 runner via Claude CLI with resume support (tools disabled).
- Web search: `web_search`/`web_fetch` tools (Brave API) + first-time setup in onboarding/configure.
+- CLI: move `clawdbot message` to subcommands (`message send|poll|…`), fold Discord/Slack/Telegram/WhatsApp tools into `message`, and require `--provider` unless only one provider is configured.
- Browser control: Chrome extension relay takeover mode + remote browser control via `clawdbot browser serve`.
+- CLI: improve `logs` output (pretty/plain/JSONL), add gateway unreachable hint, and document logging.
- Plugins: channel plugins (gateway HTTP hooks) + Zalo plugin + onboarding install flow. (#854) — thanks @longmaba.
+- Hooks: default hook agent delivery to true. (#533) — thanks @mcinteerj
- Security: expanded `clawdbot security audit` (+ `--fix`), detect-secrets CI scan, and a `SECURITY.md` reporting policy.
+- Hooks: normalize hook agent providers (aliases + msteams support).
-
+- WhatsApp: route queued replies to the original sender instead of the bot's own number. (#534) — thanks @mcinteerj
-### Changes
+- WhatsApp: improve "no active web listener" errors (include account + relink hint). (#612) — thanks @YuriNachos
- Docs: clarify per-agent auth stores, sandboxed skill binaries, and elevated semantics.
+- WhatsApp: add broadcast groups for multi-agent replies. (#547) — thanks @pasogott
- Docs: add FAQ entries for missing provider auth after adding agents and Gemini thinking signature errors.
+- WhatsApp: resolve @lid inbound senders via auth-dir mapping fallback + shared resolver. (#365)
- Agents: add optional auth-profile copy prompt on `agents add` and improve auth error messaging.
+- WhatsApp: treat shared contact cards as inbound messages (prefer vCard FN). (#622) — thanks @mahmoudashraf93
- Security: expand `clawdbot security audit` checks (model hygiene, config includes, plugin allowlists, exposure matrix) and extend `--fix` to tighten more sensitive state paths.
+- iMessage: isolate group-ish threads by chat_id. (#535) — thanks @mdahmann
- Security: add `SECURITY.md` reporting policy.
+- Models: add OAuth expiry checks in doctor, expanded `models status` auth output (missing auth + `--check` exit codes). (#538) — thanks @latitudeki5223
- Channels: add Matrix plugin (external) with docs + onboarding hooks.
+- Deps: bump Pi to 0.40.0 and drop pi-ai patch (upstream 429 fix). (#543) — thanks @mcinteerj
- Plugins: add Zalo channel plugin with gateway HTTP hooks and onboarding install prompt. (#854) — thanks @longmaba.
+- Agent: skip empty error assistant messages when rebuilding session context to avoid tool-chain corruption. (#561) — thanks @mukhtharcm
- Onboarding: add a security checkpoint prompt (docs link + sandboxing hint); require `--accept-risk` for `--non-interactive`.
+- Security: per-agent mention patterns and group elevated directives now require explicit mention to avoid cross-agent toggles.
- Docs: expand gateway security hardening guidance and incident response checklist.
+- Config: support inline env vars in config (`env.*` / `env.vars`) and document env precedence.
- Docs: document DM history limits for channel DMs. (#883) — thanks @pkrmf.
+- Config: write `clawdbot.json` atomically (temp file + replace) and keep a best-effort `.bak` backup.
- Security: add detect-secrets CI scan and baseline guidance. (#227) — thanks @Hyaxia.
+- Agent: enable adaptive context pruning by default for tool-result trimming.
- Tools: add `web_search`/`web_fetch` (Brave API), auto-enable `web_fetch` for sandboxed sessions, and remove the `brave-search` skill.
+- Agent: drop empty error assistant messages when sanitizing session history. (#591) — thanks @steipete
- CLI/Docs: add a web tools configure section for storing Brave API keys and update onboarding tips.
+- Agent: inject eligible skills list into the system prompt so bundled skills load from their actual locations. (#551) — thanks @gabriel-trigo
- Browser: add Chrome extension relay takeover mode (toolbar button), plus `clawdbot browser extension install/path` and remote browser control via `clawdbot browser serve` + `browser.controlToken`.
+- Doctor: check config/state permissions and offer to tighten them. — thanks @steipete
-
+- Doctor/Daemon: audit supervisor configs, add --repair/--force flows, surface service config audits in daemon status, and document user vs system services. — thanks @steipete
-### Fixes
+- Doctor: repair gateway service entrypoint when switching between npm and git installs; add Docker e2e coverage. — thanks @steipete
- Sessions: refactor session store updates to lock + mutate per-entry, add chat.inject, and harden subagent cleanup flow. (#944) — thanks @tyler6204.
+- Daemon: align generated systemd unit with docs for network-online + restart delay. (#479) — thanks @azade-c
- Browser: add tests for snapshot labels/efficient query params and labeled image responses.
+- Daemon: add KillMode=process to systemd units to avoid podman restart hangs. (#541) — thanks @ogulcancelik
- Google: downgrade unsigned thinking blocks before send to avoid missing signature errors.
+- WhatsApp: make inbound media size cap configurable (default 50 MB). (#505) — thanks @koala73
- Doctor: avoid re-adding WhatsApp config when only legacy ack reactions are set. (#927, fixes #900) — thanks @grp06.
+- Doctor: run legacy state migrations in non-interactive mode without prompts.
- Agents: scrub tuple `items` schemas for Gemini tool calls. (#926, fixes #746) — thanks @grp06.
+- Cron: parse Telegram topic targets for isolated delivery. (#478) — thanks @nachoiacovino
- Agents: harden Antigravity Claude history/tool-call sanitization. (#968) — thanks @rdev.
+- Cron: enqueue main-session system events under the resolved main session key. (#510)
- Agents: stabilize sub-agent announce status from runtime outcomes and normalize Result/Notes. (#835) — thanks @roshanasingh4.
+- Mobile: centralize main session key normalization for iOS/Android runtime helpers. — thanks @steipete
- Embedded runner: suppress raw API error payloads from replies. (#924) — thanks @grp06.
+- Chat UI: stop pinning hardcoded `main` session in the recent list; prefer active session if missing. — thanks @steipete
- Auth: normalize Claude Code CLI profile mode to oauth and auto-migrate config. (#855) — thanks @sebslight.
+- Outbound: default Telegram account selection for config-only tokens; remove heartbeat-specific accountId handling. (follow-up #516) — thanks @YuriNachos
- Daemon: clear persisted launchd disabled state before bootstrap (fixes `daemon install` after uninstall). (#849) — thanks @ndraiman.
+- Cron: allow Telegram delivery targets with topic/thread IDs (e.g. `-100…:topic:123`). (#474) — thanks @mitschabaude-bot
- Logging: tolerate `EIO` from console writes to avoid gateway crashes. (#925, fixes #878) — thanks @grp06.
+- Heartbeat: resolve Telegram account IDs from config-only tokens; cron tool accepts canonical `jobId` and legacy `id` for job actions. (#516) — thanks @YuriNachos
- Sandbox: restore `docker.binds` config validation for custom bind mounts. (#873) — thanks @akonyer.
+- Discord: stop provider when gateway reconnects are exhausted and surface errors. (#514) — thanks @joshp123
- Sandbox: preserve configured PATH for `docker exec` so custom tools remain available. (#873) — thanks @akonyer.
+- Agents: strip empty assistant text blocks from session history to avoid Claude API 400s. (#210)
- Slack: respect `channels.slack.requireMention` default when resolving channel mention gating. (#850) — thanks @evalexpr.
+- Agents: scrub unsupported JSON Schema keywords from tool schemas for Cloud Code Assist API compatibility. (#567) — thanks @erikpr1994
- Telegram: aggregate split inbound messages into one prompt (reduces “one reply per fragment”).
+- Agents: sanitize Cloud Code Assist tool call IDs and detect format/quota errors for failover. (#544) — thanks @jeffersonwarrior
- Auto-reply: treat trailing `NO_REPLY` tokens as silent replies.
+- Agents: simplify session tool schemas for Gemini compatibility. (#599) — thanks @mcinteerj
- Config: prevent partial config writes from clobbering unrelated settings (base hash guard + merge patch for connection saves).
+- Agents: require `raw` for gateway `config.apply` tool calls while keeping schema 2020-12 compatible. (#566) — thanks @sircrumpet
-
+- Agents: add `session_status` agent tool for `/status`-equivalent status (incl. usage/cost) + per-session model overrides. — thanks @steipete
-## 2026.1.14
+- Auto-reply: preserve block reply ordering with timeout fallback for streaming. (#503) — thanks @joshp123
-
+- Auto-reply: block reply ordering fix (duplicate PR superseded by #503). (#483) — thanks @AbhisekBasu1
-### Changes
+- Auto-reply: avoid splitting outbound chunks inside parentheses. (#499) — thanks @philipp-spiess
- Usage: add MiniMax coding plan usage tracking.
+- Auto-reply: preserve spacing when stripping inline directives. (#539) — thanks @joshp123
- Auth: label Claude Code CLI auth options. (#915) — thanks @SeanZoR.
+- Auto-reply: relax reply tag parsing to allow whitespace. (#560) — thanks @mcinteerj
- Docs: standardize Claude Code CLI naming across docs and prompts. (follow-up to #915)
+- Auto-reply: add per-provider block streaming toggles and coalesce streamed blocks to reduce line spam. (#536) — thanks @mcinteerj
- Telegram: add message delete action in the message tool. (#903) — thanks @sleontenko.
+- Auto-reply: suppress `<think>` leakage in block streaming and emit `/reasoning` as a separate `Reasoning:` message. (#614) — thanks @zknicker
- Config: add `channels.<provider>.configWrites` gating for channel-initiated config writes; migrate Slack channel IDs.
+- Auto-reply: default block streaming off for non-Telegram providers unless explicitly enabled, and avoid splitting on forced flushes below max.
-
+- Auto-reply: raise default coalesce minChars for Signal/Slack/Discord and clarify streaming vs draft streaming in docs.
-### Fixes
+- Auto-reply: default block streaming coalesce idle to 1s to reduce tiny chunks. — thanks @steipete
- - Mac: pass auth token/password to dashboard URL for authenticated access. (#918) — thanks @rahthakor.
+- Auto-reply: fix /status usage summary filtering for the active provider.
- - UI: use application-defined WebSocket close code (browser compatibility). (#918) — thanks @rahthakor.
+- Auto-reply: deduplicate followup queue entries using message id/routing to avoid duplicate replies. (#600) — thanks @samratjha96
- TUI: render picker overlays via the overlay stack so /models and /settings display. (#921) — thanks @grizzdank.
+- Status: show provider prefix in /status model display. (#506) — thanks @mcinteerj
- TUI: add a bright spinner + elapsed time in the status line for send/stream/run states.
+- Status: compact /status with session token usage + estimated cost, add `/cost` per-response usage lines (tokens-only for OAuth).
- TUI: show LLM error messages (rate limits, auth, etc.) instead of `(no output)`.
+- Status: show active auth profile and key snippet in /status.
- Gateway/Dev: ensure `pnpm gateway:dev` always uses the dev profile config + state (`~/.clawdbot-dev`).
+- Status: show provider usage windows when auth uses token-based OAuth (e.g. Claude setup-token).
-
+- Agent: promote `<think>`/`<thinking>` tag reasoning into structured thinking blocks so `/reasoning` works consistently for OpenAI-compat providers.
-#### Agents / Auth / Tools / Sandbox
+- macOS: package ClawdbotKit resources and Swift 6.2 compatibility dylib to avoid launch/tool crashes. (#473) — thanks @gupsammy
- Agents: make user time zone and 24-hour time explicit in the system prompt. (#859) — thanks @CashWilliams.
+- WhatsApp: group `/model list` output by provider for scannability. (#456) - thanks @mcinteerj
- Agents: strip downgraded tool call text without eating adjacent replies and filter thinking-tag leaks. (#905) — thanks @erikpr1994.
+- Hooks: allow per-hook model overrides for webhook/Gmail runs (e.g. GPT 5 Mini).
- Agents: cap tool call IDs for OpenAI/OpenRouter to avoid request rejections. (#875) — thanks @j1philli.
+- Control UI: logs tab opens at the newest entries (bottom).
- Agents: scrub tuple `items` schemas for Gemini tool calls. (#926, fixes #746) — thanks @grp06.
+- Control UI: default to relative paths for control UI assets. (#569) — thanks @bjesuiter
- Agents: stabilize sub-agent announce status from runtime outcomes and normalize Result/Notes. (#835) — thanks @roshanasingh4.
+- Control UI: add Docs link, remove chat composer divider, and add New session button.
- Auth: normalize Claude Code CLI profile mode to oauth and auto-migrate config. (#855) — thanks @sebslight.
+- Control UI: link sessions list to chat view. (#471) — thanks @HazAT
- Embedded runner: suppress raw API error payloads from replies. (#924) — thanks @grp06.
+- Sessions: support session `label` in store/list/UI and allow `sessions_send` lookup by label. (#570) — thanks @azade-c
- Logging: tolerate `EIO` from console writes to avoid gateway crashes. (#925, fixes #878) — thanks @grp06.
+- Sessions: clarify `sessions_send` delivery semantics, log announce failures, and enforce Discord request timeouts. (#507) — thanks @steipete
- Sandbox: restore `docker.binds` config validation and preserve configured PATH for `docker exec`. (#873) — thanks @akonyer.
+- Control UI: show/patch per-session reasoning level and render extracted reasoning in chat.
- Google: downgrade unsigned thinking blocks before send to avoid missing signature errors.
+- Control UI: queue outgoing chat messages, add Enter-to-send, and show queued items. (#527) — thanks @YuriNachos
-
+- Control UI: refactor chat layout with tool sidebar, grouped messages, and nav improvements. (#475) — thanks @rahthakor
-#### macOS / Apps
+- Control UI: drop explicit `ui:install` step; `ui:build` now auto-installs UI deps (docs + update flow).
- macOS: ensure launchd log directory exists with a test-only override. (#909) — thanks @roshanasingh4.
+- Telegram: retry long-polling conflicts with backoff to avoid fatal exits.
- macOS: format ConnectionsStore config to satisfy SwiftFormat lint. (#852) — thanks @mneves75.
+- Telegram: fix grammY fetch type mismatch when injecting `fetch`. (#512) — thanks @YuriNachos
- macOS: pass auth token/password to dashboard URL for authenticated access. (#918) — thanks @rahthakor.
+- Telegram: add inline keyboard buttons (capability-gated) and route callback query payloads as messages. (#491) — thanks @azade-c
- macOS: reuse launchd gateway auth and skip wizard when gateway config already exists. (#917)
+- WhatsApp: resolve @lid JIDs via Baileys mapping to unblock inbound messages. (#415)
- macOS: prefer the default bridge tunnel port in remote mode for node bridge connectivity; document macOS remote control + bridge tunnels. (#960, fixes #865) — thanks @kkarimi.
+- Pairing: replies now include sender ids for Discord/Slack/Signal/iMessage/WhatsApp; pairing list labels them explicitly.
- Apps: use canonical main session keys from gateway defaults across macOS/iOS/Android to avoid creating bare `main` sessions.
+- Messages: default inbound/outbound prefixes from the routed agent’s `identity.name` when set. (#578) — thanks @p6l-richard
- macOS: fix cron preview/testing payload to use `channel` key. (#867) — thanks @wes-davis.
+- Signal: accept UUID-only senders for pairing/allowlists/routing when sourceNumber is missing. (#523) — thanks @neist
- Telegram: honor `channels.telegram.timeoutSeconds` for grammY API requests. (#863) — thanks @Snaver.
+- Signal: ignore reaction-only messages so they don't surface as unknown media. (#616) — thanks @neist
- Telegram: split long captions into media + follow-up text messages. (#907) - thanks @jalehman.
+- Signal: add reaction notifications with allowlist support. — thanks @steipete
- Telegram: migrate group config when supergroups change chat IDs. (#906) — thanks @sleontenko.
+- Agent system prompt: avoid automatic self-updates unless explicitly requested.
- Messaging: unify markdown formatting + format-first chunking for Slack/Telegram/Signal. (#920) — thanks @TheSethRose.
+- Onboarding: tighten QuickStart hint copy for configuring later.
- Slack: drop Socket Mode events with mismatched `api_app_id`/`team_id`. (#889) — thanks @roshanasingh4.
+- Onboarding: set Gemini 3 Pro as the default model for Gemini API key auth. (#489) — thanks @jonasjancarik
- Discord: isolate autoThread thread context. (#856) — thanks @davidguttman.
+- Onboarding: avoid “token expired” for Codex CLI when expiry is heuristic.
- WhatsApp: fix context isolation using wrong ID (was bot's number, now conversation ID). (#911) — thanks @tristanmanchester.
+- Onboarding: QuickStart jumps straight into provider selection with Telegram preselected when unset.
- WhatsApp: normalize user JIDs with device suffix for allowlist checks in groups. (#838) — thanks @peschee.
+- Onboarding: QuickStart auto-installs the Gateway daemon with Node (no runtime picker).
-
+- Onboarding: clarify WhatsApp owner number prompt and label pairing phone number.
-## 2026.1.13
+- Auto-reply: normalize routed replies to drop NO_REPLY and apply response prefixes.
-
+- Commands: add /debug for runtime config overrides (memory-only).
-### Fixes
+- Daemon runtime: remove Bun from selection options.
- Postinstall: treat already-applied pnpm patches as no-ops to avoid npm/bun install failures.
+- CLI: restore hidden `gateway-daemon` alias for legacy launchd configs.
- Packaging: pin `@mariozechner/pi-ai` to 0.45.7 and refresh patched dependency to match npm resolution.
+- Onboarding/Configure: add OpenAI API key flow that stores in shared `~/.clawdbot/.env` for launchd; simplify Anthropic token prompt order.
-
+- Configure/Onboarding: show Control UI docs with gateway reachability status and only offer to open when a gateway is detected; default model prompt now prefers Opus 4.5 for Anthropic auth.
-## 2026.1.12-2
+- Control UI: show skill install progress + per-skill results, hide install once binaries present. (#445) — thanks @pkrmf
-
+- Providers/Doctor: surface Discord privileged intent (Message Content) misconfiguration with actionable warnings.
-### Fixes
+- Providers/Doctor: warn when Telegram config expects unmentioned group messages but Bot API privacy mode is likely enabled; surface WhatsApp login/disconnect hints.
- Packaging: include `dist/memory/**` in the npm tarball (fixes `ERR_MODULE_NOT_FOUND` for `dist/memory/index.js`).
+- Providers/Doctor: add last inbound/outbound activity timestamps in `providers status` and extend `--probe` with Discord channel permission + Telegram group membership audits.
- Agents: persist sub-agent registry across gateway restarts and resume announce flow safely. (#831) — thanks @roshanasingh4.
+- Docs: add provider troubleshooting index (`/providers/troubleshooting`) and link it from the main troubleshooting guide.
-
+- Docs: clarify model allowlist errors and add safety notes for verbose/reasoning in groups.
-## 2026.1.12-1
+- Docs: add Ansible installation guide. (#545) — thanks @pasogott
-
+- Telegram: include the user id in DM pairing messages and label it clearly in `clawdbot pairing list --provider telegram`.
-### Fixes
+- Apps: refresh iOS/Android/macOS app icons for Clawdbot branding. (#521) — thanks @fishfisher
- Packaging: include `dist/channels/**` in the npm tarball (fixes `ERR_MODULE_NOT_FOUND` for `dist/channels/registry.js`).
+- Docs: expand parameter descriptions for agent/wake hooks. (#532) — thanks @mcinteerj
-
+- Docs: add community showcase entries from Discord. (#476) — thanks @gupsammy
-## 2026.1.12
+- TUI: refresh status bar after think/verbose/reasoning changes. (#519) — thanks @jdrhyne
-
+- TUI: stop overriding agent timeout so config defaults apply; warn on invalid `--timeout-ms`. (#549)
-### Highlights
+- Status: show Verbose/Elevated only when enabled.
- **BREAKING:** rename chat “providers” (Slack/Telegram/WhatsApp/…) to **channels** across CLI/RPC/config; legacy config keys auto-migrate on load (and are written back as `channels.*`).
+- Status: filter usage summary to the active model provider.
- Memory: add vector search for agent memories (Markdown-only) with SQLite index, chunking, lazy sync + file watch, and per-agent enablement/fallback.
+- Status: map model providers to usage sources so unrelated usage doesn’t appear.
- Plugins: restore full voice-call plugin parity (Telnyx/Twilio, streaming, inbound policies, tools/CLI).
+- Status: fix Claude usage snapshots when `anthropic:default` is a setup-token lacking `user:profile` by preferring `anthropic:claude-cli`; optional claude.ai fallback via `CLAUDE_AI_SESSION_KEY` / `CLAUDE_WEB_COOKIE`.
- Models: add Synthetic provider plus Moonshot Kimi K2 0905 + turbo/thinking variants (with docs). (#811) — thanks @siraht; (#818) — thanks @mickahouan.
+- Commands: allow /elevated off in groups without a mention; keep /elevated on mention-gated.
- Cron: one-shot schedules accept ISO timestamps (UTC) with optional delete-after-run; cron jobs can target a specific agent (CLI + macOS/Control UI).
+- Commands: keep multi-directive messages from clearing directive handling.
- Agents: add compaction mode config with optional safeguard summarization and per-agent model fallbacks. (#700) — thanks @thewilloftheshadow; (#583) — thanks @mitschabaude-bot.
+- Commands: warn when /elevated runs in direct (unsandboxed) runtime.
-
+- Commands: treat mention-bypassed group command messages as mentioned so elevated directives respond.
-### New & Improved
+- Commands: return /status in directive-only multi-line messages.
- Memory: add custom OpenAI-compatible embedding endpoints; support OpenAI/local `node-llama-cpp` embeddings with per-agent overrides and provider metadata in tools/CLI. (#819) — thanks @mukhtharcm.
+- Models: fall back to configured models when the provider catalog is unavailable.
- Memory: new `clawdbot memory` CLI plus `memory_search`/`memory_get` tools with snippets + line ranges; index stored under `~/.clawdbot/memory/{agentId}.sqlite` with watch-on-by-default.
+- Agent system prompt: add messaging guidance for reply routing and cross-session sends. (#526) — thanks @neist
- Agents: strengthen memory recall guidance; make workspace bootstrap truncation configurable (default 20k) with warnings; add default sub-agent model config.
+- Agent: bypass Anthropic OAuth tool-name blocks by capitalizing built-ins and keeping pruning tool matching case-insensitive. (#553) — thanks @andrewting19
- Tools/Sandbox: add tool profiles + group shorthands; support tool-policy groups in `tools.sandbox.tools`; drop legacy `memory` shorthand; allow Docker bind mounts via `docker.binds`. (#790) — thanks @akonyer.
+- Commands/Tools: disable /restart and gateway restart tool by default (enable with commands.restart=true).
- Tools: add provider/model-specific tool policy overrides (`tools.byProvider`) to trim tool exposure per provider.
+- Gateway/CLI: add `clawdbot gateway discover` (Bonjour scan on `local.` + `clawdbot.internal.`) with `--timeout` and `--json`. — thanks @steipete
- Tools: add browser `scrollintoview` action; allow Claude/Gemini tool param aliases; allow thinking `xhigh` for GPT-5.2/Codex with safe downgrades. (#793) — thanks @hsrvc; (#444) — thanks @grp06.
+- Gateway/CLI: make `clawdbot gateway status` human-readable by default, add `--json`, and probe localhost + configured remote (warn on multiple gateways). — thanks @steipete
- Gateway/CLI: add Tailscale binary discovery, custom bind mode, and probe auth retry; add `clawdbot dashboard` auto-open flow; default native slash commands to `"auto"` with per-provider overrides. (#740) — thanks @jeffersonwarrior.
+- Gateway/CLI: support remote loopback gateways via SSH tunnel in `clawdbot gateway status` (`--ssh` / `--ssh-auto`). — thanks @steipete
- Auth/Onboarding: add Chutes OAuth (PKCE + refresh + onboarding choice); normalize API key inputs; default TUI onboarding to `deliver: false`. (#726) — thanks @FrieSei; (#791) — thanks @roshanasingh4.
+- Gateway/Discovery: include `gatewayPort`/`sshPort`/`cliPath` in wide-area Bonjour records, and add a tailnet DNS fallback for `gateway discover` when split DNS isn’t configured. — thanks @steipete
- Providers: add `discord.allowBots`; trim legacy MiniMax M2 from default catalogs; route MiniMax vision to the Coding Plan VLM endpoint (also accepts `@/path/to/file.png` inputs). (#802) — thanks @zknicker.
+- CLI: add global `--no-color` (and respect `NO_COLOR=1`) to disable ANSI output. — thanks @steipete
- Gateway: allow Tailscale Serve identity headers to satisfy token auth; rebuild Control UI assets when protocol schema is newer. (#823) — thanks @roshanasingh4; (#786) — thanks @meaningfool.
+- CLI: centralize lobster palette + apply it to onboarding/config prompts. — thanks @steipete
- Heartbeat: default `ackMaxChars` to 300 so short `HEARTBEAT_OK` replies stay internal.
+- Gateway/CLI: add `clawdbot gateway --dev/--reset` to auto-create a dev config/workspace with a robot identity (no BOOTSTRAP.md), and reset wipes config/creds/sessions/workspace (subcommand --dev no longer collides with global --dev profile). — thanks @steipete
-
+- Configure: stop prompting to open the Control UI (still shown in onboarding). — thanks @steipete
-### Installer
+- Configure: add wizard mode to remove a provider config block. — thanks @steipete
- Install: run `clawdbot doctor --non-interactive` after git installs/updates and nudge daemon restarts when detected.
+- Onboarding/TUI: prompt to start TUI (best option) when BOOTSTRAP.md exists and add `tui --message` to auto-send the first prompt. — thanks @steipete
-
+- Telegram: suppress grammY getUpdates stack traces; log concise retry message instead. — thanks @steipete
-### Fixes
+- Gateway/CLI: allow dev profile (`clawdbot --dev`) to auto-create the dev config + workspace. — thanks @steipete
- Doctor: warn on pnpm workspace mismatches, missing Control UI assets, and missing tsx binaries; offer UI rebuilds.
+- Dev templates: ship C-3PO dev workspace defaults as docs templates and use them for dev bootstrap. — thanks @steipete
- Tools: apply global tool allow/deny even when agent-specific tool policy is set.
+- Config: fix Minimax hosted onboarding to write `agents.defaults` and allow `msteams` as a heartbeat target. — thanks @steipete
- Models/Providers: treat credential validation failures as auth errors to trigger fallback; normalize `${ENV_VAR}` apiKey values and auto-fill missing provider keys; preserve explicit GitHub Copilot provider config + agent-dir auth profiles. (#822) — thanks @sebslight; (#705) — thanks @TAGOOZ.
+- Discord: add channel/category management actions (create/edit/move/delete + category removal). (#487) - thanks @NicholasSpisak
- Auth: drop invalid auth profiles from ordering so environment keys can still be used for providers like MiniMax.
+- Docs: split CLI install commands into separate code blocks. (#601) — thanks @martinpucik
- Gemini: normalize Gemini 3 ids to preview variants; strip Gemini CLI tool call/response ids; downgrade missing `thought_signature`; strip Claude `msg_*` thought_signature fields to avoid base64 decode errors. (#795) — thanks @thewilloftheshadow; (#783) — thanks @ananth-vardhan-cn; (#793) — thanks @hsrvc; (#805) — thanks @marcmarg.
+- WhatsApp: record outbound provider activity using the active account id. (#537) — thanks @Nachx639
- Agents: auto-recover from compaction context overflow by resetting the session and retrying; propagate overflow details from embedded runs so callers can recover.
+- Discord: add gateway HELLO timeout to detect zombie connections. (#608) — thanks @NicholasSpisak
- MiniMax: strip malformed tool invocation XML; include `MiniMax-VL-01` in implicit provider for image pairing. (#809) — thanks @latitudeki5223.
+- Docker: cache dependency layer for faster rebuilds. (#605) — thanks @zknicker
 - Onboarding/Auth: honor `CLAWDBOT_AGENT_DIR` / `PI_CODING_AGENT_DIR` when writing auth profiles (MiniMax). (#829) — thanks @roshanasingh4.
 - Anthropic: handle `overloaded_error` with a friendly message and failover classification. (#832) — thanks @danielz1z.
 - Anthropic: merge consecutive user turns (preserve newest metadata) before validation to avoid incorrect role errors. (#804) — thanks @ThomsenDrake.
 - Messaging: enforce context isolation for message tool sends; keep typing indicators alive during tool execution. (#793) — thanks @hsrvc; (#450, #447) — thanks @thewilloftheshadow.
 - Auto-reply: `/status` allowlist behavior, reasoning-tag enforcement on fallback, and system-event enqueueing for elevated/reasoning toggles. (#810) — thanks @mcinteerj.
 - System events: include local timestamps when events are injected into prompts. (#245) — thanks @thewilloftheshadow.
 - Auto-reply: resolve ambiguous `/model` matches; fix streaming block reply media handling; keep >300 char heartbeat replies instead of dropping.
 - Discord/Slack: centralize reply-thread planning; fix autoThread routing + add per-channel autoThread; avoid duplicate listeners; keep reasoning italics intact; allow clearing channel parents via message tool. (#800, #807) — thanks @davidguttman; (#744) — thanks @thewilloftheshadow.
 - Telegram: preserve forum topic thread ids, persist polling offsets, respect account bindings in webhook mode, and show typing indicator in General topics. (#727, #739) — thanks @thewilloftheshadow; (#821) — thanks @gumadeiras; (#779) — thanks @azade-c.
 - Slack: accept slash commands with or without leading `/` for custom command configs. (#798) — thanks @thewilloftheshadow.
 - Cron: persist disabled jobs correctly; accept `jobId` aliases for update/run/remove params. (#205, #252) — thanks @thewilloftheshadow.
 - Gateway/CLI: honor `CLAWDBOT_LAUNCHD_LABEL` / `CLAWDBOT_SYSTEMD_UNIT` overrides; `agents.list` respects explicit config; reduce noisy loopback WS logs during tests; run `clawdbot doctor --non-interactive` during updates. (#781) — thanks @ronyrus.
 - Onboarding/Control UI: refuse invalid configs (run doctor first); quote Windows browser URLs for OAuth; keep chat scroll position unless the user is near the bottom. (#764) — thanks @mukhtharcm; (#794) — thanks @roshanasingh4; (#217) — thanks @thewilloftheshadow.
 - Tools/UI: harden tool input schemas for strict providers; drop null-only union variants for Gemini schema cleanup; treat `maxChars: 0` as unlimited; keep TUI last streamed response instead of "(no output)". (#782) — thanks @AbhisekBasu1; (#796) — thanks @gabriel-trigo; (#747) — thanks @thewilloftheshadow.
 - Connections UI: polish multi-account account cards. (#816) — thanks @steipete.
 ### Maintenance
 - Dependencies: bump Pi packages to 0.45.3 and refresh patched pi-ai.
 - Testing: update Vitest + browser-playwright to 4.0.17.
 - Docs: add Amazon Bedrock provider notes and link from models/FAQ.
 ## 2026.1.11
 ### Highlights
 - Plugins are now first-class: loader + CLI management, plus the new Voice Call plugin.
 - Config: modular `$include` support for split config files. (#731) — thanks @pasogott.
 - Agents/Pi: reserve compaction headroom so pre-compaction memory writes can run before auto-compaction.
 - Agents: automatic pre-compaction memory flush turn to store durable memories before compaction.
 ### Changes
 - CLI/Onboarding: simplify MiniMax auth choice to a single M2.1 option.
 - CLI: configure section selection now loops until Continue.
 - Docs: explain MiniMax vs MiniMax Lightning (speed vs cost) and restore LM Studio example.
 - Docs: add Cerebras GLM 4.6/4.7 config example (OpenAI-compatible endpoint).
 - Onboarding/CLI: group model/auth choice by provider and label Z.AI as GLM 4.7.
 - Onboarding/Docs: add Moonshot AI (Kimi K2) auth choice + config example.
 - CLI/Onboarding: prompt to reuse detected API keys for Moonshot/MiniMax/Z.AI/Gemini/Anthropic/OpenCode.
 - Auto-reply: add compact `/model` picker (models + available providers) and show provider endpoints in `/model status`.
 - Control UI: add Config tab model presets (MiniMax M2.1, GLM 4.7, Kimi) for one-click setup.
 - Plugins: add extension loader (tools/RPC/CLI/services), discovery paths, and config schema + Control UI labels (uiHints).
 - Plugins: add `clawdbot plugins install` (path/tgz/npm), plus `list|info|enable|disable|doctor` UX.
 - Plugins: voice-call plugin now real (Twilio/log), adds start/status RPC/CLI/tool + tests.
 - Docs: add plugins doc + cross-links from tools/skills/gateway config.
 - Docs: add beginner-friendly plugin quick start + expand Voice Call plugin docs.
 - Tests: add Docker plugin loader + tgz-install smoke test.
 - Tests: extend Docker plugin E2E to cover installing from local folders (`plugins.load.paths`) and `file:` npm specs.
 - Tests: add coverage for pre-compaction memory flush settings.
 - Tests: modernize live model smoke selection for current releases and enforce tools/images/thinking-high coverage. (#769) — thanks @steipete.
 - Agents/Tools: add `apply_patch` tool for multi-file edits (experimental; gated by tools.exec.applyPatch; OpenAI-only).
 - Agents/Tools: rename the bash tool to exec (config alias maintained). (#748) — thanks @myfunc.
 - Agents: add pre-compaction memory flush config (`agents.defaults.compaction.*`) with a soft threshold + system prompt.
 - Config: add `$include` directive for modular config files. (#731) — thanks @pasogott.
 - Build: set pnpm minimum release age to 2880 minutes (2 days). (#718) — thanks @dan-dr.
 - macOS: prompt to install the global `clawdbot` CLI when missing in local mode; install via `clawd.bot/install-cli.sh` (no onboarding) and use external launchd/CLI instead of the embedded gateway runtime.
 - Docs: add gog calendar event color IDs from `gog calendar colors`. (#715) — thanks @mjrussell.
 - Cron/CLI: add `--model` flag to cron add/edit commands. (#711) — thanks @mjrussell.
 - Cron/CLI: trim model overrides on cron edits and document main-session guidance. (#711) — thanks @mjrussell.
 - Skills: bundle `skill-creator` to guide creating and packaging skills.
 - Providers: add per-DM history limit overrides (`dmHistoryLimit`) with provider-level config. (#728) — thanks @pkrmf.
 - Discord: expose channel/category management actions in the message tool. (#730) — thanks @NicholasSpisak.
 - Docs: rename README “macOS app” section to “Apps”. (#733) — thanks @AbhisekBasu1.
 - Gateway: require `client.id` in WebSocket connect params; use `client.instanceId` for presence de-dupe; update docs/tests.
 - macOS: remove the attach-only gateway setting; local mode now always manages launchd while still attaching to an existing gateway if present.
 ### Installer
 - Postinstall: replace `git apply` with builtin JS patcher (works npm/pnpm/bun; no git dependency) plus regression tests.
 - Postinstall: skip pnpm patch fallback when the new patcher is active.
 - Installer tests: add root+non-root docker smokes, CI workflow to fetch clawd.bot scripts and run install sh/cli with onboarding skipped.
 - Installer UX: support `CLAWDBOT_NO_ONBOARD=1` for non-interactive installs; fix npm prefix on Linux and auto-install git.
 - Installer UX: add `install.sh --help` with flags/env and git install hint.
 - Installer UX: add `--install-method git|npm` and auto-detect source checkouts (prompt to update git checkout vs migrate to npm).
 ### Fixes
 - Models/Onboarding: configure MiniMax (minimax.io) via Anthropic-compatible `/anthropic` endpoint by default (keep `minimax-api` as a legacy alias).
 - Models: normalize Gemini 3 Pro/Flash IDs to preview names for live model lookups. (#769) — thanks @steipete.
 - CLI: fix guardCancel typing for configure prompts. (#769) — thanks @steipete.
 - Gateway/WebChat: include handshake validation details in the WebSocket close reason for easier debugging; preserve close codes.
 - Gateway/Auth: send invalid connect responses before closing the handshake; stabilize invalid-connect auth test.
 - Gateway: tighten gateway listener detection.
 - Control UI: hide onboarding chat when configured and guard the mobile chat sidebar overlay.
 - Auth: read Codex keychain credentials and make the lookup platform-aware.
 - macOS/Release: avoid bundling dist artifacts in relay builds and generate appcasts from zip-only sources.
 - Doctor: surface plugin diagnostics in the report.
 - Plugins: treat `plugins.load.paths` directory entries as package roots when they contain `package.json` + `clawdbot.extensions`; load plugin packages from config dirs; extract archives without system tar.
 - Config: expand `~` in `CLAWDBOT_CONFIG_PATH` and common path-like config fields (including `plugins.load.paths`); guard invalid `$include` paths. (#731) — thanks @pasogott.
 - Agents: stop pre-creating session transcripts so first user messages persist in JSONL history.
 - Agents: skip pre-compaction memory flush when the session workspace is read-only.
 - Auto-reply: ignore inline `/status` directives unless the message is directive-only.
 - Auto-reply: align `/think` default display with model reasoning defaults. (#751) — thanks @gabriel-trigo.
 - Auto-reply: flush block reply buffers on tool boundaries. (#750) — thanks @sebslight.
 - Auto-reply: allow sender fallback for command authorization when `SenderId` is empty (WhatsApp self-chat). (#755) — thanks @juanpablodlc.
 - Auto-reply: treat whitespace-only sender ids as missing for command authorization (WhatsApp self-chat). (#766) — thanks @steipete.
 - Heartbeat: refresh prompt text for updated defaults.
 - Agents/Tools: use PowerShell on Windows to capture system utility output. (#748) — thanks @myfunc.
 - Docker: tolerate unset optional env vars in docker-setup.sh under strict mode. (#725) — thanks @petradonka.
 - CLI/Update: preserve base environment when passing overrides to update subprocesses. (#713) — thanks @danielz1z.
 - Agents: treat message tool errors as failures so fallback replies still send; require `to` + `message` for `action=send`. (#717) — thanks @theglove44.
 - Agents: preserve reasoning items on tool-only turns.
 - Agents/Subagents: wait for completion before announcing, align wait timeout with run timeout, and make announce prompts more emphatic.
 - Agents: route subagent transcripts to the target agent sessions directory and add regression coverage. (#708) — thanks @xMikeMickelson.
 - Agents/Tools: preserve action enums when flattening tool schemas. (#708) — thanks @xMikeMickelson.
 - Gateway/Agents: canonicalize main session aliases for store writes and add regression coverage. (#709) — thanks @xMikeMickelson.
 - Agents: reset sessions and retry when auto-compaction overflows instead of crashing the gateway.
 - Providers/Telegram: normalize command mentions for consistent parsing. (#729) — thanks @obviyus.
 - Providers: skip DM history limit handling for non-DM sessions. (#728) — thanks @pkrmf.
 - Sandbox: fix non-main mode incorrectly sandboxing the main DM session and align `/status` runtime reporting with effective sandbox state.
 - Sandbox/Gateway: treat `agent:<id>:main` as a main-session alias when `session.mainKey` is customized (backwards compatible).
 - Auto-reply: fast-path allowlisted slash commands (inline `/help`/`/commands`/`/status`/`/whoami` stripped before model).
 ## 2026.1.10
 ### Highlights
 - CLI: `clawdbot status` now table-based + shows OS/update/gateway/daemon/agents/sessions; `status --all` adds a full read-only debug report (tables, log tails, Tailscale summary, and scan progress via OSC-9 + spinner).
 - CLI Backends: add Codex CLI fallback with resume support (text output) and JSONL parsing for new runs, plus a live CLI resume probe.
 - CLI: add `clawdbot update` (safe-ish git checkout update) + `--update` shorthand. (#673) — thanks @fm1randa.
 - Gateway: add OpenAI-compatible `/v1/chat/completions` HTTP endpoint (auth, SSE streaming, per-agent routing). (#680).
 ### Changes
 - Onboarding/Models: add first-class Z.AI (GLM) auth choice (`zai-api-key`) + `--zai-api-key` flag.
 - CLI/Onboarding: add OpenRouter API key auth option in configure/onboard. (#703) — thanks @mteam88.
 - Agents: add human-delay pacing between block replies (modes: off/natural/custom, per-agent configurable). (#446) — thanks @tony-freedomology.
 - Agents/Browser: add `browser.target` (sandbox/host/custom) with sandbox host-control gating via `agents.defaults.sandbox.browser.allowHostControl`, allowlists for custom control URLs/hosts/ports, and expand browser tool docs (remote control, profiles, internals).
 - Onboarding/Models: add catalog-backed default model picker to onboarding + configure. (#611) — thanks @jonasjancarik.
 - Agents/OpenCode Zen: update fallback models + defaults, keep legacy alias mappings. (#669) — thanks @magimetal.
 - CLI: add `clawdbot reset` and `clawdbot uninstall` flows (interactive + non-interactive) plus docker cleanup smoke test.
 - Providers: move provider wiring to a plugin architecture. (#661).
 - Providers: unify group history context wrappers across providers with per-provider/per-account `historyLimit` overrides (fallback to `messages.groupChat.historyLimit`). Set `0` to disable. (#672).
 - Gateway/Heartbeat: optionally deliver heartbeat `Reasoning:` output (`agents.defaults.heartbeat.includeReasoning`). (#690)
 - Docker: allow optional home volume + extra bind mounts in `docker-setup.sh`. (#679) — thanks @gabriel-trigo.
 ### Fixes
 - Auto-reply: suppress draft/typing streaming for `NO_REPLY` (silent system ops) so it doesn’t leak partial output.
 - CLI/Status: expand tables to full terminal width; clarify provider setup vs runtime warnings; richer per-provider detail; token previews in `status` while keeping `status --all` redacted; add troubleshooting link footer; keep log tails pasteable; show gateway auth used when reachable; surface provider runtime errors (Signal/iMessage/Slack); harden `tailscale status --json` parsing; make `status --all` scan progress determinate; and replace the footer with a 3-line “Next steps” recommendation (share/debug/probe).
 - CLI/Gateway: clarify that `clawdbot gateway status` reports RPC health (connect + RPC) and shows RPC failures separately from connect failures.
 - CLI/Update: gate progress spinner on stdout TTY and align clean-check step label. (#701) — thanks @bjesuiter.
 - Telegram: add `/whoami` + `/id` commands to reveal sender id for allowlists; allow `@username` and prefixed ids in `allowFrom` prompts (with stability warning).
 - Heartbeat: strip markup-wrapped `HEARTBEAT_OK` so acks don’t leak to external providers (e.g., Telegram).
 - Control UI: stop auto-writing `telegram.groups["*"]` and warn/confirm before enabling wildcard groups.
 - WhatsApp: send ack reactions only for handled messages and ignore legacy `messages.ackReaction` (doctor copies to `whatsapp.ackReaction`). (#629) — thanks @pasogott.
 - Sandbox/Skills: mirror skills into sandbox workspaces for read-only mounts so SKILL.md stays accessible.
 - Terminal/Table: ANSI-safe wrapping to prevent table clipping/color loss; add regression coverage.
 - Docker: allow optional apt packages during image build and document the build arg. (#697) — thanks @gabriel-trigo.
 - Gateway/Heartbeat: deliver reasoning even when the main heartbeat reply is `HEARTBEAT_OK`. (#694) — thanks @antons.
 - Agents/Pi: inject config `temperature`/`maxTokens` into streaming without replacing the session streamFn; cover with live maxTokens probe. (#732) — thanks @peschee.
 - macOS: clear unsigned launchd overrides on signed restarts and warn via doctor when attach-only/disable markers are set. (#695) — thanks @jeffersonwarrior.
 - Agents: enforce single-writer session locks and drop orphan tool results to prevent tool-call ID failures (MiniMax/Anthropic-compatible APIs).
 - Docs: make `clawdbot status` the first diagnostic step, clarify `status --deep` behavior, and document `/whoami` + `/id`.
 - Docs/Testing: clarify live tool+image probes and how to list your testable `provider/model` ids.
 - Tests/Live: make gateway bash+read probes resilient to provider formatting while still validating real tool calls.
 - WhatsApp: detect @lid mentions in groups using authDir reverse mapping + resolve self JID E.164 for mention gating. (#692) — thanks @peschee.
 - Gateway/Auth: default to token auth on loopback during onboarding, add doctor token generation flow, and tighten audio transcription config to Whisper-only.
 - Providers: dedupe inbound messages across providers to avoid duplicate LLM runs on redeliveries/reconnects. (#689) — thanks @adam91holt.
 - Agents: strip `<thought>`/`<antthinking>` tags from hidden reasoning output and cover tag variants in tests. (#688) — thanks @theglove44.
 - macOS: save model picker selections as normalized provider/model IDs and keep manual entries aligned. (#683) — thanks @benithors.
 - Agents: recognize "usage limit" errors as rate limits for failover. (#687) — thanks @evalexpr.
 - CLI: avoid success message when daemon restart is skipped. (#685) — thanks @carlulsoe.
 - Commands: disable `/config` + `/debug` by default; gate via `commands.config`/`commands.debug` and hide from native registration/help output.
 - Agents/System: clarify that sub-agents remain sandboxed and cannot use elevated host access.
 - Gateway: disable the OpenAI-compatible `/v1/chat/completions` endpoint by default; enable via `gateway.http.endpoints.chatCompletions.enabled=true`.
 - macOS: stabilize bridge tunnels, guard invoke senders on disconnect, and drain stdout/stderr to avoid deadlocks. (#676) — thanks @ngutman.
 - Agents/System: clarify sandboxed runtime in system prompt and surface elevated availability when sandboxed.
 - Auto-reply: prefer `RawBody` for command/directive parsing (WhatsApp + Discord) and prevent fallback runs from clobbering concurrent session updates. (#643) — thanks @mcinteerj.
 - WhatsApp: fix group reactions by preserving message IDs and sender JIDs in history; normalize participant phone numbers to JIDs in outbound reactions. (#640) — thanks @mcinteerj.
 - WhatsApp: expose group participant IDs to the model so reactions can target the right sender.
 - Cron: `wakeMode: "now"` waits for heartbeat completion (and retries when the main lane is busy). (#666) — thanks @roshanasingh4.
 - Agents/OpenAI: fix Responses tool-only → follow-up turn handling (avoid standalone `reasoning` items that trigger 400 “required following item”) and replay reasoning items in Responses/Codex Responses history for tool-call-only turns.
 - Sandbox: add `clawdbot sandbox explain` (effective policy inspector + fix-it keys); improve “sandbox jail” tool-policy/elevated errors with actionable config key paths; link to docs.
 - Hooks/Gmail: keep Tailscale serve path at `/` while preserving the public path. (#668) — thanks @antons.
 - Hooks/Gmail: allow Tailscale target URLs to preserve internal serve paths.
 - Auth: update Claude Code keychain credentials in-place during refresh sync; share JSON file helpers; add CLI fallback coverage.
 - Auth: throttle external CLI credential syncs (Claude/Codex), reduce Keychain reads, and skip sync when cached credentials are still fresh.
 - CLI: respect `CLAWDBOT_STATE_DIR` for node pairing + voice wake settings storage. (#664) — thanks @azade-c.
 - Onboarding/Gateway: persist non-interactive gateway token auth in config; add WS wizard + gateway tool-calling regression coverage.
 - Gateway/Control UI: make `chat.send` non-blocking, wire Stop to `chat.abort`, and treat `/stop` as an out-of-band abort. (#653)
 - Gateway/Control UI: allow `chat.abort` without `runId` (abort active runs), suppress post-abort chat streaming, and prune stuck chat runs. (#653)
 - Gateway/Control UI: sniff image attachments for chat.send, drop non-images, and log mismatches. (#670) — thanks @cristip73.
 - macOS: force `restart-mac.sh --sign` to require identities and keep bundled Node signed for relay verification. (#580) — thanks @jeffersonwarrior.
 - Gateway/Agent: accept image attachments on `agent` (multimodal message) and add live gateway image probe (`CLAWDBOT_LIVE_GATEWAY_IMAGE_PROBE=1`).
 - CLI: `clawdbot sessions` now includes `elev:*` + `usage:*` flags in the table output.
 - CLI/Pairing: accept positional provider for `pairing list|approve` (npm-run compatible); update docs/bot hints.
 - Branding: normalize user-facing “ClawdBot”/“CLAWDBOT” → “Clawdbot” (CLI, status, docs).
 - Auto-reply: fix native `/model` not updating the actual chat session (Telegram/Slack/Discord). (#646)
 - Doctor: offer to run `clawdbot update` first on git installs (keeps doctor output aligned with latest).
 - Doctor: avoid false legacy workspace warning when install dir is `~/clawdbot`. (#660)
 - iMessage: fix reasoning persistence across DMs; avoid partial/duplicate replies when reasoning is enabled. (#655) — thanks @antons.
 - Models/Auth: allow MiniMax API configs without `models.providers.minimax.apiKey` (auth profiles / `MINIMAX_API_KEY`). (#656) — thanks @mneves75.
 - Agents: avoid duplicate replies when the message tool sends. (#659) — thanks @mickahouan.
 - Agents: harden Cloud Code Assist tool ID sanitization (toolUse/toolCall/toolResult) and scrub extra JSON Schema constraints. (#665) — thanks @sebslight.
 - Agents: sanitize tool results + Cloud Code Assist tool IDs at context-build time (prevents mid-run strict-provider request rejects).
 - Agents/Tools: resolve workspace-relative Read/Write/Edit paths; align bash default cwd. (#642) — thanks @mukhtharcm.
 - Discord: include forwarded message snapshots in agent session context. (#667) — thanks @rubyrunsstuff.
 - Telegram: add `telegram.draftChunk` to tune draft streaming chunking for `streamMode: "block"`. (#667) — thanks @rubyrunsstuff.
 - Tests/Agents: add regression coverage for workspace tool path resolution and bash cwd defaults.
 - iOS/Android: enable stricter concurrency/lint checks; fix Swift 6 strict concurrency issues + Android lint errors (ExifInterface, obsolete SDK check). (#662) — thanks @KristijanJovanovski.
 - Auth: read Codex CLI keychain tokens on macOS before falling back to `~/.codex/auth.json`, preventing stale refresh tokens from breaking gateway live tests.
 - iOS/macOS: share `AsyncTimeout`, require explicit `bridgeStableID` on connect, and harden tool display defaults (avoids missing-resource label fallbacks).
 - Telegram: serialize media-group processing to avoid missed albums under load.
 - Signal: handle `dataMessage.reaction` events (signal-cli SSE) to avoid broken attachment errors. (#637) — thanks @neist.
 - Docs: showcase entries for ParentPay, R2 Upload, iOS TestFlight, and Oura Health. (#650) — thanks @henrino3.
 - Agents: repair session transcripts by dropping duplicate tool results across the whole history (unblocks Anthropic-compatible APIs after retries).
 - Tests/Live: reset the gateway session between model runs to avoid cross-provider transcript incompatibilities (notably OpenAI Responses reasoning replay rules).
 ## 2026.1.9
 ### Highlights
 - Microsoft Teams provider: polling, attachments, outbound CLI send, per-channel policy.
 - Models/Auth expansion: OpenCode Zen + MiniMax API onboarding; token auth profiles + auth order; OAuth health in doctor/status.
 - CLI/Gateway UX: message subcommands, gateway discover/status/SSH, /config + /debug, sandbox CLI.
 - Provider reliability sweep: WhatsApp contact cards/targets, Telegram audio-as-voice + streaming, Signal reactions, Slack threading, Discord stability.
 - Auto-reply + status: block-streaming controls, reasoning handling, usage/cost reporting.
 - Control UI/TUI: queued messages, session links, reasoning view, mobile polish, logs UX.
 ### Breaking
 - CLI: `clawdbot message` now subcommands (`message send|poll|...`) and requires `--provider` unless only one provider configured.
 - Commands/Tools: `/restart` and gateway restart tool disabled by default; enable with `commands.restart=true`.
 ### New Features and Changes
 - Models/Auth: OpenCode Zen onboarding (#623) — thanks @magimetal; MiniMax Anthropic-compatible API + hosted onboarding (#590, #495) — thanks @mneves75, @tobiasbischoff.
 - Models/Auth: setup-token + token auth profiles; `clawdbot models auth order {get,set,clear}`; per-agent auth candidates in `/model status`; OAuth expiry checks in doctor/status.
 - Agent/System: claude-cli runner; `session_status` tool (and sandbox allow); adaptive context pruning default; system prompt messaging guidance + no auto self-update; eligible skills list injection; sub-agent context trimmed.
 - Commands: `/commands` list; `/models` alias; `/usage` alias; `/debug` runtime overrides + effective config view; `/config` chat updates + `/config get`; `config --section`.
 - CLI/Gateway: unified message tool + message subcommands; gateway discover (local + wide-area DNS-SD) with JSON/timeout; gateway status human-readable + JSON + SSH loopback; wide-area records include gatewayPort/sshPort/cliPath + tailnet DNS fallback.
 - CLI UX: logs output modes (pretty/plain/JSONL) + colorized health/daemon output; global `--no-color`; lobster palette in onboarding/config.
 - Dev ergonomics: gateway `--dev/--reset` + dev profile auto-config; C-3PO dev templates; dev gateway/TUI helper scripts.
 - Sandbox/Workspace: sandbox list/recreate commands; sync skills into sandbox workspace; sandbox browser auto-start.
 - Config/Onboarding: inline env vars; OpenAI API key flow to shared `~/.clawdbot/.env`; Opus 4.5 default prompt for Anthropic auth; QuickStart auto-install gateway (Node-only) + provider picker tweaks + skip-systemd flags; TUI bootstrap prompt (`tui --message`); remove Bun runtime choice.
 - Providers: Microsoft Teams provider (polling, attachments, outbound sends, requireMention, config reload/DM policy). (#404) — thanks @onutc
 - Providers: WhatsApp broadcast groups for multi-agent replies (#547) — thanks @pasogott; inbound media size cap configurable (#505) — thanks @koala73; identity-based message prefixes (#578) — thanks @p6l-richard.
 - Providers: Telegram inline keyboard buttons + callback payload routing (#491) — thanks @azade-c; cron topic delivery targets (#474/#478) — thanks @mitschabaude-bot, @nachoiacovino; `[[audio_as_voice]]` tag support (#490) — thanks @jarvis-medmatic.
 - Providers: Signal reactions + notifications with allowlist support.
 - Status/Usage: /status cost reporting + `/cost` lines; auth profile snippet; provider usage windows.
 - Control UI: mobile responsiveness (#558) — thanks @carlulsoe; queued messages + Enter-to-send (#527) — thanks @YuriNachos; session links (#471) — thanks @HazAT; reasoning view; skill install feedback (#445) — thanks @pkrmf; chat layout refresh (#475) — thanks @rahthakor; docs link + new session button; drop explicit `ui:install`.
 - TUI: agent picker + agents list RPC; improved status line.
 - Doctor/Daemon: audit/repair flows, permissions checks, supervisor config audits; provider status probes + warnings for Discord intents and Telegram privacy; last activity timestamps; gateway restart guidance.
 - Docs: Hetzner Docker VPS guide + cross-links (#556/#592) — thanks @Iamadig; Ansible guide (#545) — thanks @pasogott; provider troubleshooting index; hook parameter expansion (#532) — thanks @mcinteerj; model allowlist notes; OAuth deep dive; showcase refresh.
 - Apps/Branding: refreshed iOS/Android/macOS icons (#521) — thanks @fishfisher.
 ### Fixes
 - Packaging: include MS Teams send module in npm tarball.
 - Sandbox/Browser: auto-start CDP endpoint; proxy CDP out of container for attachOnly; relax Bun fetch typing; align sandbox list output with config images.
 - Agents/Runtime: gate heartbeat prompt to default sessions; /stop aborts between tool calls; require explicit system-event session keys; guard small context windows; fix model fallback stringification; sessions_spawn inherits provider; failover on billing/credits; respect auth cooldown ordering; restore Anthropic OAuth tool dispatch + tool-name bypass; avoid OpenAI invalid reasoning replay; harden Gmail hook model defaults.
 - Agent history/schema: strip/skip empty assistant/error blocks to prevent session corruption/Claude 400s; scrub unsupported JSON Schema keywords + sanitize tool call IDs for Cloud Code Assist; simplify Gemini-compatible tool/session schemas; require raw for config.apply.
 - Auto-reply/Streaming: default audioAsVoice false; preserve audio_as_voice propagation + buffer audio blocks + guard voice notes; block reply ordering (timeout) + forced-block fence-safe; avoid chunk splits inside parentheses + fence-close breaks + invalid UTF-16 truncation; preserve inline directive spacing + allow whitespace in reply tags; filter NO_REPLY prefixes + normalize routed replies; suppress <think> leakage with separate Reasoning; block streaming defaults (off by default, minChars/idle tuning) + coalesced blocks; dedupe followup queue; restore explicit responsePrefix default.
 - Status/Commands: provider prefix in /status model display; usage filtering + provider mapping; auth label + usage snapshots (claude-cli fallback + optional claude.ai); show Verbose/Elevated only when enabled; compact usage/cost line + restore emoji-rich status; /status in directive-only + multi-directive handling; mention-bypass elevated handling; surface provider usage errors; wire /usage to /status; restore hidden gateway-daemon alias; fallback /model list when catalog unavailable.
 - WhatsApp: vCard/contact cards (prefer FN, include numbers, show all contacts, keep summary counts, better empty summaries); preserve group JIDs + normalize targets; resolve @lid mappings/JIDs (Baileys/auth-dir) + inbound mapping; route queued replies to sender; improve web listener errors + remove provider name from errors; record outbound activity account id; fix web media fetch errors; broadcast group history consistency.
 - Telegram: keep streamMode draft-only; long-poll conflict retries + update dedupe; grammY fetch mismatch fixes + restrict native fetch to Bun; suppress getUpdates stack traces; include user id in pairing; audio_as_voice handling fixes.
 - Discord/Slack: thread context helpers + forum thread starters; avoid category parent overrides; gateway reconnect logs + HELLO timeout + stop provider after reconnect exhaustion; DM recipient parsing for numeric IDs; remove incorrect limited warning; reply threading + mrkdwn edge cases; remove ack reactions after reply; gateway debug event visibility.
 - Signal: reaction handling safety; own-reaction matching (uuid+phone); UUID-only senders accepted; ignore reaction-only messages.
 - MS Teams: download image attachments reliably; fix top-level replies; stop on shutdown + honor chunk limits; normalize poll providers/deps; pairing label fixes.
 - iMessage: isolate group-ish threads by chat_id.
 - Gateway/Daemon/Doctor: atomic config writes; repair gateway service entrypoint + install switches; non-interactive legacy migrations; systemd unit alignment + KillMode=process; node bridge keepalive/pings; Launch at Login persistence; bundle ClawdbotKit resources + Swift 6.2 compat dylib; relay version check + remove smoke test; regen Swift GatewayModels + keep agent provider string; cron jobId alias + channel alias migration + main session key normalization; heartbeat Telegram accountId resolution; avoid WhatsApp fallback for internal runs; gateway listener error wording; serveBaseUrl param; honor gateway --dev; fix wide-area discovery updates; align agents.defaults schema; provider account metadata in daemon status; refresh Carbon patch for gateway fixes; restore doctor prompter initialValue handling.
 - Control UI/TUI: persist per-session verbose off + hide tool cards; logs tab opens at bottom; relative asset paths + landing cleanup; session labels lookup/persistence; stop pinning main session in recents; start logs at bottom; TUI status bar refresh + timeout handling + hide reasoning label when off.
 - Onboarding/Configure: QuickStart single-select provider picker; avoid Codex CLI false-expiry warnings; clarify WhatsApp owner prompt; fix Minimax hosted onboarding (agents.defaults + msteams heartbeat target); remove configure Control UI prompt; honor gateway --dev flag.
 ### Maintenance
 - Dependencies: bump pi-* stack to 0.42.2.
 - Dependencies: Pi 0.40.0 bump (#543) — thanks @mcinteerj.
 - Build: Docker build cache layer (#605) — thanks @zknicker.
 - Auth: enable OAuth token refresh for Claude Code CLI credentials (`anthropic:claude-cli`) with bidirectional sync back to Claude Code storage (file on Linux/Windows, Keychain on macOS). This allows long-running agents to operate autonomously without manual re-authentication (#654 — thanks @radek-paclt).
 ## 2026.1.8
@@ -457,7 +196,7 @@
  - Previously, if you didn’t configure an allowlist, your bot could be **open to anyone** (especially discoverable Telegram bots).
  - New default: DM pairing (`dmPolicy="pairing"` / `discord.dm.policy="pairing"` / `slack.dm.policy="pairing"`).
  - To keep old “open to everyone” behavior: set `dmPolicy="open"` and include `"*"` in the relevant `allowFrom` (Discord/Slack: `discord.dm.allowFrom` / `slack.dm.allowFrom`).
-  - Approve requests via `clawdbot pairing list <provider>` + `clawdbot pairing approve <provider> <code>`.
+  - Approve requests via `clawdbot pairing list --provider <provider>` + `clawdbot pairing approve --provider <provider> <code>`.
 - Sandbox: default `agent.sandbox.scope` to `"agent"` (one container/workspace per agent). Use `"session"` for per-session isolation; `"shared"` disables cross-session isolation.
 - Timestamps in agent envelopes are now UTC (compact `YYYY-MM-DDTHH:mmZ`); removed `messages.timestampPrefix`. Add `agent.userTimezone` to tell the model the user’s local time (system prompt only).
 - Model config schema changes (auth profiles + model lists); doctor auto-migrates and the gateway rewrites legacy configs on startup.
@@ -13,7 +13,7 @@ Welcome to the lobster tank! 🦞
  - GitHub: [@steipete](https://github.com/steipete) · X: [@steipete](https://x.com/steipete)
 - **Shadow** - Discord + Slack subsystem
-  - GitHub: [@thewilloftheshadow](https://github.com/thewilloftheshadow) · X: [@4shad0wed](https://x.com/4shad0wed)
+  - GitHub: [@4shadowed](https://github.com/4shadowed) · X: [@4shad0wed](https://x.com/4shad0wed)
 - **Jos** - Telegram, API, Nix mode
  - GitHub: [@joshp123](https://github.com/joshp123) · X: [@jjpcodes](https://x.com/jjpcodes)
@@ -8,14 +8,6 @@ RUN corepack enable
 WORKDIR /app
 ARG CLAWDBOT_DOCKER_APT_PACKAGES=""
 RUN if [ -n "$CLAWDBOT_DOCKER_APT_PACKAGES" ]; then \
      apt-get update && \
      DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends $CLAWDBOT_DOCKER_APT_PACKAGES && \
      apt-get clean && \
      rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*; \
    fi
 COPY package.json pnpm-lock.yaml pnpm-workspace.yaml .npmrc ./
 COPY ui/package.json ./ui/package.json
 COPY patches ./patches
@@ -14,7 +14,6 @@ RUN apt-get update \
    jq \
    novnc \
    python3 \
    socat \
    websockify \
    x11vnc \
    xvfb \
@@ -1,7 +1,7 @@
-# 🦞 Clawdbot — Personal AI Assistant
+# 🦞 CLAWDBOT — Personal AI Assistant
 <p align="center">
-  <img src="https://raw.githubusercontent.com/clawdbot/clawdbot/main/docs/whatsapp-clawd.jpg" alt="Clawdbot" width="400">
+  <img src="https://raw.githubusercontent.com/clawdbot/clawdbot/main/docs/whatsapp-clawd.jpg" alt="CLAWDBOT" width="400">
 </p>
 <p align="center">
@@ -16,26 +16,26 @@
 </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 providers you already use (WhatsApp, Telegram, Slack, Discord, Signal, iMessage, 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.
 If you want a personal, single-user assistant that feels local, fast, and always-on, this is it.
-[Website](https://clawdbot.com) · [Docs](https://docs.clawd.bot) · [Getting Started](https://docs.clawd.bot/start/getting-started) · [Updating](https://docs.clawd.bot/install/updating) · [Showcase](https://docs.clawd.bot/start/showcase) · [FAQ](https://docs.clawd.bot/start/faq) · [Wizard](https://docs.clawd.bot/start/wizard) · [Nix](https://github.com/clawdbot/nix-clawdbot) · [Docker](https://docs.clawd.bot/install/docker) · [Discord](https://discord.gg/clawd)
+[Website](https://clawdbot.com) · [Docs](https://docs.clawd.bot) · [Getting Started](https://docs.clawd.bot/getting-started) · [Updating](https://docs.clawd.bot/updating) · [Showcase](https://docs.clawd.bot/showcase) · [FAQ](https://docs.clawd.bot/faq) · [Wizard](https://docs.clawd.bot/wizard) · [Nix](https://github.com/clawdbot/nix-clawdbot) · [Docker](https://docs.clawd.bot/docker) · [Discord](https://discord.gg/clawd)
-Preferred setup: run the onboarding wizard (`clawdbot onboard`). It walks through gateway, workspace, channels, and skills. The CLI wizard is the recommended path and works on **macOS, Linux, and Windows (via WSL2; strongly recommended)**.
+Preferred setup: run the onboarding wizard (`clawdbot onboard`). It walks through gateway, workspace, providers, and skills. The CLI wizard is the recommended path and works on **macOS, Linux, and Windows (via WSL2; strongly recommended)**.
 Works with npm, pnpm, or bun.
-New install? Start here: [Getting started](https://docs.clawd.bot/start/getting-started)
+New install? Start here: [Getting started](https://docs.clawd.bot/getting-started)
 **Subscriptions (OAuth):**
 - **[Anthropic](https://www.anthropic.com/)** (Claude Pro/Max)
 - **[OpenAI](https://openai.com/)** (ChatGPT/Codex)
-Model note: while any model is supported, I strongly recommend **Anthropic Pro/Max (100/200) + Opus 4.5** for long‑context strength and better prompt‑injection resistance. See [Onboarding](https://docs.clawd.bot/start/onboarding).
+Model note: while any model is supported, I strongly recommend **Anthropic Pro/Max (100/200) + Opus 4.5** for long‑context strength and better prompt‑injection resistance. See [Onboarding](https://docs.clawd.bot/onboarding).
 ## Models (selection + auth)
- Models config + CLI: [Models](https://docs.clawd.bot/concepts/models)
+- Models config + CLI: [Models](https://docs.clawd.bot/models)
- Auth profile rotation (OAuth vs API keys) + fallbacks: [Model failover](https://docs.clawd.bot/concepts/model-failover)
+- Auth profile rotation (OAuth vs API keys) + fallbacks: [Model failover](https://docs.clawd.bot/model-failover)
 ## Install (recommended)
@@ -54,7 +54,7 @@ The wizard installs the Gateway daemon (launchd/systemd user service) so it stay
 Runtime: **Node ≥22**.
-Full beginner guide (auth, pairing, channels): [Getting started](https://docs.clawd.bot/start/getting-started)
+Full beginner guide (auth, pairing, providers): [Getting started](https://docs.clawd.bot/getting-started)
 ```bash
 clawdbot onboard --install-daemon
@@ -64,11 +64,11 @@ 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 WhatsApp/Telegram/Slack/Discord)
 clawdbot agent --message "Ship checklist" --thinking high
 ```
-Upgrading? [Updating guide](https://docs.clawd.bot/install/updating) (and run `clawdbot doctor`).
+Upgrading? [Updating guide](https://docs.clawd.bot/updating) (and run `clawdbot doctor`).
 ## From source (development)
@@ -94,94 +94,89 @@ Note: `pnpm clawdbot ...` runs TypeScript directly (via `tsx`). `pnpm build` pro
 Clawdbot connects to real messaging surfaces. Treat inbound DMs as **untrusted input**.
-Full security guide: [Security](https://docs.clawd.bot/gateway/security)
+Full security guide: [Security](https://docs.clawd.bot/security)
-Default behavior on Telegram/WhatsApp/Signal/iMessage/Microsoft Teams/Discord/Slack:
+Default behavior on Telegram/WhatsApp/Signal/iMessage/Discord/Slack:
- **DM pairing** (`dmPolicy="pairing"` / `channels.discord.dm.policy="pairing"` / `channels.slack.dm.policy="pairing"`): unknown senders receive a short pairing code and the bot does not process their message.
+- **DM pairing** (`dmPolicy="pairing"` / `discord.dm.policy="pairing"` / `slack.dm.policy="pairing"`): unknown senders receive a short pairing code and the bot does not process their message.
- Approve with: `clawdbot pairing approve <channel> <code>` (then the sender is added to a local allowlist store).
+- Approve with: `clawdbot pairing approve --provider <provider> <code>` (then the sender is added to a local allowlist store).
- Public inbound DMs require an explicit opt-in: set `dmPolicy="open"` and include `"*"` in the channel allowlist (`allowFrom` / `channels.discord.dm.allowFrom` / `channels.slack.dm.allowFrom`).
+- Public inbound DMs require an explicit opt-in: set `dmPolicy="open"` and include `"*"` in the provider allowlist (`allowFrom` / `discord.dm.allowFrom` / `slack.dm.allowFrom`).
 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.
+- **[Local-first Gateway](https://docs.clawd.bot/gateway)** — single control plane for sessions, providers, tools, and events.
- **[Multi-channel inbox](https://docs.clawd.bot/channels)** — WhatsApp, Telegram, Slack, Discord, Signal, iMessage, Microsoft Teams, WebChat, macOS, iOS/Android.
+- **[Multi-provider inbox](https://docs.clawd.bot/surface)** — WhatsApp, Telegram, Slack, Discord, Signal, iMessage, 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).
+- **[Multi-agent routing](https://docs.clawd.bot/configuration)** — route inbound providers/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.
+- **[Voice Wake](https://docs.clawd.bot/voicewake) + [Talk Mode](https://docs.clawd.bot/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).
+- **[Live Canvas](https://docs.clawd.bot/mac/canvas)** — agent-driven visual workspace with [A2UI](https://docs.clawd.bot/mac/canvas#canvas-a2ui).
 - **[First-class tools](https://docs.clawd.bot/tools)** — browser, canvas, nodes, cron, sessions, and Discord/Slack actions.
- **[Companion apps](https://docs.clawd.bot/platforms/macos)** — macOS menu bar app + iOS/Android [nodes](https://docs.clawd.bot/nodes).
+- **[Companion apps](https://docs.clawd.bot/macos)** — macOS menu bar app + iOS/Android [nodes](https://docs.clawd.bot/nodes).
- **[Onboarding](https://docs.clawd.bot/start/wizard) + [skills](https://docs.clawd.bot/tools/skills)** — wizard-driven setup with bundled/managed/workspace skills.
+- **[Onboarding](https://docs.clawd.bot/wizard) + [skills](https://docs.clawd.bot/skills)** — wizard-driven setup with bundled/managed/workspace skills.
 ## Star History
 [![Star History Chart](https://api.star-history.com/svg?repos=clawdbot/clawdbot&type=date&legend=top-left)](https://www.star-history.com/#clawdbot/clawdbot&type=date&legend=top-left)
 ## Everything we built so far
 ### Core platform
- [Gateway WS control plane](https://docs.clawd.bot/gateway) with sessions, presence, config, cron, webhooks, [Control UI](https://docs.clawd.bot/web), and [Canvas host](https://docs.clawd.bot/platforms/mac/canvas#canvas-a2ui).
+- [Gateway WS control plane](https://docs.clawd.bot/gateway) with sessions, presence, config, cron, webhooks, [Control UI](https://docs.clawd.bot/web), and [Canvas host](https://docs.clawd.bot/mac/canvas#canvas-a2ui).
- [CLI surface](https://docs.clawd.bot/tools/agent-send): gateway, agent, send, [wizard](https://docs.clawd.bot/start/wizard), and [doctor](https://docs.clawd.bot/gateway/doctor).
+- [CLI surface](https://docs.clawd.bot/agent-send): gateway, agent, send, [wizard](https://docs.clawd.bot/wizard), and [doctor](https://docs.clawd.bot/doctor).
- [Pi agent runtime](https://docs.clawd.bot/concepts/agent) in RPC mode with tool streaming and block streaming.
+- [Pi agent runtime](https://docs.clawd.bot/agent) in RPC mode with tool streaming and block streaming.
- [Session model](https://docs.clawd.bot/concepts/session): `main` for direct chats, group isolation, activation modes, queue modes, reply-back. Group rules: [Groups](https://docs.clawd.bot/concepts/groups).
+- [Session model](https://docs.clawd.bot/session): `main` for direct chats, group isolation, activation modes, queue modes, reply-back. Group rules: [Groups](https://docs.clawd.bot/groups).
- [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).
+- [Media pipeline](https://docs.clawd.bot/images): images/audio/video, transcription hooks, size caps, temp file lifecycle. Audio details: [Audio](https://docs.clawd.bot/audio).
-### Channels
+### Providers
- [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).
+- [Providers](https://docs.clawd.bot/surface): [WhatsApp](https://docs.clawd.bot/whatsapp) (Baileys), [Telegram](https://docs.clawd.bot/telegram) (grammY), [Slack](https://docs.clawd.bot/slack) (Bolt), [Discord](https://docs.clawd.bot/discord) (discord.js), [Signal](https://docs.clawd.bot/signal) (signal-cli), [iMessage](https://docs.clawd.bot/imessage) (imsg), [WebChat](https://docs.clawd.bot/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).
+- [Group routing](https://docs.clawd.bot/group-messages): mention gating, reply tags, per-provider chunking and routing. Provider rules: [Providers](https://docs.clawd.bot/surface).
 ### Apps + nodes
- [macOS app](https://docs.clawd.bot/platforms/macos): menu bar control plane, [Voice Wake](https://docs.clawd.bot/nodes/voicewake)/PTT, [Talk Mode](https://docs.clawd.bot/nodes/talk) overlay, [WebChat](https://docs.clawd.bot/web/webchat), debug tools, [remote gateway](https://docs.clawd.bot/gateway/remote) control.
+- [macOS app](https://docs.clawd.bot/macos): menu bar control plane, [Voice Wake](https://docs.clawd.bot/voicewake)/PTT, [Talk Mode](https://docs.clawd.bot/talk) overlay, [WebChat](https://docs.clawd.bot/webchat), debug tools, [remote gateway](https://docs.clawd.bot/remote) control.
- [iOS node](https://docs.clawd.bot/platforms/ios): [Canvas](https://docs.clawd.bot/platforms/mac/canvas), [Voice Wake](https://docs.clawd.bot/nodes/voicewake), [Talk Mode](https://docs.clawd.bot/nodes/talk), camera, screen recording, Bonjour pairing.
+- [iOS node](https://docs.clawd.bot/ios): [Canvas](https://docs.clawd.bot/mac/canvas), [Voice Wake](https://docs.clawd.bot/voicewake), [Talk Mode](https://docs.clawd.bot/talk), camera, screen recording, Bonjour pairing.
- [Android node](https://docs.clawd.bot/platforms/android): [Canvas](https://docs.clawd.bot/platforms/mac/canvas), [Talk Mode](https://docs.clawd.bot/nodes/talk), camera, screen recording, optional SMS.
+- [Android node](https://docs.clawd.bot/android): [Canvas](https://docs.clawd.bot/mac/canvas), [Talk Mode](https://docs.clawd.bot/talk), camera, screen recording, optional SMS.
 - [macOS node mode](https://docs.clawd.bot/nodes): system.run/notify + canvas/camera exposure.
 ### Tools + automation
- [Browser control](https://docs.clawd.bot/tools/browser): dedicated clawd Chrome/Chromium, snapshots, actions, uploads, profiles.
+- [Browser control](https://docs.clawd.bot/browser): dedicated clawd Chrome/Chromium, snapshots, actions, uploads, profiles.
- [Canvas](https://docs.clawd.bot/platforms/mac/canvas): [A2UI](https://docs.clawd.bot/platforms/mac/canvas#canvas-a2ui) push/reset, eval, snapshot.
+- [Canvas](https://docs.clawd.bot/mac/canvas): [A2UI](https://docs.clawd.bot/mac/canvas#canvas-a2ui) push/reset, eval, snapshot.
- [Nodes](https://docs.clawd.bot/nodes): camera snap/clip, screen record, [location.get](https://docs.clawd.bot/nodes/location-command), notifications.
+- [Nodes](https://docs.clawd.bot/nodes): camera snap/clip, screen record, [location.get](https://docs.clawd.bot/location-command), notifications.
- [Cron + wakeups](https://docs.clawd.bot/automation/cron-jobs); [webhooks](https://docs.clawd.bot/automation/webhook); [Gmail Pub/Sub](https://docs.clawd.bot/automation/gmail-pubsub).
+- [Cron + wakeups](https://docs.clawd.bot/cron); [webhooks](https://docs.clawd.bot/webhook); [Gmail Pub/Sub](https://docs.clawd.bot/gmail-pubsub).
- [Skills platform](https://docs.clawd.bot/tools/skills): bundled, managed, and workspace skills with install gating + UI.
+- [Skills platform](https://docs.clawd.bot/skills): bundled, managed, and workspace skills with install gating + UI.
 ### Runtime + safety
- [Channel routing](https://docs.clawd.bot/concepts/channel-routing), [retry policy](https://docs.clawd.bot/concepts/retry), and [streaming/chunking](https://docs.clawd.bot/concepts/streaming).
+- [Provider routing](https://docs.clawd.bot/provider-routing), [retry policy](https://docs.clawd.bot/retry), and [streaming/chunking](https://docs.clawd.bot/streaming).
- [Presence](https://docs.clawd.bot/concepts/presence), [typing indicators](https://docs.clawd.bot/concepts/typing-indicators), and [usage tracking](https://docs.clawd.bot/concepts/usage-tracking).
+- [Presence](https://docs.clawd.bot/presence), [typing indicators](https://docs.clawd.bot/typing-indicators), and [usage tracking](https://docs.clawd.bot/usage-tracking).
- [Models](https://docs.clawd.bot/concepts/models), [model failover](https://docs.clawd.bot/concepts/model-failover), and [session pruning](https://docs.clawd.bot/concepts/session-pruning).
+- [Models](https://docs.clawd.bot/models), [model failover](https://docs.clawd.bot/model-failover), and [session pruning](https://docs.clawd.bot/session-pruning).
- [Security](https://docs.clawd.bot/gateway/security) and [troubleshooting](https://docs.clawd.bot/channels/troubleshooting).
+- [Security](https://docs.clawd.bot/security) and [troubleshooting](https://docs.clawd.bot/troubleshooting).
 ### Ops + packaging
- [Control UI](https://docs.clawd.bot/web) + [WebChat](https://docs.clawd.bot/web/webchat) served directly from the Gateway.
+- [Control UI](https://docs.clawd.bot/web) + [WebChat](https://docs.clawd.bot/webchat) served directly from the Gateway.
- [Tailscale Serve/Funnel](https://docs.clawd.bot/gateway/tailscale) or [SSH tunnels](https://docs.clawd.bot/gateway/remote) with token/password auth.
+- [Tailscale Serve/Funnel](https://docs.clawd.bot/tailscale) or [SSH tunnels](https://docs.clawd.bot/remote) with token/password auth.
- [Nix mode](https://docs.clawd.bot/install/nix) for declarative config; [Docker](https://docs.clawd.bot/install/docker)-based installs.
+- [Nix mode](https://docs.clawd.bot/nix) for declarative config; [Docker](https://docs.clawd.bot/docker)-based installs.
- [Doctor](https://docs.clawd.bot/gateway/doctor) migrations, [logging](https://docs.clawd.bot/logging).
+- [Doctor](https://docs.clawd.bot/doctor) migrations, [logging](https://docs.clawd.bot/logging).
 ## How it works (short)
 ```
-WhatsApp / Telegram / Slack / Discord / Signal / iMessage / Microsoft Teams / WebChat
+WhatsApp / Telegram / Slack / Discord / Signal / iMessage / WebChat
               │
               ▼
 ┌───────────────────────────────┐
-│            Gateway            │
+│            Gateway            │  ws://127.0.0.1:18789
-│       (control plane)         │
+│       (control plane)         │  bridge: tcp://0.0.0.0:18790
 │     ws://127.0.0.1:18789      │
 └──────────────┬────────────────┘
               │
               ├─ Pi agent (RPC)
               ├─ CLI (clawdbot …)
               ├─ WebChat UI
               ├─ macOS app
-               └─ iOS / Android nodes
+               └─ iOS/Android nodes
 ```
 ## Key subsystems
- **[Gateway WebSocket network](https://docs.clawd.bot/concepts/architecture)** — single WS control plane for clients, tools, and events (plus ops: [Gateway runbook](https://docs.clawd.bot/gateway)).
+- **[Gateway WebSocket network](https://docs.clawd.bot/architecture)** — single WS control plane for clients, tools, and events (plus ops: [Gateway runbook](https://docs.clawd.bot/gateway)).
- **[Tailscale exposure](https://docs.clawd.bot/gateway/tailscale)** — Serve/Funnel for the Gateway dashboard + WS (remote access: [Remote](https://docs.clawd.bot/gateway/remote)).
+- **[Tailscale exposure](https://docs.clawd.bot/tailscale)** — Serve/Funnel for the Gateway dashboard + WS (remote access: [Remote](https://docs.clawd.bot/remote)).
- **[Browser control](https://docs.clawd.bot/tools/browser)** — clawd‑managed Chrome/Chromium with CDP control.
+- **[Browser control](https://docs.clawd.bot/browser)** — clawd‑managed Chrome/Chromium with CDP control.
- **[Canvas + A2UI](https://docs.clawd.bot/platforms/mac/canvas)** — agent‑driven visual workspace (A2UI host: [Canvas/A2UI](https://docs.clawd.bot/platforms/mac/canvas#canvas-a2ui)).
+- **[Canvas + A2UI](https://docs.clawd.bot/mac/canvas)** — agent‑driven visual workspace (A2UI host: [Canvas/A2UI](https://docs.clawd.bot/mac/canvas#canvas-a2ui)).
- **[Voice Wake](https://docs.clawd.bot/nodes/voicewake) + [Talk Mode](https://docs.clawd.bot/nodes/talk)** — always‑on speech and continuous conversation.
+- **[Voice Wake](https://docs.clawd.bot/voicewake) + [Talk Mode](https://docs.clawd.bot/talk)** — always‑on speech and continuous conversation.
 - **[Nodes](https://docs.clawd.bot/nodes)** — Canvas, camera snap/clip, screen record, `location.get`, notifications, plus macOS‑only `system.run`/`system.notify`.
 ## Tailscale access (Gateway dashboard)
@@ -198,17 +193,17 @@ Notes:
 - Funnel refuses to start unless `gateway.auth.mode: "password"` is set.
 - Optional: `gateway.tailscale.resetOnExit` to undo Serve/Funnel on shutdown.
-Details: [Tailscale guide](https://docs.clawd.bot/gateway/tailscale) · [Web surfaces](https://docs.clawd.bot/web)
+Details: [Tailscale guide](https://docs.clawd.bot/tailscale) · [Web surfaces](https://docs.clawd.bot/web)
 ## Remote Gateway (Linux is great)
 It’s perfectly fine to run the Gateway on a small Linux instance. Clients (macOS app, CLI, WebChat) can connect over **Tailscale Serve/Funnel** or **SSH tunnels**, and you can still pair device nodes (macOS/iOS/Android) to execute device‑local actions when needed.
- **Gateway host** runs the exec tool and channel connections by default.
+- **Gateway host** runs the bash tool and provider connections by default.
 - **Device nodes** run device‑local actions (`system.run`, camera, screen recording, notifications) via `node.invoke`.
-In short: exec runs where the Gateway lives; device actions run where the device lives.
+In short: bash runs where the Gateway lives; device actions run where the device lives.
-Details: [Remote access](https://docs.clawd.bot/gateway/remote) · [Nodes](https://docs.clawd.bot/nodes) · [Security](https://docs.clawd.bot/gateway/security)
+Details: [Remote access](https://docs.clawd.bot/remote) · [Nodes](https://docs.clawd.bot/nodes) · [Security](https://docs.clawd.bot/security)
 ## macOS permissions via the Gateway protocol
@@ -223,7 +218,7 @@ Elevated bash (host permissions) is separate from macOS TCC:
 - Use `/elevated on|off` to toggle per‑session elevated access when enabled + allowlisted.
 - Gateway persists the per‑session toggle via `sessions.patch` (WS method) alongside `thinkingLevel`, `verboseLevel`, `model`, `sendPolicy`, and `groupActivation`.
-Details: [Nodes](https://docs.clawd.bot/nodes) · [macOS app](https://docs.clawd.bot/platforms/macos) · [Gateway protocol](https://docs.clawd.bot/concepts/architecture)
+Details: [Nodes](https://docs.clawd.bot/nodes) · [macOS app](https://docs.clawd.bot/macos) · [Gateway protocol](https://docs.clawd.bot/architecture)
 ## Agent to Agent (sessions_* tools)
@@ -232,7 +227,7 @@ Details: [Nodes](https://docs.clawd.bot/nodes) · [macOS app](https://docs.clawd
 - `sessions_history` — fetch transcript logs for a session.
 - `sessions_send` — message another session; optional reply‑back ping‑pong + announce step (`REPLY_SKIP`, `ANNOUNCE_SKIP`).
-Details: [Session tools](https://docs.clawd.bot/concepts/session-tool)
+Details: [Session tools](https://docs.clawd.bot/session-tool)
 ## Skills registry (ClawdHub)
@@ -242,18 +237,18 @@ ClawdHub is a minimal skill registry. With ClawdHub enabled, the agent can searc
 ## Chat commands
-Send these in WhatsApp/Telegram/Slack/Microsoft Teams/WebChat (group commands are owner-only):
+Send these in WhatsApp/Telegram/Slack/WebChat (group commands are owner-only):
 - `/status` — compact session status (model + tokens, cost when available)
 - `/new` or `/reset` — reset the session
 - `/compact` — compact session context (summary)
- `/think <level>` — off|minimal|low|medium|high|xhigh (GPT-5.2 + Codex models only)
+- `/think <level>` — off|minimal|low|medium|high
 - `/verbose on|off`
 - `/cost on|off` — append per-response token/cost usage lines
 - `/restart` — restart the gateway (owner-only in groups)
 - `/activation mention|always` — group activation toggle (groups only)
-## Apps (optional)
+## macOS app (optional)
 The Gateway alone delivers a great experience. All apps are optional and add extra features.
@@ -279,13 +274,13 @@ Note: signed builds required for macOS permissions to stick across rebuilds (see
 - Voice trigger forwarding + Canvas surface.
 - Controlled via `clawdbot nodes …`.
-Runbook: [iOS connect](https://docs.clawd.bot/platforms/ios).
+Runbook: [iOS connect](https://docs.clawd.bot/ios).
 ### Android node (optional)
 - Pairs via the same Bridge + pairing flow as iOS.
 - Exposes Canvas, Camera, and Screen capture commands.
- Runbook: [Android connect](https://docs.clawd.bot/platforms/android).
+- Runbook: [Android connect](https://docs.clawd.bot/android).
 ## Agent workspace + skills
@@ -305,7 +300,7 @@ Minimal `~/.clawdbot/clawdbot.json` (model + defaults):
 }
 ```
-[Full configuration reference (all keys + examples).](https://docs.clawd.bot/gateway/configuration)
+[Full configuration reference (all keys + examples).](https://docs.clawd.bot/configuration)
 ## Security model (important)
@@ -313,63 +308,54 @@ Minimal `~/.clawdbot/clawdbot.json` (model + defaults):
 - **Group/channel safety:** set `agents.defaults.sandbox.mode: "non-main"` to run **non‑main sessions** (groups/channels) inside per‑session Docker sandboxes; bash then runs in Docker for those sessions.
 - **Sandbox defaults:** allowlist `bash`, `process`, `read`, `write`, `edit`, `sessions_list`, `sessions_history`, `sessions_send`, `sessions_spawn`; denylist `browser`, `canvas`, `nodes`, `cron`, `discord`, `gateway`.
-Details: [Security guide](https://docs.clawd.bot/gateway/security) · [Docker + sandboxing](https://docs.clawd.bot/install/docker) · [Sandbox config](https://docs.clawd.bot/gateway/configuration)
+Details: [Security guide](https://docs.clawd.bot/security) · [Docker + sandboxing](https://docs.clawd.bot/docker) · [Sandbox config](https://docs.clawd.bot/configuration)
-### [WhatsApp](https://docs.clawd.bot/channels/whatsapp)
+### [WhatsApp](https://docs.clawd.bot/whatsapp)
- Link the device: `pnpm clawdbot channels login` (stores creds in `~/.clawdbot/credentials`).
+- Link the device: `pnpm clawdbot login` (stores creds in `~/.clawdbot/credentials`).
- Allowlist who can talk to the assistant via `channels.whatsapp.allowFrom`.
+- Allowlist who can talk to the assistant via `whatsapp.allowFrom`.
- If `channels.whatsapp.groups` is set, it becomes a group allowlist; include `"*"` to allow all.
+- If `whatsapp.groups` is set, it becomes a group allowlist; include `"*"` to allow all.
-### [Telegram](https://docs.clawd.bot/channels/telegram)
+### [Telegram](https://docs.clawd.bot/telegram)
- Set `TELEGRAM_BOT_TOKEN` or `channels.telegram.botToken` (env wins).
+- Set `TELEGRAM_BOT_TOKEN` or `telegram.botToken` (env wins).
- Optional: set `channels.telegram.groups` (with `channels.telegram.groups."*".requireMention`); when set, it is a group allowlist (include `"*"` to allow all). Also `channels.telegram.allowFrom` or `channels.telegram.webhookUrl` as needed.
+- Optional: set `telegram.groups` (with `telegram.groups."*".requireMention`); when set, it is a group allowlist (include `"*"` to allow all). Also `telegram.allowFrom` or `telegram.webhookUrl` as needed.
 ```json5
 {
-  channels: {
+  telegram: {
-    telegram: {
+    botToken: "123456:ABCDEF"
      botToken: "123456:ABCDEF"
    }
  }
 }
 ```
-### [Slack](https://docs.clawd.bot/channels/slack)
+### [Slack](https://docs.clawd.bot/slack)
- Set `SLACK_BOT_TOKEN` + `SLACK_APP_TOKEN` (or `channels.slack.botToken` + `channels.slack.appToken`).
+- Set `SLACK_BOT_TOKEN` + `SLACK_APP_TOKEN` (or `slack.botToken` + `slack.appToken`).
-### [Discord](https://docs.clawd.bot/channels/discord)
+### [Discord](https://docs.clawd.bot/discord)
- Set `DISCORD_BOT_TOKEN` or `channels.discord.token` (env wins).
+- Set `DISCORD_BOT_TOKEN` or `discord.token` (env wins).
- Optional: set `commands.native`, `commands.text`, or `commands.useAccessGroups`, plus `channels.discord.dm.allowFrom`, `channels.discord.guilds`, or `channels.discord.mediaMaxMb` as needed.
+- Optional: set `commands.native`, `commands.text`, or `commands.useAccessGroups`, plus `discord.dm.allowFrom`, `discord.guilds`, or `discord.mediaMaxMb` as needed.
 ```json5
 {
-  channels: {
+  discord: {
-    discord: {
+    token: "1234abcd"
      token: "1234abcd"
    }
  }
 }
 ```
-### [Signal](https://docs.clawd.bot/channels/signal)
+### [Signal](https://docs.clawd.bot/signal)
- Requires `signal-cli` and a `channels.signal` config section.
+- Requires `signal-cli` and a `signal` config section.
-### [iMessage](https://docs.clawd.bot/channels/imessage)
+### [iMessage](https://docs.clawd.bot/imessage)
 - macOS only; Messages must be signed in.
- If `channels.imessage.groups` is set, it becomes a group allowlist; include `"*"` to allow all.
+- If `imessage.groups` is set, it becomes a group allowlist; include `"*"` to allow all.
-### [Microsoft Teams](https://docs.clawd.bot/channels/msteams)
+### [WebChat](https://docs.clawd.bot/webchat)
 - Configure a Teams app + Bot Framework, then add a `msteams` config section.
 - Allowlist who can talk via `msteams.allowFrom`; group access via `msteams.groupAllowFrom` or `msteams.groupPolicy: "open"`.
 ### [WebChat](https://docs.clawd.bot/web/webchat)
 - Uses the Gateway WebSocket; no separate WebChat port/config.
@@ -389,68 +375,68 @@ Browser control (optional):
 Use these when you’re past the onboarding flow and want the deeper reference.
 - [Start with the docs index for navigation and “what’s where.”](https://docs.clawd.bot)
- [Read the architecture overview for the gateway + protocol model.](https://docs.clawd.bot/concepts/architecture)
+- [Read the architecture overview for the gateway + protocol model.](https://docs.clawd.bot/architecture)
- [Use the full configuration reference when you need every key and example.](https://docs.clawd.bot/gateway/configuration)
+- [Use the full configuration reference when you need every key and example.](https://docs.clawd.bot/configuration)
 - [Run the Gateway by the book with the operational runbook.](https://docs.clawd.bot/gateway)
 - [Learn how the Control UI/Web surfaces work and how to expose them safely.](https://docs.clawd.bot/web)
- [Understand remote access over SSH tunnels or tailnets.](https://docs.clawd.bot/gateway/remote)
+- [Understand remote access over SSH tunnels or tailnets.](https://docs.clawd.bot/remote)
- [Follow the onboarding wizard flow for a guided setup.](https://docs.clawd.bot/start/wizard)
+- [Follow the onboarding wizard flow for a guided setup.](https://docs.clawd.bot/wizard)
- [Wire external triggers via the webhook surface.](https://docs.clawd.bot/automation/webhook)
+- [Wire external triggers via the webhook surface.](https://docs.clawd.bot/webhook)
- [Set up Gmail Pub/Sub triggers.](https://docs.clawd.bot/automation/gmail-pubsub)
+- [Set up Gmail Pub/Sub triggers.](https://docs.clawd.bot/gmail-pubsub)
- [Learn the macOS menu bar companion details.](https://docs.clawd.bot/platforms/mac/menu-bar)
+- [Learn the macOS menu bar companion details.](https://docs.clawd.bot/mac/menu-bar)
- [Platform guides: Windows (WSL2)](https://docs.clawd.bot/platforms/windows), [Linux](https://docs.clawd.bot/platforms/linux), [macOS](https://docs.clawd.bot/platforms/macos), [iOS](https://docs.clawd.bot/platforms/ios), [Android](https://docs.clawd.bot/platforms/android)
+- [Platform guides: Windows (WSL2)](https://docs.clawd.bot/windows), [Linux](https://docs.clawd.bot/linux), [macOS](https://docs.clawd.bot/macos), [iOS](https://docs.clawd.bot/ios), [Android](https://docs.clawd.bot/android)
- [Debug common failures with the troubleshooting guide.](https://docs.clawd.bot/channels/troubleshooting)
+- [Debug common failures with the troubleshooting guide.](https://docs.clawd.bot/troubleshooting)
- [Review security guidance before exposing anything.](https://docs.clawd.bot/gateway/security)
+- [Review security guidance before exposing anything.](https://docs.clawd.bot/security)
 ## Advanced docs (discovery + control)
- [Discovery + transports](https://docs.clawd.bot/gateway/discovery)
+- [Discovery + transports](https://docs.clawd.bot/discovery)
- [Bonjour/mDNS](https://docs.clawd.bot/gateway/bonjour)
+- [Bonjour/mDNS](https://docs.clawd.bot/bonjour)
 - [Gateway pairing](https://docs.clawd.bot/gateway/pairing)
- [Remote gateway README](https://docs.clawd.bot/gateway/remote-gateway-readme)
+- [Remote gateway README](https://docs.clawd.bot/remote-gateway-readme)
- [Control UI](https://docs.clawd.bot/web/control-ui)
+- [Control UI](https://docs.clawd.bot/control-ui)
- [Dashboard](https://docs.clawd.bot/web/dashboard)
+- [Dashboard](https://docs.clawd.bot/dashboard)
 ## Operations & troubleshooting
- [Health checks](https://docs.clawd.bot/gateway/health)
+- [Health checks](https://docs.clawd.bot/health)
- [Gateway lock](https://docs.clawd.bot/gateway/gateway-lock)
+- [Gateway lock](https://docs.clawd.bot/gateway-lock)
- [Background process](https://docs.clawd.bot/gateway/background-process)
+- [Background process](https://docs.clawd.bot/background-process)
- [Browser troubleshooting (Linux)](https://docs.clawd.bot/tools/browser-linux-troubleshooting)
+- [Browser troubleshooting (Linux)](https://docs.clawd.bot/browser-linux-troubleshooting)
 - [Logging](https://docs.clawd.bot/logging)
 ## Deep dives
- [Agent loop](https://docs.clawd.bot/concepts/agent-loop)
+- [Agent loop](https://docs.clawd.bot/agent-loop)
- [Presence](https://docs.clawd.bot/concepts/presence)
+- [Presence](https://docs.clawd.bot/presence)
- [TypeBox schemas](https://docs.clawd.bot/concepts/typebox)
+- [TypeBox schemas](https://docs.clawd.bot/typebox)
- [RPC adapters](https://docs.clawd.bot/reference/rpc)
+- [RPC adapters](https://docs.clawd.bot/rpc)
- [Queue](https://docs.clawd.bot/concepts/queue)
+- [Queue](https://docs.clawd.bot/queue)
 ## Workspace & skills
- [Skills config](https://docs.clawd.bot/tools/skills-config)
+- [Skills config](https://docs.clawd.bot/skills-config)
- [Default AGENTS](https://docs.clawd.bot/reference/AGENTS.default)
+- [Default AGENTS](https://docs.clawd.bot/AGENTS.default)
- [Templates: AGENTS](https://docs.clawd.bot/reference/templates/AGENTS)
+- [Templates: AGENTS](https://docs.clawd.bot/templates/AGENTS)
- [Templates: BOOTSTRAP](https://docs.clawd.bot/reference/templates/BOOTSTRAP)
+- [Templates: BOOTSTRAP](https://docs.clawd.bot/templates/BOOTSTRAP)
- [Templates: IDENTITY](https://docs.clawd.bot/reference/templates/IDENTITY)
+- [Templates: IDENTITY](https://docs.clawd.bot/templates/IDENTITY)
- [Templates: SOUL](https://docs.clawd.bot/reference/templates/SOUL)
+- [Templates: SOUL](https://docs.clawd.bot/templates/SOUL)
- [Templates: TOOLS](https://docs.clawd.bot/reference/templates/TOOLS)
+- [Templates: TOOLS](https://docs.clawd.bot/templates/TOOLS)
- [Templates: USER](https://docs.clawd.bot/reference/templates/USER)
+- [Templates: USER](https://docs.clawd.bot/templates/USER)
 ## Platform internals
- [macOS dev setup](https://docs.clawd.bot/platforms/mac/dev-setup)
+- [macOS dev setup](https://docs.clawd.bot/mac/dev-setup)
- [macOS menu bar](https://docs.clawd.bot/platforms/mac/menu-bar)
+- [macOS menu bar](https://docs.clawd.bot/mac/menu-bar)
- [macOS voice wake](https://docs.clawd.bot/platforms/mac/voicewake)
+- [macOS voice wake](https://docs.clawd.bot/mac/voicewake)
- [iOS node](https://docs.clawd.bot/platforms/ios)
+- [iOS node](https://docs.clawd.bot/ios)
- [Android node](https://docs.clawd.bot/platforms/android)
+- [Android node](https://docs.clawd.bot/android)
- [Windows (WSL2)](https://docs.clawd.bot/platforms/windows)
+- [Windows (WSL2)](https://docs.clawd.bot/windows)
- [Linux app](https://docs.clawd.bot/platforms/linux)
+- [Linux app](https://docs.clawd.bot/linux)
 ## Email hooks (Gmail)
- [docs.clawd.bot/gmail-pubsub](https://docs.clawd.bot/automation/gmail-pubsub)
+- [docs.clawd.bot/gmail-pubsub](https://docs.clawd.bot/gmail-pubsub)
 ## Clawd
@@ -468,29 +454,20 @@ AI/vibe-coded PRs welcome! 🤖
 Special thanks to @andrewting19 for the Anthropic OAuth tool-name fix.
 Core contributors:
 - @cpojer — Telegram onboarding UX + docs
 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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/search?q=sheeek"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="sheeek" title="sheeek"/></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/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/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/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/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/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/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/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/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/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/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/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=Yurii%20Chukhlib"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Yurii Chukhlib" title="Yurii Chukhlib"/></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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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=Kit"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Kit" title="Kit"/></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/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/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/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/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/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/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/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/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/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/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/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/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/search?q=VAC"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="VAC" title="VAC"/></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/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/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/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/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/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/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/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=Jarvis"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Jarvis" title="Jarvis"/></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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/search?q=Azade"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Azade" title="Azade"/></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/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/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/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/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/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/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/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/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=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=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/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/search?q=Marc"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Marc" title="Marc"/></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/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/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/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/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/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/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/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/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/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/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/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/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=William%20Stock"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="William Stock" title="William Stock"/></a>
 </p>
@@ -1,15 +0,0 @@
 # Security Policy
 If you believe you’ve found a security issue in Clawdbot, please report it privately.
 ## Reporting
 - Email: `steipete@gmail.com`
 - What to include: reproduction steps, impact assessment, and (if possible) a minimal PoC.
 ## Operational Guidance
 For threat model + hardening guidance (including `clawdbot security audit --deep` and `--fix`), see:
 - `https://docs.clawd.bot/gateway/security`
@@ -34,7 +34,8 @@ extension AttributedString {
            var ranges: [Range<AttributedString.Index>] = []
            for wordRange in wordRanges {
                if let lastRange = ranges.last,
-                   self[lastRange].characters.count + self[wordRange].characters.count <= maxLength {
+                   self[lastRange].characters.count + self[wordRange].characters.count <= maxLength
                {
                    ranges[ranges.count - 1] = lastRange.lowerBound..<wordRange.upperBound
                } else {
                    ranges.append(wordRange)
@@ -13,7 +13,8 @@ public actor TranscriptsStore {
        try? FileManager.default.createDirectory(at: dir, withIntermediateDirectories: true)
        fileURL = dir.appendingPathComponent("transcripts.log")
        if let data = try? Data(contentsOf: fileURL),
-           let text = String(data: data, encoding: .utf8) {
+           let text = String(data: data, encoding: .utf8)
        {
            entries = text.split(separator: "\n").map(String.init).suffix(limit)
        }
    }
@@ -24,7 +24,8 @@ public struct WakeWordGateConfig: Sendable, Equatable {
    public init(
        triggers: [String],
        minPostTriggerGap: TimeInterval = 0.45,
-        minCommandLength: Int = 1) {
+        minCommandLength: Int = 1)
    {
        self.triggers = triggers
        self.minPostTriggerGap = minPostTriggerGap
        self.minCommandLength = minCommandLength
@@ -56,12 +57,6 @@ public enum WakeWordGate {
        let tokens: [String]
    }
    private struct MatchCandidate {
        let index: Int
        let triggerEnd: TimeInterval
        let gap: TimeInterval
    }
    public static func match(
        transcript: String,
        segments: [WakeWordSegment],
@@ -73,7 +68,7 @@ public enum WakeWordGate {
        let tokens = normalizeSegments(segments)
        guard !tokens.isEmpty else { return nil }
-        var best: MatchCandidate?
+        var best: (index: Int, triggerEnd: TimeInterval, gap: TimeInterval)?
        for trigger in triggerTokens {
            let count = trigger.tokens.count
@@ -89,7 +84,7 @@ public enum WakeWordGate {
                if let best, i <= best.index { continue }
-                best = MatchCandidate(index: i, triggerEnd: triggerEnd, gap: gap)
+                best = (i, triggerEnd, gap)
            }
        }
@@ -24,7 +24,7 @@ enum CLIRegistry {
            subcommands: [
                descriptor(for: ServiceInstall.self),
                descriptor(for: ServiceUninstall.self),
-                descriptor(for: ServiceStatus.self)
+                descriptor(for: ServiceStatus.self),
            ])
        let doctorDesc = descriptor(for: DoctorCommand.self)
        let setupDesc = descriptor(for: SetupCommand.self)
@@ -54,7 +54,7 @@ enum CLIRegistry {
                startDesc,
                stopDesc,
                restartDesc,
-                statusDesc
+                statusDesc,
            ])
        return [root]
    }
@@ -25,7 +25,7 @@ private enum LaunchdHelper {
            "Label": label,
            "ProgramArguments": [executable, "serve"],
            "RunAtLoad": true,
-            "KeepAlive": true
+            "KeepAlive": true,
        ]
        let data = try PropertyListSerialization.data(fromPropertyList: plist, format: .xml, options: 0)
        try data.write(to: plistURL)
@@ -25,123 +25,78 @@ private func dispatch(invocation: CommandInvocation) async throws {
    switch first {
    case "swabble":
-        try await dispatchSwabble(parsed: parsed, path: path)
+        guard path.count >= 2 else { throw CommanderProgramError.missingSubcommand(command: "swabble") }
        let sub = path[1]
        switch sub {
        case "serve":
            var cmd = ServeCommand(parsed: parsed)
            try await cmd.run()
        case "transcribe":
            var cmd = TranscribeCommand(parsed: parsed)
            try await cmd.run()
        case "test-hook":
            var cmd = TestHookCommand(parsed: parsed)
            try await cmd.run()
        case "mic":
            guard path.count >= 3 else { throw CommanderProgramError.missingSubcommand(command: "mic") }
            let micSub = path[2]
            if micSub == "list" {
                var cmd = MicList(parsed: parsed)
                try await cmd.run()
            } else if micSub == "set" {
                var cmd = MicSet(parsed: parsed)
                try await cmd.run()
            } else {
                throw CommanderProgramError.unknownSubcommand(command: "mic", name: micSub)
            }
        case "service":
            guard path.count >= 3 else { throw CommanderProgramError.missingSubcommand(command: "service") }
            let svcSub = path[2]
            switch svcSub {
            case "install":
                var cmd = ServiceInstall()
                try await cmd.run()
            case "uninstall":
                var cmd = ServiceUninstall()
                try await cmd.run()
            case "status":
                var cmd = ServiceStatus()
                try await cmd.run()
            default:
                throw CommanderProgramError.unknownSubcommand(command: "service", name: svcSub)
            }
        case "doctor":
            var cmd = DoctorCommand(parsed: parsed)
            try await cmd.run()
        case "setup":
            var cmd = SetupCommand(parsed: parsed)
            try await cmd.run()
        case "health":
            var cmd = HealthCommand(parsed: parsed)
            try await cmd.run()
        case "tail-log":
            var cmd = TailLogCommand(parsed: parsed)
            try await cmd.run()
        case "start":
            var cmd = StartCommand()
            try await cmd.run()
        case "stop":
            var cmd = StopCommand()
            try await cmd.run()
        case "restart":
            var cmd = RestartCommand()
            try await cmd.run()
        case "status":
            var cmd = StatusCommand()
            try await cmd.run()
        default:
            throw CommanderProgramError.unknownSubcommand(command: "swabble", name: sub)
        }
    default:
        throw CommanderProgramError.unknownCommand(first)
    }
 }
@available(macOS 26.0, *)
@MainActor
 private func dispatchSwabble(parsed: ParsedValues, path: [String]) async throws {
    let sub = try subcommand(path, index: 1, command: "swabble")
    switch sub {
    case "mic":
        try await dispatchMic(parsed: parsed, path: path)
    case "service":
        try await dispatchService(path: path)
    default:
        let handlers = swabbleHandlers(parsed: parsed)
        guard let handler = handlers[sub] else {
            throw CommanderProgramError.unknownSubcommand(command: "swabble", name: sub)
        }
        try await handler()
    }
 }
@available(macOS 26.0, *)
@MainActor
 private func swabbleHandlers(parsed: ParsedValues) -> [String: () async throws -> Void] {
    [
        "serve": {
            var cmd = ServeCommand(parsed: parsed)
            try await cmd.run()
        },
        "transcribe": {
            var cmd = TranscribeCommand(parsed: parsed)
            try await cmd.run()
        },
        "test-hook": {
            var cmd = TestHookCommand(parsed: parsed)
            try await cmd.run()
        },
        "doctor": {
            var cmd = DoctorCommand(parsed: parsed)
            try await cmd.run()
        },
        "setup": {
            var cmd = SetupCommand(parsed: parsed)
            try await cmd.run()
        },
        "health": {
            var cmd = HealthCommand(parsed: parsed)
            try await cmd.run()
        },
        "tail-log": {
            var cmd = TailLogCommand(parsed: parsed)
            try await cmd.run()
        },
        "start": {
            var cmd = StartCommand()
            try await cmd.run()
        },
        "stop": {
            var cmd = StopCommand()
            try await cmd.run()
        },
        "restart": {
            var cmd = RestartCommand()
            try await cmd.run()
        },
        "status": {
            var cmd = StatusCommand()
            try await cmd.run()
        }
    ]
 }
@available(macOS 26.0, *)
@MainActor
 private func dispatchMic(parsed: ParsedValues, path: [String]) async throws {
    let micSub = try subcommand(path, index: 2, command: "mic")
    switch micSub {
    case "list":
        var cmd = MicList(parsed: parsed)
        try await cmd.run()
    case "set":
        var cmd = MicSet(parsed: parsed)
        try await cmd.run()
    default:
        throw CommanderProgramError.unknownSubcommand(command: "mic", name: micSub)
    }
 }
@available(macOS 26.0, *)
@MainActor
 private func dispatchService(path: [String]) async throws {
    let svcSub = try subcommand(path, index: 2, command: "service")
    switch svcSub {
    case "install":
        var cmd = ServiceInstall()
        try await cmd.run()
    case "uninstall":
        var cmd = ServiceUninstall()
        try await cmd.run()
    case "status":
        var cmd = ServiceStatus()
        try await cmd.run()
    default:
        throw CommanderProgramError.unknownSubcommand(command: "service", name: svcSub)
    }
 }
 private func subcommand(_ path: [String], index: Int, command: String) throws -> String {
    guard path.count > index else {
        throw CommanderProgramError.missingSubcommand(command: command)
    }
    return path[index]
 }
 if #available(macOS 26.0, *) {
    let exitCode = await runCLI()
    exit(exitCode)
@@ -1,211 +1,55 @@
 <?xml version="1.0" standalone="yes"?>
 <rss xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" version="2.0">
    <channel>
-        <title>Clawdbot</title>
+        <title>Clawdis</title>
        <item>
-            <title>2026.1.14-1</title>
+            <title>2026.1.5-3</title>
-            <pubDate>Thu, 15 Jan 2026 11:14:40 +0000</pubDate>
+            <pubDate>Mon, 05 Jan 2026 04:30:46 +0100</pubDate>
            <link>https://raw.githubusercontent.com/clawdbot/clawdbot/main/appcast.xml</link>
-            <sparkle:version>5825</sparkle:version>
+            <sparkle:version>3095</sparkle:version>
-            <sparkle:shortVersionString>2026.1.14-1</sparkle:shortVersionString>
+            <sparkle:shortVersionString>2026.1.5-3</sparkle:shortVersionString>
            <sparkle:minimumSystemVersion>15.0</sparkle:minimumSystemVersion>
-            <description><![CDATA[<h2>Clawdbot 2026.1.14-1</h2>
+            <description><![CDATA[<h2>Clawdbot 2026.1.5-3</h2>
 <h3>Highlights</h3>
 <ul>
 <li>Web search: <code>web_search</code>/<code>web_fetch</code> tools (Brave API) + first-time setup in onboarding/configure.</li>
 <li>Browser control: Chrome extension relay takeover mode + remote browser control via <code>clawdbot browser serve</code>.</li>
 <li>Plugins: channel plugins (gateway HTTP hooks) + Zalo plugin + onboarding install flow. (#854) — thanks @longmaba.</li>
 <li>Security: expanded <code>clawdbot security audit</code> (+ <code>--fix</code>), detect-secrets CI scan, and a <code>SECURITY.md</code> reporting policy.</li>
 </ul>
 <h3>Changes</h3>
 <h4>Web Tools</h4>
 <ul>
 <li>Tools: add <code>web_search</code>/<code>web_fetch</code> (Brave API), including helpful setup hints when the key is missing.</li>
 <li>Tools: enable <code>web_fetch</code> by default (unless explicitly disabled in config).</li>
 <li>CLI/Docs: add <code>clawdbot configure --section web</code> for storing Brave API keys and update onboarding tips.</li>
 </ul>
 <h4>Browser / Control UI</h4>
 <ul>
 <li>Browser: add Chrome extension relay takeover mode (toolbar button) + <code>clawdbot browser serve</code> remote control + <code>browser.controlToken</code>.</li>
 <li>Browser: ship a built-in <code>chrome</code> profile for extension relay and start the relay automatically when running locally.</li>
 <li>Browser: default <code>browser.defaultProfile</code> to <code>chrome</code> (existing Chrome takeover mode).</li>
 <li>Browser: add <code>clawdbot browser extension install/path</code> and copy extension path to clipboard.</li>
 <li>Browser: add <code>snapshot refs=aria</code> (Playwright aria-ref ids) for self-resolving refs across <code>snapshot</code> → <code>act</code>.</li>
 <li>Browser: <code>profile="chrome"</code> now defaults to host control and returns clearer “attach a tab” errors.</li>
 <li>Browser: extension mode recovers when only one tab is attached (stale targetId fallback).</li>
 <li>Control UI: show raw any-map entries in config views; move Docs link into the left nav.</li>
 </ul>
 <h4>Plugins</h4>
 <ul>
 <li>Plugins: add plugin HTTP hooks + loader updates to support channel plugins. (#854) — thanks @longmaba.</li>
 <li>Plugins: add onboarding plugin install flow. (#854) — thanks @longmaba.</li>
 <li>Channels: add Matrix plugin (external) with docs + onboarding hooks.</li>
 <li>Voice Call: add Plivo provider (no SDK dependency). (#846) — thanks @vrknetha.</li>
 </ul>
 <h4>Security</h4>
 <ul>
 <li>Security: expand <code>clawdbot security audit</code> checks and publish a <code>SECURITY.md</code> reporting policy.</li>
 <li>Security: extend <code>clawdbot security audit --fix</code> to tighten more sensitive state paths.</li>
 <li>Security: add detect-secrets CI scan and baseline guidance. (#227) — thanks @Hyaxia.</li>
 </ul>
 <h4>Onboarding / Daemon</h4>
 <ul>
 <li>Onboarding: add a security checkpoint prompt (docs link + sandboxing hint); require <code>--accept-risk</code> for <code>--non-interactive</code>.</li>
 <li>Daemon: support profile-aware service names for multi-gateway setups. (#671) — thanks @bjesuiter.</li>
 </ul>
 <h4>Auth / Usage / Config</h4>
 <ul>
 <li>Usage: add MiniMax coding plan usage tracking.</li>
 <li>Auth: label Claude Code CLI auth options. (#915) — thanks @SeanZoR.</li>
 <li>Agents: add optional auth-profile copy prompt on <code>agents add</code> and improve auth error messaging.</li>
 <li>Auth: add dynamic template variables to <code>messages.responsePrefix</code>. (#928) — thanks @sebslight.</li>
 <li>Config: add <code>channels.<provider>.configWrites</code> gating for channel-initiated config writes; migrate Slack channel IDs.</li>
 </ul>
 <h4>Channels</h4>
 <ul>
 <li>Telegram: add message delete action in the message tool. (#903) — thanks @sleontenko.</li>
 <li>WhatsApp: add <code>channels.whatsapp.sendReadReceipts</code> to disable auto read receipts. (#882) — thanks @chrisrodz.</li>
 </ul>
 <h4>Docs</h4>
 <ul>
 <li>Docs: clarify per-agent auth stores, sandboxed skill binaries, and elevated semantics.</li>
 <li>Docs: add FAQ entries for missing provider auth after adding agents and Gemini thinking signature errors.</li>
 <li>Docs: expand gateway security hardening guidance and incident response checklist.</li>
 <li>Docs: document DM history limits for channel DMs. (#883) — thanks @pkrmf.</li>
 <li>Docs: standardize Claude Code CLI naming across docs and prompts. (follow-up to #915)</li>
 <li>Docs: add per-command CLI doc pages and link them from <code>clawdbot <command> --help</code>.</li>
 <li>Docs: add multi-gateway guide (sidebar + nav).</li>
 </ul>
 <h3>Fixes</h3>
 <h4>Gateway / Daemon / Sessions</h4>
 <ul>
-<li>Gateway: forward termination signals to respawned CLI child processes to avoid orphaned systemd runs. (#933) — thanks @roshanasingh4.</li>
+<li>NPM package: include missing runtime dist folders (slack/signal/imessage/tui/wizard/control-ui/daemon) to avoid <code>ERR_MODULE_NOT_FOUND</code> in Node 25 npx installs.</li>
 <li>Gateway/UI: ship session defaults in the hello snapshot so the Control UI canonicalizes main session keys (no bare <code>main</code> alias).</li>
 <li>Agents: skip thinking/final tag stripping inside Markdown code spans. (#939) — thanks @ngutman.</li>
 <li>Browser: add tests for snapshot labels/efficient query params and labeled image responses.</li>
 <li>Browser: persist role snapshot refs per CDP target so <code>snapshot</code> → <code>act</code> clicks work even if Playwright returns a different Page instance.</li>
 <li>macOS: ensure launchd log directory exists with a test-only override. (#909) — thanks @roshanasingh4.</li>
 <li>macOS: format ConnectionsStore config to satisfy SwiftFormat lint. (#852) — thanks @mneves75.</li>
 <li>Packaging: run <code>pnpm build</code> on <code>prepack</code> so npm publishes include fresh <code>dist/</code> output.</li>
 <li>Telegram: register dock native commands with underscores to avoid <code>BOT_COMMAND_INVALID</code> (#929, fixes #901) — thanks @grp06.</li>
 <li>Google: downgrade unsigned thinking blocks before send to avoid missing signature errors.</li>
 <li>Agents: make user time zone and 24-hour time explicit in the system prompt. (#859) — thanks @CashWilliams.</li>
 <li>Agents: strip downgraded tool call text without eating adjacent replies and filter thinking-tag leaks. (#905) — thanks @erikpr1994.</li>
 <li>Agents: cap tool call IDs for OpenAI/OpenRouter to avoid request rejections. (#875) — thanks @j1philli.</li>
 <li>Doctor: avoid re-adding WhatsApp config when only legacy ack reactions are set. (#927, fixes #900) — thanks @grp06.</li>
 <li>Agents: scrub tuple <code>items</code> schemas for Gemini tool calls. (#926, fixes #746) — thanks @grp06.</li>
 <li>Agents: stabilize sub-agent announce status from runtime outcomes and normalize Result/Notes. (#835) — thanks @roshanasingh4.</li>
 <li>Apps: use canonical main session keys from gateway defaults across macOS/iOS/Android to avoid creating bare <code>main</code> sessions.</li>
 <li>Embedded runner: suppress raw API error payloads from replies. (#924) — thanks @grp06.</li>
 <li>Auth: normalize Claude Code CLI profile mode to oauth and auto-migrate config. (#855) — thanks @sebslight.</li>
 <li>Daemon: clear persisted launchd disabled state before bootstrap (fixes <code>daemon install</code> after uninstall). (#849) — thanks @ndraiman.</li>
 <li>Sessions: return deep clones (<code>structuredClone</code>) so cached session entries can't be mutated. (#934) — thanks @ronak-guliani.</li>
 <li>Heartbeat: keep <code>updatedAt</code> monotonic when restoring heartbeat sessions. (#934) — thanks @ronak-guliani.</li>
 <li>Agent: clear run context after CLI runs (<code>clearAgentRunContext</code>) to avoid runaway contexts. (#934) — thanks @ronak-guliani.</li>
 <li>Gateway/Dev: ensure <code>pnpm gateway:dev</code> always uses the dev profile config + state (<code>~/.clawdbot-dev</code>).</li>
 </ul>
 <h4>CLI / Onboarding</h4>
 <ul>
 <li>Onboarding: show web search setup at the end (not the beginning).</li>
 <li>Onboarding: show daemon install/restart progress (avoid “blinking cursor”) and fix daemon install output formatting.</li>
 <li>Health: colorize “not configured” provider lines for easier scanning.</li>
 </ul>
 <h4>Control UI / TUI</h4>
 <ul>
 <li>Control UI: load cron run history on job selection and clarify empty-state messaging. (#866)</li>
 <li>UI: use application-defined WebSocket close code and fix dashboard auth query items. (#918) — thanks @rahthakor.</li>
 <li>UI: always apply <code>?token=</code> from URL (fixes unauthorized after re-onboard).</li>
 <li>Browser: add tests for snapshot labels/efficient query params and labeled image responses.</li>
 <li>TUI: render picker overlays via the overlay stack so /models and /settings display. (#921) — thanks @grizzdank.</li>
 <li>TUI: add a bright spinner + elapsed time in the status line for send/stream/run states.</li>
 <li>TUI: show LLM error messages (rate limits, auth, etc.) instead of <code>(no output)</code>.</li>
 </ul>
 <h4>Agents / Auth / Tools / Sandbox</h4>
 <ul>
 <li>Agents: make user time zone and 24-hour time explicit in the system prompt. (#859) — thanks @CashWilliams.</li>
 <li>Agents: strip downgraded tool call text without eating adjacent replies and filter thinking-tag leaks. (#905) — thanks @erikpr1994.</li>
 <li>Agents: cap tool call IDs for OpenAI/OpenRouter to avoid request rejections. (#875) — thanks @j1philli.</li>
 <li>Agents: scrub tuple <code>items</code> schemas for Gemini tool calls. (#926, fixes #746) — thanks @grp06.</li>
 <li>Agents: stabilize sub-agent announce status from runtime outcomes and normalize Result/Notes. (#835) — thanks @roshanasingh4.</li>
 <li>Auth: normalize Claude Code CLI profile mode to oauth and auto-migrate config. (#855) — thanks @sebslight.</li>
 <li>Embedded runner: suppress raw API error payloads from replies. (#924) — thanks @grp06.</li>
 <li>Logging: tolerate <code>EIO</code> from console writes to avoid gateway crashes. (#925, fixes #878) — thanks @grp06.</li>
 <li>Sandbox: restore <code>docker.binds</code> config validation and preserve configured PATH for <code>docker exec</code>. (#873) — thanks @akonyer.</li>
 <li>Google: downgrade unsigned thinking blocks before send to avoid missing signature errors.</li>
 </ul>
 <h4>macOS / Apps</h4>
 <ul>
 <li>macOS: ensure launchd log directory exists with a test-only override. (#909) — thanks @roshanasingh4.</li>
 <li>macOS: format ConnectionsStore config to satisfy SwiftFormat lint. (#852) — thanks @mneves75.</li>
 <li>macOS: pass auth token/password to dashboard URL for authenticated access. (#918) — thanks @rahthakor.</li>
 <li>macOS: reuse launchd gateway auth and skip wizard when gateway config already exists. (#917)</li>
 <li>Apps: use canonical main session keys from gateway defaults across macOS/iOS/Android to avoid creating bare <code>main</code> sessions.</li>
 <li>macOS: fix cron preview/testing payload to use <code>channel</code> key. (#867) — thanks @wes-davis.</li>
 <li>macOS: update cron testing channel arg. (#896) — thanks @ngutman.</li>
 </ul>
 <h4>Channels / Messaging</h4>
 <ul>
 <li>Slack: isolate thread history and avoid inheriting channel transcripts for new threads by default. (#758)</li>
 <li>Slack: respect <code>channels.slack.requireMention</code> default when resolving channel mention gating. (#850) — thanks @evalexpr.</li>
 <li>Slack: drop Socket Mode events with mismatched <code>api_app_id</code>/<code>team_id</code>. (#889) — thanks @roshanasingh4.</li>
 <li>Commands: add native command argument menus across Discord/Slack/Telegram. (#936) — thanks @thewilloftheshadow.</li>
 <li>Discord: isolate autoThread thread context. (#856) — thanks @davidguttman.</li>
 <li>Telegram: honor <code>channels.telegram.timeoutSeconds</code> for grammY API requests. (#863) — thanks @Snaver.</li>
 <li>Telegram: aggregate split inbound messages into one prompt (reduces “one reply per fragment”).</li>
 <li>Telegram: let control commands bypass per-chat sequentialization; always allow abort triggers.</li>
 <li>Telegram: split long captions into media + follow-up text messages. (#907) — thanks @jalehman.</li>
 <li>Telegram: migrate group config when supergroups change chat IDs. (#906) — thanks @sleontenko.</li>
 <li>Telegram: register dock native commands with underscores to avoid <code>BOT_COMMAND_INVALID</code> (#929, fixes #901) — thanks @grp06.</li>
 <li>Messaging: unify markdown formatting + format-first chunking for Slack/Telegram/Signal. (#920) — thanks @TheSethRose.</li>
 <li>iMessage: prefer handle routing for direct-message replies; include imsg RPC error details. (#935)</li>
 <li>WhatsApp: fix context isolation using wrong ID (was bot's number, now conversation ID). (#911) — thanks @tristanmanchester.</li>
 <li>WhatsApp: normalize user JIDs with device suffix for allowlist checks in groups. (#838) — thanks @peschee.</li>
 <li>WhatsApp: harden owner command auth.</li>
 <li>Auto-reply: treat trailing <code>NO_REPLY</code> tokens as silent replies.</li>
 </ul>
 <h4>Config / Doctor / Packaging</h4>
 <ul>
 <li>Config: prevent partial config writes from clobbering unrelated settings (base hash guard + merge patch for connection saves).</li>
 <li>Config/Doctor: remove legacy Clawdis env fallbacks and config/service migrations (Clawdbot-only).</li>
 <li>Doctor: avoid re-adding WhatsApp config when only legacy ack reactions are set. (#927, fixes #900) — thanks @grp06.</li>
 <li>Packaging: run <code>pnpm build</code> on <code>prepack</code> so npm publishes include fresh <code>dist/</code> output.</li>
 </ul>
 <p><a href="https://github.com/clawdbot/clawdbot/blob/main/CHANGELOG.md">View full changelog</a></p>
 ]]></description>
-            <enclosure url="https://github.com/clawdbot/clawdbot/releases/download/v2026.1.14-1/Clawdbot-2026.1.14-1.zip" length="19887144" type="application/octet-stream" sparkle:edSignature="1irKxBLt2eRtns34m/8JsjL/ZzhZQNjahwrxtArTvzaCnidS/MEnpD4nV2SHnhuo8g+fJZQpV9NoCAoEOAinCw=="/>
+            <enclosure url="https://github.com/clawdbot/clawdbot/releases/download/v2026.1.5-3/Clawdbot-2026.1.5-3.zip" length="160800596" type="application/octet-stream" sparkle:edSignature="P8U3nvIFpbGmRItT/NGPmJ/i370OMVvDHYQL/znYsLI0MrbGfXgMGEvR5A0uwW+cJevlX/hrJLiY51zo4rAMBg=="/>
        </item>
        <item>
-            <title>2026.1.12-2</title>
+            <title>2026.1.5-3</title>
-            <pubDate>Tue, 13 Jan 2026 10:05:25 +0000</pubDate>
+            <pubDate>Mon, 05 Jan 2026 03:57:59 +0100</pubDate>
            <link>https://raw.githubusercontent.com/clawdbot/clawdbot/main/appcast.xml</link>
-            <sparkle:version>5534</sparkle:version>
+            <sparkle:version>3091</sparkle:version>
-            <sparkle:shortVersionString>2026.1.12-2</sparkle:shortVersionString>
+            <sparkle:shortVersionString>2026.1.5-3</sparkle:shortVersionString>
            <sparkle:minimumSystemVersion>15.0</sparkle:minimumSystemVersion>
-            <description><![CDATA[<h2>Clawdbot 2026.1.12-2</h2>
+            <description><![CDATA[<h2>Clawdbot 2026.1.5-3</h2>
 <h3>Fixes</h3>
 <ul>
-<li>Packaging: include <code>dist/memory/**</code> in the npm tarball (fixes <code>ERR_MODULE_NOT_FOUND</code> for <code>dist/memory/index.js</code>).</li>
+<li>NPM package: include missing runtime dist folders (slack/signal/imessage/tui/wizard/control-ui/daemon) to avoid <code>ERR_MODULE_NOT_FOUND</code> in Node 25 npx installs.</li>
 </ul>
 <p><a href="https://github.com/clawdbot/clawdbot/blob/main/CHANGELOG.md">View full changelog</a></p>
 ]]></description>
-            <enclosure url="https://github.com/clawdbot/clawdbot/releases/download/v2026.1.12-2/Clawdbot-2026.1.12-2.zip" length="19854203" type="application/octet-stream" sparkle:edSignature="CVpUofNS+pl6Smk/K0Q8q35saRuuFx90s4sePABORFvGcAF1biajC8zpiImKuXpqD0ENb+VTwDJ1ul1Oxh3wDA=="/>
+            <enclosure url="https://github.com/clawdbot/clawdbot/releases/download/v2026.1.5-3/Clawdbot-2026.1.5-3.zip" length="160797048" type="application/octet-stream" sparkle:edSignature="5KYFg0SW7liwLxLJbfzd2KsAxbX06gMH0rH/W3a4V0p4N48hjz4AsSrfFLdGZSnW+6XaJjC3MN6Ynh+l7kffDQ=="/>
        </item>
        <item>
-            <title>2026.1.11-3</title>
+            <title>2026.1.5-2</title>
-            <pubDate>Mon, 12 Jan 2026 10:40:23 +0000</pubDate>
+            <pubDate>Mon, 05 Jan 2026 03:51:30 +0100</pubDate>
            <link>https://raw.githubusercontent.com/clawdbot/clawdbot/main/appcast.xml</link>
-            <sparkle:version>5212</sparkle:version>
+            <sparkle:version>3089</sparkle:version>
-            <sparkle:shortVersionString>2026.1.11-3</sparkle:shortVersionString>
+            <sparkle:shortVersionString>2026.1.5-2</sparkle:shortVersionString>
            <sparkle:minimumSystemVersion>15.0</sparkle:minimumSystemVersion>
-            <description><![CDATA[<h2>Clawdbot 2026.1.11-3</h2>
+            <description><![CDATA[<h2>Clawdbot 2026.1.5-2</h2>
 <h3>Fixes</h3>
 <ul>
-<li>CLI: avoid top-level await warnings in the entrypoint on fresh installs.</li>
+<li>NPM package: include <code>dist/sessions</code> so <code>clawdbot agent</code> resolves session helpers in npx installs.</li>
-<li>CLI: show a commit hash in the banner for npm installs (package.json gitHead fallback).</li>
+<li>Node 25: avoid unsupported directory import by targeting <code>qrcode-terminal/vendor/QRCode/*.js</code> modules.</li>
 </ul>
 <p><a href="https://github.com/clawdbot/clawdbot/blob/main/CHANGELOG.md">View full changelog</a></p>
 ]]></description>
-            <enclosure url="https://github.com/clawdbot/clawdbot/releases/download/v2026.1.11-3/Clawdbot-2026.1.11-3.zip" length="19860758" type="application/octet-stream" sparkle:edSignature="LbvGUSjc3jGO7aVo2UVA0nEkaJbb3O4iwRBo1TBqoapdTtxnDlS3s6N+Z4vOSLRAoAm22EoZOwbpK9085c7HAQ=="/>
+            <enclosure url="https://github.com/clawdbot/clawdbot/releases/download/v2026.1.5-2/Clawdbot-2026.1.5-2.zip" length="150250417" type="application/octet-stream" sparkle:edSignature="ntHNmwyHrv6cPk6NAKOT3AUkwdt5ZadrGU6mJK4GmVxi44uIMT3ZXluvnqK9SxXQwA0H0dXjiGMS/cg8NbgqDA=="/>
        </item>
    </channel>
 </rss>
@@ -21,8 +21,8 @@ android {
    applicationId = "com.clawdbot.android"
    minSdk = 31
    targetSdk = 36
-    versionCode = 202601114
+    versionCode = 20260109
-    versionName = "2026.1.11-4"
+    versionName = "2026.1.9"
  }
  buildTypes {
@@ -49,7 +49,6 @@ android {
  lint {
    disable += setOf("IconLauncherShape")
    warningsAsErrors = true
  }
  testOptions {
@@ -73,7 +72,6 @@ androidComponents {
 kotlin {
  compilerOptions {
    jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
    allWarningsAsErrors.set(true)
  }
 }
@@ -102,7 +100,6 @@ dependencies {
  implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0")
  implementation("androidx.security:security-crypto:1.1.0")
  implementation("androidx.exifinterface:exifinterface:1.4.2")
  // CameraX (for node.invoke camera.* parity)
  implementation("androidx.camera:camera-core:1.5.2")
@@ -27,7 +27,6 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
  val remoteAddress: StateFlow<String?> = runtime.remoteAddress
  val isForeground: StateFlow<Boolean> = runtime.isForeground
  val seamColorArgb: StateFlow<Long> = runtime.seamColorArgb
  val mainSessionKey: StateFlow<String> = runtime.mainSessionKey
  val cameraHud: StateFlow<CameraHudState?> = runtime.cameraHud
  val cameraFlashToken: StateFlow<Long> = runtime.cameraFlashToken
@@ -139,7 +138,7 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
    runtime.handleCanvasA2UIActionFromWebView(payloadJson)
  }
-  fun loadChat(sessionKey: String) {
+  fun loadChat(sessionKey: String = "main") {
    runtime.loadChat(sessionKey)
  }
@@ -1,26 +1,8 @@
 package com.clawdbot.android
 import android.app.Application
 import android.os.StrictMode
 class NodeApp : Application() {
  val runtime: NodeRuntime by lazy { NodeRuntime(this) }
  override fun onCreate() {
    super.onCreate()
    if (BuildConfig.DEBUG) {
      StrictMode.setThreadPolicy(
        StrictMode.ThreadPolicy.Builder()
          .detectAll()
          .penaltyLog()
          .build(),
      )
      StrictMode.setVmPolicy(
        StrictMode.VmPolicy.Builder()
          .detectAll()
          .penaltyLog()
          .build(),
      )
    }
  }
 }
@@ -16,7 +16,6 @@ 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.node.CameraCaptureManager
 import com.clawdbot.android.node.LocationCaptureManager
 import com.clawdbot.android.BuildConfig
@@ -79,7 +78,7 @@ class NodeRuntime(context: Context) {
          payloadJson =
            buildJsonObject {
              put("message", JsonPrimitive(command))
-              put("sessionKey", JsonPrimitive(resolveMainSessionKey()))
+              put("sessionKey", JsonPrimitive(mainSessionKey.value))
              put("thinking", JsonPrimitive(chatThinkingLevel.value))
              put("deliver", JsonPrimitive(false))
            }.toString(),
@@ -143,13 +142,12 @@ class NodeRuntime(context: Context) {
  private val session =
    BridgeSession(
      scope = scope,
-      onConnected = { name, remote, mainSessionKey ->
+      onConnected = { name, remote ->
        _statusText.value = "Connected"
        _serverName.value = name
        _remoteAddress.value = remote
        _isConnected.value = true
        _seamColorArgb.value = DEFAULT_SEAM_COLOR_ARGB
        applyMainSessionKey(mainSessionKey)
        scope.launch { refreshBrandingFromGateway() }
        scope.launch { refreshWakeWordsFromGateway() }
        maybeNavigateToA2uiOnConnect()
@@ -161,9 +159,6 @@ class NodeRuntime(context: Context) {
      onInvoke = { req ->
        handleInvoke(req.command, req.paramsJson)
      },
      onTlsFingerprint = { stableId, fingerprint ->
        prefs.saveBridgeTlsFingerprint(stableId, fingerprint)
      },
    )
  private val chat = ChatController(scope = scope, session = session, json = json)
@@ -177,31 +172,11 @@ class NodeRuntime(context: Context) {
    _remoteAddress.value = null
    _isConnected.value = false
    _seamColorArgb.value = DEFAULT_SEAM_COLOR_ARGB
-    if (!isCanonicalMainSessionKey(_mainSessionKey.value)) {
+    _mainSessionKey.value = "main"
      _mainSessionKey.value = "main"
    }
    val mainKey = resolveMainSessionKey()
    talkMode.setMainSessionKey(mainKey)
    chat.applyMainSessionKey(mainKey)
    chat.onDisconnected(message)
    showLocalCanvasOnDisconnect()
  }
  private fun applyMainSessionKey(candidate: String?) {
    val trimmed = candidate?.trim().orEmpty()
    if (trimmed.isEmpty()) return
    if (isCanonicalMainSessionKey(_mainSessionKey.value)) return
    if (_mainSessionKey.value == trimmed) return
    _mainSessionKey.value = trimmed
    talkMode.setMainSessionKey(trimmed)
    chat.applyMainSessionKey(trimmed)
  }
  private fun resolveMainSessionKey(): String {
    val trimmed = _mainSessionKey.value.trim()
    return if (trimmed.isEmpty()) "main" else trimmed
  }
  private fun maybeNavigateToA2uiOnConnect() {
    val a2uiUrl = resolveA2uiHostUrl() ?: return
    val current = canvas.currentUrl()?.trim().orEmpty()
@@ -492,17 +467,12 @@ class NodeRuntime(context: Context) {
    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())
@@ -519,7 +489,6 @@ class NodeRuntime(context: Context) {
      session.connect(
        endpoint = endpoint,
        hello = buildSessionHello(token = authToken),
        tls = tls,
      )
    }
  }
@@ -566,41 +535,6 @@ class NodeRuntime(context: Context) {
    session.disconnect()
  }
  private fun resolveTlsParams(endpoint: BridgeEndpoint): BridgeTlsParams? {
    val stored = prefs.loadBridgeTlsFingerprint(endpoint.stableId)
    val hinted = endpoint.tlsEnabled || !endpoint.tlsFingerprintSha256.isNullOrBlank()
    val manual = endpoint.stableId.startsWith("manual|")
    if (hinted) {
      return BridgeTlsParams(
        required = true,
        expectedFingerprint = endpoint.tlsFingerprintSha256 ?: stored,
        allowTOFU = stored == null,
        stableId = endpoint.stableId,
      )
    }
    if (!stored.isNullOrBlank()) {
      return BridgeTlsParams(
        required = true,
        expectedFingerprint = stored,
        allowTOFU = false,
        stableId = endpoint.stableId,
      )
    }
    if (manual) {
      return BridgeTlsParams(
        required = false,
        expectedFingerprint = null,
        allowTOFU = true,
        stableId = endpoint.stableId,
      )
    }
    return null
  }
  fun handleCanvasA2UIActionFromWebView(payloadJson: String) {
    scope.launch {
      val trimmed = payloadJson.trim()
@@ -625,7 +559,7 @@ class NodeRuntime(context: Context) {
        (userActionObj["sourceComponentId"] as? JsonPrimitive)?.content?.trim().orEmpty().ifEmpty { "-" }
      val contextJson = (userActionObj["context"] as? JsonObject)?.toString()
-      val sessionKey = resolveMainSessionKey()
+      val sessionKey = "main"
      val message =
        ClawdbotCanvasA2UIAction.formatAgentMessage(
          actionName = name,
@@ -673,9 +607,8 @@ class NodeRuntime(context: Context) {
    }
  }
-  fun loadChat(sessionKey: String) {
+  fun loadChat(sessionKey: String = "main") {
-    val key = sessionKey.trim().ifEmpty { resolveMainSessionKey() }
+    chat.load(sessionKey)
    chat.load(key)
  }
  fun refreshChat() {
@@ -768,7 +701,7 @@ class NodeRuntime(context: Context) {
      val raw = ui?.get("seamColor").asStringOrNull()?.trim()
      val sessionCfg = config?.get("session").asObjectOrNull()
      val mainKey = normalizeMainKey(sessionCfg?.get("mainKey").asStringOrNull())
-      applyMainSessionKey(mainKey)
+      _mainSessionKey.value = mainKey
      val parsed = parseHexColorArgb(raw)
      _seamColorArgb.value = parsed ?: DEFAULT_SEAM_COLOR_ARGB
@@ -147,16 +147,6 @@ class SecurePrefs(context: Context) {
    prefs.edit { putString(key, token.trim()) }
  }
  fun loadBridgeTlsFingerprint(stableId: String): String? {
    val key = "bridge.tls.$stableId"
    return prefs.getString(key, null)?.trim()?.takeIf { it.isNotEmpty() }
  }
  fun saveBridgeTlsFingerprint(stableId: String, fingerprint: String) {
    val key = "bridge.tls.$stableId"
    prefs.edit { putString(key, fingerprint.trim()) }
  }
  private fun loadOrCreateInstanceId(): String {
    val existing = prefs.getString("node.instanceId", null)?.trim()
    if (!existing.isNullOrBlank()) return existing
@@ -4,10 +4,3 @@ internal fun normalizeMainKey(raw: String?): String {
  val trimmed = raw?.trim()
  return if (!trimmed.isNullOrEmpty()) trimmed else "main"
 }
 internal fun isCanonicalMainSessionKey(raw: String?): Boolean {
  val trimmed = raw?.trim().orEmpty()
  if (trimmed.isEmpty()) return false
  if (trimmed == "global") return true
  return trimmed.startsWith("agent:")
 }
@@ -143,8 +143,6 @@ class BridgeDiscovery(
        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 id = stableId(serviceName, "local.")
        localById[id] =
          BridgeEndpoint(
@@ -157,8 +155,6 @@ class BridgeDiscovery(
            gatewayPort = gatewayPort,
            bridgePort = bridgePort,
            canvasPort = canvasPort,
            tlsEnabled = tlsEnabled,
            tlsFingerprintSha256 = tlsFingerprint,
          )
        publish()
      }
@@ -213,11 +209,6 @@ class BridgeDiscovery(
    return txt(info, key)?.toIntOrNull()
  }
  private fun txtBool(info: NsdServiceInfo, key: String): Boolean {
    val raw = txt(info, key)?.trim()?.lowercase() ?: return false
    return raw == "1" || raw == "true" || raw == "yes"
  }
  private suspend fun refreshUnicast(domain: String) {
    val ptrName = "${serviceType}${domain}"
    val ptrMsg = lookupUnicastMessage(ptrName, Type.PTR) ?: return
@@ -261,8 +252,6 @@ class BridgeDiscovery(
      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 id = stableId(instanceName, domain)
      next[id] =
        BridgeEndpoint(
@@ -275,8 +264,6 @@ class BridgeDiscovery(
          gatewayPort = gatewayPort,
          bridgePort = bridgePort,
          canvasPort = canvasPort,
          tlsEnabled = tlsEnabled,
          tlsFingerprintSha256 = tlsFingerprint,
        )
    }
@@ -487,11 +474,6 @@ class BridgeDiscovery(
    return txtValue(records, key)?.toIntOrNull()
  }
  private fun txtBoolValue(records: List<TXTRecord>, key: String): Boolean {
    val raw = txtValue(records, key)?.trim()?.lowercase() ?: return false
    return raw == "1" || raw == "true" || raw == "yes"
  }
  private fun decodeDnsTxtString(raw: String): String {
    // dnsjava treats TXT as opaque bytes and decodes as ISO-8859-1 to preserve bytes.
    // Our TXT payload is UTF-8 (written by the gateway), so re-decode when possible.
@@ -10,8 +10,6 @@ data class BridgeEndpoint(
  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 =
@@ -20,8 +18,6 @@ data class BridgeEndpoint(
        name = "$host:$port",
        host = host,
        port = port,
        tlsEnabled = false,
        tlsFingerprintSha256 = null,
      )
  }
 }
@@ -14,6 +14,7 @@ import java.io.BufferedWriter
 import java.io.InputStreamReader
 import java.io.OutputStreamWriter
 import java.net.InetSocketAddress
 import java.net.Socket
 class BridgePairingClient {
  private val json = Json { ignoreUnknownKeys = true }
@@ -32,120 +33,95 @@ class BridgePairingClient {
  data class PairResult(val ok: Boolean, val token: String?, val error: String? = null)
-  suspend fun pairAndHello(
+  suspend fun pairAndHello(endpoint: BridgeEndpoint, hello: Hello): PairResult =
    endpoint: BridgeEndpoint,
    hello: Hello,
    tls: BridgeTlsParams? = null,
    onTlsFingerprint: ((String) -> Unit)? = null,
  ): PairResult =
    withContext(Dispatchers.IO) {
-      if (tls != null) {
+      val socket = Socket()
-        try {
+      socket.tcpNoDelay = true
-          return@withContext pairAndHelloWithTls(endpoint, hello, tls, onTlsFingerprint)
+      try {
-        } catch (e: Exception) {
+        socket.connect(InetSocketAddress(endpoint.host, endpoint.port), 8_000)
-          if (tls.required) throw e
+        socket.soTimeout = 60_000
        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()
        }
      }
      pairAndHelloWithTls(endpoint, hello, null, null)
    }
-  private fun pairAndHelloWithTls(
+        fun sendJson(obj: JsonObject) = send(obj.toString())
    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))
+        sendJson(
-      val writer = BufferedWriter(OutputStreamWriter(socket.getOutputStream(), Charsets.UTF_8))
+          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))) }
          },
        )
-      fun send(line: String) {
+        val firstObj = json.parseToJsonElement(reader.readLine()).asObjectOrNull()
-        writer.write(line)
+          ?: return@withContext PairResult(ok = false, token = null, error = "unexpected bridge response")
-        writer.write("\n")
+        when (firstObj["type"].asStringOrNull()) {
-        writer.flush()
+          "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@withContext PairResult(ok = false, token = null, error = "$code: $message")
            }
-      fun sendJson(obj: JsonObject) = send(obj.toString())
+            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))) }
              },
            )
-      sendJson(
+            while (true) {
-        buildJsonObject {
+              val nextLine = reader.readLine() ?: break
-          put("type", JsonPrimitive("hello"))
+              val next = json.parseToJsonElement(nextLine).asObjectOrNull() ?: continue
-          put("nodeId", JsonPrimitive(hello.nodeId))
+              when (next["type"].asStringOrNull()) {
-          hello.displayName?.let { put("displayName", JsonPrimitive(it)) }
+                "pair-ok" -> {
-          hello.token?.let { put("token", JsonPrimitive(it)) }
+                  val token = next["token"].asStringOrNull()
-          hello.platform?.let { put("platform", JsonPrimitive(it)) }
+                  return@withContext PairResult(ok = !token.isNullOrBlank(), token = token)
-          hello.version?.let { put("version", JsonPrimitive(it)) }
+                }
-          hello.deviceFamily?.let { put("deviceFamily", JsonPrimitive(it)) }
+                "error" -> {
-          hello.modelIdentifier?.let { put("modelIdentifier", JsonPrimitive(it)) }
+                  val c = next["code"].asStringOrNull() ?: "UNAVAILABLE"
-          hello.caps?.let { put("caps", JsonArray(it.map(::JsonPrimitive))) }
+                  val m = next["message"].asStringOrNull() ?: "pairing failed"
-          hello.commands?.let { put("commands", JsonArray(it.map(::JsonPrimitive))) }
+                  return@withContext PairResult(ok = false, token = null, error = "$c: $m")
-        },
+                }
      )
      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")
          }
-          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" }
        PairResult(ok = false, token = null, error = message)
      } finally {
        try {
          socket.close()
        } catch (_: Throwable) {
          // ignore
        }
        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
@@ -31,11 +31,10 @@ import java.util.concurrent.ConcurrentHashMap
 class BridgeSession(
  private val scope: CoroutineScope,
-  private val onConnected: (serverName: String, remoteAddress: String?, mainSessionKey: String?) -> Unit,
+  private val onConnected: (serverName: String, remoteAddress: 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,
@@ -65,19 +64,12 @@ class BridgeSession(
  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(
+  private var desired: Pair<BridgeEndpoint, Hello>? = null
    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) {
+  fun connect(endpoint: BridgeEndpoint, hello: Hello) {
-    desired = DesiredConnection(endpoint, hello, tls)
+    desired = endpoint to hello
    if (job == null) {
      job = scope.launch(Dispatchers.IO) { runLoop() }
    }
@@ -85,7 +77,7 @@ class BridgeSession(
  suspend fun updateHello(hello: Hello) {
    val target = desired ?: return
-    desired = target.copy(hello = hello)
+    desired = target.first to hello
    val conn = currentConnection ?: return
    conn.sendJson(buildHelloJson(hello))
  }
@@ -98,13 +90,11 @@ class BridgeSession(
      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
@@ -172,10 +162,10 @@ class BridgeSession(
        continue
      }
-      val (endpoint, hello, tls) = target
+      val (endpoint, hello) = target
      try {
        onDisconnected(if (attempt == 0) "Connecting…" else "Reconnecting…")
-        connectOnce(endpoint, hello, tls)
+        connectOnce(endpoint, hello)
        attempt = 0
      } catch (err: Throwable) {
        attempt += 1
@@ -199,66 +189,48 @@ class BridgeSession(
    return InvokeResult.error(code = "UNAVAILABLE", message = msg)
  }
-  private suspend fun connectOnce(endpoint: BridgeEndpoint, hello: Hello, tls: BridgeTlsParams?) =
+  private suspend fun connectOnce(endpoint: BridgeEndpoint, hello: Hello) =
    withContext(Dispatchers.IO) {
-      if (tls != null) {
+      val socket = Socket()
-        try {
+      socket.tcpNoDelay = true
-          connectWithSocket(endpoint, hello, tls)
+      socket.connect(InetSocketAddress(endpoint.host, endpoint.port), 8_000)
-          return@withContext
+      socket.soTimeout = 0
        } catch (err: Throwable) {
          if (tls.required) throw err
        }
      }
      connectWithSocket(endpoint, hello, null)
    }
-  private fun connectWithSocket(endpoint: BridgeEndpoint, hello: Hello, tls: BridgeTlsParams?) {
+      val reader = BufferedReader(InputStreamReader(socket.getInputStream(), Charsets.UTF_8))
-    val socket =
+      val writer = BufferedWriter(OutputStreamWriter(socket.getOutputStream(), Charsets.UTF_8))
      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 conn = Connection(socket, reader, writer, writeLock)
-    val writer = BufferedWriter(OutputStreamWriter(socket.getOutputStream(), Charsets.UTF_8))
+      currentConnection = conn
-    val conn = Connection(socket, reader, writer, writeLock)
+      try {
-    currentConnection = conn
+        conn.sendJson(buildHelloJson(hello))
-    try {
+        val firstLine = reader.readLine() ?: throw IllegalStateException("bridge closed connection")
-      conn.sendJson(buildHelloJson(hello))
+        val first = json.parseToJsonElement(firstLine).asObjectOrNull()
-
+          ?: throw IllegalStateException("unexpected bridge response")
-      val firstLine = reader.readLine() ?: throw IllegalStateException("bridge closed connection")
+        when (first["type"].asStringOrNull()) {
-      val first = json.parseToJsonElement(firstLine).asObjectOrNull()
+          "hello-ok" -> {
-        ?: throw IllegalStateException("unexpected bridge response")
+            val name = first["serverName"].asStringOrNull() ?: "Bridge"
-      when (first["type"].asStringOrNull()) {
+            val rawCanvasUrl = first["canvasHostUrl"].asStringOrNull()?.trim()?.ifEmpty { null }
-        "hello-ok" -> {
+            canvasHostUrl = normalizeCanvasHostUrl(rawCanvasUrl, endpoint)
-          val name = first["serverName"].asStringOrNull() ?: "Bridge"
+            if (BuildConfig.DEBUG) {
-          val rawCanvasUrl = first["canvasHostUrl"].asStringOrNull()?.trim()?.ifEmpty { null }
+              // Local JVM unit tests use android.jar stubs; Log.d can throw "not mocked".
-          val rawMainSessionKey = first["mainSessionKey"].asStringOrNull()?.trim()?.ifEmpty { null }
+              runCatching {
-          canvasHostUrl = normalizeCanvasHostUrl(rawCanvasUrl, endpoint)
+                android.util.Log.d(
-          mainSessionKey = rawMainSessionKey
+                  "ClawdbotBridge",
-          if (BuildConfig.DEBUG) {
+                  "canvasHostUrl resolved=${canvasHostUrl ?: "none"} (raw=${rawCanvasUrl ?: "none"})",
-            // 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)
          }
-          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")
        }
        "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
@@ -1,79 +0,0 @@
 package com.clawdbot.android.bridge
 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.SSLContext
 import javax.net.ssl.SSLSocket
 import javax.net.ssl.TrustManagerFactory
 import javax.net.ssl.X509TrustManager
 data class BridgeTlsParams(
  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()
  val expected = params.expectedFingerprint?.let(::normalizeFingerprint)
  val defaultTrust = defaultTrustManager()
  val trustManager =
    object : X509TrustManager {
      override fun checkClientTrusted(chain: Array<X509Certificate>, authType: String) {
        defaultTrust.checkClientTrusted(chain, authType)
      }
      override fun checkServerTrusted(chain: Array<X509Certificate>, authType: String) {
        if (chain.isEmpty()) throw CertificateException("empty certificate chain")
        val fingerprint = sha256Hex(chain[0].encoded)
        if (expected != null) {
          if (fingerprint != expected) {
            throw CertificateException("bridge TLS fingerprint mismatch")
          }
          return
        }
        if (params.allowTOFU) {
          onStore?.invoke(fingerprint)
          return
        }
        defaultTrust.checkServerTrusted(chain, authType)
      }
      override fun getAcceptedIssuers(): Array<X509Certificate> = defaultTrust.acceptedIssuers
    }
  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()
  }
 }
 private fun defaultTrustManager(): X509TrustManager {
  val factory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())
  factory.init(null as java.security.KeyStore?)
  val trust =
    factory.trustManagers.firstOrNull { it is X509TrustManager } as? X509TrustManager
  return trust ?: throw IllegalStateException("No default X509TrustManager found")
 }
 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 normalizeFingerprint(raw: String): String {
  return raw.lowercase().filter { it in '0'..'9' || it in 'a'..'f' }
 }
@@ -71,21 +71,12 @@ class ChatController(
    _sessionId.value = null
  }
-  fun load(sessionKey: String) {
+  fun load(sessionKey: String = "main") {
    val key = sessionKey.trim().ifEmpty { "main" }
    _sessionKey.value = key
    scope.launch { bootstrap(forceHealth = true) }
  }
  fun applyMainSessionKey(mainSessionKey: String) {
    val trimmed = mainSessionKey.trim()
    if (trimmed.isEmpty()) return
    if (_sessionKey.value == trimmed) return
    if (_sessionKey.value != "main") return
    _sessionKey.value = trimmed
    scope.launch { bootstrap(forceHealth = true) }
  }
  fun refresh() {
    scope.launch { bootstrap(forceHealth = true) }
  }
@@ -8,7 +8,7 @@ import android.graphics.BitmapFactory
 import android.graphics.Matrix
 import android.util.Base64
 import android.content.pm.PackageManager
-import androidx.exifinterface.media.ExifInterface
+import android.media.ExifInterface
 import androidx.lifecycle.LifecycleOwner
 import androidx.camera.core.CameraSelector
 import androidx.camera.core.ImageCapture
@@ -122,7 +122,13 @@ class ScreenRecordManager(private val context: Context) {
      )
    }
-  private fun createMediaRecorder(): MediaRecorder = MediaRecorder(context)
+  private fun createMediaRecorder(): MediaRecorder =
    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
      MediaRecorder(context)
    } else {
      @Suppress("DEPRECATION")
      MediaRecorder()
    }
  private suspend fun ensureMicPermission() {
    val granted =
@@ -44,7 +44,6 @@ import com.clawdbot.android.chat.ChatSessionEntry
 fun ChatComposer(
  sessionKey: String,
  sessions: List<ChatSessionEntry>,
  mainSessionKey: String,
  healthOk: Boolean,
  thinkingLevel: String,
  pendingRunCount: Int,
@@ -62,7 +61,7 @@ fun ChatComposer(
  var showThinkingMenu by remember { mutableStateOf(false) }
  var showSessionMenu by remember { mutableStateOf(false) }
-  val sessionOptions = resolveSessionChoices(sessionKey, sessions, mainSessionKey = mainSessionKey)
+  val sessionOptions = resolveSessionChoices(sessionKey, sessions)
  val currentSessionLabel =
    sessionOptions.firstOrNull { it.key == sessionKey }?.displayName ?: sessionKey
@@ -33,14 +33,13 @@ fun ChatSheetContent(viewModel: MainViewModel) {
  val pendingRunCount by viewModel.pendingRunCount.collectAsState()
  val healthOk by viewModel.chatHealthOk.collectAsState()
  val sessionKey by viewModel.chatSessionKey.collectAsState()
  val mainSessionKey by viewModel.mainSessionKey.collectAsState()
  val thinkingLevel by viewModel.chatThinkingLevel.collectAsState()
  val streamingAssistantText by viewModel.chatStreamingAssistantText.collectAsState()
  val pendingToolCalls by viewModel.chatPendingToolCalls.collectAsState()
  val sessions by viewModel.chatSessions.collectAsState()
-  LaunchedEffect(mainSessionKey) {
+  LaunchedEffect(Unit) {
-    viewModel.loadChat(mainSessionKey)
+    viewModel.loadChat("main")
    viewModel.refreshChatSessions(limit = 200)
  }
@@ -86,7 +85,6 @@ fun ChatSheetContent(viewModel: MainViewModel) {
    ChatComposer(
      sessionKey = sessionKey,
      sessions = sessions,
      mainSessionKey = mainSessionKey,
      healthOk = healthOk,
      thinkingLevel = thinkingLevel,
      pendingRunCount = pendingRunCount,
@@ -2,23 +2,20 @@ package com.clawdbot.android.ui.chat
 import com.clawdbot.android.chat.ChatSessionEntry
 private const val MAIN_SESSION_KEY = "main"
 private const val RECENT_WINDOW_MS = 24 * 60 * 60 * 1000L
 fun resolveSessionChoices(
  currentSessionKey: String,
  sessions: List<ChatSessionEntry>,
  mainSessionKey: String,
  nowMs: Long = System.currentTimeMillis(),
 ): List<ChatSessionEntry> {
-  val mainKey = mainSessionKey.trim().ifEmpty { "main" }
+  val current = currentSessionKey.trim()
  val current = currentSessionKey.trim().let { if (it == "main" && mainKey != "main") mainKey else it }
  val aliasKey = if (mainKey == "main") null else "main"
  val cutoff = nowMs - RECENT_WINDOW_MS
  val sorted = sessions.sortedByDescending { it.updatedAtMs ?: 0L }
  val recent = mutableListOf<ChatSessionEntry>()
  val seen = mutableSetOf<String>()
  for (entry in sorted) {
    if (aliasKey != null && entry.key == aliasKey) continue
    if (!seen.add(entry.key)) continue
    if ((entry.updatedAtMs ?: 0L) < cutoff) continue
    recent.add(entry)
@@ -26,13 +23,13 @@ fun resolveSessionChoices(
  val result = mutableListOf<ChatSessionEntry>()
  val included = mutableSetOf<String>()
-  val mainEntry = sorted.firstOrNull { it.key == mainKey }
+  val mainEntry = sorted.firstOrNull { it.key == MAIN_SESSION_KEY }
  if (mainEntry != null) {
    result.add(mainEntry)
-    included.add(mainKey)
+    included.add(MAIN_SESSION_KEY)
-  } else if (current == mainKey) {
+  } else if (current == MAIN_SESSION_KEY) {
-    result.add(ChatSessionEntry(key = mainKey, updatedAtMs = null))
+    result.add(ChatSessionEntry(key = MAIN_SESSION_KEY, updatedAtMs = null))
-    included.add(mainKey)
+    included.add(MAIN_SESSION_KEY)
  }
  for (entry in recent) {
@@ -21,7 +21,6 @@ import android.speech.tts.UtteranceProgressListener
 import android.util.Log
 import androidx.core.content.ContextCompat
 import com.clawdbot.android.bridge.BridgeSession
 import com.clawdbot.android.isCanonicalMainSessionKey
 import com.clawdbot.android.normalizeMainKey
 import java.net.HttpURLConnection
 import java.net.URL
@@ -117,13 +116,6 @@ class TalkModeManager(
    chatSubscribedSessionKey = null
  }
  fun setMainSessionKey(sessionKey: String?) {
    val trimmed = sessionKey?.trim().orEmpty()
    if (trimmed.isEmpty()) return
    if (isCanonicalMainSessionKey(mainSessionKey)) return
    mainSessionKey = trimmed
  }
  fun setEnabled(enabled: Boolean) {
    if (_isEnabled.value == enabled) return
    _isEnabled.value = enabled
@@ -835,9 +827,7 @@ class TalkModeManager(
      val key = talk?.get("apiKey")?.asStringOrNull()?.trim()?.takeIf { it.isNotEmpty() }
      val interrupt = talk?.get("interruptOnSpeech")?.asBooleanOrNull()
-      if (!isCanonicalMainSessionKey(mainSessionKey)) {
+      mainSessionKey = mainKey
        mainSessionKey = mainKey
      }
      defaultVoiceId = voice ?: envVoice?.takeIf { it.isNotEmpty() } ?: sagVoice?.takeIf { it.isNotEmpty() }
      voiceAliases = aliases
      if (!voiceOverrideActive) currentVoiceId = defaultVoiceId
@@ -30,7 +30,7 @@ class BridgeSessionTest {
    val session =
      BridgeSession(
        scope = scope,
-        onConnected = { _, _, _ -> connected.complete(Unit) },
+        onConnected = { _, _ -> connected.complete(Unit) },
        onDisconnected = { /* ignore */ },
        onEvent = { _, _ -> /* ignore */ },
        onInvoke = { BridgeSession.InvokeResult.ok(null) },
@@ -97,7 +97,7 @@ class BridgeSessionTest {
    val session =
      BridgeSession(
        scope = scope,
-        onConnected = { _, _, _ -> connected.complete(Unit) },
+        onConnected = { _, _ -> connected.complete(Unit) },
        onDisconnected = { /* ignore */ },
        onEvent = { _, _ -> /* ignore */ },
        onInvoke = { BridgeSession.InvokeResult.ok(null) },
@@ -167,7 +167,7 @@ class BridgeSessionTest {
    val session =
      BridgeSession(
        scope = scope,
-        onConnected = { _, _, _ -> connected.complete(Unit) },
+        onConnected = { _, _ -> connected.complete(Unit) },
        onDisconnected = { /* ignore */ },
        onEvent = { _, _ -> /* ignore */ },
        onInvoke = { throw IllegalStateException("FOO_BAR: boom") },
@@ -239,7 +239,7 @@ class BridgeSessionTest {
    val session =
      BridgeSession(
        scope = scope,
-        onConnected = { _, _, _ -> connected.countDown() },
+        onConnected = { _, _ -> connected.countDown() },
        onDisconnected = { /* ignore */ },
        onEvent = { _, _ -> /* ignore */ },
        onInvoke = { BridgeSession.InvokeResult.ok(null) },
@@ -19,7 +19,7 @@ class SessionFiltersTest {
        ChatSessionEntry(key = "recent-2", updatedAtMs = recent2),
      )
-    val result = resolveSessionChoices("main", sessions, mainSessionKey = "main", nowMs = now).map { it.key }
+    val result = resolveSessionChoices("main", sessions, nowMs = now).map { it.key }
    assertEquals(listOf("main", "recent-1", "recent-2"), result)
  }
@@ -29,7 +29,7 @@ class SessionFiltersTest {
    val recent = now - 10 * 60 * 1000L
    val sessions = listOf(ChatSessionEntry(key = "main", updatedAtMs = recent))
-    val result = resolveSessionChoices("custom", sessions, mainSessionKey = "main", nowMs = now).map { it.key }
+    val result = resolveSessionChoices("custom", sessions, nowMs = now).map { it.key }
    assertEquals(listOf("main", "custom"), result)
  }
 }
@@ -10,36 +10,10 @@ actor BridgeClient {
    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: .tcp)
        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") {
@@ -168,18 +142,6 @@ actor BridgeClient {
        }
    }
    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
@@ -199,10 +161,18 @@ actor BridgeClient {
        purpose: String,
        _ op: @escaping @Sendable () async throws -> T) async throws -> T
    {
-        try await AsyncTimeout.withTimeout(
+        try await withThrowingTaskGroup(of: T.self) { group in
-            seconds: Double(seconds),
+            group.addTask {
-            onTimeout: { TimeoutError(purpose: purpose, seconds: seconds) },
+                try await op()
-            operation: op)
+            }
            group.addTask {
                try await Task.sleep(nanoseconds: UInt64(seconds) * 1_000_000_000)
                throw TimeoutError(purpose: purpose, seconds: seconds)
            }
            let result = try await group.next()!
            group.cancelAll()
            return result
        }
    }
    private func startAndWaitForReady(_ connection: NWConnection, queue: DispatchQueue) async throws {
@@ -10,7 +10,6 @@ protocol BridgePairingClient: Sendable {
    func pairAndHello(
        endpoint: NWEndpoint,
        hello: BridgeHello,
        tls: BridgeTLSParams?,
        onStatus: (@Sendable (String) -> Void)?) async throws -> String
 }
@@ -116,14 +115,7 @@ final class BridgeConnectionController {
            self.didAutoConnect = true
            let endpoint = NWEndpoint.hostPort(host: NWEndpoint.Host(manualHost), port: port)
-            let stableID = BridgeEndpointID.stableID(endpoint)
+            self.startAutoConnect(endpoint: endpoint, token: token, instanceId: instanceId)
            let tlsParams = self.resolveManualTLSParams(stableID: stableID)
            self.startAutoConnect(
                endpoint: endpoint,
                bridgeStableID: stableID,
                tls: tlsParams,
                token: token,
                instanceId: instanceId)
            return
        }
@@ -139,14 +131,8 @@ final class BridgeConnectionController {
        guard let target = self.bridges.first(where: { $0.stableID == targetStableID }) else { return }
        let tlsParams = self.resolveDiscoveredTLSParams(bridge: target)
        self.didAutoConnect = true
-        self.startAutoConnect(
+        self.startAutoConnect(endpoint: target.endpoint, token: token, instanceId: instanceId)
            endpoint: target.endpoint,
            bridgeStableID: target.stableID,
            tls: tlsParams,
            token: token,
            instanceId: instanceId)
    }
    private func updateLastDiscoveredBridge(from bridges: [BridgeDiscoveryModel.DiscoveredBridge]) {
@@ -185,13 +171,7 @@ final class BridgeConnectionController {
        "bridge-token.\(instanceId)"
    }
-    private func startAutoConnect(
+    private func startAutoConnect(endpoint: NWEndpoint, token: String, instanceId: String) {
        endpoint: NWEndpoint,
        bridgeStableID: String,
        tls: BridgeTLSParams?,
        token: String,
        instanceId: String)
    {
        guard let appModel else { return }
        Task { [weak self] in
            guard let self else { return }
@@ -200,7 +180,6 @@ final class BridgeConnectionController {
                let refreshed = try await self.bridgeClientFactory().pairAndHello(
                    endpoint: endpoint,
                    hello: hello,
                    tls: tls,
                    onStatus: { status in
                        Task { @MainActor in
                            appModel.bridgeStatusText = status
@@ -213,11 +192,7 @@ final class BridgeConnectionController {
                        service: "com.clawdbot.bridge",
                        account: self.keychainAccount(instanceId: instanceId))
                }
-                appModel.connectToBridge(
+                appModel.connectToBridge(endpoint: endpoint, hello: self.makeHello(token: resolvedToken))
                    endpoint: endpoint,
                    bridgeStableID: bridgeStableID,
                    tls: tls,
                    hello: self.makeHello(token: resolvedToken))
            } catch {
                await MainActor.run {
                    appModel.bridgeStatusText = "Bridge error: \(error.localizedDescription)"
@@ -226,47 +201,6 @@ final class BridgeConnectionController {
        }
    }
    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)
    }
    private func resolvedDisplayName(defaults: UserDefaults) -> String {
        let key = "node.displayName"
        let existing = defaults.string(forKey: key)?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
@@ -23,8 +23,6 @@ final class BridgeDiscoveryModel {
        var gatewayPort: Int?
        var bridgePort: Int?
        var canvasPort: Int?
        var tlsEnabled: Bool
        var tlsFingerprintSha256: String?
        var cliPath: String?
    }
@@ -92,8 +90,6 @@ final class BridgeDiscoveryModel {
                                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"),
                                cliPath: Self.txtValue(txt, key: "cliPath"))
                        default:
                            return nil
@@ -218,9 +214,4 @@ final class BridgeDiscoveryModel {
        guard let raw = self.txtValue(dict, key: key) else { return nil }
        return Int(raw)
    }
    private static func txtBoolValue(_ dict: [String: String], key: String) -> Bool {
        guard let raw = self.txtValue(dict, key: key)?.lowercased() else { return false }
        return raw == "1" || raw == "true" || raw == "yes"
    }
 }
@@ -26,7 +26,6 @@ actor BridgeSession {
    private(set) var state: State = .idle
    private var canvasHostUrl: String?
    private var mainSessionKey: String?
    func currentCanvasHostUrl() -> String? {
        self.canvasHostUrl
@@ -69,42 +68,15 @@ actor BridgeSession {
    func connect(
        endpoint: NWEndpoint,
        hello: BridgeHello,
-        tls: BridgeTLSParams? = nil,
+        onConnected: (@Sendable (String) async -> Void)? = 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(
+        let params = NWParameters.tcp
-        endpoint: NWEndpoint,
+        params.includePeerToPeer = true
        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
@@ -135,9 +107,7 @@ actor BridgeSession {
            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)
+            await onConnected?(ok.serverName)
            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)")
@@ -247,7 +217,6 @@ actor BridgeSession {
        self.queue = nil
        self.buffer = Data()
        self.canvasHostUrl = nil
        self.mainSessionKey = nil
        let pending = self.pendingRPC.values
        self.pendingRPC.removeAll()
@@ -265,10 +234,6 @@ actor BridgeSession {
        self.state = .idle
    }
    func currentMainSessionKey() -> String? {
        self.mainSessionKey
    }
    private func beginRPC(
        id: String,
        request: BridgeRPCRequest,
@@ -282,18 +247,6 @@ actor BridgeSession {
        }
    }
    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: [
@@ -368,10 +321,20 @@ actor BridgeSession {
        seconds: Double,
        operation: @escaping @Sendable () async throws -> T) async throws -> T
    {
-        try await AsyncTimeout.withTimeout(
+        try await withThrowingTaskGroup(of: T.self) { group in
-            seconds: seconds,
+            group.addTask { try await operation() }
-            onTimeout: { TimeoutError(message: "UNAVAILABLE: connection timeout") },
+            group.addTask {
-            operation: operation)
+                try await Task.sleep(nanoseconds: UInt64(seconds * 1_000_000_000))
                throw TimeoutError(message: "UNAVAILABLE: connection timeout")
            }
            guard let first = try await group.next() else {
                throw TimeoutError(message: "UNAVAILABLE: connection timeout")
            }
            group.cancelAll()
            return first
        }
    }
    private static func makeStateStream(for connection: NWConnection) -> AsyncStream<NWConnection.State> {
@@ -1,67 +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
            guard let trust else {
                complete(false)
                return
            }
            if let cert = SecTrustGetCertificateAtIndex(trust, 0) {
                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(trust, 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 }
 }
@@ -6,7 +6,7 @@ struct ChatSheet: View {
    @State private var viewModel: ClawdbotChatViewModel
    private let userAccent: Color?
-    init(bridge: BridgeSession, sessionKey: String, userAccent: Color? = nil) {
+    init(bridge: BridgeSession, sessionKey: String = "main", userAccent: Color? = nil) {
        let transport = IOSBridgeChatTransport(bridge: bridge)
        self._viewModel = State(
            initialValue: ClawdbotChatViewModel(
@@ -19,9 +19,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2026.1.11-4</string>
+	<string>2026.1.9</string>
 	<key>CFBundleVersion</key>
-	<string>202601113</string>
+	<string>20260109</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoadsInWebContent</key>
@@ -35,10 +35,10 @@
 	<string>Clawdbot can capture photos or short video clips when requested via the bridge.</string>
 	<key>NSLocalNetworkUsageDescription</key>
 	<string>Clawdbot discovers and connects to your Clawdbot bridge 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>
 	<string>Clawdbot uses your location when you allow location sharing.</string>
 	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
 	<string>Clawdbot can share your location in the background when you enable Always.</string>
 	<key>NSMicrophoneUsageDescription</key>
 	<string>Clawdbot needs microphone access for voice wake.</string>
 	<key>NSSpeechRecognitionUsageDescription</key>
@@ -86,11 +86,24 @@ final class LocationService: NSObject, CLLocationManagerDelegate {
        }
    }
-    private func withTimeout<T: Sendable>(
+    private func withTimeout<T>(
        timeoutMs: Int,
-        operation: @escaping @Sendable () async throws -> T) async throws -> T
+        operation: @escaping () async throws -> T) async throws -> T
    {
-        try await AsyncTimeout.withTimeoutMs(timeoutMs: timeoutMs, onTimeout: { Error.timeout }, operation: operation)
+        if timeoutMs == 0 {
            return try await operation()
        }
        return try await withThrowingTaskGroup(of: T.self) { group in
            group.addTask { try await operation() }
            group.addTask {
                try await Task.sleep(nanoseconds: UInt64(timeoutMs) * 1_000_000)
                throw Error.timeout
            }
            let result = try await group.next()!
            group.cancelAll()
            return result
        }
    }
    private static func accuracyValue(_ accuracy: ClawdbotLocationAccuracy) -> CLLocationAccuracy {
@@ -104,35 +117,26 @@ final class LocationService: NSObject, CLLocationManagerDelegate {
        }
    }
-    nonisolated func locationManagerDidChangeAuthorization(_ manager: CLLocationManager) {
+    func locationManagerDidChangeAuthorization(_ manager: CLLocationManager) {
-        let status = manager.authorizationStatus
+        if let cont = self.authContinuation {
-        Task { @MainActor in
+            self.authContinuation = nil
-            if let cont = self.authContinuation {
+            cont.resume(returning: manager.authorizationStatus)
                self.authContinuation = nil
                cont.resume(returning: status)
            }
        }
    }
-    nonisolated func locationManager(_ manager: CLLocationManager, didUpdateLocations locations: [CLLocation]) {
+    func locationManager(_ manager: CLLocationManager, didUpdateLocations locations: [CLLocation]) {
-        let locs = locations
+        guard let cont = self.locationContinuation else { return }
-        Task { @MainActor in
+        self.locationContinuation = nil
-            guard let cont = self.locationContinuation else { return }
+        if let latest = locations.last {
-            self.locationContinuation = nil
+            cont.resume(returning: latest)
-            if let latest = locs.last {
+        } else {
-                cont.resume(returning: latest)
+            cont.resume(throwing: Error.unavailable)
            } else {
                cont.resume(throwing: Error.unavailable)
            }
        }
    }
-    nonisolated func locationManager(_ manager: CLLocationManager, didFailWithError error: Swift.Error) {
+    func locationManager(_ manager: CLLocationManager, didFailWithError error: Swift.Error) {
-        let err = error
+        guard let cont = self.locationContinuation else { return }
-        Task { @MainActor in
+        self.locationContinuation = nil
-            guard let cont = self.locationContinuation else { return }
+        cont.resume(throwing: error)
            self.locationContinuation = nil
            cont.resume(throwing: err)
        }
    }
 }
@@ -109,7 +109,7 @@ final class NodeAppModel {
        let host = UserDefaults.standard.string(forKey: "node.displayName") ?? UIDevice.current.name
        let instanceId = (UserDefaults.standard.string(forKey: "node.instanceId") ?? "ios-node").lowercased()
        let contextJSON = ClawdbotCanvasA2UIAction.compactJSON(userAction["context"])
-        let sessionKey = self.mainSessionKey
+        let sessionKey = "main"
        let messageContext = ClawdbotCanvasA2UIAction.AgentMessageContext(
            actionName: name,
@@ -204,15 +204,12 @@ final class NodeAppModel {
    func connectToBridge(
        endpoint: NWEndpoint,
        bridgeStableID: String,
        tls: BridgeTLSParams?,
        hello: BridgeHello)
    {
        self.bridgeTask?.cancel()
        self.bridgeServerName = nil
        self.bridgeRemoteAddress = nil
-        let id = bridgeStableID.trimmingCharacters(in: .whitespacesAndNewlines)
+        self.connectedBridgeID = BridgeEndpointID.stableID(endpoint)
        self.connectedBridgeID = id.isEmpty ? BridgeEndpointID.stableID(endpoint) : id
        self.voiceWakeSyncTask?.cancel()
        self.voiceWakeSyncTask = nil
@@ -233,16 +230,12 @@ final class NodeAppModel {
                    try await self.bridge.connect(
                        endpoint: endpoint,
                        hello: hello,
-                        tls: tls,
+                        onConnected: { [weak self] serverName in
                        onConnected: { [weak self] serverName, mainSessionKey in
                            guard let self else { return }
                            await MainActor.run {
                                self.bridgeStatusText = "Connected"
                                self.bridgeServerName = serverName
                            }
                            await MainActor.run {
                                self.applyMainSessionKey(mainSessionKey)
                            }
                            if let addr = await self.bridge.currentRemoteAddress() {
                                await MainActor.run {
                                    self.bridgeRemoteAddress = addr
@@ -291,10 +284,7 @@ final class NodeAppModel {
                self.bridgeRemoteAddress = nil
                self.connectedBridgeID = nil
                self.seamColorHex = nil
-                if !SessionKey.isCanonicalMainSessionKey(self.mainSessionKey) {
+                self.mainSessionKey = "main"
                    self.mainSessionKey = "main"
                    self.talkMode.updateMainSessionKey(self.mainSessionKey)
                }
                self.showLocalCanvasOnDisconnect()
            }
        }
@@ -311,23 +301,10 @@ final class NodeAppModel {
        self.bridgeRemoteAddress = nil
        self.connectedBridgeID = nil
        self.seamColorHex = nil
-        if !SessionKey.isCanonicalMainSessionKey(self.mainSessionKey) {
+        self.mainSessionKey = "main"
            self.mainSessionKey = "main"
            self.talkMode.updateMainSessionKey(self.mainSessionKey)
        }
        self.showLocalCanvasOnDisconnect()
    }
    private func applyMainSessionKey(_ key: String?) {
        let trimmed = (key ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
        guard !trimmed.isEmpty else { return }
        let current = self.mainSessionKey.trimmingCharacters(in: .whitespacesAndNewlines)
        if SessionKey.isCanonicalMainSessionKey(current) { return }
        if trimmed == current { return }
        self.mainSessionKey = trimmed
        self.talkMode.updateMainSessionKey(trimmed)
    }
    var seamColor: Color {
        Self.color(fromHex: self.seamColorHex) ?? Self.defaultSeamColor
    }
@@ -356,10 +333,7 @@ final class NodeAppModel {
            let mainKey = SessionKey.normalizeMainKey(session?["mainKey"] as? String)
            await MainActor.run {
                self.seamColorHex = raw.isEmpty ? nil : raw
-                if !SessionKey.isCanonicalMainSessionKey(self.mainSessionKey) {
+                self.mainSessionKey = mainKey
                    self.mainSessionKey = mainKey
                    self.talkMode.updateMainSessionKey(mainKey)
                }
            }
        } catch {
            // ignore
@@ -5,11 +5,4 @@ enum SessionKey {
        let trimmed = (raw ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
        return trimmed.isEmpty ? "main" : trimmed
    }
    static func isCanonicalMainSessionKey(_ value: String?) -> Bool {
        let trimmed = (value ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
        if trimmed.isEmpty { return false }
        if trimmed == "global" { return true }
        return trimmed.hasPrefix("agent:")
    }
 }
@@ -407,11 +407,9 @@ struct SettingsTab: View {
                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
@@ -427,8 +425,6 @@ struct SettingsTab: View {
            self.appModel.connectToBridge(
                endpoint: bridge.endpoint,
                bridgeStableID: bridge.stableID,
                tls: tlsParams,
                hello: BridgeHello(
                    nodeId: self.instanceId,
                    displayName: self.displayName,
@@ -465,8 +461,6 @@ struct SettingsTab: View {
        defer { self.connectingBridgeID = 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
@@ -490,7 +484,6 @@ struct SettingsTab: View {
            let token = try await BridgeClient().pairAndHello(
                endpoint: endpoint,
                hello: hello,
                tls: tlsParams,
                onStatus: { status in
                    Task { @MainActor in
                        statusStore.text = status
@@ -506,8 +499,6 @@ struct SettingsTab: View {
            self.appModel.connectToBridge(
                endpoint: endpoint,
                bridgeStableID: stableID,
                tls: tlsParams,
                hello: BridgeHello(
                    nodeId: self.instanceId,
                    displayName: self.displayName,
@@ -524,47 +515,6 @@ struct SettingsTab: View {
        }
    }
    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)
    }
    private static func primaryIPv4Address() -> String? {
        var addrList: UnsafeMutablePointer<ifaddrs>?
        guard getifaddrs(&addrList) == 0, let first = addrList else { return nil }
@@ -53,13 +53,6 @@ final class TalkModeManager: NSObject {
        self.bridge = bridge
    }
    func updateMainSessionKey(_ sessionKey: String?) {
        let trimmed = (sessionKey ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
        guard !trimmed.isEmpty else { return }
        if SessionKey.isCanonicalMainSessionKey(self.mainSessionKey) { return }
        self.mainSessionKey = trimmed
    }
    func setEnabled(_ enabled: Bool) {
        self.isEnabled = enabled
        if enabled {
@@ -295,8 +288,9 @@ final class TalkModeManager: NSObject {
            self.chatSubscribedSessionKeys.insert(key)
            self.logger.info("chat.subscribe ok sessionKey=\(key, privacy: .public)")
        } catch {
-            let err = error.localizedDescription
+            self.logger.warning(
-            self.logger.warning("chat.subscribe failed key=\(key, privacy: .public) err=\(err, privacy: .public)")
+                "chat.subscribe failed sessionKey=\(key, privacy: .public) " +
                    "err=\(error.localizedDescription, privacy: .public)")
        }
    }
@@ -534,8 +528,9 @@ final class TalkModeManager: NSObject {
                    self.lastPlaybackWasPCM = false
                    result = await self.mp3Player.play(stream: stream)
                }
-                let duration = Date().timeIntervalSince(started)
+                self.logger.info(
-                self.logger.info("elevenlabs stream finished=\(result.finished, privacy: .public) dur=\(duration, privacy: .public)s")
+                    "elevenlabs stream finished=\(result.finished, privacy: .public) " +
                        "dur=\(Date().timeIntervalSince(started), privacy: .public)s")
                if !result.finished, let interruptedAt = result.interruptedAt {
                    self.lastInterruptedAtSeconds = interruptedAt
                }
@@ -656,10 +651,7 @@ final class TalkModeManager: NSObject {
            guard let config = json["config"] as? [String: Any] else { return }
            let talk = config["talk"] as? [String: Any]
            let session = config["session"] as? [String: Any]
-            let mainKey = SessionKey.normalizeMainKey(session?["mainKey"] as? String)
+            self.mainSessionKey = SessionKey.normalizeMainKey(session?["mainKey"] as? String)
            if !SessionKey.isCanonicalMainSessionKey(self.mainSessionKey) {
                self.mainSessionKey = mainKey
            }
            self.defaultVoiceId = (talk?["voiceId"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines)
            if let aliases = talk?["voiceAliases"] as? [String: Any] {
                var resolved: [String: String] = [:]
@@ -27,7 +27,6 @@ private actor MockBridgePairingClient: BridgePairingClient {
    func pairAndHello(
        endpoint: NWEndpoint,
        hello: BridgeHello,
        tls: BridgeTLSParams?,
        onStatus: (@Sendable (String) -> Void)?) async throws -> String
    {
        self.lastToken = hello.token
@@ -176,6 +175,7 @@ private func withKeychainValues<T>(
    }
    @Test @MainActor func makeHelloBuildsCapsAndCommands() {
        let defaults = UserDefaults.standard
        let voiceWakeKey = VoiceWakePreferences.enabledKey
        withKeychainValues([instanceIdEntry: nil, preferredBridgeEntry: nil, lastBridgeEntry: nil]) {
@@ -245,8 +245,6 @@ private func withKeychainValues<T>(
            gatewayPort: 18789,
            bridgePort: 18790,
            canvasPort: 18793,
            tlsEnabled: false,
            tlsFingerprintSha256: nil,
            cliPath: nil)
        let mock = MockBridgePairingClient(resultToken: "new-token")
        let account = "bridge-token.ios-test"
@@ -295,8 +293,6 @@ private func withKeychainValues<T>(
            gatewayPort: 18789,
            bridgePort: 18790,
            canvasPort: 18793,
            tlsEnabled: false,
            tlsFingerprintSha256: nil,
            cliPath: nil)
        let bridgeB = BridgeDiscoveryModel.DiscoveredBridge(
            name: "Gateway B",
@@ -308,8 +304,6 @@ private func withKeychainValues<T>(
            gatewayPort: 28789,
            bridgePort: 28790,
            canvasPort: 28793,
            tlsEnabled: false,
            tlsFingerprintSha256: nil,
            cliPath: nil)
        let mock = MockBridgePairingClient(resultToken: "token-ok")
@@ -17,8 +17,8 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2026.1.11-4</string>
+	<string>2026.1.9</string>
 	<key>CFBundleVersion</key>
-	<string>202601113</string>
+	<string>20260109</string>
 </dict>
 </plist>
@@ -5,10 +5,6 @@ options:
    iOS: "17.0"
  xcodeVersion: "16.0"
 settings:
  base:
    SWIFT_VERSION: "6.0"
 packages:
  ClawdbotKit:
    path: ../shared/ClawdbotKit
@@ -72,15 +68,11 @@ targets:
        PRODUCT_BUNDLE_IDENTIFIER: com.clawdbot.ios
        PROVISIONING_PROFILE_SPECIFIER: "com.clawdbot.ios Development"
        SWIFT_VERSION: "6.0"
        SWIFT_STRICT_CONCURRENCY: complete
        ENABLE_APPINTENTS_METADATA: NO
    info:
      path: Sources/Info.plist
      properties:
        CFBundleDisplayName: Clawdbot
        CFBundleIconName: AppIcon
        CFBundleShortVersionString: "2026.1.9"
        CFBundleVersion: "20260109"
        UILaunchScreen: {}
        UIApplicationSceneManifest:
          UIApplicationSupportsMultipleScenes: false
@@ -92,20 +84,8 @@ targets:
        NSBonjourServices:
          - _clawdbot-bridge._tcp
        NSCameraUsageDescription: Clawdbot can capture photos or short video clips when requested via the bridge.
        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.
        NSSpeechRecognitionUsageDescription: Clawdbot uses on-device speech recognition for voice wake.
        UISupportedInterfaceOrientations:
          - UIInterfaceOrientationPortrait
          - UIInterfaceOrientationPortraitUpsideDown
          - UIInterfaceOrientationLandscapeLeft
          - UIInterfaceOrientationLandscapeRight
        UISupportedInterfaceOrientations~ipad:
          - UIInterfaceOrientationPortrait
          - UIInterfaceOrientationPortraitUpsideDown
          - UIInterfaceOrientationLandscapeLeft
          - UIInterfaceOrientationLandscapeRight
  ClawdbotTests:
    type: bundle.unit-test
@@ -116,17 +96,13 @@ targets:
      - target: Clawdbot
      - package: Swabble
        product: SwabbleKit
      - sdk: AppIntents.framework
    settings:
      base:
        PRODUCT_BUNDLE_IDENTIFIER: com.clawdbot.ios.tests
        SWIFT_VERSION: "6.0"
        SWIFT_STRICT_CONCURRENCY: complete
        TEST_HOST: "$(BUILT_PRODUCTS_DIR)/Clawdbot.app/Clawdbot"
        BUNDLE_LOADER: "$(TEST_HOST)"
    info:
      path: Tests/Info.plist
      properties:
        CFBundleDisplayName: ClawdbotTests
        CFBundleShortVersionString: "2026.1.9"
        CFBundleVersion: "20260109"
@@ -10,10 +10,7 @@ let package = Package(
    ],
    products: [
        .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"]),
    ],
    dependencies: [
        .package(url: "https://github.com/orchetect/MenuBarExtraAccess", exact: "1.2.2"),
@@ -39,20 +36,10 @@ let package = Package(
            swiftSettings: [
                .enableUpcomingFeature("StrictConcurrency"),
            ]),
        .target(
            name: "ClawdbotDiscovery",
            dependencies: [
                .product(name: "ClawdbotKit", package: "ClawdbotKit"),
            ],
            path: "Sources/ClawdbotDiscovery",
            swiftSettings: [
                .enableUpcomingFeature("StrictConcurrency"),
            ]),
        .executableTarget(
            name: "Clawdbot",
            dependencies: [
                "ClawdbotIPC",
                "ClawdbotDiscovery",
                "ClawdbotProtocol",
                .product(name: "ClawdbotKit", package: "ClawdbotKit"),
                .product(name: "ClawdbotChatUI", package: "ClawdbotKit"),
@@ -74,30 +61,11 @@ let package = Package(
            swiftSettings: [
                .enableUpcomingFeature("StrictConcurrency"),
            ]),
        .executableTarget(
            name: "ClawdbotDiscoveryCLI",
            dependencies: [
                "ClawdbotDiscovery",
            ],
            path: "Sources/ClawdbotDiscoveryCLI",
            swiftSettings: [
                .enableUpcomingFeature("StrictConcurrency"),
            ]),
        .executableTarget(
            name: "ClawdbotWizardCLI",
            dependencies: [
                "ClawdbotProtocol",
            ],
            path: "Sources/ClawdbotWizardCLI",
            swiftSettings: [
                .enableUpcomingFeature("StrictConcurrency"),
            ]),
        .testTarget(
            name: "ClawdbotIPCTests",
            dependencies: [
                "ClawdbotIPC",
                "Clawdbot",
                "ClawdbotDiscovery",
                "ClawdbotProtocol",
                .product(name: "SwabbleKit", package: "swabble"),
            ],
@@ -170,10 +170,6 @@ final class AppState {
        didSet { self.ifNotPreview { UserDefaults.standard.set(self.canvasEnabled, forKey: canvasEnabledKey) } }
    }
    var systemRunPolicy: SystemRunPolicy {
        didSet { self.ifNotPreview { MacNodeConfigFile.setSystemRunPolicy(self.systemRunPolicy) } }
    }
    /// Tracks whether the Canvas panel is currently visible (not persisted).
    var canvasPanelVisible: Bool = false
@@ -186,6 +182,14 @@ final class AppState {
        }
    }
    var attachExistingGatewayOnly: Bool {
        didSet {
            self.ifNotPreview {
                UserDefaults.standard.set(self.attachExistingGatewayOnly, forKey: attachExistingGatewayOnlyKey)
            }
        }
    }
    var remoteTarget: String {
        didSet {
            self.ifNotPreview { UserDefaults.standard.set(self.remoteTarget, forKey: remoteTargetKey) }
@@ -208,7 +212,7 @@ final class AppState {
    private var earBoostTask: Task<Void, Never>?
    init(preview: Bool = false) {
-        self.isPreview = preview || ProcessInfo.processInfo.isRunningTests
+        self.isPreview = preview
        let onboardingSeen = UserDefaults.standard.bool(forKey: "clawdbot.onboardingSeen")
        self.isPaused = UserDefaults.standard.bool(forKey: pauseDefaultsKey)
        self.launchAtLogin = false
@@ -296,9 +300,10 @@ final class AppState {
        self.remoteProjectRoot = UserDefaults.standard.string(forKey: remoteProjectRootKey) ?? ""
        self.remoteCliPath = UserDefaults.standard.string(forKey: remoteCliPathKey) ?? ""
        self.canvasEnabled = UserDefaults.standard.object(forKey: canvasEnabledKey) as? Bool ?? true
        self.systemRunPolicy = SystemRunPolicy.load()
        self.peekabooBridgeEnabled = UserDefaults.standard
            .object(forKey: peekabooBridgeEnabledKey) as? Bool ?? true
        self.attachExistingGatewayOnly = UserDefaults.standard.bool(forKey: attachExistingGatewayOnlyKey)
        if !self.isPreview {
            Task.detached(priority: .utility) { [weak self] in
                let current = await LaunchAgentManager.status()
@@ -599,6 +604,7 @@ extension AppState {
        state.remoteIdentity = "~/.ssh/id_ed25519"
        state.remoteProjectRoot = "~/Projects/clawdbot"
        state.remoteCliPath = ""
        state.attachExistingGatewayOnly = false
        return state
    }
 }
@@ -617,6 +623,10 @@ enum AppStateStore {
    static var canvasEnabled: Bool {
        UserDefaults.standard.object(forKey: canvasEnabledKey) as? Bool ?? true
    }
    static var attachExistingGatewayOnly: Bool {
        UserDefaults.standard.bool(forKey: attachExistingGatewayOnlyKey)
    }
 }
@MainActor
@@ -1,16 +1,12 @@
 import Foundation
-public enum AsyncTimeout {
+enum AsyncTimeout {
-    public static func withTimeout<T: Sendable>(
+    static func withTimeout<T: Sendable>(
        seconds: Double,
        onTimeout: @escaping @Sendable () -> Error,
        operation: @escaping @Sendable () async throws -> T) async throws -> T
    {
        let clamped = max(0, seconds)
        if clamped == 0 {
            return try await operation()
        }
        return try await withThrowingTaskGroup(of: T.self) { group in
            group.addTask { try await operation() }
            group.addTask {
@@ -23,14 +19,4 @@ public enum AsyncTimeout {
            throw onTimeout()
        }
    }
    public static func withTimeoutMs<T: Sendable>(
        timeoutMs: Int,
        onTimeout: @escaping @Sendable () -> Error,
        operation: @escaping @Sendable () async throws -> T) async throws -> T
    {
        let clamped = max(0, timeoutMs)
        let seconds = Double(clamped) / 1000.0
        return try await self.withTimeout(seconds: seconds, onTimeout: onTimeout, operation: operation)
    }
 }
@@ -282,12 +282,7 @@ actor BridgeConnectionHandler {
            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))
                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)")
            }
@@ -303,12 +298,7 @@ actor BridgeConnectionHandler {
        case .ok:
            self.isAuthenticated = true
            do {
-                let mainSessionKey = await GatewayConnection.shared.mainSessionKey()
+                try await self.send(BridgeHelloOk(type: "hello-ok", serverName: serverName))
                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)")
            }
@@ -187,7 +187,7 @@ actor BridgeServer {
                thinking: "low",
                deliver: false,
                to: nil,
-                channel: .last))
+                provider: .last))
        case "agent.request":
            guard let json = evt.payloadJSON, let data = json.data(using: .utf8) else {
@@ -205,7 +205,7 @@ actor BridgeServer {
                ?? "node-\(nodeId)"
            let thinking = link.thinking?.trimmingCharacters(in: .whitespacesAndNewlines).nonEmpty
            let to = link.to?.trimmingCharacters(in: .whitespacesAndNewlines).nonEmpty
-            let channel = GatewayAgentChannel(raw: link.channel)
+            let provider = GatewayAgentProvider(raw: link.channel)
            _ = await GatewayConnection.shared.sendAgent(GatewayAgentInvocation(
                message: message,
@@ -213,7 +213,7 @@ actor BridgeServer {
                thinking: thinking,
                deliver: link.deliver,
                to: to,
-                channel: channel))
+                provider: provider))
        default:
            break
@@ -2,8 +2,8 @@ import ClawdbotKit
 import Foundation
 import Network
-public enum BridgeEndpointID {
+enum BridgeEndpointID {
-    public static func stableID(_ endpoint: NWEndpoint) -> String {
+    static func stableID(_ endpoint: NWEndpoint) -> String {
        switch endpoint {
        case let .service(name, type, domain, _):
            // Keep stable across encoded/decoded differences (e.g. \032 for spaces).
@@ -14,7 +14,7 @@ public enum BridgeEndpointID {
        }
    }
-    public static func prettyDescription(_ endpoint: NWEndpoint) -> String {
+    static func prettyDescription(_ endpoint: NWEndpoint) -> String {
        BonjourEscapes.decode(String(describing: endpoint))
    }
@@ -1,84 +0,0 @@
 import AppKit
 import Foundation
 import OSLog
@MainActor
 final class CLIInstallPrompter {
    static let shared = CLIInstallPrompter()
    private let logger = Logger(subsystem: "com.clawdbot", category: "cli.prompt")
    private var isPrompting = false
    func checkAndPromptIfNeeded(reason: String) {
        guard self.shouldPrompt() else { return }
        guard let version = Self.appVersion() else { return }
        self.isPrompting = true
        UserDefaults.standard.set(version, forKey: cliInstallPromptedVersionKey)
        let alert = NSAlert()
        alert.messageText = "Install Clawdbot CLI?"
        alert.informativeText = "Local mode needs the CLI so launchd can run the gateway."
        alert.addButton(withTitle: "Install CLI")
        alert.addButton(withTitle: "Not now")
        alert.addButton(withTitle: "Open Settings")
        let response = alert.runModal()
        switch response {
        case .alertFirstButtonReturn:
            Task { await self.installCLI() }
        case .alertThirdButtonReturn:
            self.openSettings(tab: .general)
        default:
            break
        }
        self.logger.debug("cli install prompt handled reason=\(reason, privacy: .public)")
        self.isPrompting = false
    }
    private func shouldPrompt() -> Bool {
        guard !self.isPrompting else { return false }
        guard AppStateStore.shared.onboardingSeen else { return false }
        guard AppStateStore.shared.connectionMode == .local else { return false }
        guard CLIInstaller.installedLocation() == nil else { return false }
        guard let version = Self.appVersion() else { return false }
        let lastPrompt = UserDefaults.standard.string(forKey: cliInstallPromptedVersionKey)
        return lastPrompt != version
    }
    private func installCLI() async {
        let status = StatusBox()
        await CLIInstaller.install { message in
            await status.set(message)
        }
        if let message = await status.get() {
            let alert = NSAlert()
            alert.messageText = "CLI install finished"
            alert.informativeText = message
            alert.runModal()
        }
    }
    private func openSettings(tab: SettingsTab) {
        SettingsTabRouter.request(tab)
        SettingsWindowOpener.shared.open()
        DispatchQueue.main.async {
            NotificationCenter.default.post(name: .clawdbotSelectSettingsTab, object: tab)
        }
    }
    private static func appVersion() -> String? {
        Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String
    }
 }
 private actor StatusBox {
    private var value: String?
    func set(_ value: String) {
        self.value = value
    }
    func get() -> String? {
        self.value
    }
 }
@@ -2,16 +2,24 @@ import Foundation
@MainActor
 enum CLIInstaller {
    private static func embeddedHelperURL() -> URL {
        Bundle.main.bundleURL.appendingPathComponent("Contents/Resources/Relay/clawdbot")
    }
    static func installedLocation() -> String? {
        self.installedLocation(
-            searchPaths: CommandResolver.preferredPaths(),
+            searchPaths: cliHelperSearchPaths,
            embeddedHelper: self.embeddedHelperURL(),
            fileManager: .default)
    }
    static func installedLocation(
        searchPaths: [String],
        embeddedHelper: URL,
        fileManager: FileManager) -> String?
    {
        let embedded = embeddedHelper.resolvingSymlinksInPath()
        for basePath in searchPaths {
            let candidate = URL(fileURLWithPath: basePath).appendingPathComponent("clawdbot").path
            var isDirectory: ObjCBool = false
@@ -24,7 +32,10 @@ enum CLIInstaller {
            guard fileManager.isExecutableFile(atPath: candidate) else { continue }
-            return candidate
+            let resolved = URL(fileURLWithPath: candidate).resolvingSymlinksInPath()
            if resolved == embedded {
                return candidate
            }
        }
        return nil
@@ -34,70 +45,58 @@ enum CLIInstaller {
        self.installedLocation() != nil
    }
-    static func install(statusHandler: @escaping @MainActor @Sendable (String) async -> Void) async {
+    static func install(statusHandler: @escaping @Sendable (String) async -> Void) async {
-        let expected = GatewayEnvironment.expectedGatewayVersion()?.description ?? "latest"
+        let helper = self.embeddedHelperURL()
-        let prefix = Self.installPrefix()
+        guard FileManager.default.isExecutableFile(atPath: helper.path) else {
-        await statusHandler("Installing clawdbot CLI…")
+            await statusHandler(
-        let cmd = self.installScriptCommand(version: expected, prefix: prefix)
+                "Embedded CLI missing in bundle; repackage via scripts/package-mac-app.sh " +
-        let response = await ShellExecutor.runDetailed(command: cmd, cwd: nil, env: nil, timeout: 900)
+                    "(or restart-mac.sh without SKIP_GATEWAY_PACKAGE=1).")
        if response.success {
            let parsed = self.parseInstallEvents(response.stdout)
            let installedVersion = parsed.last { $0.event == "done" }?.version
            let summary = installedVersion.map { "Installed clawdbot \($0)." } ?? "Installed clawdbot."
            await statusHandler(summary)
            return
        }
-        let parsed = self.parseInstallEvents(response.stdout)
+        let targets = cliHelperSearchPaths.map { "\($0)/clawdbot" }
-        if let error = parsed.last(where: { $0.event == "error" })?.message {
+        let result = await self.privilegedSymlink(source: helper.path, targets: targets)
-            await statusHandler("Install failed: \(error)")
+        await statusHandler(result)
            return
        }
        let detail = response.stderr.trimmingCharacters(in: .whitespacesAndNewlines)
        let fallback = response.errorMessage ?? "install failed"
        await statusHandler("Install failed: \(detail.isEmpty ? fallback : detail)")
    }
-    private static func installPrefix() -> String {
+    private static func privilegedSymlink(source: String, targets: [String]) async -> String {
-        FileManager.default.homeDirectoryForCurrentUser
+        let escapedSource = self.shellEscape(source)
-            .appendingPathComponent(".clawdbot")
+        let targetList = targets.map(self.shellEscape).joined(separator: " ")
-            .path
+        let cmds = [
-    }
+            "mkdir -p /usr/local/bin /opt/homebrew/bin",
            targets.map { "ln -sf \(escapedSource) \($0)" }.joined(separator: "; "),
        ].joined(separator: "; ")
    private static func installScriptCommand(version: String, prefix: String) -> [String] {
        let escapedVersion = self.shellEscape(version)
        let escapedPrefix = self.shellEscape(prefix)
        let script = """
-        curl -fsSL https://clawd.bot/install-cli.sh | \
+        do shell script "\(cmds)" with administrator privileges
        bash -s -- --json --no-onboard --prefix \(escapedPrefix) --version \(escapedVersion)
        """
        return ["/bin/bash", "-lc", script]
    }
-    private static func parseInstallEvents(_ output: String) -> [InstallEvent] {
+        let proc = Process()
-        let decoder = JSONDecoder()
+        proc.executableURL = URL(fileURLWithPath: "/usr/bin/osascript")
-        let lines = output
+        proc.arguments = ["-e", script]
-            .split(whereSeparator: \.isNewline)
+
-            .map { String($0) }
+        let pipe = Pipe()
-        var events: [InstallEvent] = []
+        proc.standardOutput = pipe
-        for line in lines {
+        proc.standardError = pipe
-            guard let data = line.data(using: .utf8) else { continue }
+
-            if let event = try? decoder.decode(InstallEvent.self, from: data) {
+        do {
-                events.append(event)
+            try proc.run()
            proc.waitUntilExit()
            let data = pipe.fileHandleForReading.readToEndSafely()
            let output = String(data: data, encoding: .utf8)?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
            if proc.terminationStatus == 0 {
                return output.isEmpty ? "CLI helper linked into \(targetList)" : output
            }
            if output.lowercased().contains("user canceled") {
                return "Install canceled"
            }
            return "Failed to install CLI helper: \(output)"
        } catch {
            return "Failed to run installer: \(error.localizedDescription)"
        }
        return events
    }
-    private static func shellEscape(_ raw: String) -> String {
+    private static func shellEscape(_ path: String) -> String {
-        "'" + raw.replacingOccurrences(of: "'", with: "'\"'\"'") + "'"
+        "'" + path.replacingOccurrences(of: "'", with: "'\"'\"'") + "'"
    }
 }
 private struct InstallEvent: Decodable {
    let event: String
    let version: String?
    let message: String?
 }
@@ -86,7 +86,7 @@ final class CanvasA2UIActionMessageHandler: NSObject, WKScriptMessageHandler {
                    thinking: "low",
                    deliver: false,
                    to: nil,
-                    channel: .last,
+                    provider: .last,
                    idempotencyKey: actionId))
            await MainActor.run {
@@ -84,30 +84,12 @@ enum CommandResolver {
            "/bin",
        ]
        extras.insert(projectRoot.appendingPathComponent("node_modules/.bin").path, at: 0)
-        let clawdbotPaths = self.clawdbotManagedPaths(home: home)
+        extras.insert(contentsOf: self.nodeManagerBinPaths(home: home), at: 1)
        if !clawdbotPaths.isEmpty {
            extras.insert(contentsOf: clawdbotPaths, at: 1)
        }
        extras.insert(contentsOf: self.nodeManagerBinPaths(home: home), at: 1 + clawdbotPaths.count)
        var seen = Set<String>()
        // Preserve order while stripping duplicates so PATH lookups remain deterministic.
        return (extras + current).filter { seen.insert($0).inserted }
    }
    private static func clawdbotManagedPaths(home: URL) -> [String] {
        let base = home.appendingPathComponent(".clawdbot")
        let bin = base.appendingPathComponent("bin")
        let nodeBin = base.appendingPathComponent("tools/node/bin")
        var paths: [String] = []
        if FileManager.default.fileExists(atPath: bin.path) {
            paths.append(bin.path)
        }
        if FileManager.default.fileExists(atPath: nodeBin.path) {
            paths.append(nodeBin.path)
        }
        return paths
    }
    private static func nodeManagerBinPaths(home: URL) -> [String] {
        var bins: [String] = []
@@ -405,6 +387,10 @@ enum CommandResolver {
            cliPath: cliPath)
    }
    static var attachExistingGatewayOnly: Bool {
        UserDefaults.standard.bool(forKey: attachExistingGatewayOnlyKey)
    }
    static func connectionModeIsRemote(defaults: UserDefaults = .standard) -> Bool {
        self.connectionSettings(defaults: defaults).mode == .remote
    }
@@ -12,12 +12,11 @@ struct ConfigSettings: View {
        "Clawd uses a separate Chrome profile and ports (default 18791/18792) "
            + "so it won’t interfere with your daily browser."
    @State private var configModel: String = ""
    @State private var customModel: String = ""
    @State private var configSaving = false
    @State private var hasLoaded = false
    @State private var models: [ModelChoice] = []
    @State private var modelsLoading = false
    @State private var modelSearchQuery: String = ""
    @State private var isModelPickerOpen = false
    @State private var modelError: String?
    @State private var modelsSourceLabel: String?
    @AppStorage(modelCatalogPathKey) private var modelCatalogPath: String = ModelCatalogLoader.defaultPath
@@ -37,10 +36,10 @@ struct ConfigSettings: View {
    @State private var talkInterruptOnSpeech: Bool = true
    @State private var talkApiKey: String = ""
    @State private var gatewayApiKeyFound = false
    @FocusState private var modelSearchFocused: Bool
    private struct ConfigDraft {
        let configModel: String
        let customModel: String
        let heartbeatMinutes: Int?
        let heartbeatBody: String
        let browserEnabled: Bool
@@ -70,9 +69,7 @@ struct ConfigSettings: View {
                self.allowAutosave = true
            }
    }
 }
 extension ConfigSettings {
    private var content: some View {
        VStack(alignment: .leading, spacing: 14) {
            self.header
@@ -109,7 +106,8 @@ extension ConfigSettings {
                GridRow {
                    self.gridLabel("Model")
                    VStack(alignment: .leading, spacing: 6) {
-                        self.modelPickerField
+                        self.modelPicker
                        self.customModelField
                        self.modelMetaLabels
                    }
                }
@@ -118,114 +116,37 @@ extension ConfigSettings {
        .frame(maxWidth: .infinity, alignment: .leading)
    }
-    private var modelPickerField: some View {
+    private var modelPicker: some View {
-        Button {
+        Picker("Model", selection: self.$configModel) {
-            guard !self.modelsLoading else { return }
+            ForEach(self.models) { choice in
-            self.isModelPickerOpen = true
+                Text("\(choice.name) — \(choice.provider.uppercased())")
-        } label: {
+                    .tag(choice.id)
            HStack(spacing: 8) {
                Text(self.modelPickerLabel)
                    .foregroundStyle(self.modelPickerLabelIsPlaceholder ? .secondary : .primary)
                    .lineLimit(1)
                    .truncationMode(.tail)
                Spacer(minLength: 8)
                Image(systemName: "chevron.up.chevron.down")
                    .foregroundStyle(.secondary)
            }
-            .padding(.vertical, 6)
+            Text("Manual entry…").tag("__custom__")
            .padding(.horizontal, 8)
        }
        .buttonStyle(.plain)
        .frame(maxWidth: .infinity, alignment: .leading)
        .contentShape(Rectangle())
        .background(
            RoundedRectangle(cornerRadius: 6)
                .fill(
                    Color(nsColor: .textBackgroundColor)))
        .overlay(
            RoundedRectangle(cornerRadius: 6)
                .stroke(
                    Color.secondary.opacity(0.25),
                    lineWidth: 1))
        .popover(isPresented: self.$isModelPickerOpen, arrowEdge: .bottom) {
            self.modelPickerPopover
        }
        .labelsHidden()
        .frame(maxWidth: .infinity)
        .disabled(self.modelsLoading || (!self.modelError.isNilOrEmpty && self.models.isEmpty))
-        .onChange(of: self.isModelPickerOpen) { _, isOpen in
+        .onChange(of: self.configModel) { _, _ in
-            if isOpen {
+            self.autosaveConfig()
                self.modelSearchQuery = ""
                self.modelSearchFocused = true
            }
        }
    }
-    private var modelPickerPopover: some View {
+    @ViewBuilder
-        VStack(alignment: .leading, spacing: 10) {
+    private var customModelField: some View {
-            TextField("Search models", text: self.$modelSearchQuery)
+        if self.configModel == "__custom__" {
            TextField("Enter model ID", text: self.$customModel)
                .textFieldStyle(.roundedBorder)
-                .focused(self.$modelSearchFocused)
+                .frame(maxWidth: .infinity)
-                .controlSize(.small)
+                .onChange(of: self.customModel) { _, newValue in
-                .onSubmit {
+                    self.configModel = newValue
-                    if let exact = self.exactMatchForQuery() {
+                    self.autosaveConfig()
                        self.selectModel(exact)
                        return
                    }
                    if let manual = self.manualEntryCandidate {
                        self.selectManualModel(manual)
                        return
                    }
                    if self.modelSearchMatches.count == 1 {
                        self.selectModel(self.modelSearchMatches[0])
                    }
                }
            List {
                if self.modelSearchMatches.isEmpty {
                    Text("No models match \"\(self.modelSearchQuery)\"")
                        .font(.footnote)
                        .foregroundStyle(.secondary)
                } else {
                    ForEach(self.modelSearchMatches) { choice in
                        Button {
                            self.selectModel(choice)
                        } label: {
                            HStack(spacing: 8) {
                                Text(choice.name)
                                    .lineLimit(1)
                                Spacer(minLength: 8)
                                Text(choice.provider.uppercased())
                                    .font(.caption2.weight(.semibold))
                                    .foregroundStyle(.secondary)
                                    .padding(.vertical, 2)
                                    .padding(.horizontal, 6)
                                    .background(Color.secondary.opacity(0.15))
                                    .clipShape(RoundedRectangle(cornerRadius: 4))
                            }
                            .padding(.vertical, 2)
                        }
                        .buttonStyle(.plain)
                        .listRowInsets(EdgeInsets(top: 4, leading: 8, bottom: 4, trailing: 8))
                    }
                }
                if let manual = self.manualEntryCandidate {
                    Button("Use \"\(manual)\"") {
                        self.selectManualModel(manual)
                    }
                    .listRowInsets(EdgeInsets(top: 4, leading: 8, bottom: 4, trailing: 8))
                }
            }
            .listStyle(.inset)
        }
        .frame(width: 340, height: 260)
        .padding(8)
    }
    @ViewBuilder
    private var modelMetaLabels: some View {
        if self.shouldShowProviderHintForSelection {
            self.statusLine(label: "Tip: prefer provider/model (e.g. openai-codex/gpt-5.2)", color: .orange)
        }
        if let contextLabel = self.selectedContextLabel {
            Text(contextLabel)
                .font(.footnote)
@@ -463,9 +384,7 @@ extension ConfigSettings {
        }
        .padding(.top, 2)
    }
 }
 extension ConfigSettings {
    private func loadConfig() async {
        let parsed = await ConfigStore.load()
        let agents = parsed["agents"] as? [String: Any]
@@ -484,8 +403,10 @@ extension ConfigSettings {
        }()
        if !loadedModel.isEmpty {
            self.configModel = loadedModel
            self.customModel = loadedModel
        } else {
            self.configModel = SessionLoader.fallbackModel
            self.customModel = SessionLoader.fallbackModel
        }
        if let heartbeatEvery {
@@ -538,6 +459,7 @@ extension ConfigSettings {
        defer { self.configSaving = false }
        let configModel = self.configModel
        let customModel = self.customModel
        let heartbeatMinutes = self.heartbeatMinutes
        let heartbeatBody = self.heartbeatBody
        let browserEnabled = self.browserEnabled
@@ -550,6 +472,7 @@ extension ConfigSettings {
        let draft = ConfigDraft(
            configModel: configModel,
            customModel: customModel,
            heartbeatMinutes: heartbeatMinutes,
            heartbeatBody: heartbeatBody,
            browserEnabled: browserEnabled,
@@ -575,7 +498,8 @@ extension ConfigSettings {
        var browser = root["browser"] as? [String: Any] ?? [:]
        var talk = root["talk"] as? [String: Any] ?? [:]
-        let chosenModel = draft.configModel.trimmingCharacters(in: .whitespacesAndNewlines)
+        let chosenModel = (draft.configModel == "__custom__" ? draft.customModel : draft.configModel)
            .trimmingCharacters(in: .whitespacesAndNewlines)
        let trimmedModel = chosenModel
        if !trimmedModel.isEmpty {
            var model = defaults["model"] as? [String: Any] ?? [:]
@@ -643,9 +567,7 @@ extension ConfigSettings {
            return error.localizedDescription
        }
    }
 }
 extension ConfigSettings {
    private var browserColor: Color {
        let raw = self.browserColorHex.trimmingCharacters(in: .whitespacesAndNewlines)
        let hex = raw.hasPrefix("#") ? String(raw.dropFirst()) : raw
@@ -742,9 +664,7 @@ extension ConfigSettings {
        if host == "::1" { return true }
        return false
    }
 }
 extension ConfigSettings {
    private func loadModels() async {
        guard !self.modelsLoading else { return }
        self.modelsLoading = true
@@ -758,11 +678,23 @@ extension ConfigSettings {
                        timeoutMs: 15000)
            self.models = res.models
            self.modelsSourceLabel = "gateway"
            if !self.configModel.isEmpty,
               !res.models.contains(where: { $0.id == self.configModel })
            {
                self.customModel = self.configModel
                self.configModel = "__custom__"
            }
        } catch {
            do {
                let loaded = try await ModelCatalogLoader.load(from: self.modelCatalogPath)
                self.models = loaded
                self.modelsSourceLabel = "local fallback"
                if !self.configModel.isEmpty,
                   !loaded.contains(where: { $0.id == self.configModel })
                {
                    self.customModel = self.configModel
                    self.configModel = "__custom__"
                }
            } catch {
                self.modelError = error.localizedDescription
                self.models = []
@@ -775,129 +707,11 @@ extension ConfigSettings {
        let models: [ModelChoice]
    }
    private var modelSearchMatches: [ModelChoice] {
        let raw = self.modelSearchQuery.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
        guard !raw.isEmpty else { return self.models }
        let tokens = raw
            .split(whereSeparator: { $0.isWhitespace })
            .map { token in
                token.trimmingCharacters(in: CharacterSet(charactersIn: "%"))
            }
            .filter { !$0.isEmpty }
        guard !tokens.isEmpty else { return self.models }
        return self.models.filter { choice in
            let haystack = [
                choice.id,
                choice.name,
                choice.provider,
                self.modelRef(for: choice),
            ]
                .joined(separator: " ")
                .lowercased()
            return tokens.allSatisfy { haystack.contains($0) }
        }
    }
    private var selectedModelChoice: ModelChoice? {
        guard !self.configModel.isEmpty else { return nil }
        return self.models.first(where: { self.matchesConfigModel($0) })
    }
    private var modelPickerLabel: String {
        if let choice = self.selectedModelChoice {
            return "\(choice.name) — \(choice.provider.uppercased())"
        }
        if !self.configModel.isEmpty { return self.configModel }
        return "Select model"
    }
    private var modelPickerLabelIsPlaceholder: Bool {
        self.configModel.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
    }
    private var manualEntryCandidate: String? {
        let trimmed = self.modelSearchQuery.trimmingCharacters(in: .whitespacesAndNewlines)
        guard !trimmed.isEmpty else { return nil }
        let cleaned = trimmed.trimmingCharacters(in: CharacterSet(charactersIn: "%"))
        guard !cleaned.isEmpty else { return nil }
        guard !self.isKnownModelRef(cleaned) else { return nil }
        return cleaned
    }
    private func isKnownModelRef(_ value: String) -> Bool {
        let needle = value.lowercased()
        return self.models.contains { choice in
            choice.id.lowercased() == needle
                || self.modelRef(for: choice).lowercased() == needle
        }
    }
    private func modelRef(for choice: ModelChoice) -> String {
        let id = choice.id.trimmingCharacters(in: .whitespacesAndNewlines)
        let provider = choice.provider.trimmingCharacters(in: .whitespacesAndNewlines)
        guard !provider.isEmpty else { return id }
        let normalizedProvider = provider.lowercased()
        if id.lowercased().hasPrefix("\(normalizedProvider)/") {
            return id
        }
        return "\(normalizedProvider)/\(id)"
    }
    private func matchesConfigModel(_ choice: ModelChoice) -> Bool {
        let configured = self.configModel.trimmingCharacters(in: .whitespacesAndNewlines)
        guard !configured.isEmpty else { return false }
        if configured.caseInsensitiveCompare(choice.id) == .orderedSame { return true }
        let ref = self.modelRef(for: choice)
        return configured.caseInsensitiveCompare(ref) == .orderedSame
    }
    private func exactMatchForQuery() -> ModelChoice? {
        let trimmed = self.modelSearchQuery.trimmingCharacters(in: .whitespacesAndNewlines)
        guard !trimmed.isEmpty else { return nil }
        let cleaned = trimmed.trimmingCharacters(in: CharacterSet(charactersIn: "%")).lowercased()
        guard !cleaned.isEmpty else { return nil }
        return self.models.first(where: { choice in
            let id = choice.id.lowercased()
            if id == cleaned { return true }
            return self.modelRef(for: choice).lowercased() == cleaned
        })
    }
    private var shouldShowProviderHint: Bool {
        let trimmed = self.modelSearchQuery.trimmingCharacters(in: .whitespacesAndNewlines)
        guard !trimmed.isEmpty else { return false }
        let cleaned = trimmed.trimmingCharacters(in: CharacterSet(charactersIn: "%"))
        return !cleaned.contains("/")
    }
    private var shouldShowProviderHintForSelection: Bool {
        let trimmed = self.configModel.trimmingCharacters(in: .whitespacesAndNewlines)
        guard !trimmed.isEmpty else { return false }
        return !trimmed.contains("/")
    }
    private func selectModel(_ choice: ModelChoice) {
        self.configModel = self.modelRef(for: choice)
        self.autosaveConfig()
        self.isModelPickerOpen = false
    }
    private func selectManualModel(_ value: String) {
        let trimmed = value.trimmingCharacters(in: .whitespacesAndNewlines)
        if let slash = trimmed.firstIndex(of: "/") {
            let provider = trimmed[..<slash].trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
            let model = trimmed[trimmed.index(after: slash)...].trimmingCharacters(in: .whitespacesAndNewlines)
            self.configModel = provider.isEmpty ? String(model) : "\(provider)/\(model)"
        } else {
            self.configModel = trimmed
        }
        self.autosaveConfig()
        self.isModelPickerOpen = false
    }
    private var selectedContextLabel: String? {
        let chosenId = (self.configModel == "__custom__") ? self.customModel : self.configModel
        guard
-            let choice = self.selectedModelChoice,
+            !chosenId.isEmpty,
            let choice = self.models.first(where: { $0.id == chosenId }),
            let context = choice.contextWindow
        else {
            return nil
@@ -908,7 +722,8 @@ extension ConfigSettings {
    }
    private var selectedAnthropicAuthMode: AnthropicAuthMode? {
-        guard let choice = self.selectedModelChoice else { return nil }
+        let chosenId = (self.configModel == "__custom__") ? self.customModel : self.configModel
        guard !chosenId.isEmpty, let choice = self.models.first(where: { $0.id == chosenId }) else { return nil }
        guard choice.provider.lowercased() == "anthropic" else { return nil }
        return AnthropicAuthResolver.resolve()
    }
@@ -19,7 +19,6 @@ enum ConfigStore {
    }
    private static let overrideStore = OverrideStore()
    @MainActor private static var lastHash: String?
    private static func isRemoteMode() async -> Bool {
        let overrides = await self.overrideStore.overrides
@@ -76,7 +75,6 @@ enum ConfigStore {
                method: .configGet,
                params: nil,
                timeoutMs: 8000)
            self.lastHash = snap.hash
            return snap.config?.mapValues { $0.foundationValue } ?? [:]
        } catch {
            return nil
@@ -85,24 +83,17 @@ enum ConfigStore {
    @MainActor
    private static func saveToGateway(_ root: [String: Any]) async throws {
        if self.lastHash == nil {
            _ = await self.loadFromGateway()
        }
        let data = try JSONSerialization.data(withJSONObject: root, options: [.prettyPrinted, .sortedKeys])
        guard let raw = String(data: data, encoding: .utf8) else {
            throw NSError(domain: "ConfigStore", code: 1, userInfo: [
                NSLocalizedDescriptionKey: "Failed to encode config.",
            ])
        }
-        var params: [String: AnyCodable] = ["raw": AnyCodable(raw)]
+        let params: [String: AnyCodable] = ["raw": AnyCodable(raw)]
        if let baseHash = self.lastHash {
            params["baseHash"] = AnyCodable(baseHash)
        }
        _ = try await GatewayConnection.shared.requestRaw(
            method: .configSet,
            params: params,
            timeoutMs: 10000)
        _ = await self.loadFromGateway()
    }
    #if DEBUG
@@ -27,7 +27,8 @@ final class ConnectionModeCoordinator {
                GatewayProcessManager.shared.setActive(true)
                if GatewayAutostartPolicy.shouldEnsureLaunchAgent(
                    mode: .local,
-                    paused: paused)
+                    paused: paused,
                    attachExistingOnly: AppStateStore.attachExistingGatewayOnly)
                {
                    Task { await GatewayProcessManager.shared.ensureLaunchAgentEnabledIfNeeded() }
                }
@@ -11,9 +11,9 @@ extension ConnectionsSettings {
    }
    @ViewBuilder
-    func channelHeaderActions(_ channel: ConnectionChannel) -> some View {
+    func providerHeaderActions(_ provider: ConnectionProvider) -> some View {
        HStack(spacing: 8) {
-            if channel == .whatsapp {
+            if provider == .whatsapp {
                Button("Logout") {
                    Task { await self.store.logoutWhatsApp() }
                }
@@ -21,7 +21,7 @@ extension ConnectionsSettings {
                .disabled(self.store.whatsappBusy)
            }
-            if channel == .telegram {
+            if provider == .telegram {
                Button("Logout") {
                    Task { await self.store.logoutTelegram() }
                }
@@ -1,16 +1,8 @@
 import SwiftUI
 extension ConnectionsSettings {
    private func channelStatus<T: Decodable>(
        _ id: String,
        as type: T.Type) -> T?
    {
        self.store.snapshot?.decodeChannel(id, as: type)
    }
    var whatsAppTint: Color {
-        guard let status = self.channelStatus("whatsapp", as: ChannelsStatusSnapshot.WhatsAppStatus.self)
+        guard let status = self.store.snapshot?.whatsapp else { return .secondary }
        else { return .secondary }
        if !status.configured { return .secondary }
        if !status.linked { return .red }
        if status.lastError != nil { return .orange }
@@ -20,8 +12,7 @@ extension ConnectionsSettings {
    }
    var telegramTint: Color {
-        guard let status = self.channelStatus("telegram", as: ChannelsStatusSnapshot.TelegramStatus.self)
+        guard let status = self.store.snapshot?.telegram else { return .secondary }
        else { return .secondary }
        if !status.configured { return .secondary }
        if status.lastError != nil { return .orange }
        if status.probe?.ok == false { return .orange }
@@ -30,8 +21,7 @@ extension ConnectionsSettings {
    }
    var discordTint: Color {
-        guard let status = self.channelStatus("discord", as: ChannelsStatusSnapshot.DiscordStatus.self)
+        guard let status = self.store.snapshot?.discord else { return .secondary }
        else { return .secondary }
        if !status.configured { return .secondary }
        if status.lastError != nil { return .orange }
        if status.probe?.ok == false { return .orange }
@@ -40,8 +30,7 @@ extension ConnectionsSettings {
    }
    var signalTint: Color {
-        guard let status = self.channelStatus("signal", as: ChannelsStatusSnapshot.SignalStatus.self)
+        guard let status = self.store.snapshot?.signal else { return .secondary }
        else { return .secondary }
        if !status.configured { return .secondary }
        if status.lastError != nil { return .orange }
        if status.probe?.ok == false { return .orange }
@@ -50,8 +39,7 @@ extension ConnectionsSettings {
    }
    var imessageTint: Color {
-        guard let status = self.channelStatus("imessage", as: ChannelsStatusSnapshot.IMessageStatus.self)
+        guard let status = self.store.snapshot?.imessage else { return .secondary }
        else { return .secondary }
        if !status.configured { return .secondary }
        if status.lastError != nil { return .orange }
        if status.probe?.ok == false { return .orange }
@@ -60,8 +48,7 @@ extension ConnectionsSettings {
    }
    var whatsAppSummary: String {
-        guard let status = self.channelStatus("whatsapp", as: ChannelsStatusSnapshot.WhatsAppStatus.self)
+        guard let status = self.store.snapshot?.whatsapp else { return "Checking…" }
        else { return "Checking…" }
        if !status.linked { return "Not linked" }
        if status.connected { return "Connected" }
        if status.running { return "Running" }
@@ -69,40 +56,35 @@ extension ConnectionsSettings {
    }
    var telegramSummary: String {
-        guard let status = self.channelStatus("telegram", as: ChannelsStatusSnapshot.TelegramStatus.self)
+        guard let status = self.store.snapshot?.telegram else { return "Checking…" }
        else { return "Checking…" }
        if !status.configured { return "Not configured" }
        if status.running { return "Running" }
        return "Configured"
    }
    var discordSummary: String {
-        guard let status = self.channelStatus("discord", as: ChannelsStatusSnapshot.DiscordStatus.self)
+        guard let status = self.store.snapshot?.discord else { return "Checking…" }
        else { return "Checking…" }
        if !status.configured { return "Not configured" }
        if status.running { return "Running" }
        return "Configured"
    }
    var signalSummary: String {
-        guard let status = self.channelStatus("signal", as: ChannelsStatusSnapshot.SignalStatus.self)
+        guard let status = self.store.snapshot?.signal else { return "Checking…" }
        else { return "Checking…" }
        if !status.configured { return "Not configured" }
        if status.running { return "Running" }
        return "Configured"
    }
    var imessageSummary: String {
-        guard let status = self.channelStatus("imessage", as: ChannelsStatusSnapshot.IMessageStatus.self)
+        guard let status = self.store.snapshot?.imessage else { return "Checking…" }
        else { return "Checking…" }
        if !status.configured { return "Not configured" }
        if status.running { return "Running" }
        return "Configured"
    }
    var whatsAppDetails: String? {
-        guard let status = self.channelStatus("whatsapp", as: ChannelsStatusSnapshot.WhatsAppStatus.self)
+        guard let status = self.store.snapshot?.whatsapp else { return nil }
        else { return nil }
        var lines: [String] = []
        if let e164 = status.`self`?.e164 ?? status.`self`?.jid {
            lines.append("Linked as \(e164)")
@@ -132,8 +114,7 @@ extension ConnectionsSettings {
    }
    var telegramDetails: String? {
-        guard let status = self.channelStatus("telegram", as: ChannelsStatusSnapshot.TelegramStatus.self)
+        guard let status = self.store.snapshot?.telegram else { return nil }
        else { return nil }
        var lines: [String] = []
        if let source = status.tokenSource {
            lines.append("Token source: \(source)")
@@ -164,8 +145,7 @@ extension ConnectionsSettings {
    }
    var discordDetails: String? {
-        guard let status = self.channelStatus("discord", as: ChannelsStatusSnapshot.DiscordStatus.self)
+        guard let status = self.store.snapshot?.discord else { return nil }
        else { return nil }
        var lines: [String] = []
        if let source = status.tokenSource {
            lines.append("Token source: \(source)")
@@ -193,8 +173,7 @@ extension ConnectionsSettings {
    }
    var signalDetails: String? {
-        guard let status = self.channelStatus("signal", as: ChannelsStatusSnapshot.SignalStatus.self)
+        guard let status = self.store.snapshot?.signal else { return nil }
        else { return nil }
        var lines: [String] = []
        lines.append("Base URL: \(status.baseUrl)")
        if let probe = status.probe {
@@ -220,8 +199,7 @@ extension ConnectionsSettings {
    }
    var imessageDetails: String? {
-        guard let status = self.channelStatus("imessage", as: ChannelsStatusSnapshot.IMessageStatus.self)
+        guard let status = self.store.snapshot?.imessage else { return nil }
        else { return nil }
        var lines: [String] = []
        if let cliPath = status.cliPath, !cliPath.isEmpty {
            lines.append("CLI: \(cliPath)")
@@ -243,68 +221,63 @@ extension ConnectionsSettings {
    }
    var isTelegramTokenLocked: Bool {
-        self.channelStatus("telegram", as: ChannelsStatusSnapshot.TelegramStatus.self)?.tokenSource == "env"
+        self.store.snapshot?.telegram.tokenSource == "env"
    }
    var isDiscordTokenLocked: Bool {
-        self.channelStatus("discord", as: ChannelsStatusSnapshot.DiscordStatus.self)?.tokenSource == "env"
+        self.store.snapshot?.discord?.tokenSource == "env"
    }
-    var orderedChannels: [ConnectionChannel] {
+    var orderedProviders: [ConnectionProvider] {
-        ConnectionChannel.allCases.sorted { lhs, rhs in
+        ConnectionProvider.allCases.sorted { lhs, rhs in
-            let lhsEnabled = self.channelEnabled(lhs)
+            let lhsEnabled = self.providerEnabled(lhs)
-            let rhsEnabled = self.channelEnabled(rhs)
+            let rhsEnabled = self.providerEnabled(rhs)
            if lhsEnabled != rhsEnabled { return lhsEnabled && !rhsEnabled }
            return lhs.sortOrder < rhs.sortOrder
        }
    }
-    var enabledChannels: [ConnectionChannel] {
+    var enabledProviders: [ConnectionProvider] {
-        self.orderedChannels.filter { self.channelEnabled($0) }
+        self.orderedProviders.filter { self.providerEnabled($0) }
    }
-    var availableChannels: [ConnectionChannel] {
+    var availableProviders: [ConnectionProvider] {
-        self.orderedChannels.filter { !self.channelEnabled($0) }
+        self.orderedProviders.filter { !self.providerEnabled($0) }
    }
    func ensureSelection() {
-        guard let selected = self.selectedChannel else {
+        guard let selected = self.selectedProvider else {
-            self.selectedChannel = self.orderedChannels.first
+            self.selectedProvider = self.orderedProviders.first
            return
        }
-        if !self.orderedChannels.contains(selected) {
+        if !self.orderedProviders.contains(selected) {
-            self.selectedChannel = self.orderedChannels.first
+            self.selectedProvider = self.orderedProviders.first
        }
    }
-    func channelEnabled(_ channel: ConnectionChannel) -> Bool {
+    func providerEnabled(_ provider: ConnectionProvider) -> Bool {
-        switch channel {
+        switch provider {
        case .whatsapp:
-            guard let status = self.channelStatus("whatsapp", as: ChannelsStatusSnapshot.WhatsAppStatus.self)
+            guard let status = self.store.snapshot?.whatsapp else { return false }
            else { return false }
            return status.configured || status.linked || status.running
        case .telegram:
-            guard let status = self.channelStatus("telegram", as: ChannelsStatusSnapshot.TelegramStatus.self)
+            guard let status = self.store.snapshot?.telegram else { return false }
            else { return false }
            return status.configured || status.running
        case .discord:
-            guard let status = self.channelStatus("discord", as: ChannelsStatusSnapshot.DiscordStatus.self)
+            guard let status = self.store.snapshot?.discord else { return false }
            else { return false }
            return status.configured || status.running
        case .signal:
-            guard let status = self.channelStatus("signal", as: ChannelsStatusSnapshot.SignalStatus.self)
+            guard let status = self.store.snapshot?.signal else { return false }
            else { return false }
            return status.configured || status.running
        case .imessage:
-            guard let status = self.channelStatus("imessage", as: ChannelsStatusSnapshot.IMessageStatus.self)
+            guard let status = self.store.snapshot?.imessage else { return false }
            else { return false }
            return status.configured || status.running
        }
    }
    @ViewBuilder
-    func channelSection(_ channel: ConnectionChannel) -> some View {
+    func providerSection(_ provider: ConnectionProvider) -> some View {
-        switch channel {
+        switch provider {
        case .whatsapp:
            self.whatsAppSection
        case .telegram:
@@ -318,8 +291,8 @@ extension ConnectionsSettings {
        }
    }
-    func channelTint(_ channel: ConnectionChannel) -> Color {
+    func providerTint(_ provider: ConnectionProvider) -> Color {
-        switch channel {
+        switch provider {
        case .whatsapp:
            self.whatsAppTint
        case .telegram:
@@ -333,8 +306,8 @@ extension ConnectionsSettings {
        }
    }
-    func channelSummary(_ channel: ConnectionChannel) -> String {
+    func providerSummary(_ provider: ConnectionProvider) -> String {
-        switch channel {
+        switch provider {
        case .whatsapp:
            self.whatsAppSummary
        case .telegram:
@@ -348,8 +321,8 @@ extension ConnectionsSettings {
        }
    }
-    func channelDetails(_ channel: ConnectionChannel) -> String? {
+    func providerDetails(_ provider: ConnectionProvider) -> String? {
-        switch channel {
+        switch provider {
        case .whatsapp:
            self.whatsAppDetails
        case .telegram:
@@ -363,56 +336,43 @@ extension ConnectionsSettings {
        }
    }
-    func channelLastCheckText(_ channel: ConnectionChannel) -> String {
+    func providerLastCheckText(_ provider: ConnectionProvider) -> String {
-        guard let date = self.channelLastCheck(channel) else { return "never" }
+        guard let date = self.providerLastCheck(provider) else { return "never" }
        return relativeAge(from: date)
    }
-    func channelLastCheck(_ channel: ConnectionChannel) -> Date? {
+    func providerLastCheck(_ provider: ConnectionProvider) -> Date? {
-        switch channel {
+        switch provider {
        case .whatsapp:
-            guard let status = self.channelStatus("whatsapp", as: ChannelsStatusSnapshot.WhatsAppStatus.self)
+            guard let status = self.store.snapshot?.whatsapp else { return nil }
            else { return nil }
            return self.date(fromMs: status.lastEventAt ?? status.lastMessageAt ?? status.lastConnectedAt)
        case .telegram:
-            return self
+            return self.date(fromMs: self.store.snapshot?.telegram.lastProbeAt)
                .date(fromMs: self.channelStatus("telegram", as: ChannelsStatusSnapshot.TelegramStatus.self)?
                    .lastProbeAt)
        case .discord:
-            return self
+            return self.date(fromMs: self.store.snapshot?.discord?.lastProbeAt)
                .date(fromMs: self.channelStatus("discord", as: ChannelsStatusSnapshot.DiscordStatus.self)?
                    .lastProbeAt)
        case .signal:
-            return self
+            return self.date(fromMs: self.store.snapshot?.signal?.lastProbeAt)
                .date(fromMs: self.channelStatus("signal", as: ChannelsStatusSnapshot.SignalStatus.self)?.lastProbeAt)
        case .imessage:
-            return self
+            return self.date(fromMs: self.store.snapshot?.imessage?.lastProbeAt)
                .date(fromMs: self.channelStatus("imessage", as: ChannelsStatusSnapshot.IMessageStatus.self)?
                    .lastProbeAt)
        }
    }
-    func channelHasError(_ channel: ConnectionChannel) -> Bool {
+    func providerHasError(_ provider: ConnectionProvider) -> Bool {
-        switch channel {
+        switch provider {
        case .whatsapp:
-            guard let status = self.channelStatus("whatsapp", as: ChannelsStatusSnapshot.WhatsAppStatus.self)
+            guard let status = self.store.snapshot?.whatsapp else { return false }
            else { return false }
            return status.lastError?.isEmpty == false || status.lastDisconnect?.loggedOut == true
        case .telegram:
-            guard let status = self.channelStatus("telegram", as: ChannelsStatusSnapshot.TelegramStatus.self)
+            guard let status = self.store.snapshot?.telegram else { return false }
            else { return false }
            return status.lastError?.isEmpty == false || status.probe?.ok == false
        case .discord:
-            guard let status = self.channelStatus("discord", as: ChannelsStatusSnapshot.DiscordStatus.self)
+            guard let status = self.store.snapshot?.discord else { return false }
            else { return false }
            return status.lastError?.isEmpty == false || status.probe?.ok == false
        case .signal:
-            guard let status = self.channelStatus("signal", as: ChannelsStatusSnapshot.SignalStatus.self)
+            guard let status = self.store.snapshot?.signal else { return false }
            else { return false }
            return status.lastError?.isEmpty == false || status.probe?.ok == false
        case .imessage:
-            guard let status = self.channelStatus("imessage", as: ChannelsStatusSnapshot.IMessageStatus.self)
+            guard let status = self.store.snapshot?.imessage else { return false }
            else { return false }
            return status.lastError?.isEmpty == false || status.probe?.ok == false
        }
    }
@@ -11,7 +11,7 @@ extension ConnectionsSettings {
            self.store.start()
            self.ensureSelection()
        }
-        .onChange(of: self.orderedChannels) { _, _ in
+        .onChange(of: self.orderedProviders) { _, _ in
            self.ensureSelection()
        }
        .onDisappear { self.store.stop() }
@@ -20,17 +20,17 @@ extension ConnectionsSettings {
    private var sidebar: some View {
        ScrollView {
            LazyVStack(alignment: .leading, spacing: 8) {
-                if !self.enabledChannels.isEmpty {
+                if !self.enabledProviders.isEmpty {
                    self.sidebarSectionHeader("Configured")
-                    ForEach(self.enabledChannels) { channel in
+                    ForEach(self.enabledProviders) { provider in
-                        self.sidebarRow(channel)
+                        self.sidebarRow(provider)
                    }
                }
-                if !self.availableChannels.isEmpty {
+                if !self.availableProviders.isEmpty {
                    self.sidebarSectionHeader("Available")
-                    ForEach(self.availableChannels) { channel in
+                    ForEach(self.availableProviders) { provider in
-                        self.sidebarRow(channel)
+                        self.sidebarRow(provider)
                    }
                }
            }
@@ -46,8 +46,8 @@ extension ConnectionsSettings {
    private var detail: some View {
        Group {
-            if let channel = self.selectedChannel {
+            if let provider = self.selectedProvider {
-                self.channelDetail(channel)
+                self.providerDetail(provider)
            } else {
                self.emptyDetail
            }
@@ -59,7 +59,7 @@ extension ConnectionsSettings {
        VStack(alignment: .leading, spacing: 8) {
            Text("Connections")
                .font(.title3.weight(.semibold))
-            Text("Select a channel to view status and settings.")
+            Text("Select a provider to view status and settings.")
                .font(.callout)
                .foregroundStyle(.secondary)
        }
@@ -67,12 +67,12 @@ extension ConnectionsSettings {
        .padding(.vertical, 18)
    }
-    private func channelDetail(_ channel: ConnectionChannel) -> some View {
+    private func providerDetail(_ provider: ConnectionProvider) -> some View {
        ScrollView(.vertical) {
            VStack(alignment: .leading, spacing: 16) {
-                self.detailHeader(for: channel)
+                self.detailHeader(for: provider)
                Divider()
-                self.channelSection(channel)
+                self.providerSection(provider)
                Spacer(minLength: 0)
            }
            .frame(maxWidth: .infinity, alignment: .leading)
@@ -81,18 +81,18 @@ extension ConnectionsSettings {
        }
    }
-    private func sidebarRow(_ channel: ConnectionChannel) -> some View {
+    private func sidebarRow(_ provider: ConnectionProvider) -> some View {
-        let isSelected = self.selectedChannel == channel
+        let isSelected = self.selectedProvider == provider
        return Button {
-            self.selectedChannel = channel
+            self.selectedProvider = provider
        } label: {
            HStack(spacing: 8) {
                Circle()
-                    .fill(self.channelTint(channel))
+                    .fill(self.providerTint(provider))
                    .frame(width: 8, height: 8)
                VStack(alignment: .leading, spacing: 2) {
-                    Text(channel.title)
+                    Text(provider.title)
-                    Text(self.channelSummary(channel))
+                    Text(self.providerSummary(provider))
                        .font(.caption)
                        .foregroundStyle(.secondary)
                }
@@ -119,23 +119,23 @@ extension ConnectionsSettings {
            .padding(.top, 2)
    }
-    private func detailHeader(for channel: ConnectionChannel) -> some View {
+    private func detailHeader(for provider: ConnectionProvider) -> some View {
        VStack(alignment: .leading, spacing: 8) {
            HStack(alignment: .firstTextBaseline, spacing: 10) {
-                Label(channel.detailTitle, systemImage: channel.systemImage)
+                Label(provider.detailTitle, systemImage: provider.systemImage)
                    .font(.title3.weight(.semibold))
                self.statusBadge(
-                    self.channelSummary(channel),
+                    self.providerSummary(provider),
-                    color: self.channelTint(channel))
+                    color: self.providerTint(provider))
                Spacer()
-                self.channelHeaderActions(channel)
+                self.providerHeaderActions(provider)
            }
            HStack(spacing: 10) {
-                Text("Last check \(self.channelLastCheckText(channel))")
+                Text("Last check \(self.providerLastCheckText(provider))")
                    .font(.caption)
                    .foregroundStyle(.secondary)
-                if self.channelHasError(channel) {
+                if self.providerHasError(provider) {
                    Text("Error")
                        .font(.caption2.weight(.semibold))
                        .padding(.horizontal, 6)
@@ -146,7 +146,7 @@ extension ConnectionsSettings {
                }
            }
-            if let details = self.channelDetails(channel) {
+            if let details = self.providerDetails(provider) {
                Text(details)
                    .font(.caption)
                    .foregroundStyle(.secondary)
@@ -2,7 +2,7 @@ import AppKit
 import SwiftUI
 struct ConnectionsSettings: View {
-    enum ConnectionChannel: String, CaseIterable, Identifiable, Hashable {
+    enum ConnectionProvider: String, CaseIterable, Identifiable, Hashable {
        case whatsapp
        case telegram
        case discord
@@ -53,7 +53,7 @@ struct ConnectionsSettings: View {
    }
    @Bindable var store: ConnectionsStore
-    @State var selectedChannel: ConnectionChannel?
+    @State var selectedProvider: ConnectionProvider?
    @State var showTelegramToken = false
    @State var showDiscordToken = false
@@ -2,16 +2,6 @@ import ClawdbotProtocol
 import Foundation
 extension ConnectionsStore {
    var isTelegramTokenLocked: Bool {
        self.snapshot?.decodeChannel("telegram", as: ChannelsStatusSnapshot.TelegramStatus.self)?
            .tokenSource == "env"
    }
    var isDiscordTokenLocked: Bool {
        self.snapshot?.decodeChannel("discord", as: ChannelsStatusSnapshot.DiscordStatus.self)?
            .tokenSource == "env"
    }
    func loadConfig() async {
        do {
            let snap: ConfigSnapshot = try await GatewayConnection.shared.requestDecoded(
@@ -22,7 +12,6 @@ extension ConnectionsStore {
                ? "Config invalid; fix it in ~/.clawdbot/clawdbot.json."
                : nil
            self.configRoot = snap.config?.mapValues { $0.foundationValue } ?? [:]
            self.configHash = snap.hash
            self.configLoaded = true
            self.applyUIConfig(snap)
@@ -45,23 +34,10 @@ extension ConnectionsStore {
        AppStateStore.shared.seamColorHex = rawSeam.isEmpty ? nil : rawSeam
    }
    private func resolveChannelConfig(_ snap: ConfigSnapshot, key: String) -> [String: AnyCodable]? {
        if let channels = snap.config?["channels"]?.dictionaryValue,
           let entry = channels[key]?.dictionaryValue
        {
            return entry
        }
        return snap.config?[key]?.dictionaryValue
    }
    private func applyTelegramConfig(_ snap: ConfigSnapshot) {
-        let telegram = self.resolveChannelConfig(snap, key: "telegram")
+        let telegram = snap.config?["telegram"]?.dictionaryValue
        self.telegramToken = telegram?["botToken"]?.stringValue ?? ""
-        let groups = telegram?["groups"]?.dictionaryValue
+        self.telegramRequireMention = telegram?["requireMention"]?.boolValue ?? true
        let defaultGroup = groups?["*"]?.dictionaryValue
        self.telegramRequireMention = defaultGroup?["requireMention"]?.boolValue
            ?? telegram?["requireMention"]?.boolValue
            ?? true
        self.telegramAllowFrom = self.stringList(from: telegram?["allowFrom"]?.arrayValue)
        self.telegramProxy = telegram?["proxy"]?.stringValue ?? ""
        self.telegramWebhookUrl = telegram?["webhookUrl"]?.stringValue ?? ""
@@ -70,7 +46,7 @@ extension ConnectionsStore {
    }
    private func applyDiscordConfig(_ snap: ConfigSnapshot) {
-        let discord = self.resolveChannelConfig(snap, key: "discord")
+        let discord = snap.config?["discord"]?.dictionaryValue
        self.discordEnabled = discord?["enabled"]?.boolValue ?? true
        self.discordToken = discord?["token"]?.stringValue ?? ""
@@ -146,7 +122,7 @@ extension ConnectionsStore {
    }
    private func applySignalConfig(_ snap: ConfigSnapshot) {
-        let signal = self.resolveChannelConfig(snap, key: "signal")
+        let signal = snap.config?["signal"]?.dictionaryValue
        self.signalEnabled = signal?["enabled"]?.boolValue ?? true
        self.signalAccount = signal?["account"]?.stringValue ?? ""
        self.signalHttpUrl = signal?["httpUrl"]?.stringValue ?? ""
@@ -163,7 +139,7 @@ extension ConnectionsStore {
    }
    private func applyIMessageConfig(_ snap: ConfigSnapshot) {
-        let imessage = self.resolveChannelConfig(snap, key: "imessage")
+        let imessage = snap.config?["imessage"]?.dictionaryValue
        self.imessageEnabled = imessage?["enabled"]?.boolValue ?? true
        self.imessageCliPath = imessage?["cliPath"]?.stringValue ?? ""
        self.imessageDbPath = imessage?["dbPath"]?.stringValue ?? ""
@@ -174,15 +150,6 @@ extension ConnectionsStore {
        self.imessageMediaMaxMb = self.numberString(from: imessage?["mediaMaxMb"])
    }
    private func channelConfigRoot(for key: String) -> [String: Any] {
        if let channels = self.configRoot["channels"] as? [String: Any],
           let entry = channels[key] as? [String: Any]
        {
            return entry
        }
        return self.configRoot[key] as? [String: Any] ?? [:]
    }
    func saveTelegramConfig() async {
        guard !self.isSavingConfig else { return }
        self.isSavingConfig = true
@@ -191,24 +158,30 @@ extension ConnectionsStore {
            await self.loadConfig()
        }
-        var telegram: [String: Any] = [:]
+        var telegram: [String: Any] = (self.configRoot["telegram"] as? [String: Any]) ?? [:]
-        if !self.isTelegramTokenLocked {
+        let token = self.trimmed(self.telegramToken)
-            self.setPatchString(&telegram, key: "botToken", value: self.telegramToken)
+        if token.isEmpty {
            telegram.removeValue(forKey: "botToken")
        } else {
            telegram["botToken"] = token
        }
        telegram["requireMention"] = NSNull()
        telegram["groups"] = [
            "*": [
                "requireMention": self.telegramRequireMention,
            ],
        ]
        let allow = self.splitCsv(self.telegramAllowFrom)
        self.setPatchList(&telegram, key: "allowFrom", values: allow)
        self.setPatchString(&telegram, key: "proxy", value: self.telegramProxy)
        self.setPatchString(&telegram, key: "webhookUrl", value: self.telegramWebhookUrl)
        self.setPatchString(&telegram, key: "webhookSecret", value: self.telegramWebhookSecret)
        self.setPatchString(&telegram, key: "webhookPath", value: self.telegramWebhookPath)
-        await self.persistChannelPatch("telegram", payload: telegram)
+        telegram["requireMention"] = self.telegramRequireMention
        let allow = self.splitCsv(self.telegramAllowFrom)
        if allow.isEmpty {
            telegram.removeValue(forKey: "allowFrom")
        } else {
            telegram["allowFrom"] = allow
        }
        self.setOptionalString(&telegram, key: "proxy", value: self.telegramProxy)
        self.setOptionalString(&telegram, key: "webhookUrl", value: self.telegramWebhookUrl)
        self.setOptionalString(&telegram, key: "webhookSecret", value: self.telegramWebhookSecret)
        self.setOptionalString(&telegram, key: "webhookPath", value: self.telegramWebhookPath)
        self.setSection("telegram", payload: telegram)
        await self.persistConfig()
    }
    func saveDiscordConfig() async {
@@ -219,9 +192,9 @@ extension ConnectionsStore {
            await self.loadConfig()
        }
-        let base = self.channelConfigRoot(for: "discord")
+        let discord = self.buildDiscordConfig()
-        let discord = self.buildDiscordPatch(base: base)
+        self.setSection("discord", payload: discord)
-        await self.persistChannelPatch("discord", payload: discord)
+        await self.persistConfig()
    }
    func saveSignalConfig() async {
@@ -232,23 +205,42 @@ extension ConnectionsStore {
            await self.loadConfig()
        }
-        var signal: [String: Any] = [:]
+        var signal: [String: Any] = (self.configRoot["signal"] as? [String: Any]) ?? [:]
-        self.setPatchBool(&signal, key: "enabled", value: self.signalEnabled, defaultValue: true)
+        if self.signalEnabled {
-        self.setPatchString(&signal, key: "account", value: self.signalAccount)
+            signal.removeValue(forKey: "enabled")
-        self.setPatchString(&signal, key: "httpUrl", value: self.signalHttpUrl)
+        } else {
-        self.setPatchString(&signal, key: "httpHost", value: self.signalHttpHost)
+            signal["enabled"] = false
-        self.setPatchNumber(&signal, key: "httpPort", value: self.signalHttpPort)
+        }
        self.setPatchString(&signal, key: "cliPath", value: self.signalCliPath)
        self.setPatchBool(&signal, key: "autoStart", value: self.signalAutoStart, defaultValue: true)
        self.setPatchString(&signal, key: "receiveMode", value: self.signalReceiveMode)
        self.setPatchBool(&signal, key: "ignoreAttachments", value: self.signalIgnoreAttachments, defaultValue: false)
        self.setPatchBool(&signal, key: "ignoreStories", value: self.signalIgnoreStories, defaultValue: false)
        self.setPatchBool(&signal, key: "sendReadReceipts", value: self.signalSendReadReceipts, defaultValue: false)
        let allow = self.splitCsv(self.signalAllowFrom)
        self.setPatchList(&signal, key: "allowFrom", values: allow)
        self.setPatchNumber(&signal, key: "mediaMaxMb", value: self.signalMediaMaxMb)
-        await self.persistChannelPatch("signal", payload: signal)
+        self.setOptionalString(&signal, key: "account", value: self.signalAccount)
        self.setOptionalString(&signal, key: "httpUrl", value: self.signalHttpUrl)
        self.setOptionalString(&signal, key: "httpHost", value: self.signalHttpHost)
        self.setOptionalNumber(&signal, key: "httpPort", value: self.signalHttpPort)
        self.setOptionalString(&signal, key: "cliPath", value: self.signalCliPath)
        if self.signalAutoStart {
            signal.removeValue(forKey: "autoStart")
        } else {
            signal["autoStart"] = false
        }
        self.setOptionalString(&signal, key: "receiveMode", value: self.signalReceiveMode)
        self.setOptionalBool(&signal, key: "ignoreAttachments", value: self.signalIgnoreAttachments)
        self.setOptionalBool(&signal, key: "ignoreStories", value: self.signalIgnoreStories)
        self.setOptionalBool(&signal, key: "sendReadReceipts", value: self.signalSendReadReceipts)
        let allow = self.splitCsv(self.signalAllowFrom)
        if allow.isEmpty {
            signal.removeValue(forKey: "allowFrom")
        } else {
            signal["allowFrom"] = allow
        }
        self.setOptionalNumber(&signal, key: "mediaMaxMb", value: self.signalMediaMaxMb)
        self.setSection("signal", payload: signal)
        await self.persistConfig()
    }
    func saveIMessageConfig() async {
@@ -259,168 +251,147 @@ extension ConnectionsStore {
            await self.loadConfig()
        }
-        var imessage: [String: Any] = [:]
+        var imessage: [String: Any] = (self.configRoot["imessage"] as? [String: Any]) ?? [:]
-        self.setPatchBool(&imessage, key: "enabled", value: self.imessageEnabled, defaultValue: true)
+        if self.imessageEnabled {
-        self.setPatchString(&imessage, key: "cliPath", value: self.imessageCliPath)
+            imessage.removeValue(forKey: "enabled")
-        self.setPatchString(&imessage, key: "dbPath", value: self.imessageDbPath)
+        } else {
            imessage["enabled"] = false
        }
        self.setOptionalString(&imessage, key: "cliPath", value: self.imessageCliPath)
        self.setOptionalString(&imessage, key: "dbPath", value: self.imessageDbPath)
        let service = self.trimmed(self.imessageService)
        if service.isEmpty || service == "auto" {
-            imessage["service"] = NSNull()
+            imessage.removeValue(forKey: "service")
        } else {
            imessage["service"] = service
        }
-        self.setPatchString(&imessage, key: "region", value: self.imessageRegion)
+        self.setOptionalString(&imessage, key: "region", value: self.imessageRegion)
        let allow = self.splitCsv(self.imessageAllowFrom)
-        self.setPatchList(&imessage, key: "allowFrom", values: allow)
+        if allow.isEmpty {
            imessage.removeValue(forKey: "allowFrom")
        } else {
            imessage["allowFrom"] = allow
        }
-        self.setPatchBool(
+        self.setOptionalBool(&imessage, key: "includeAttachments", value: self.imessageIncludeAttachments)
-            &imessage,
+        self.setOptionalNumber(&imessage, key: "mediaMaxMb", value: self.imessageMediaMaxMb)
            key: "includeAttachments",
            value: self.imessageIncludeAttachments,
            defaultValue: false)
        self.setPatchNumber(&imessage, key: "mediaMaxMb", value: self.imessageMediaMaxMb)
-        await self.persistChannelPatch("imessage", payload: imessage)
+        self.setSection("imessage", payload: imessage)
        await self.persistConfig()
    }
-    private func buildDiscordPatch(base: [String: Any]) -> [String: Any] {
+    private func buildDiscordConfig() -> [String: Any] {
-        var discord: [String: Any] = [:]
+        var discord: [String: Any] = (self.configRoot["discord"] as? [String: Any]) ?? [:]
-        self.setPatchBool(&discord, key: "enabled", value: self.discordEnabled, defaultValue: true)
+        if self.discordEnabled {
-        if !self.isDiscordTokenLocked {
+            discord.removeValue(forKey: "enabled")
-            self.setPatchString(&discord, key: "token", value: self.discordToken)
+        } else {
            discord["enabled"] = false
        }
        self.setOptionalString(&discord, key: "token", value: self.discordToken)
-        if let dm = self.buildDiscordDmPatch() {
+        if let dm = self.buildDiscordDmConfig(base: discord["dm"] as? [String: Any] ?? [:]) {
            discord["dm"] = dm
        } else {
-            discord["dm"] = NSNull()
+            discord.removeValue(forKey: "dm")
        }
-        self.setPatchNumber(&discord, key: "mediaMaxMb", value: self.discordMediaMaxMb)
+        self.setOptionalNumber(&discord, key: "mediaMaxMb", value: self.discordMediaMaxMb)
-        self.setPatchInt(&discord, key: "historyLimit", value: self.discordHistoryLimit, allowZero: true)
+        self.setOptionalInt(&discord, key: "historyLimit", value: self.discordHistoryLimit, allowZero: true)
-        self.setPatchInt(&discord, key: "textChunkLimit", value: self.discordTextChunkLimit, allowZero: false)
+        self.setOptionalInt(&discord, key: "textChunkLimit", value: self.discordTextChunkLimit, allowZero: false)
        let replyToMode = self.trimmed(self.discordReplyToMode)
-        if replyToMode.isEmpty || replyToMode == "off" || !["first", "all"].contains(replyToMode) {
+        if replyToMode.isEmpty || replyToMode == "off" {
-            discord["replyToMode"] = NSNull()
+            discord.removeValue(forKey: "replyToMode")
-        } else {
+        } else if ["first", "all"].contains(replyToMode) {
            discord["replyToMode"] = replyToMode
        } else {
            discord.removeValue(forKey: "replyToMode")
        }
-        let baseGuilds = base["guilds"] as? [String: Any] ?? [:]
+        if let guilds = self.buildDiscordGuildsConfig() {
        if let guilds = self.buildDiscordGuildsPatch(base: baseGuilds) {
            discord["guilds"] = guilds
        } else {
-            discord["guilds"] = NSNull()
+            discord.removeValue(forKey: "guilds")
        }
-        if let actions = self.buildDiscordActionsPatch() {
+        if let actions = self.buildDiscordActionsConfig(base: discord["actions"] as? [String: Any] ?? [:]) {
            discord["actions"] = actions
        } else {
-            discord["actions"] = NSNull()
+            discord.removeValue(forKey: "actions")
        }
-        if let slash = self.buildDiscordSlashPatch() {
+        if let slash = self.buildDiscordSlashConfig(base: discord["slashCommand"] as? [String: Any] ?? [:]) {
            discord["slashCommand"] = slash
        } else {
-            discord["slashCommand"] = NSNull()
+            discord.removeValue(forKey: "slashCommand")
        }
        return discord
    }
-    private func buildDiscordDmPatch() -> [String: Any]? {
+    private func buildDiscordDmConfig(base: [String: Any]) -> [String: Any]? {
-        var dm: [String: Any] = [:]
+        var dm = base
-        self.setPatchBool(&dm, key: "enabled", value: self.discordDmEnabled, defaultValue: true)
+        if self.discordDmEnabled {
            dm.removeValue(forKey: "enabled")
        } else {
            dm["enabled"] = false
        }
        let allow = self.splitCsv(self.discordAllowFrom)
-        self.setPatchList(&dm, key: "allowFrom", values: allow)
+        if allow.isEmpty {
-        self.setPatchBool(&dm, key: "groupEnabled", value: self.discordGroupEnabled, defaultValue: false)
+            dm.removeValue(forKey: "allowFrom")
        } else {
            dm["allowFrom"] = allow
        }
        if self.discordGroupEnabled {
            dm["groupEnabled"] = true
        } else {
            dm.removeValue(forKey: "groupEnabled")
        }
        let groupChannels = self.splitCsv(self.discordGroupChannels)
-        self.setPatchList(&dm, key: "groupChannels", values: groupChannels)
+        if groupChannels.isEmpty {
            dm.removeValue(forKey: "groupChannels")
        } else {
            dm["groupChannels"] = groupChannels
        }
        return dm.isEmpty ? nil : dm
    }
-    private func buildDiscordGuildsPatch(base: [String: Any]) -> Any? {
+    private func buildDiscordGuildsConfig() -> [String: Any]? {
-        if self.discordGuilds.isEmpty {
+        let guilds: [String: Any] = self.discordGuilds.reduce(into: [:]) { result, entry in
            return NSNull()
        }
        var patch: [String: Any] = [:]
        let baseKeys = Set(base.keys)
        var formKeys = Set<String>()
        for entry in self.discordGuilds {
            let key = self.trimmed(entry.key)
-            guard !key.isEmpty else { continue }
+            guard !key.isEmpty else { return }
-            formKeys.insert(key)
+            var payload: [String: Any] = [:]
-            let baseGuild = base[key] as? [String: Any] ?? [:]
+            let slug = self.trimmed(entry.slug)
-            patch[key] = self.buildDiscordGuildPatch(entry, base: baseGuild)
+            if !slug.isEmpty { payload["slug"] = slug }
            if entry.requireMention { payload["requireMention"] = true }
            if ["off", "own", "all", "allowlist"].contains(entry.reactionNotifications) {
                payload["reactionNotifications"] = entry.reactionNotifications
            }
            let users = self.splitCsv(entry.users)
            if !users.isEmpty { payload["users"] = users }
            let channels: [String: Any] = entry.channels.reduce(into: [:]) { channelsResult, channel in
                let channelKey = self.trimmed(channel.key)
                guard !channelKey.isEmpty else { return }
                var channelPayload: [String: Any] = [:]
                if !channel.allow { channelPayload["allow"] = false }
                if channel.requireMention { channelPayload["requireMention"] = true }
                channelsResult[channelKey] = channelPayload
            }
            if !channels.isEmpty { payload["channels"] = channels }
            result[key] = payload
        }
-        for key in baseKeys.subtracting(formKeys) {
+        return guilds.isEmpty ? nil : guilds
            patch[key] = NSNull()
        }
        return patch.isEmpty ? NSNull() : patch
    }
-    private func buildDiscordGuildPatch(_ entry: DiscordGuildForm, base: [String: Any]) -> [String: Any] {
+    private func buildDiscordActionsConfig(base: [String: Any]) -> [String: Any]? {
-        var payload: [String: Any] = [:]
+        var actions = base
        let slug = self.trimmed(entry.slug)
        if slug.isEmpty {
            payload["slug"] = NSNull()
        } else {
            payload["slug"] = slug
        }
        if entry.requireMention {
            payload["requireMention"] = true
        } else {
            payload["requireMention"] = NSNull()
        }
        if ["off", "all", "allowlist"].contains(entry.reactionNotifications) {
            payload["reactionNotifications"] = entry.reactionNotifications
        } else {
            payload["reactionNotifications"] = NSNull()
        }
        let users = self.splitCsv(entry.users)
        self.setPatchList(&payload, key: "users", values: users)
        let baseChannels = base["channels"] as? [String: Any] ?? [:]
        if let channels = self.buildDiscordChannelsPatch(base: baseChannels, forms: entry.channels) {
            payload["channels"] = channels
        } else {
            payload["channels"] = NSNull()
        }
        return payload
    }
    private func buildDiscordChannelsPatch(base: [String: Any], forms: [DiscordGuildChannelForm]) -> Any? {
        if forms.isEmpty {
            return NSNull()
        }
        var patch: [String: Any] = [:]
        let baseKeys = Set(base.keys)
        var formKeys = Set<String>()
        for channel in forms {
            let channelKey = self.trimmed(channel.key)
            guard !channelKey.isEmpty else { continue }
            formKeys.insert(channelKey)
            var channelPayload: [String: Any] = [:]
            self.setPatchBool(&channelPayload, key: "allow", value: channel.allow, defaultValue: true)
            self.setPatchBool(
                &channelPayload,
                key: "requireMention",
                value: channel.requireMention,
                defaultValue: false)
            patch[channelKey] = channelPayload
        }
        for key in baseKeys.subtracting(formKeys) {
            patch[key] = NSNull()
        }
        return patch.isEmpty ? NSNull() : patch
    }
    private func buildDiscordActionsPatch() -> [String: Any]? {
        var actions: [String: Any] = [:]
        self.setAction(&actions, key: "reactions", value: self.discordActionReactions, defaultValue: true)
        self.setAction(&actions, key: "stickers", value: self.discordActionStickers, defaultValue: true)
        self.setAction(&actions, key: "polls", value: self.discordActionPolls, defaultValue: true)
@@ -439,44 +410,52 @@ extension ConnectionsStore {
        return actions.isEmpty ? nil : actions
    }
-    private func buildDiscordSlashPatch() -> [String: Any]? {
+    private func buildDiscordSlashConfig(base: [String: Any]) -> [String: Any]? {
-        var slash: [String: Any] = [:]
+        var slash = base
-        self.setPatchBool(&slash, key: "enabled", value: self.discordSlashEnabled, defaultValue: false)
+        if self.discordSlashEnabled {
-        self.setPatchString(&slash, key: "name", value: self.discordSlashName)
+            slash["enabled"] = true
-        self.setPatchString(&slash, key: "sessionPrefix", value: self.discordSlashSessionPrefix)
+        } else {
-        self.setPatchBool(&slash, key: "ephemeral", value: self.discordSlashEphemeral, defaultValue: true)
+            slash.removeValue(forKey: "enabled")
        }
        self.setOptionalString(&slash, key: "name", value: self.discordSlashName)
        self.setOptionalString(&slash, key: "sessionPrefix", value: self.discordSlashSessionPrefix)
        if self.discordSlashEphemeral {
            slash.removeValue(forKey: "ephemeral")
        } else {
            slash["ephemeral"] = false
        }
        return slash.isEmpty ? nil : slash
    }
-    private func persistChannelPatch(_ channelId: String, payload: [String: Any]) async {
+    private func persistConfig() async {
        do {
            guard let baseHash = self.configHash else {
                self.configStatus = "Config hash missing; reload and retry."
                return
            }
            let data = try JSONSerialization.data(
-                withJSONObject: ["channels": [channelId: payload]],
+                withJSONObject: self.configRoot,
                options: [.prettyPrinted, .sortedKeys])
            guard let raw = String(data: data, encoding: .utf8) else {
                self.configStatus = "Failed to encode config."
                return
            }
-            let params: [String: AnyCodable] = [
+            let params: [String: AnyCodable] = ["raw": AnyCodable(raw)]
                "raw": AnyCodable(raw),
                "baseHash": AnyCodable(baseHash),
            ]
            _ = try await GatewayConnection.shared.requestRaw(
-                method: .configPatch,
+                method: .configSet,
                params: params,
                timeoutMs: 10000)
            self.configStatus = "Saved to ~/.clawdbot/clawdbot.json."
            await self.loadConfig()
            await self.refresh(probe: true)
        } catch {
            self.configStatus = error.localizedDescription
        }
    }
    private func setSection(_ key: String, payload: [String: Any]) {
        if payload.isEmpty {
            self.configRoot.removeValue(forKey: key)
        } else {
            self.configRoot[key] = payload
        }
    }
    private func stringList(from values: [AnyCodable]?) -> String {
        guard let values else { return "" }
        let strings = values.compactMap { entry -> String? in
@@ -513,29 +492,25 @@ extension ConnectionsStore {
        value.trimmingCharacters(in: .whitespacesAndNewlines)
    }
-    private func setPatchString(_ target: inout [String: Any], key: String, value: String) {
+    private func setOptionalString(_ target: inout [String: Any], key: String, value: String) {
        let trimmed = self.trimmed(value)
        if trimmed.isEmpty {
-            target[key] = NSNull()
+            target.removeValue(forKey: key)
        } else {
            target[key] = trimmed
        }
    }
-    private func setPatchNumber(_ target: inout [String: Any], key: String, value: String) {
+    private func setOptionalNumber(_ target: inout [String: Any], key: String, value: String) {
        let trimmed = self.trimmed(value)
        if trimmed.isEmpty {
-            target[key] = NSNull()
+            target.removeValue(forKey: key)
-            return
+        } else if let number = Double(trimmed) {
        }
        if let number = Double(trimmed) {
            target[key] = number
        } else {
            target[key] = NSNull()
        }
    }
-    private func setPatchInt(
+    private func setOptionalInt(
        _ target: inout [String: Any],
        key: String,
        value: String,
@@ -543,39 +518,26 @@ extension ConnectionsStore {
    {
        let trimmed = self.trimmed(value)
        if trimmed.isEmpty {
-            target[key] = NSNull()
+            target.removeValue(forKey: key)
            return
        }
        guard let number = Int(trimmed) else {
-            target[key] = NSNull()
+            target.removeValue(forKey: key)
            return
        }
        let isValid = allowZero ? number >= 0 : number > 0
        guard isValid else {
-            target[key] = NSNull()
+            target.removeValue(forKey: key)
            return
        }
        target[key] = number
    }
-    private func setPatchBool(
+    private func setOptionalBool(_ target: inout [String: Any], key: String, value: Bool) {
-        _ target: inout [String: Any],
+        if value {
-        key: String,
+            target[key] = true
        value: Bool,
        defaultValue: Bool)
    {
        if value == defaultValue {
            target[key] = NSNull()
        } else {
-            target[key] = value
+            target.removeValue(forKey: key)
        }
    }
    private func setPatchList(_ target: inout [String: Any], key: String, values: [String]) {
        if values.isEmpty {
            target[key] = NSNull()
        } else {
            target[key] = values
        }
    }
@@ -586,7 +548,7 @@ extension ConnectionsStore {
        defaultValue: Bool)
    {
        if value == defaultValue {
-            actions[key] = NSNull()
+            actions.removeValue(forKey: key)
        } else {
            actions[key] = value
        }
@@ -31,8 +31,8 @@ extension ConnectionsStore {
                "probe": AnyCodable(probe),
                "timeoutMs": AnyCodable(8000),
            ]
-            let snap: ChannelsStatusSnapshot = try await GatewayConnection.shared.requestDecoded(
+            let snap: ProvidersStatusSnapshot = try await GatewayConnection.shared.requestDecoded(
-                method: .channelsStatus,
+                method: .providersStatus,
                params: params,
                timeoutMs: 12000)
            self.snapshot = snap
@@ -100,12 +100,9 @@ extension ConnectionsStore {
        self.whatsappBusy = true
        defer { self.whatsappBusy = false }
        do {
-            let params: [String: AnyCodable] = [
+            let result: WhatsAppLogoutResult = try await GatewayConnection.shared.requestDecoded(
-                "channel": AnyCodable("whatsapp"),
+                method: .webLogout,
-            ]
+                params: nil,
            let result: ChannelLogoutResult = try await GatewayConnection.shared.requestDecoded(
                method: .channelsLogout,
                params: params,
                timeoutMs: 15000)
            self.whatsappLoginMessage = result.cleared
                ? "Logged out and cleared credentials."
@@ -122,12 +119,9 @@ extension ConnectionsStore {
        self.telegramBusy = true
        defer { self.telegramBusy = false }
        do {
-            let params: [String: AnyCodable] = [
+            let result: TelegramLogoutResult = try await GatewayConnection.shared.requestDecoded(
-                "channel": AnyCodable("telegram"),
+                method: .telegramLogout,
-            ]
+                params: nil,
            let result: ChannelLogoutResult = try await GatewayConnection.shared.requestDecoded(
                method: .channelsLogout,
                params: params,
                timeoutMs: 15000)
            if result.envToken == true {
                self.configStatus = "Telegram token still set via env; config cleared."
@@ -154,9 +148,11 @@ private struct WhatsAppLoginWaitResult: Codable {
    let message: String
 }
-private struct ChannelLogoutResult: Codable {
+private struct WhatsAppLogoutResult: Codable {
-    let channel: String?
+    let cleared: Bool
-    let accountId: String?
+}
 private struct TelegramLogoutResult: Codable {
    let cleared: Bool
    let envToken: Bool?
 }
@@ -2,7 +2,7 @@ import ClawdbotProtocol
 import Foundation
 import Observation
-struct ChannelsStatusSnapshot: Codable {
+struct ProvidersStatusSnapshot: Codable {
    struct WhatsAppSelf: Codable {
        let e164: String?
        let jid: String?
@@ -121,54 +121,12 @@ struct ChannelsStatusSnapshot: Codable {
        let lastProbeAt: Double?
    }
    struct ChannelAccountSnapshot: Codable {
        let accountId: String
        let name: String?
        let enabled: Bool?
        let configured: Bool?
        let linked: Bool?
        let running: Bool?
        let connected: Bool?
        let reconnectAttempts: Int?
        let lastConnectedAt: Double?
        let lastError: String?
        let lastStartAt: Double?
        let lastStopAt: Double?
        let lastInboundAt: Double?
        let lastOutboundAt: Double?
        let lastProbeAt: Double?
        let mode: String?
        let dmPolicy: String?
        let allowFrom: [String]?
        let tokenSource: String?
        let botTokenSource: String?
        let appTokenSource: String?
        let baseUrl: String?
        let allowUnmentionedGroups: Bool?
        let cliPath: String?
        let dbPath: String?
        let port: Int?
        let probe: AnyCodable?
        let audit: AnyCodable?
        let application: AnyCodable?
    }
    let ts: Double
-    let channelOrder: [String]
+    let whatsapp: WhatsAppStatus
-    let channelLabels: [String: String]
+    let telegram: TelegramStatus
-    let channels: [String: AnyCodable]
+    let discord: DiscordStatus?
-    let channelAccounts: [String: [ChannelAccountSnapshot]]
+    let signal: SignalStatus?
-    let channelDefaultAccountId: [String: String]
+    let imessage: IMessageStatus?
    func decodeChannel<T: Decodable>(_ id: String, as type: T.Type) -> T? {
        guard let value = self.channels[id] else { return nil }
        do {
            let data = try JSONEncoder().encode(value)
            return try JSONDecoder().decode(type, from: data)
        } catch {
            return nil
        }
    }
 }
 struct ConfigSnapshot: Codable {
@@ -180,7 +138,6 @@ struct ConfigSnapshot: Codable {
    let path: String?
    let exists: Bool?
    let raw: String?
    let hash: String?
    let parsed: AnyCodable?
    let valid: Bool?
    let config: [String: AnyCodable]?
@@ -231,7 +188,7 @@ struct DiscordGuildForm: Identifiable {
 final class ConnectionsStore {
    static let shared = ConnectionsStore()
-    var snapshot: ChannelsStatusSnapshot?
+    var snapshot: ProvidersStatusSnapshot?
    var lastError: String?
    var lastSuccess: Date?
    var isRefreshing = false
@@ -308,7 +265,6 @@ final class ConnectionsStore {
    var pollTask: Task<Void, Never>?
    var configRoot: [String: Any] = [:]
    var configLoaded = false
    var configHash: String?
    init(isPreview: Bool = ProcessInfo.processInfo.isPreview) {
        self.isPreview = isPreview
@@ -26,17 +26,15 @@ let remoteProjectRootKey = "clawdbot.remoteProjectRoot"
 let remoteCliPathKey = "clawdbot.remoteCliPath"
 let canvasEnabledKey = "clawdbot.canvasEnabled"
 let cameraEnabledKey = "clawdbot.cameraEnabled"
 let systemRunPolicyKey = "clawdbot.systemRunPolicy"
 let systemRunAllowlistKey = "clawdbot.systemRunAllowlist"
 let systemRunEnabledKey = "clawdbot.systemRunEnabled"
 let locationModeKey = "clawdbot.locationMode"
 let locationPreciseKey = "clawdbot.locationPreciseEnabled"
 let peekabooBridgeEnabledKey = "clawdbot.peekabooBridgeEnabled"
 let deepLinkKeyKey = "clawdbot.deepLinkKey"
 let modelCatalogPathKey = "clawdbot.modelCatalogPath"
 let modelCatalogReloadKey = "clawdbot.modelCatalogReload"
-let cliInstallPromptedVersionKey = "clawdbot.cliInstallPromptedVersion"
+let attachExistingGatewayOnlyKey = "clawdbot.gateway.attachExistingOnly"
 let heartbeatsEnabledKey = "clawdbot.heartbeatsEnabled"
 let debugFileLogEnabledKey = "clawdbot.debug.fileLogEnabled"
 let appLogLevelKey = "clawdbot.debug.appLogLevel"
 let voiceWakeSupported: Bool = ProcessInfo.processInfo.operatingSystemVersion.majorVersion >= 26
 let cliHelperSearchPaths = ["/usr/local/bin", "/opt/homebrew/bin"]
@@ -108,7 +108,6 @@ final class ControlChannel {
                self.logger.info(
                    "control channel configure mode=remote " +
                        "target=\(target, privacy: .public) identitySet=\(idSet, privacy: .public)")
                self.state = .connecting
                _ = try await GatewayEndpointStore.shared.ensureRemoteControlTunnel()
                await self.configure()
            } catch {
@@ -183,7 +182,7 @@ final class ControlChannel {
        {
            let reason = urlErr.failureURLString ?? urlErr.localizedDescription
            return
-                "Gateway rejected token; set gateway.auth.token (or CLAWDBOT_GATEWAY_TOKEN) " +
+                "Gateway rejected token; set CLAWDBOT_GATEWAY_TOKEN in the mac app environment " +
                "or clear it on the gateway. " +
                "Reason: \(reason)"
        }
@@ -212,6 +211,12 @@ final class ControlChannel {
                return "Gateway connection was closed; start the gateway (localhost:\(port)) and retry."
            case .cannotFindHost, .cannotConnectToHost:
                let isRemote = CommandResolver.connectionModeIsRemote()
                if AppStateStore.attachExistingGatewayOnly, !isRemote {
                    return """
                    Cannot reach gateway at localhost:\(port) and “Attach existing gateway only” is enabled.
                    Disable it in Debug Settings or start a gateway on that port.
                    """
                }
                if isRemote {
                    return """
                    Cannot reach gateway at localhost:\(port).
@@ -13,9 +13,7 @@ extension CronJobEditor {
        guard let job else { return }
        self.name = job.name
        self.description = job.description ?? ""
        self.agentId = job.agentId ?? ""
        self.enabled = job.enabled
        self.deleteAfterRun = job.deleteAfterRun ?? false
        self.sessionTarget = job.sessionTarget
        self.wakeMode = job.wakeMode
@@ -36,13 +34,13 @@ extension CronJobEditor {
        case let .systemEvent(text):
            self.payloadKind = .systemEvent
            self.systemEventText = text
-        case let .agentTurn(message, thinking, timeoutSeconds, deliver, channel, to, bestEffortDeliver):
+        case let .agentTurn(message, thinking, timeoutSeconds, deliver, provider, to, bestEffortDeliver):
            self.payloadKind = .agentTurn
            self.agentMessage = message
            self.thinking = thinking ?? ""
            self.timeoutSeconds = timeoutSeconds.map(String.init) ?? ""
            self.deliver = deliver ?? false
-            self.channel = GatewayAgentChannel(raw: channel)
+            self.provider = GatewayAgentProvider(raw: provider)
            self.to = to ?? ""
            self.bestEffortDeliver = bestEffortDeliver ?? false
        }
@@ -61,60 +59,18 @@ extension CronJobEditor {
    }
    func buildPayload() throws -> [String: AnyCodable] {
-        let name = try self.requireName()
+        let name = self.name.trimmingCharacters(in: .whitespacesAndNewlines)
        let description = self.trimmed(self.description)
        let agentId = self.trimmed(self.agentId)
        let schedule = try self.buildSchedule()
        let payload = try self.buildSelectedPayload()
        try self.validateSessionTarget(payload)
        try self.validatePayloadRequiredFields(payload)
        var root: [String: Any] = [
            "name": name,
            "enabled": self.enabled,
            "schedule": schedule,
            "sessionTarget": self.sessionTarget.rawValue,
            "wakeMode": self.wakeMode.rawValue,
            "payload": payload,
        ]
        self.applyDeleteAfterRun(to: &root)
        if !description.isEmpty { root["description"] = description }
        if !agentId.isEmpty {
            root["agentId"] = agentId
        } else if self.job?.agentId != nil {
            root["agentId"] = NSNull()
        }
        if self.sessionTarget == .isolated {
            let trimmed = self.postPrefix.trimmingCharacters(in: .whitespacesAndNewlines)
            root["isolation"] = [
                "postToMainPrefix": trimmed.isEmpty ? "Cron" : trimmed,
            ]
        }
        return root.mapValues { AnyCodable($0) }
    }
    func trimmed(_ value: String) -> String {
        value.trimmingCharacters(in: .whitespacesAndNewlines)
    }
    func requireName() throws -> String {
        let name = self.trimmed(self.name)
        if name.isEmpty {
            throw NSError(
                domain: "Cron",
                code: 0,
                userInfo: [NSLocalizedDescriptionKey: "Name is required."])
        }
-        return name
+        let description = self.description.trimmingCharacters(in: .whitespacesAndNewlines)
-    }
+        let schedule: [String: Any]
    func buildSchedule() throws -> [String: Any] {
        switch self.scheduleKind {
        case .at:
-            return ["kind": "at", "atMs": Int(self.atDate.timeIntervalSince1970 * 1000)]
+            schedule = ["kind": "at", "atMs": Int(self.atDate.timeIntervalSince1970 * 1000)]
        case .every:
            guard let ms = Self.parseDurationMs(self.everyText) else {
                throw NSError(
@@ -122,35 +78,34 @@ extension CronJobEditor {
                    code: 0,
                    userInfo: [NSLocalizedDescriptionKey: "Invalid every duration (use 10m, 1h, 1d)."])
            }
-            return ["kind": "every", "everyMs": ms]
+            schedule = ["kind": "every", "everyMs": ms]
        case .cron:
-            let expr = self.trimmed(self.cronExpr)
+            let expr = self.cronExpr.trimmingCharacters(in: .whitespacesAndNewlines)
            if expr.isEmpty {
                throw NSError(
                    domain: "Cron",
                    code: 0,
                    userInfo: [NSLocalizedDescriptionKey: "Cron expression is required."])
            }
-            let tz = self.trimmed(self.cronTz)
+            let tz = self.cronTz.trimmingCharacters(in: .whitespacesAndNewlines)
            if tz.isEmpty {
-                return ["kind": "cron", "expr": expr]
+                schedule = ["kind": "cron", "expr": expr]
            } else {
                schedule = ["kind": "cron", "expr": expr, "tz": tz]
            }
            return ["kind": "cron", "expr": expr, "tz": tz]
        }
    }
-    func buildSelectedPayload() throws -> [String: Any] {
+        let payload: [String: Any] = {
-        if self.sessionTarget == .isolated { return self.buildAgentTurnPayload() }
+            if self.sessionTarget == .isolated { return self.buildAgentTurnPayload() }
-        switch self.payloadKind {
+            switch self.payloadKind {
-        case .systemEvent:
+            case .systemEvent:
-            let text = self.trimmed(self.systemEventText)
+                let text = self.systemEventText.trimmingCharacters(in: .whitespacesAndNewlines)
-            return ["kind": "systemEvent", "text": text]
+                return ["kind": "systemEvent", "text": text]
-        case .agentTurn:
+            case .agentTurn:
-            return self.buildAgentTurnPayload()
+                return self.buildAgentTurnPayload()
-        }
+            }
-    }
+        }()
    func validateSessionTarget(_ payload: [String: Any]) throws {
        if self.sessionTarget == .main, payload["kind"] as? String == "agentTurn" {
            throw NSError(
                domain: "Cron",
@@ -167,9 +122,7 @@ extension CronJobEditor {
                code: 0,
                userInfo: [NSLocalizedDescriptionKey: "Isolated jobs require agentTurn payloads."])
        }
    }
    func validatePayloadRequiredFields(_ payload: [String: Any]) throws {
        if payload["kind"] as? String == "systemEvent" {
            if (payload["text"] as? String ?? "").isEmpty {
                throw NSError(
@@ -177,8 +130,7 @@ extension CronJobEditor {
                    code: 0,
                    userInfo: [NSLocalizedDescriptionKey: "System event text is required."])
            }
-        }
+        } else if payload["kind"] as? String == "agentTurn" {
        if payload["kind"] as? String == "agentTurn" {
            if (payload["message"] as? String ?? "").isEmpty {
                throw NSError(
                    domain: "Cron",
@@ -186,14 +138,25 @@ extension CronJobEditor {
                    userInfo: [NSLocalizedDescriptionKey: "Agent message is required."])
            }
        }
    }
-    func applyDeleteAfterRun(to root: inout [String: Any]) {
+        var root: [String: Any] = [
-        if self.scheduleKind == .at {
+            "name": name,
-            root["deleteAfterRun"] = self.deleteAfterRun
+            "enabled": self.enabled,
-        } else if self.job?.deleteAfterRun != nil {
+            "schedule": schedule,
-            root["deleteAfterRun"] = false
+            "sessionTarget": self.sessionTarget.rawValue,
            "wakeMode": self.wakeMode.rawValue,
            "payload": payload,
        ]
        if !description.isEmpty { root["description"] = description }
        if self.sessionTarget == .isolated {
            let trimmed = self.postPrefix.trimmingCharacters(in: .whitespacesAndNewlines)
            root["isolation"] = [
                "postToMainPrefix": trimmed.isEmpty ? "Cron" : trimmed,
            ]
        }
        return root.mapValues { AnyCodable($0) }
    }
    func buildAgentTurnPayload() -> [String: Any] {
@@ -204,7 +167,7 @@ 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
+            payload["provider"] = self.provider.rawValue
            let to = self.to.trimmingCharacters(in: .whitespacesAndNewlines)
            if !to.isEmpty { payload["to"] = to }
            payload["bestEffortDeliver"] = self.bestEffortDeliver
@@ -3,7 +3,6 @@ extension CronJobEditor {
    mutating func exerciseForTesting() {
        self.name = "Test job"
        self.description = "Test description"
        self.agentId = "ops"
        self.enabled = true
        self.sessionTarget = .isolated
        self.wakeMode = .now
@@ -14,7 +13,7 @@ extension CronJobEditor {
        self.payloadKind = .agentTurn
        self.agentMessage = "Run diagnostic"
        self.deliver = true
-        self.channel = .last
+        self.provider = .last
        self.to = "+15551230000"
        self.thinking = "low"
        self.timeoutSeconds = "90"
@@ -18,7 +18,7 @@ struct CronJobEditor: View {
    static let scheduleKindNote =
        "“At” runs once, “Every” repeats with a duration, “Cron” uses a 5-field Unix expression."
    static let isolatedPayloadNote =
-        "Isolated jobs always run an agent turn. The result can be delivered to a channel, "
+        "Isolated jobs always run an agent turn. The result can be delivered to a provider, "
            + "and a short summary is posted back to your main chat."
    static let mainPayloadNote =
        "System events are injected into the current main session. Agent turns require an isolated session target."
@@ -27,11 +27,9 @@ struct CronJobEditor: View {
    @State var name: String = ""
    @State var description: String = ""
    @State var agentId: String = ""
    @State var enabled: Bool = true
    @State var sessionTarget: CronSessionTarget = .main
    @State var wakeMode: CronWakeMode = .nextHeartbeat
    @State var deleteAfterRun: Bool = false
    enum ScheduleKind: String, CaseIterable, Identifiable { case at, every, cron; var id: String { rawValue } }
    @State var scheduleKind: ScheduleKind = .every
@@ -45,7 +43,7 @@ struct CronJobEditor: View {
    @State var systemEventText: String = ""
    @State var agentMessage: String = ""
    @State var deliver: Bool = false
-    @State var channel: GatewayAgentChannel = .last
+    @State var provider: GatewayAgentProvider = .last
    @State var to: String = ""
    @State var thinking: String = ""
    @State var timeoutSeconds: String = ""
@@ -79,12 +77,6 @@ struct CronJobEditor: View {
                                    .textFieldStyle(.roundedBorder)
                                    .frame(maxWidth: .infinity)
                            }
                            GridRow {
                                self.gridLabel("Agent ID")
                                TextField("Optional (default agent)", text: self.$agentId)
                                    .textFieldStyle(.roundedBorder)
                                    .frame(maxWidth: .infinity)
                            }
                            GridRow {
                                self.gridLabel("Enabled")
                                Toggle("", isOn: self.$enabled)
@@ -157,11 +149,6 @@ struct CronJobEditor: View {
                                        .labelsHidden()
                                        .frame(maxWidth: .infinity, alignment: .leading)
                                }
                                GridRow {
                                    self.gridLabel("Auto-delete")
                                    Toggle("Delete after successful run", isOn: self.$deleteAfterRun)
                                        .toggleStyle(.switch)
                                }
                            case .every:
                                GridRow {
                                    self.gridLabel("Every")
@@ -323,7 +310,7 @@ struct CronJobEditor: View {
                }
                GridRow {
                    self.gridLabel("Deliver")
-                    Toggle("Deliver result to a channel", isOn: self.$deliver)
+                    Toggle("Deliver result to a provider", isOn: self.$deliver)
                        .toggleStyle(.switch)
                }
            }
@@ -331,15 +318,15 @@ struct CronJobEditor: View {
            if self.deliver {
                Grid(alignment: .leadingFirstTextBaseline, horizontalSpacing: 14, verticalSpacing: 10) {
                    GridRow {
-                        self.gridLabel("Channel")
+                        self.gridLabel("Provider")
-                        Picker("", selection: self.$channel) {
+                        Picker("", selection: self.$provider) {
-                            Text("last").tag(GatewayAgentChannel.last)
+                            Text("last").tag(GatewayAgentProvider.last)
-                            Text("whatsapp").tag(GatewayAgentChannel.whatsapp)
+                            Text("whatsapp").tag(GatewayAgentProvider.whatsapp)
-                            Text("telegram").tag(GatewayAgentChannel.telegram)
+                            Text("telegram").tag(GatewayAgentProvider.telegram)
-                            Text("discord").tag(GatewayAgentChannel.discord)
+                            Text("discord").tag(GatewayAgentProvider.discord)
-                            Text("slack").tag(GatewayAgentChannel.slack)
+                            Text("slack").tag(GatewayAgentProvider.slack)
-                            Text("signal").tag(GatewayAgentChannel.signal)
+                            Text("signal").tag(GatewayAgentProvider.signal)
-                            Text("imessage").tag(GatewayAgentChannel.imessage)
+                            Text("imessage").tag(GatewayAgentProvider.imessage)
                        }
                        .labelsHidden()
                        .pickerStyle(.segmented)
@@ -74,12 +74,12 @@ enum CronPayload: Codable, Equatable {
        thinking: String?,
        timeoutSeconds: Int?,
        deliver: Bool?,
-        channel: String?,
+        provider: String?,
        to: String?,
        bestEffortDeliver: Bool?)
    enum CodingKeys: String, CodingKey {
-        case kind, text, message, thinking, timeoutSeconds, deliver, channel, provider, to, bestEffortDeliver
+        case kind, text, message, thinking, timeoutSeconds, deliver, provider, to, bestEffortDeliver
    }
    var kind: String {
@@ -101,8 +101,7 @@ enum CronPayload: Codable, Equatable {
                thinking: container.decodeIfPresent(String.self, forKey: .thinking),
                timeoutSeconds: container.decodeIfPresent(Int.self, forKey: .timeoutSeconds),
                deliver: container.decodeIfPresent(Bool.self, forKey: .deliver),
-                channel: container.decodeIfPresent(String.self, forKey: .channel)
+                provider: container.decodeIfPresent(String.self, forKey: .provider),
                    ?? container.decodeIfPresent(String.self, forKey: .provider),
                to: container.decodeIfPresent(String.self, forKey: .to),
                bestEffortDeliver: container.decodeIfPresent(Bool.self, forKey: .bestEffortDeliver))
        default:
@@ -119,12 +118,12 @@ enum CronPayload: Codable, Equatable {
        switch self {
        case let .systemEvent(text):
            try container.encode(text, forKey: .text)
-        case let .agentTurn(message, thinking, timeoutSeconds, deliver, channel, to, bestEffortDeliver):
+        case let .agentTurn(message, thinking, timeoutSeconds, deliver, provider, to, bestEffortDeliver):
            try container.encode(message, forKey: .message)
            try container.encodeIfPresent(thinking, forKey: .thinking)
            try container.encodeIfPresent(timeoutSeconds, forKey: .timeoutSeconds)
            try container.encodeIfPresent(deliver, forKey: .deliver)
-            try container.encodeIfPresent(channel, forKey: .channel)
+            try container.encodeIfPresent(provider, forKey: .provider)
            try container.encodeIfPresent(to, forKey: .to)
            try container.encodeIfPresent(bestEffortDeliver, forKey: .bestEffortDeliver)
        }
@@ -146,11 +145,9 @@ struct CronJobState: Codable, Equatable {
 struct CronJob: Identifiable, Codable, Equatable {
    let id: String
    let agentId: String?
    var name: String
    var description: String?
    var enabled: Bool
    var deleteAfterRun: Bool?
    let createdAtMs: Int
    let updatedAtMs: Int
    let schedule: CronSchedule
@@ -20,9 +20,6 @@ extension CronSettings {
            HStack(spacing: 6) {
                StatusPill(text: job.sessionTarget.rawValue, tint: .secondary)
                StatusPill(text: job.wakeMode.rawValue, tint: .secondary)
                if let agentId = job.agentId, !agentId.isEmpty {
                    StatusPill(text: "agent \(agentId)", tint: .secondary)
                }
                if let status = job.state.lastStatus {
                    StatusPill(text: status, tint: status == "ok" ? .green : .orange)
                }
@@ -94,15 +91,9 @@ extension CronSettings {
    func detailCard(_ job: CronJob) -> some View {
        VStack(alignment: .leading, spacing: 10) {
            LabeledContent("Schedule") { Text(self.scheduleSummary(job.schedule)).font(.callout) }
            if case .at = job.schedule, job.deleteAfterRun == true {
                LabeledContent("Auto-delete") { Text("after success") }
            }
            if let desc = job.description, !desc.isEmpty {
                LabeledContent("Description") { Text(desc).font(.callout) }
            }
            if let agentId = job.agentId, !agentId.isEmpty {
                LabeledContent("Agent") { Text(agentId) }
            }
            LabeledContent("Session") { Text(job.sessionTarget.rawValue) }
            LabeledContent("Wake") { Text(job.wakeMode.rawValue) }
            LabeledContent("Next run") {
@@ -7,11 +7,9 @@ struct CronSettings_Previews: PreviewProvider {
        store.jobs = [
            CronJob(
                id: "job-1",
                agentId: "ops",
                name: "Daily summary",
                description: nil,
                enabled: true,
                deleteAfterRun: nil,
                createdAtMs: 0,
                updatedAtMs: 0,
                schedule: .every(everyMs: 86_400_000, anchorMs: nil),
@@ -22,7 +20,7 @@ struct CronSettings_Previews: PreviewProvider {
                    thinking: "low",
                    timeoutSeconds: 600,
                    deliver: true,
-                    channel: "last",
+                    provider: "last",
                    to: nil,
                    bestEffortDeliver: true),
                isolation: CronIsolation(postToMainPrefix: "Cron"),
@@ -61,11 +59,9 @@ extension CronSettings {
        let job = CronJob(
            id: "job-1",
            agentId: "ops",
            name: "Daily summary",
            description: "Summary job",
            enabled: true,
            deleteAfterRun: nil,
            createdAtMs: 1_700_000_000_000,
            updatedAtMs: 1_700_000_100_000,
            schedule: .cron(expr: "0 8 * * *", tz: "UTC"),
@@ -76,7 +72,7 @@ extension CronSettings {
                thinking: "low",
                timeoutSeconds: 120,
                deliver: true,
-                channel: "whatsapp",
+                provider: "whatsapp",
                to: "+15551234567",
                bestEffortDeliver: true),
            isolation: CronIsolation(postToMainPrefix: "[cron] "),
@@ -5,7 +5,6 @@ import SwiftUI
 enum DebugActions {
    private static let verboseDefaultsKey = "clawdbot.debug.verboseMain"
    private static let sessionMenuLimit = 12
    private static let onboardingSeenKey = "clawdbot.onboardingSeen"
    @MainActor
    static func openAgentEventsWindow() {
@@ -184,14 +183,6 @@ enum DebugActions {
        NSApp.terminate(nil)
    }
    @MainActor
    static func restartOnboarding() {
        UserDefaults.standard.set(false, forKey: self.onboardingSeenKey)
        UserDefaults.standard.set(0, forKey: onboardingVersionKey)
        AppStateStore.shared.onboardingSeen = false
        OnboardingController.shared.restart()
    }
    @MainActor
    private static func resolveSessionStorePath() -> String {
        let defaultPath = SessionLoader.defaultStorePath
@@ -28,6 +28,7 @@ struct DebugSettings: View {
    @State private var tunnelResetInFlight = false
    @State private var tunnelResetStatus: String?
    @State private var pendingKill: DebugActions.PortListener?
    @AppStorage(attachExistingGatewayOnlyKey) private var attachExistingGatewayOnly: Bool = false
    @AppStorage(debugFileLogEnabledKey) private var diagnosticsFileLogEnabled: Bool = false
    @AppStorage(appLogLevelKey) private var appLogLevelRaw: String = AppLogLevel.default.rawValue
@@ -107,7 +108,7 @@ struct DebugSettings: View {
                    .frame(maxWidth: .infinity, alignment: .leading)
                }
                GridRow {
-                    self.gridLabel("CLI")
+                    self.gridLabel("CLI helper")
                    let loc = CLIInstaller.installedLocation()
                    Text(loc ?? "missing")
                        .font(.caption.monospaced())
@@ -144,6 +145,16 @@ struct DebugSettings: View {
                        }
                        .frame(maxWidth: .infinity, alignment: .leading)
                    }
                    GridRow {
                        self.gridLabel("Attach only")
                        Toggle("", isOn: self.$attachExistingGatewayOnly)
                            .labelsHidden()
                            .toggleStyle(.checkbox)
                            .help(
                                "When enabled in local mode, the mac app will only connect " +
                                    "to an already-running gateway " +
                                    "and will not start one itself.")
                    }
                }
                let key = DeepLinkHandler.currentKey()
@@ -486,7 +497,6 @@ struct DebugSettings: View {
                HStack(spacing: 8) {
                    Button("Restart app") { DebugActions.restartApp() }
                    Button("Restart onboarding") { DebugActions.restartOnboarding() }
                    Button("Reveal app in Finder") { self.revealApp() }
                    Spacer(minLength: 0)
                }
@@ -772,7 +782,7 @@ struct DebugSettings: View {
    }
    private var canRestartGateway: Bool {
-        self.state.connectionMode == .local
+        self.state.connectionMode == .local && !self.attachExistingGatewayOnly
    }
    private func configURL() -> URL {
@@ -59,7 +59,7 @@ final class DeepLinkHandler {
        }
        do {
-            let channel = GatewayAgentChannel(raw: link.channel)
+            let provider = GatewayAgentProvider(raw: link.channel)
            let explicitSessionKey = link.sessionKey?
                .trimmingCharacters(in: .whitespacesAndNewlines)
                .nonEmpty
@@ -72,9 +72,9 @@ final class DeepLinkHandler {
                message: messagePreview,
                sessionKey: resolvedSessionKey,
                thinking: link.thinking?.trimmingCharacters(in: .whitespacesAndNewlines).nonEmpty,
-                deliver: channel.shouldDeliver(link.deliver),
+                deliver: provider.shouldDeliver(link.deliver),
                to: link.to?.trimmingCharacters(in: .whitespacesAndNewlines).nonEmpty,
-                channel: channel,
+                provider: provider,
                timeoutSeconds: link.timeoutSeconds,
                idempotencyKey: UUID().uuidString)
@@ -0,0 +1,26 @@
 import Foundation
 enum GatewayAgentChannel: String, CaseIterable, Sendable {
    case last
    case webchat
    case whatsapp
    case telegram
    init(raw: String?) {
        let trimmed = raw?
            .trimmingCharacters(in: .whitespacesAndNewlines)
            .lowercased() ?? ""
        self = GatewayAgentChannel(rawValue: trimmed) ?? .last
    }
    func shouldDeliver(_ isLast: Bool) -> Bool {
        switch self {
        case .webchat:
            false
        case .last:
            isLast
        case .whatsapp, .telegram:
            true
        }
    }
 }
@@ -7,8 +7,9 @@ enum GatewayAutostartPolicy {
    static func shouldEnsureLaunchAgent(
        mode: AppState.ConnectionMode,
-        paused: Bool) -> Bool
+        paused: Bool,
        attachExistingOnly: Bool) -> Bool
    {
-        self.shouldStartGateway(mode: mode, paused: paused)
+        self.shouldStartGateway(mode: mode, paused: paused) && !attachExistingOnly
    }
 }
@@ -1,4 +1,3 @@
 import ClawdbotKit
 import ClawdbotProtocol
 import Foundation
 import OSLog
@@ -76,7 +75,6 @@ actor GatewayChannelActor {
    private var tickIntervalMs: Double = 30000
    private let decoder = JSONDecoder()
    private let encoder = JSONEncoder()
    private let connectTimeoutSeconds: Double = 6
    private var watchdogTask: Task<Void, Never>?
    private var tickTask: Task<Void, Never>?
    private let defaultRequestTimeoutMs: Double = 15000
@@ -165,15 +163,7 @@ actor GatewayChannelActor {
        self.task = self.session.makeWebSocketTask(url: self.url)
        self.task?.resume()
        do {
-            try await AsyncTimeout.withTimeout(
+            try await self.sendConnect()
                seconds: self.connectTimeoutSeconds,
                onTimeout: {
                    NSError(
                        domain: "Gateway",
                        code: 1,
                        userInfo: [NSLocalizedDescriptionKey: "connect timed out"])
                },
                operation: { try await self.sendConnect() })
        } catch {
            let wrapped = self.wrap(error, context: "connect to gateway @ \(self.url.absoluteString)")
            self.connected = false
@@ -202,17 +192,15 @@ actor GatewayChannelActor {
        let osVersion = ProcessInfo.processInfo.operatingSystemVersion
        let platform = "macos \(osVersion.majorVersion).\(osVersion.minorVersion).\(osVersion.patchVersion)"
        let primaryLocale = Locale.preferredLanguages.first ?? Locale.current.identifier
-        let clientDisplayName = InstanceIdentity.displayName
+        let clientName = InstanceIdentity.displayName
        let clientId = "clawdbot-macos"
        let reqId = UUID().uuidString
        var client: [String: ProtoAnyCodable] = [
-            "id": ProtoAnyCodable(clientId),
+            "name": ProtoAnyCodable(clientName),
            "displayName": ProtoAnyCodable(clientDisplayName),
            "version": ProtoAnyCodable(
                Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "dev"),
            "platform": ProtoAnyCodable(platform),
-            "mode": ProtoAnyCodable("ui"),
+            "mode": ProtoAnyCodable("app"),
            "instanceId": ProtoAnyCodable(InstanceIdentity.instanceId),
        ]
        client["deviceFamily"] = ProtoAnyCodable("Mac")
@@ -391,11 +379,7 @@ actor GatewayChannelActor {
        }
    }
-    func request(
+    func request(method: String, params: [String: AnyCodable]?, timeoutMs: Double? = nil) async throws -> Data {
        method: String,
        params: [String: ClawdbotProtocol.AnyCodable]?,
        timeoutMs: Double? = nil) async throws -> Data
    {
        do {
            try await self.connect()
        } catch {
@@ -446,8 +430,8 @@ actor GatewayChannelActor {
        if res.ok == false {
            let code = res.error?["code"]?.value as? String
            let msg = res.error?["message"]?.value as? String
-            let details: [String: ClawdbotProtocol.AnyCodable] = (res.error ?? [:]).reduce(into: [:]) { acc, pair in
+            let details: [String: AnyCodable] = (res.error ?? [:]).reduce(into: [:]) { acc, pair in
-                acc[pair.key] = ClawdbotProtocol.AnyCodable(pair.value.value)
+                acc[pair.key] = AnyCodable(pair.value.value)
            }
            throw GatewayResponseError(method: method, code: code, message: msg, details: details)
        }
@@ -5,7 +5,7 @@ import OSLog
 private let gatewayConnectionLogger = Logger(subsystem: "com.clawdbot", category: "gateway.connection")
-enum GatewayAgentChannel: String, Codable, CaseIterable, Sendable {
+enum GatewayAgentProvider: String, Codable, CaseIterable, Sendable {
    case last
    case whatsapp
    case telegram
@@ -13,12 +13,11 @@ enum GatewayAgentChannel: String, Codable, CaseIterable, Sendable {
    case slack
    case signal
    case imessage
    case msteams
    case webchat
    init(raw: String?) {
        let normalized = (raw ?? "").trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
-        self = GatewayAgentChannel(rawValue: normalized) ?? .last
+        self = GatewayAgentProvider(rawValue: normalized) ?? .last
    }
    var isDeliverable: Bool { self != .webchat }
@@ -32,7 +31,7 @@ struct GatewayAgentInvocation: Sendable {
    var thinking: String?
    var deliver: Bool = false
    var to: String?
-    var channel: GatewayAgentChannel = .last
+    var provider: GatewayAgentProvider = .last
    var timeoutSeconds: Int?
    var idempotencyKey: String = UUID().uuidString
 }
@@ -52,10 +51,9 @@ actor GatewayConnection {
        case setHeartbeats = "set-heartbeats"
        case systemEvent = "system-event"
        case health
-        case channelsStatus = "channels.status"
+        case providersStatus = "providers.status"
        case configGet = "config.get"
        case configSet = "config.set"
        case configPatch = "config.patch"
        case wizardStart = "wizard.start"
        case wizardNext = "wizard.next"
        case wizardCancel = "wizard.cancel"
@@ -63,7 +61,8 @@ actor GatewayConnection {
        case talkMode = "talk.mode"
        case webLoginStart = "web.login.start"
        case webLoginWait = "web.login.wait"
-        case channelsLogout = "channels.logout"
+        case webLogout = "web.logout"
        case telegramLogout = "telegram.logout"
        case modelsList = "models.list"
        case chatHistory = "chat.history"
        case chatSend = "chat.send"
@@ -233,18 +232,7 @@ actor GatewayConnection {
    func canvasHostUrl() async -> String? {
        guard let snapshot = self.lastSnapshot else { return nil }
-        let trimmed = snapshot.canvashosturl?.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines) ?? ""
+        let trimmed = snapshot.canvashosturl?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
        return trimmed.isEmpty ? nil : trimmed
    }
    private func sessionDefaultString(_ defaults: [String: AnyCodable]?, key: String) -> String {
        (defaults?[key]?.stringValue ?? "")
            .trimmingCharacters(in: CharacterSet.whitespacesAndNewlines)
    }
    func cachedMainSessionKey() -> String? {
        guard let snapshot = self.lastSnapshot else { return nil }
        let trimmed = self.sessionDefaultString(snapshot.snapshot.sessiondefaults, key: "mainSessionKey")
        return trimmed.isEmpty ? nil : trimmed
    }
@@ -279,35 +267,12 @@ actor GatewayConnection {
    private func broadcast(_ push: GatewayPush) {
        if case let .snapshot(snapshot) = push {
            self.lastSnapshot = snapshot
            if let mainSessionKey = self.cachedMainSessionKey() {
                Task { @MainActor in
                    WorkActivityStore.shared.setMainSessionKey(mainSessionKey)
                }
            }
        }
        for (_, continuation) in self.subscribers {
            continuation.yield(push)
        }
    }
    private func canonicalizeSessionKey(_ raw: String) -> String {
        let trimmed = raw.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines)
        guard !trimmed.isEmpty else { return trimmed }
        guard let defaults = self.lastSnapshot?.snapshot.sessiondefaults else { return trimmed }
        let mainSessionKey = self.sessionDefaultString(defaults, key: "mainSessionKey")
        guard !mainSessionKey.isEmpty else { return trimmed }
        let mainKey = self.sessionDefaultString(defaults, key: "mainKey")
        let defaultAgentId = self.sessionDefaultString(defaults, key: "defaultAgentId")
        let isMainAlias =
            trimmed == "main" ||
            (!mainKey.isEmpty && trimmed == mainKey) ||
            trimmed == mainSessionKey ||
            (!defaultAgentId.isEmpty &&
                (trimmed == "agent:\(defaultAgentId):main" ||
                    (mainKey.isEmpty == false && trimmed == "agent:\(defaultAgentId):\(mainKey)")))
        return isMainAlias ? mainSessionKey : trimmed
    }
    private func configure(url: URL, token: String?, password: String?) async {
        if self.client != nil, self.configuredURL == url, self.configuredToken == token,
           self.configuredPassword == password
@@ -366,9 +331,6 @@ extension GatewayConnection {
    }
    func mainSessionKey(timeoutMs: Double = 15000) async -> String {
        if let cached = self.cachedMainSessionKey() {
            return cached
        }
        do {
            let data = try await self.requestRaw(method: "config.get", params: nil, timeoutMs: timeoutMs)
            return try Self.mainSessionKey(fromConfigGetData: data)
@@ -399,15 +361,14 @@ extension GatewayConnection {
    func sendAgent(_ invocation: GatewayAgentInvocation) async -> (ok: Bool, error: String?) {
        let trimmed = invocation.message.trimmingCharacters(in: .whitespacesAndNewlines)
        guard !trimmed.isEmpty else { return (false, "message empty") }
        let sessionKey = self.canonicalizeSessionKey(invocation.sessionKey)
        var params: [String: AnyCodable] = [
            "message": AnyCodable(trimmed),
-            "sessionKey": AnyCodable(sessionKey),
+            "sessionKey": AnyCodable(invocation.sessionKey),
            "thinking": AnyCodable(invocation.thinking ?? "default"),
            "deliver": AnyCodable(invocation.deliver),
            "to": AnyCodable(invocation.to ?? ""),
-            "channel": AnyCodable(invocation.channel.rawValue),
+            "provider": AnyCodable(invocation.provider.rawValue),
            "idempotencyKey": AnyCodable(invocation.idempotencyKey),
        ]
        if let timeout = invocation.timeoutSeconds {
@@ -428,7 +389,7 @@ extension GatewayConnection {
        sessionKey: String,
        deliver: Bool,
        to: String?,
-        channel: GatewayAgentChannel = .last,
+        provider: GatewayAgentProvider = .last,
        timeoutSeconds: Int? = nil,
        idempotencyKey: String = UUID().uuidString) async -> (ok: Bool, error: String?)
    {
@@ -438,7 +399,7 @@ extension GatewayConnection {
            thinking: thinking,
            deliver: deliver,
            to: to,
-            channel: channel,
+            provider: provider,
            timeoutSeconds: timeoutSeconds,
            idempotencyKey: idempotencyKey))
    }
@@ -507,8 +468,7 @@ extension GatewayConnection {
        limit: Int? = nil,
        timeoutMs: Int? = nil) async throws -> ClawdbotChatHistoryPayload
    {
-        let resolvedKey = self.canonicalizeSessionKey(sessionKey)
+        var params: [String: AnyCodable] = ["sessionKey": AnyCodable(sessionKey)]
        var params: [String: AnyCodable] = ["sessionKey": AnyCodable(resolvedKey)]
        if let limit { params["limit"] = AnyCodable(limit) }
        let timeout = timeoutMs.map { Double($0) }
        return try await self.requestDecoded(
@@ -525,9 +485,8 @@ extension GatewayConnection {
        attachments: [ClawdbotChatAttachmentPayload],
        timeoutMs: Int = 30000) async throws -> ClawdbotChatSendResponse
    {
        let resolvedKey = self.canonicalizeSessionKey(sessionKey)
        var params: [String: AnyCodable] = [
-            "sessionKey": AnyCodable(resolvedKey),
+            "sessionKey": AnyCodable(sessionKey),
            "message": AnyCodable(message),
            "thinking": AnyCodable(thinking),
            "idempotencyKey": AnyCodable(idempotencyKey),
@@ -553,11 +512,10 @@ extension GatewayConnection {
    }
    func chatAbort(sessionKey: String, runId: String) async throws -> Bool {
        let resolvedKey = self.canonicalizeSessionKey(sessionKey)
        struct AbortResponse: Decodable { let ok: Bool?; let aborted: Bool? }
        let res: AbortResponse = try await self.requestDecoded(
            method: .chatAbort,
-            params: ["sessionKey": AnyCodable(resolvedKey), "runId": AnyCodable(runId)])
+            params: ["sessionKey": AnyCodable(sessionKey), "runId": AnyCodable(runId)])
        return res.aborted ?? false
    }
@@ -1,4 +1,3 @@
 import ClawdbotDiscovery
 import SwiftUI
 struct GatewayDiscoveryInlineList: View {
@@ -6,79 +6,43 @@ import OSLog
@MainActor
@Observable
-public final class GatewayDiscoveryModel {
+final class GatewayDiscoveryModel {
-    public struct LocalIdentity: Equatable, Sendable {
+    struct LocalIdentity: Equatable {
-        public var hostTokens: Set<String>
+        var hostTokens: Set<String>
-        public var displayTokens: Set<String>
+        var displayTokens: Set<String>
        public init(hostTokens: Set<String>, displayTokens: Set<String>) {
            self.hostTokens = hostTokens
            self.displayTokens = displayTokens
        }
    }
-    public struct DiscoveredGateway: Identifiable, Equatable, Sendable {
+    struct DiscoveredGateway: Identifiable, Equatable {
-        public var id: String { self.stableID }
+        var id: String { self.stableID }
-        public var displayName: String
+        var displayName: String
-        public var lanHost: String?
+        var lanHost: String?
-        public var tailnetDns: String?
+        var tailnetDns: String?
-        public var sshPort: Int
+        var sshPort: Int
-        public var gatewayPort: Int?
+        var gatewayPort: Int?
-        public var cliPath: String?
+        var cliPath: String?
-        public var stableID: String
+        var stableID: String
-        public var debugID: String
+        var debugID: String
-        public var isLocal: Bool
+        var isLocal: Bool
        public init(
            displayName: String,
            lanHost: String? = nil,
            tailnetDns: String? = nil,
            sshPort: Int,
            gatewayPort: Int? = nil,
            cliPath: String? = nil,
            stableID: String,
            debugID: String,
            isLocal: Bool)
        {
            self.displayName = displayName
            self.lanHost = lanHost
            self.tailnetDns = tailnetDns
            self.sshPort = sshPort
            self.gatewayPort = gatewayPort
            self.cliPath = cliPath
            self.stableID = stableID
            self.debugID = debugID
            self.isLocal = isLocal
        }
    }
-    public var gateways: [DiscoveredGateway] = []
+    var gateways: [DiscoveredGateway] = []
-    public var statusText: String = "Idle"
+    var statusText: String = "Idle"
    private var browsers: [String: NWBrowser] = [:]
    private var resultsByDomain: [String: Set<NWBrowser.Result>] = [:]
    private var gatewaysByDomain: [String: [DiscoveredGateway]] = [:]
    private var statesByDomain: [String: NWBrowser.State] = [:]
    private var localIdentity: LocalIdentity
    private let localDisplayName: String?
    private let filterLocalGateways: Bool
    private var resolvedTXTByID: [String: [String: String]] = [:]
    private var pendingTXTResolvers: [String: GatewayTXTResolver] = [:]
    private var wideAreaFallbackTask: Task<Void, Never>?
    private var wideAreaFallbackGateways: [DiscoveredGateway] = []
    private let logger = Logger(subsystem: "com.clawdbot", category: "gateway-discovery")
-    public init(
+    init() {
-        localDisplayName: String? = nil,
+        self.localIdentity = Self.buildLocalIdentityFast()
        filterLocalGateways: Bool = true)
    {
        self.localDisplayName = localDisplayName
        self.filterLocalGateways = filterLocalGateways
        self.localIdentity = Self.buildLocalIdentityFast(displayName: localDisplayName)
        self.refreshLocalIdentity()
    }
-    public func start() {
+    func start() {
        if !self.browsers.isEmpty { return }
        for domain in ClawdbotBonjour.bridgeServiceDomains {
@@ -108,24 +72,9 @@ public final class GatewayDiscoveryModel {
            self.browsers[domain] = browser
            browser.start(queue: DispatchQueue(label: "com.clawdbot.macos.gateway-discovery.\(domain)"))
        }
        self.scheduleWideAreaFallback()
    }
-    public func refreshWideAreaFallbackNow(timeoutSeconds: TimeInterval = 5.0) {
+    func stop() {
        let domain = ClawdbotBonjour.wideAreaBridgeServiceDomain
        Task.detached(priority: .utility) { [weak self] in
            guard let self else { return }
            let beacons = WideAreaGatewayDiscovery.discover(timeoutSeconds: timeoutSeconds)
            await MainActor.run { [weak self] in
                guard let self else { return }
                self.wideAreaFallbackGateways = self.mapWideAreaBeacons(beacons, domain: domain)
                self.recomputeGateways()
            }
        }
    }
    public func stop() {
        for browser in self.browsers.values {
            browser.cancel()
        }
@@ -136,52 +85,15 @@ public final class GatewayDiscoveryModel {
        self.resolvedTXTByID = [:]
        self.pendingTXTResolvers.values.forEach { $0.cancel() }
        self.pendingTXTResolvers = [:]
        self.wideAreaFallbackTask?.cancel()
        self.wideAreaFallbackTask = nil
        self.wideAreaFallbackGateways = []
        self.gateways = []
        self.statusText = "Stopped"
    }
    private func mapWideAreaBeacons(_ beacons: [WideAreaGatewayBeacon], domain: String) -> [DiscoveredGateway] {
        beacons.map { beacon in
            let stableID = "wide-area|\(domain)|\(beacon.instanceName)"
            let isLocal = Self.isLocalGateway(
                lanHost: beacon.lanHost,
                tailnetDns: beacon.tailnetDns,
                displayName: beacon.displayName,
                serviceName: beacon.instanceName,
                local: self.localIdentity)
            return DiscoveredGateway(
                displayName: beacon.displayName,
                lanHost: beacon.lanHost,
                tailnetDns: beacon.tailnetDns,
                sshPort: beacon.sshPort ?? 22,
                gatewayPort: beacon.gatewayPort,
                cliPath: beacon.cliPath,
                stableID: stableID,
                debugID: "\(beacon.instanceName)@\(beacon.host):\(beacon.port)",
                isLocal: isLocal)
        }
    }
    private func recomputeGateways() {
-        let primary = self.sortedDeduped(gateways: self.gatewaysByDomain.values.flatMap(\.self))
+        self.gateways = self.gatewaysByDomain.values
-        let primaryFiltered = self.filterLocalGateways ? primary.filter { !$0.isLocal } : primary
+            .flatMap(\.self)
-        if !primaryFiltered.isEmpty {
+            .filter { !$0.isLocal }
-            self.gateways = primaryFiltered
+            .sorted { $0.displayName.localizedCaseInsensitiveCompare($1.displayName) == .orderedAscending }
            return
        }
        // Bonjour can return only "local" results for the wide-area domain (or no results at all),
        // which makes onboarding look empty even though Tailscale DNS-SD can already see bridges.
        guard !self.wideAreaFallbackGateways.isEmpty else {
            self.gateways = primaryFiltered
            return
        }
        let combined = self.sortedDeduped(gateways: primary + self.wideAreaFallbackGateways)
        self.gateways = self.filterLocalGateways ? combined.filter { !$0.isLocal } : combined
    }
    private func updateGateways(for domain: String) {
@@ -234,74 +146,6 @@ public final class GatewayDiscoveryModel {
                isLocal: isLocal)
        }
        .sorted { $0.displayName.localizedCaseInsensitiveCompare($1.displayName) == .orderedAscending }
        if domain == ClawdbotBonjour.wideAreaBridgeServiceDomain,
           self.hasUsableWideAreaResults
        {
            self.wideAreaFallbackGateways = []
        }
    }
    private func scheduleWideAreaFallback() {
        let domain = ClawdbotBonjour.wideAreaBridgeServiceDomain
        if Self.isRunningTests { return }
        guard self.wideAreaFallbackTask == nil else { return }
        self.wideAreaFallbackTask = Task.detached(priority: .utility) { [weak self] in
            guard let self else { return }
            var attempt = 0
            let startedAt = Date()
            while !Task.isCancelled, Date().timeIntervalSince(startedAt) < 35.0 {
                let hasResults = await MainActor.run {
                    self.hasUsableWideAreaResults
                }
                if hasResults { return }
                // Wide-area discovery can be racy (Tailscale not yet up, DNS zone not
                // published yet). Retry with a short backoff while onboarding is open.
                let beacons = WideAreaGatewayDiscovery.discover(timeoutSeconds: 2.0)
                if !beacons.isEmpty {
                    await MainActor.run { [weak self] in
                        guard let self else { return }
                        self.wideAreaFallbackGateways = self.mapWideAreaBeacons(beacons, domain: domain)
                        self.recomputeGateways()
                    }
                    return
                }
                attempt += 1
                let backoff = min(8.0, 0.6 + (Double(attempt) * 0.7))
                try? await Task.sleep(nanoseconds: UInt64(backoff * 1_000_000_000))
            }
        }
    }
    private var hasUsableWideAreaResults: Bool {
        let domain = ClawdbotBonjour.wideAreaBridgeServiceDomain
        guard let gateways = self.gatewaysByDomain[domain], !gateways.isEmpty else { return false }
        if !self.filterLocalGateways { return true }
        return gateways.contains(where: { !$0.isLocal })
    }
    private func sortedDeduped(gateways: [DiscoveredGateway]) -> [DiscoveredGateway] {
        var seen = Set<String>()
        let deduped = gateways.filter { gateway in
            if seen.contains(gateway.stableID) { return false }
            seen.insert(gateway.stableID)
            return true
        }
        return deduped.sorted {
            $0.displayName.localizedCaseInsensitiveCompare($1.displayName) == .orderedAscending
        }
    }
    private nonisolated static var isRunningTests: Bool {
        // Keep discovery background work from running forever during SwiftPM test runs.
        if Bundle.allBundles.contains(where: { $0.bundleURL.pathExtension == "xctest" }) { return true }
        let env = ProcessInfo.processInfo.environment
        return env["XCTestConfigurationFilePath"] != nil
            || env["XCTestBundlePath"] != nil
            || env["XCTestSessionIdentifier"] != nil
    }
    private func updateGatewaysForAllDomains() {
@@ -364,15 +208,15 @@ public final class GatewayDiscoveryModel {
        return merged
    }
-    public struct GatewayTXT: Equatable {
+    struct GatewayTXT: Equatable {
-        public var lanHost: String?
+        var lanHost: String?
-        public var tailnetDns: String?
+        var tailnetDns: String?
-        public var sshPort: Int
+        var sshPort: Int
-        public var gatewayPort: Int?
+        var gatewayPort: Int?
-        public var cliPath: String?
+        var cliPath: String?
    }
-    public static func parseGatewayTXT(_ txt: [String: String]) -> GatewayTXT {
+    static func parseGatewayTXT(_ txt: [String: String]) -> GatewayTXT {
        var lanHost: String?
        var tailnetDns: String?
        var sshPort = 22
@@ -412,7 +256,7 @@ public final class GatewayDiscoveryModel {
            cliPath: cliPath)
    }
-    public static func buildSSHTarget(user: String, host: String, port: Int) -> String {
+    static func buildSSHTarget(user: String, host: String, port: Int) -> String {
        var target = "\(user)@\(host)"
        if port != 22 {
            target += ":\(port)"
@@ -480,7 +324,7 @@ public final class GatewayDiscoveryModel {
        return titled.isEmpty ? normalized : titled
    }
-    public nonisolated static func isLocalGateway(
+    nonisolated static func isLocalGateway(
        lanHost: String?,
        tailnetDns: String?,
        displayName: String?,
@@ -502,19 +346,18 @@ public final class GatewayDiscoveryModel {
        {
            return true
        }
-        if let serviceHost = normalizeServiceHostToken(serviceName),
+        if let service = normalizeServiceToken(serviceName) {
-           local.hostTokens.contains(serviceHost)
+            for token in local.hostTokens where service.contains(token) {
-        {
+                return true
-            return true
+            }
        }
        return false
    }
    private func refreshLocalIdentity() {
        let fastIdentity = self.localIdentity
        let displayName = self.localDisplayName
        Task.detached(priority: .utility) {
-            let slowIdentity = Self.buildLocalIdentitySlow(displayName: displayName)
+            let slowIdentity = Self.buildLocalIdentitySlow()
            let merged = Self.mergeLocalIdentity(fast: fastIdentity, slow: slowIdentity)
            await MainActor.run { [weak self] in
                guard let self else { return }
@@ -534,7 +377,7 @@ public final class GatewayDiscoveryModel {
            displayTokens: fast.displayTokens.union(slow.displayTokens))
    }
-    private nonisolated static func buildLocalIdentityFast(displayName: String?) -> LocalIdentity {
+    private nonisolated static func buildLocalIdentityFast() -> LocalIdentity {
        var hostTokens: Set<String> = []
        var displayTokens: Set<String> = []
@@ -543,14 +386,14 @@ public final class GatewayDiscoveryModel {
            hostTokens.insert(token)
        }
-        if let token = normalizeDisplayToken(displayName) {
+        if let token = normalizeDisplayToken(InstanceIdentity.displayName) {
            displayTokens.insert(token)
        }
        return LocalIdentity(hostTokens: hostTokens, displayTokens: displayTokens)
    }
-    private nonisolated static func buildLocalIdentitySlow(displayName: String?) -> LocalIdentity {
+    private nonisolated static func buildLocalIdentitySlow() -> LocalIdentity {
        var hostTokens: Set<String> = []
        var displayTokens: Set<String> = []
@@ -560,10 +403,6 @@ public final class GatewayDiscoveryModel {
            hostTokens.insert(token)
        }
        if let token = normalizeDisplayToken(displayName) {
            displayTokens.insert(token)
        }
        if let token = normalizeDisplayToken(Host.current().localizedName) {
            displayTokens.insert(token)
        }
@@ -595,14 +434,11 @@ public final class GatewayDiscoveryModel {
        return trimmed.lowercased()
    }
-    private nonisolated static func normalizeServiceHostToken(_ raw: String?) -> String? {
+    private nonisolated static func normalizeServiceToken(_ raw: String?) -> String? {
        guard let raw else { return nil }
-        let prettified = Self.prettifyInstanceName(raw)
+        let trimmed = raw.trimmingCharacters(in: .whitespacesAndNewlines)
-        let strippedBridge = prettified.replacingOccurrences(
+        if trimmed.isEmpty { return nil }
-            of: #"\s*-?\s*bridge$"#,
+        return trimmed.lowercased()
            with: "",
            options: .regularExpression)
        return self.normalizeHostToken(strippedBridge)
    }
 }
@@ -3,7 +3,6 @@ import OSLog
 enum GatewayEndpointState: Sendable, Equatable {
    case ready(mode: AppState.ConnectionMode, url: URL, token: String?, password: String?)
    case connecting(mode: AppState.ConnectionMode, detail: String)
    case unavailable(mode: AppState.ConnectionMode, reason: String)
 }
@@ -15,7 +14,6 @@ enum GatewayEndpointState: Sendable, Equatable {
 actor GatewayEndpointStore {
    static let shared = GatewayEndpointStore()
    private static let supportedBindModes: Set<String> = ["loopback", "tailnet", "lan", "auto"]
    private static let remoteConnectingDetail = "Connecting to remote gateway…"
    struct Deps: Sendable {
        let mode: @Sendable () async -> AppState.ConnectionMode
@@ -28,21 +26,13 @@ actor GatewayEndpointStore {
        static let live = Deps(
            mode: { await MainActor.run { AppStateStore.shared.connectionMode } },
-            token: {
+            token: { ProcessInfo.processInfo.environment["CLAWDBOT_GATEWAY_TOKEN"] },
                let root = ClawdbotConfigFile.loadDict()
                return GatewayEndpointStore.resolveGatewayToken(
                    isRemote: CommandResolver.connectionModeIsRemote(),
                    root: root,
                    env: ProcessInfo.processInfo.environment,
                    launchdSnapshot: GatewayLaunchAgentManager.launchdConfigSnapshot())
            },
            password: {
                let root = ClawdbotConfigFile.loadDict()
                return GatewayEndpointStore.resolveGatewayPassword(
                    isRemote: CommandResolver.connectionModeIsRemote(),
                    root: root,
-                    env: ProcessInfo.processInfo.environment,
+                    env: ProcessInfo.processInfo.environment)
                    launchdSnapshot: GatewayLaunchAgentManager.launchdConfigSnapshot())
            },
            localPort: { GatewayEnvironment.gatewayPort() },
            localHost: {
@@ -62,8 +52,7 @@ actor GatewayEndpointStore {
    private static func resolveGatewayPassword(
        isRemote: Bool,
        root: [String: Any],
-        env: [String: String],
+        env: [String: String]) -> String?
        launchdSnapshot: LaunchAgentPlistSnapshot?) -> String?
    {
        let raw = env["CLAWDBOT_GATEWAY_PASSWORD"] ?? ""
        let trimmed = raw.trimmingCharacters(in: .whitespacesAndNewlines)
@@ -91,51 +80,6 @@ actor GatewayEndpointStore {
                return pw
            }
        }
        if let password = launchdSnapshot?.password?.trimmingCharacters(in: .whitespacesAndNewlines),
           !password.isEmpty
        {
            return password
        }
        return nil
    }
    private static func resolveGatewayToken(
        isRemote: Bool,
        root: [String: Any],
        env: [String: String],
        launchdSnapshot: LaunchAgentPlistSnapshot?) -> String?
    {
        let raw = env["CLAWDBOT_GATEWAY_TOKEN"] ?? ""
        let trimmed = raw.trimmingCharacters(in: .whitespacesAndNewlines)
        if !trimmed.isEmpty {
            return trimmed
        }
        if isRemote {
            if let gateway = root["gateway"] as? [String: Any],
               let remote = gateway["remote"] as? [String: Any],
               let token = remote["token"] as? String
            {
                let value = token.trimmingCharacters(in: .whitespacesAndNewlines)
                if !value.isEmpty {
                    return value
                }
            }
            return nil
        }
        if let gateway = root["gateway"] as? [String: Any],
           let auth = gateway["auth"] as? [String: Any],
           let token = auth["token"] as? String
        {
            let value = token.trimmingCharacters(in: .whitespacesAndNewlines)
            if !value.isEmpty {
                return value
            }
        }
        if let token = launchdSnapshot?.token?.trimmingCharacters(in: .whitespacesAndNewlines),
           !token.isEmpty
        {
            return token
        }
        return nil
    }
@@ -144,7 +88,6 @@ actor GatewayEndpointStore {
    private var state: GatewayEndpointState
    private var subscribers: [UUID: AsyncStream<GatewayEndpointState>.Continuation] = [:]
    private var remoteEnsure: (token: UUID, task: Task<UInt16, Error>)?
    init(deps: Deps = .live) {
        self.deps = deps
@@ -172,8 +115,7 @@ actor GatewayEndpointStore {
                token: token,
                password: password)
        case .remote:
-            self.state = .connecting(mode: .remote, detail: Self.remoteConnectingDetail)
+            self.state = .unavailable(mode: .remote, reason: "Remote mode enabled but no active control tunnel")
            Task { await self.setMode(.remote) }
        case .unconfigured:
            self.state = .unavailable(mode: .unconfigured, reason: "Gateway not configured")
        }
@@ -202,7 +144,6 @@ actor GatewayEndpointStore {
        let password = self.deps.password()
        switch mode {
        case .local:
            self.cancelRemoteEnsure()
            let port = self.deps.localPort()
            let host = await self.deps.localHost()
            self.setState(.ready(
@@ -213,18 +154,15 @@ actor GatewayEndpointStore {
        case .remote:
            let port = await self.deps.remotePortIfRunning()
            guard let port else {
-                self.setState(.connecting(mode: .remote, detail: Self.remoteConnectingDetail))
+                self.setState(.unavailable(mode: .remote, reason: "Remote mode enabled but no active control tunnel"))
                self.kickRemoteEnsureIfNeeded(detail: Self.remoteConnectingDetail)
                return
            }
            self.cancelRemoteEnsure()
            self.setState(.ready(
                mode: .remote,
                url: URL(string: "ws://127.0.0.1:\(Int(port))")!,
                token: token,
                password: password))
        case .unconfigured:
            self.cancelRemoteEnsure()
            self.setState(.unavailable(mode: .unconfigured, reason: "Gateway not configured"))
        }
    }
@@ -238,13 +176,8 @@ actor GatewayEndpointStore {
                code: 1,
                userInfo: [NSLocalizedDescriptionKey: "Remote mode is not enabled"])
        }
-        let config = try await self.ensureRemoteConfig(detail: Self.remoteConnectingDetail)
+        let port = try await self.deps.ensureRemoteTunnel()
-        guard let portInt = config.0.port, let port = UInt16(exactly: portInt) else {
+        await self.setMode(.remote)
            throw NSError(
                domain: "GatewayEndpoint",
                code: 1,
                userInfo: [NSLocalizedDescriptionKey: "Missing tunnel port"])
        }
        return port
    }
@@ -253,11 +186,6 @@ actor GatewayEndpointStore {
        switch self.state {
        case let .ready(_, url, token, password):
            return (url, token, password)
        case let .connecting(mode, _):
            guard mode == .remote else {
                throw NSError(domain: "GatewayEndpoint", code: 1, userInfo: [NSLocalizedDescriptionKey: "Connecting…"])
            }
            return try await self.ensureRemoteConfig(detail: Self.remoteConnectingDetail)
        case let .unavailable(mode, reason):
            guard mode == .remote else {
                throw NSError(domain: "GatewayEndpoint", code: 1, userInfo: [NSLocalizedDescriptionKey: reason])
@@ -265,76 +193,21 @@ actor GatewayEndpointStore {
            // Auto-recover for remote mode: if the SSH control tunnel died (or hasn't been created yet),
            // recreate it on demand so callers can recover without a manual reconnect.
-            self.logger.info(
+            do {
-                "endpoint unavailable; ensuring remote control tunnel reason=\(reason, privacy: .public)")
+                self.logger.info(
-            return try await self.ensureRemoteConfig(detail: Self.remoteConnectingDetail)
+                    "endpoint unavailable; ensuring remote control tunnel reason=\(reason, privacy: .public)")
-        }
+                let forwarded = try await self.deps.ensureRemoteTunnel()
-    }
+                let token = self.deps.token()
-
+                let password = self.deps.password()
-    private func cancelRemoteEnsure() {
+                let url = URL(string: "ws://127.0.0.1:\(Int(forwarded))")!
-        self.remoteEnsure?.task.cancel()
+                self.setState(.ready(mode: .remote, url: url, token: token, password: password))
-        self.remoteEnsure = nil
+                return (url, token, password)
-    }
+            } catch {
-
+                let msg = "\(reason) (\(error.localizedDescription))"
-    private func kickRemoteEnsureIfNeeded(detail: String) {
+                self.setState(.unavailable(mode: .remote, reason: msg))
-        if self.remoteEnsure != nil {
+                self.logger.error("remote control tunnel ensure failed \(msg, privacy: .public)")
-            self.setState(.connecting(mode: .remote, detail: detail))
+                throw NSError(domain: "GatewayEndpoint", code: 1, userInfo: [NSLocalizedDescriptionKey: msg])
            return
        }
        let deps = self.deps
        let token = UUID()
        let task = Task.detached(priority: .utility) { try await deps.ensureRemoteTunnel() }
        self.remoteEnsure = (token: token, task: task)
        self.setState(.connecting(mode: .remote, detail: detail))
    }
    private func ensureRemoteConfig(detail: String) async throws -> GatewayConnection.Config {
        let mode = await self.deps.mode()
        guard mode == .remote else {
            throw NSError(
                domain: "RemoteTunnel",
                code: 1,
                userInfo: [NSLocalizedDescriptionKey: "Remote mode is not enabled"])
        }
        self.kickRemoteEnsureIfNeeded(detail: detail)
        guard let ensure = self.remoteEnsure else {
            throw NSError(domain: "GatewayEndpoint", code: 1, userInfo: [NSLocalizedDescriptionKey: "Connecting…"])
        }
        do {
            let forwarded = try await ensure.task.value
            let stillRemote = await self.deps.mode() == .remote
            guard stillRemote else {
                throw NSError(
                    domain: "RemoteTunnel",
                    code: 1,
                    userInfo: [NSLocalizedDescriptionKey: "Remote mode is not enabled"])
            }
            if self.remoteEnsure?.token == ensure.token {
                self.remoteEnsure = nil
            }
            let token = self.deps.token()
            let password = self.deps.password()
            let url = URL(string: "ws://127.0.0.1:\(Int(forwarded))")!
            self.setState(.ready(mode: .remote, url: url, token: token, password: password))
            return (url, token, password)
        } catch let err as CancellationError {
            if self.remoteEnsure?.token == ensure.token {
                self.remoteEnsure = nil
            }
            throw err
        } catch {
            if self.remoteEnsure?.token == ensure.token {
                self.remoteEnsure = nil
            }
            let msg = "Remote control tunnel failed (\(error.localizedDescription))"
            self.setState(.unavailable(mode: .remote, reason: msg))
            self.logger.error("remote control tunnel ensure failed \(msg, privacy: .public)")
            throw NSError(domain: "GatewayEndpoint", code: 1, userInfo: [NSLocalizedDescriptionKey: msg])
        }
    }
@@ -355,11 +228,6 @@ actor GatewayEndpointStore {
            self.logger
                .debug(
                    "resolved endpoint mode=\(modeDesc, privacy: .public) url=\(urlDesc, privacy: .public)")
        case let .connecting(mode, detail):
            let modeDesc = String(describing: mode)
            self.logger
                .debug(
                    "endpoint connecting mode=\(modeDesc, privacy: .public) detail=\(detail, privacy: .public)")
        case let .unavailable(mode, reason):
            let modeDesc = String(describing: mode)
            self.logger
@@ -402,61 +270,14 @@ actor GatewayEndpointStore {
    }
 }
 extension GatewayEndpointStore {
    static func dashboardURL(for config: GatewayConnection.Config) throws -> URL {
        guard var components = URLComponents(url: config.url, resolvingAgainstBaseURL: false) else {
            throw NSError(domain: "Dashboard", code: 1, userInfo: [
                NSLocalizedDescriptionKey: "Invalid gateway URL",
            ])
        }
        switch components.scheme?.lowercased() {
        case "ws":
            components.scheme = "http"
        case "wss":
            components.scheme = "https"
        default:
            components.scheme = "http"
        }
        components.path = "/"
        var queryItems: [URLQueryItem] = []
        if let token = config.token?.trimmingCharacters(in: .whitespacesAndNewlines),
           !token.isEmpty
        {
            queryItems.append(URLQueryItem(name: "token", value: token))
        }
        if let password = config.password?.trimmingCharacters(in: .whitespacesAndNewlines),
           !password.isEmpty
        {
            queryItems.append(URLQueryItem(name: "password", value: password))
        }
        components.queryItems = queryItems.isEmpty ? nil : queryItems
        guard let url = components.url else {
            throw NSError(domain: "Dashboard", code: 2, userInfo: [
                NSLocalizedDescriptionKey: "Failed to build dashboard URL",
            ])
        }
        return url
    }
 }
 #if DEBUG
 extension GatewayEndpointStore {
    static func _testResolveGatewayPassword(
        isRemote: Bool,
        root: [String: Any],
-        env: [String: String],
+        env: [String: String]) -> String?
        launchdSnapshot: LaunchAgentPlistSnapshot? = nil) -> String?
    {
-        self.resolveGatewayPassword(isRemote: isRemote, root: root, env: env, launchdSnapshot: launchdSnapshot)
+        self.resolveGatewayPassword(isRemote: isRemote, root: root, env: env)
    }
    static func _testResolveGatewayToken(
        isRemote: Bool,
        root: [String: Any],
        env: [String: String],
        launchdSnapshot: LaunchAgentPlistSnapshot? = nil) -> String?
    {
        self.resolveGatewayToken(isRemote: isRemote, root: root, env: env, launchdSnapshot: launchdSnapshot)
    }
    static func _testResolveGatewayBindMode(
@@ -65,6 +65,12 @@ enum GatewayEnvironment {
    private static let logger = Logger(subsystem: "com.clawdbot", category: "gateway.env")
    private static let supportedBindModes: Set<String> = ["loopback", "tailnet", "lan", "auto"]
    static func bundledGatewayExecutable() -> String? {
        guard let res = Bundle.main.resourceURL else { return nil }
        let path = res.appendingPathComponent("Relay/clawdbot").path
        return FileManager.default.isExecutableFile(atPath: path) ? path : nil
    }
    static func gatewayPort() -> Int {
        if let raw = ProcessInfo.processInfo.environment["CLAWDBOT_GATEWAY_PORT"] {
            let trimmed = raw.trimmingCharacters(in: .whitespacesAndNewlines)
@@ -99,6 +105,28 @@ enum GatewayEnvironment {
        }
        let expected = self.expectedGatewayVersion()
        if let bundled = self.bundledGatewayExecutable() {
            let installed = self.readGatewayVersion(binary: bundled)
            if let expected, let installed, !installed.compatible(with: expected) {
                let message =
                    "Bundled gateway \(installed.description) is incompatible with app " +
                    "\(expected.description); rebuild the app bundle."
                return GatewayEnvironmentStatus(
                    kind: .incompatible(found: installed.description, required: expected.description),
                    nodeVersion: nil,
                    gatewayVersion: installed.description,
                    requiredGateway: expected.description,
                    message: message)
            }
            let gatewayVersionText = installed?.description ?? "unknown"
            return GatewayEnvironmentStatus(
                kind: .ok,
                nodeVersion: nil,
                gatewayVersion: gatewayVersionText,
                requiredGateway: expected?.description,
                message: "Bundled gateway \(gatewayVersionText) (bun)")
        }
        let projectRoot = CommandResolver.projectRoot()
        let projectEntrypoint = CommandResolver.gatewayEntrypoint(in: projectRoot)
@@ -119,7 +147,7 @@ enum GatewayEnvironment {
                    nodeVersion: runtime.version.description,
                    gatewayVersion: nil,
                    requiredGateway: expected?.description,
-                    message: "clawdbot CLI not found in PATH; install the CLI.")
+                    message: "clawdbot CLI not found in PATH; install the global package.")
            }
            let installed = gatewayBin.flatMap { self.readGatewayVersion(binary: $0) }
@@ -169,6 +197,7 @@ enum GatewayEnvironment {
        let projectEntrypoint = CommandResolver.gatewayEntrypoint(in: projectRoot)
        let status = self.check()
        let gatewayBin = CommandResolver.clawdbotExecutable()
        let bundled = self.bundledGatewayExecutable()
        let runtime = RuntimeLocator.resolve(searchPaths: CommandResolver.preferredPaths())
        guard case .ok = status.kind else {
@@ -176,17 +205,20 @@ enum GatewayEnvironment {
        }
        let port = self.gatewayPort()
-        if let gatewayBin {
+        if let bundled {
            let bind = self.preferredGatewayBind() ?? "loopback"
-            let cmd = [gatewayBin, "gateway-daemon", "--port", "\(port)", "--bind", bind]
+            let cmd = [bundled, "gateway-daemon", "--port", "\(port)", "--bind", bind]
            return GatewayCommandResolution(status: status, command: cmd)
        }
        if let gatewayBin {
            let cmd = [gatewayBin, "gateway", "--port", "\(port)"]
            return GatewayCommandResolution(status: status, command: cmd)
        }
        if let entry = projectEntrypoint,
           case let .success(resolvedRuntime) = runtime
        {
-            let bind = self.preferredGatewayBind() ?? "loopback"
+            let cmd = [resolvedRuntime.path, entry, "gateway", "--port", "\(port)"]
            let cmd = [resolvedRuntime.path, entry, "gateway-daemon", "--port", "\(port)", "--bind", bind]
            return GatewayCommandResolution(status: status, command: cmd)
        }
@@ -2,164 +2,312 @@ import Foundation
 enum GatewayLaunchAgentManager {
    private static let logger = Logger(subsystem: "com.clawdbot", category: "gateway.launchd")
-    private static let disableLaunchAgentMarker = ".clawdbot/disable-launchagent"
+    private static let supportedBindModes: Set<String> = ["loopback", "tailnet", "lan", "auto"]
    private static let legacyGatewayLaunchdLabel = "com.steipete.clawdbot.gateway"
    private static var plistURL: URL {
        FileManager.default.homeDirectoryForCurrentUser
            .appendingPathComponent("Library/LaunchAgents/\(gatewayLaunchdLabel).plist")
    }
    private static var legacyPlistURL: URL {
        FileManager.default.homeDirectoryForCurrentUser
            .appendingPathComponent("Library/LaunchAgents/\(legacyGatewayLaunchdLabel).plist")
    }
    private static func gatewayExecutablePath(bundlePath: String) -> String {
        "\(bundlePath)/Contents/Resources/Relay/clawdbot"
    }
    private static func relayDir(bundlePath: String) -> String {
        "\(bundlePath)/Contents/Resources/Relay"
    }
    private static func gatewayProgramArguments(bundlePath: String, port: Int, bind: String) -> [String] {
        #if DEBUG
        let projectRoot = CommandResolver.projectRoot()
        if let localBin = CommandResolver.projectClawdbotExecutable(projectRoot: projectRoot) {
            return [localBin, "gateway", "--port", "\(port)", "--bind", bind]
        }
        if let entry = CommandResolver.gatewayEntrypoint(in: projectRoot),
           case let .success(runtime) = CommandResolver.runtimeResolution()
        {
            return CommandResolver.makeRuntimeCommand(
                runtime: runtime,
                entrypoint: entry,
                subcommand: "gateway",
                extraArgs: ["--port", "\(port)", "--bind", bind])
        }
        #endif
        let gatewayBin = self.gatewayExecutablePath(bundlePath: bundlePath)
        return [gatewayBin, "gateway-daemon", "--port", "\(port)", "--bind", bind]
    }
    static func isLoaded() async -> Bool {
-        guard let loaded = await self.readDaemonLoaded() else { return false }
+        guard FileManager.default.fileExists(atPath: self.plistURL.path) else { return false }
-        return loaded
+        let result = await Launchctl.run(["print", "gui/\(getuid())/\(gatewayLaunchdLabel)"])
        return result.status == 0
    }
    static func set(enabled: Bool, bundlePath: String, port: Int) async -> String? {
-        _ = bundlePath
+        if enabled {
-        if enabled, self.isLaunchAgentWriteDisabled() {
+            _ = await Launchctl.run(["bootout", "gui/\(getuid())/\(self.legacyGatewayLaunchdLabel)"])
-            self.logger.info("launchd enable skipped (disable marker set)")
+            try? FileManager.default.removeItem(at: self.legacyPlistURL)
            let gatewayBin = self.gatewayExecutablePath(bundlePath: bundlePath)
            guard FileManager.default.isExecutableFile(atPath: gatewayBin) else {
                self.logger.error("launchd enable failed: gateway missing at \(gatewayBin)")
                return "Embedded gateway missing in bundle; rebuild via scripts/package-mac-app.sh"
            }
            let desiredBind = self.preferredGatewayBind() ?? "loopback"
            let desiredToken = self.preferredGatewayToken()
            let desiredPassword = self.preferredGatewayPassword()
            let desiredConfig = DesiredConfig(
                port: port,
                bind: desiredBind,
                token: desiredToken,
                password: desiredPassword)
            // If launchd already loaded the job (common on login), avoid `bootout` unless we must
            // change the config. `bootout` can kill a just-started gateway and cause attach loops.
            let loaded = await self.isLoaded()
            if loaded,
               let existing = self.readPlistConfig(),
               existing.matches(desiredConfig)
            {
                self.logger.info("launchd job already loaded with desired config; skipping bootout")
                await self.ensureEnabled()
                _ = await Launchctl.run(["kickstart", "gui/\(getuid())/\(gatewayLaunchdLabel)"])
                return nil
            }
            self.logger.info("launchd enable requested port=\(port) bind=\(desiredBind)")
            self.writePlist(bundlePath: bundlePath, port: port)
            await self.ensureEnabled()
            if loaded {
                _ = await Launchctl.run(["bootout", "gui/\(getuid())/\(gatewayLaunchdLabel)"])
            }
            let bootstrap = await Launchctl.run(["bootstrap", "gui/\(getuid())", self.plistURL.path])
            if bootstrap.status != 0 {
                let msg = bootstrap.output.trimmingCharacters(in: .whitespacesAndNewlines)
                self.logger.error("launchd bootstrap failed: \(msg)")
                return bootstrap.output.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
                    ? "Failed to bootstrap gateway launchd job"
                    : bootstrap.output.trimmingCharacters(in: .whitespacesAndNewlines)
            }
            await self.ensureEnabled()
            return nil
        }
-        if enabled {
+        self.logger.info("launchd disable requested")
-            self.logger.info("launchd enable requested via CLI port=\(port)")
+        _ = await Launchctl.run(["bootout", "gui/\(getuid())/\(gatewayLaunchdLabel)"])
-            return await self.runDaemonCommand([
+        await self.ensureDisabled()
-                "install",
+        try? FileManager.default.removeItem(at: self.plistURL)
-                "--force",
+        return nil
                "--port",
                "\(port)",
                "--runtime",
                "node",
            ])
        }
        self.logger.info("launchd disable requested via CLI")
        return await self.runDaemonCommand(["uninstall"])
    }
    static func kickstart() async {
-        _ = await self.runDaemonCommand(["restart"], timeout: 20)
+        _ = await Launchctl.run(["kickstart", "-k", "gui/\(getuid())/\(gatewayLaunchdLabel)"])
    }
-    static func launchdConfigSnapshot() -> LaunchAgentPlistSnapshot? {
+    private static func writePlist(bundlePath: String, port: Int) {
-        LaunchAgentPlist.snapshot(url: self.plistURL)
+        let relayDir = self.relayDir(bundlePath: bundlePath)
-    }
+        let preferredPath = ([relayDir] + CommandResolver.preferredPaths())
-
+            .joined(separator: ":")
-    static func launchdGatewayLogPath() -> String {
+        let bind = self.preferredGatewayBind() ?? "loopback"
-        let snapshot = self.launchdConfigSnapshot()
+        let programArguments = self.gatewayProgramArguments(bundlePath: bundlePath, port: port, bind: bind)
-        if let stdout = snapshot?.stdoutPath?.trimmingCharacters(in: .whitespacesAndNewlines),
+        let token = self.preferredGatewayToken()
-           !stdout.isEmpty
+        let password = self.preferredGatewayPassword()
-        {
+        var envEntries = """
-            return stdout
+            <key>PATH</key>
            <string>\(preferredPath)</string>
            <key>CLAWDBOT_IMAGE_BACKEND</key>
            <string>sips</string>
        """
        if let token {
            let escapedToken = self.escapePlistValue(token)
            envEntries += """
                <key>CLAWDBOT_GATEWAY_TOKEN</key>
                <string>\(escapedToken)</string>
            """
        }
-        if let stderr = snapshot?.stderrPath?.trimmingCharacters(in: .whitespacesAndNewlines),
+        if let password {
-           !stderr.isEmpty
+            let escapedPassword = self.escapePlistValue(password)
-        {
+            envEntries += """
-            return stderr
+                <key>CLAWDBOT_GATEWAY_PASSWORD</key>
                <string>\(escapedPassword)</string>
            """
        }
        let argsXml = programArguments
            .map { "<string>\(self.escapePlistValue($0))</string>" }
            .joined(separator: "\n            ")
        let plist = """
        <?xml version="1.0" encoding="UTF-8"?>
        <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
        <plist version="1.0">
        <dict>
          <key>Label</key>
          <string>\(gatewayLaunchdLabel)</string>
          <key>ProgramArguments</key>
          <array>
            \(argsXml)
          </array>
          <key>WorkingDirectory</key>
          <string>\(FileManager.default.homeDirectoryForCurrentUser.path)</string>
          <key>RunAtLoad</key>
          <true/>
          <key>KeepAlive</key>
          <true/>
          <key>EnvironmentVariables</key>
          <dict>
        \(envEntries)
          </dict>
          <key>StandardOutPath</key>
          <string>\(LogLocator.launchdGatewayLogPath)</string>
          <key>StandardErrorPath</key>
          <string>\(LogLocator.launchdGatewayLogPath)</string>
        </dict>
        </plist>
        """
        do {
            try plist.write(to: self.plistURL, atomically: true, encoding: .utf8)
        } catch {
            self.logger.error("launchd plist write failed: \(error.localizedDescription)")
        }
        return LogLocator.launchdGatewayLogPath
    }
 }
 extension GatewayLaunchAgentManager {
    private static func isLaunchAgentWriteDisabled() -> Bool {
        let marker = FileManager.default.homeDirectoryForCurrentUser
            .appendingPathComponent(self.disableLaunchAgentMarker)
        return FileManager.default.fileExists(atPath: marker.path)
    }
-    private static func readDaemonLoaded() async -> Bool? {
+    private static func preferredGatewayBind() -> String? {
-        let result = await self.runDaemonCommand(["status", "--json", "--no-probe"], timeout: 15, quiet: true)
+        if CommandResolver.connectionModeIsRemote() {
        guard result.success, let payload = result.payload else { return nil }
        guard
            let json = try? JSONSerialization.jsonObject(with: payload) as? [String: Any],
            let service = json["service"] as? [String: Any],
            let loaded = service["loaded"] as? Bool
        else {
            return nil
        }
-        return loaded
+        if let env = ProcessInfo.processInfo.environment["CLAWDBOT_GATEWAY_BIND"] {
-    }
+            let trimmed = env.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
-
+            if self.supportedBindModes.contains(trimmed) {
-    private struct CommandResult {
+                return trimmed
-        let success: Bool
+            }
        let payload: Data?
        let message: String?
    }
    private struct ParsedDaemonJson {
        let text: String
        let object: [String: Any]
    }
    private static func runDaemonCommand(
        _ args: [String],
        timeout: Double = 15,
        quiet: Bool = false) async -> String?
    {
        let result = await self.runDaemonCommandResult(args, timeout: timeout, quiet: quiet)
        if result.success { return nil }
        return result.message ?? "Gateway daemon command failed"
    }
    private static func runDaemonCommandResult(
        _ args: [String],
        timeout: Double,
        quiet: Bool) async -> CommandResult
    {
        let command = CommandResolver.clawdbotCommand(
            subcommand: "daemon",
            extraArgs: self.withJsonFlag(args))
        var env = ProcessInfo.processInfo.environment
        env["PATH"] = CommandResolver.preferredPaths().joined(separator: ":")
        let response = await ShellExecutor.runDetailed(command: command, cwd: nil, env: env, timeout: timeout)
        let parsed = self.parseDaemonJson(from: response.stdout) ?? self.parseDaemonJson(from: response.stderr)
        let ok = parsed?.object["ok"] as? Bool
        let message = (parsed?.object["error"] as? String) ?? (parsed?.object["message"] as? String)
        let payload = parsed?.text.data(using: .utf8)
            ?? (response.stdout.isEmpty ? response.stderr : response.stdout).data(using: .utf8)
        let success = ok ?? response.success
        if success {
            return CommandResult(success: true, payload: payload, message: nil)
        }
-        if quiet {
+        let root = ClawdbotConfigFile.loadDict()
-            return CommandResult(success: false, payload: payload, message: message)
+        if let gateway = root["gateway"] as? [String: Any],
           let bind = gateway["bind"] as? String
        {
            let trimmed = bind.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
            if self.supportedBindModes.contains(trimmed) {
                return trimmed
            }
        }
-        let detail = message ?? self.summarize(response.stderr) ?? self.summarize(response.stdout)
+        return nil
        let exit = response.exitCode.map { "exit \($0)" } ?? (response.errorMessage ?? "failed")
        let fullMessage = detail.map { "Gateway daemon command failed (\(exit)): \($0)" }
            ?? "Gateway daemon command failed (\(exit))"
        self.logger.error("\(fullMessage, privacy: .public)")
        return CommandResult(success: false, payload: payload, message: detail)
    }
-    private static func withJsonFlag(_ args: [String]) -> [String] {
+    private static func preferredGatewayToken() -> String? {
-        if args.contains("--json") { return args }
+        let raw = ProcessInfo.processInfo.environment["CLAWDBOT_GATEWAY_TOKEN"] ?? ""
        return args + ["--json"]
    }
    private static func parseDaemonJson(from raw: String) -> ParsedDaemonJson? {
        let trimmed = raw.trimmingCharacters(in: .whitespacesAndNewlines)
-        guard let start = trimmed.firstIndex(of: "{"),
+        return trimmed.isEmpty ? nil : trimmed
              let end = trimmed.lastIndex(of: "}")
        else {
            return nil
        }
        let jsonText = String(trimmed[start...end])
        guard let data = jsonText.data(using: .utf8) else { return nil }
        guard let object = try? JSONSerialization.jsonObject(with: data) as? [String: Any] else { return nil }
        return ParsedDaemonJson(text: jsonText, object: object)
    }
-    private static func summarize(_ text: String) -> String? {
+    private static func preferredGatewayPassword() -> String? {
-        let lines = text
+        // First check environment variable
-            .split(whereSeparator: \.isNewline)
+        let raw = ProcessInfo.processInfo.environment["CLAWDBOT_GATEWAY_PASSWORD"] ?? ""
-            .map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }
+        let trimmed = raw.trimmingCharacters(in: .whitespacesAndNewlines)
-            .filter { !$0.isEmpty }
+        if !trimmed.isEmpty {
-        guard let last = lines.last else { return nil }
+            return trimmed
-        let normalized = last.replacingOccurrences(of: "\\s+", with: " ", options: .regularExpression)
+        }
-        return normalized.count > 200 ? String(normalized.prefix(199)) + "…" : normalized
+        // Then check config file (gateway.auth.password)
        let root = ClawdbotConfigFile.loadDict()
        if let gateway = root["gateway"] as? [String: Any],
           let auth = gateway["auth"] as? [String: Any],
           let password = auth["password"] as? String
        {
            return password.trimmingCharacters(in: .whitespacesAndNewlines)
        }
        return nil
    }
    private static func escapePlistValue(_ raw: String) -> String {
        raw
            .replacingOccurrences(of: "&", with: "&amp;")
            .replacingOccurrences(of: "<", with: "&lt;")
            .replacingOccurrences(of: ">", with: "&gt;")
            .replacingOccurrences(of: "\"", with: "&quot;")
            .replacingOccurrences(of: "'", with: "&apos;")
    }
    private struct DesiredConfig: Equatable {
        let port: Int
        let bind: String
        let token: String?
        let password: String?
    }
    private struct InstalledConfig: Equatable {
        let port: Int?
        let bind: String?
        let token: String?
        let password: String?
        func matches(_ desired: DesiredConfig) -> Bool {
            guard self.port == desired.port else { return false }
            guard (self.bind ?? "loopback") == desired.bind else { return false }
            guard self.token == desired.token else { return false }
            guard self.password == desired.password else { return false }
            return true
        }
    }
    private static func readPlistConfig() -> InstalledConfig? {
        guard let snapshot = LaunchAgentPlist.snapshot(url: self.plistURL) else { return nil }
        return InstalledConfig(
            port: snapshot.port,
            bind: snapshot.bind,
            token: snapshot.token,
            password: snapshot.password)
    }
    private static func ensureEnabled() async {
        let result = await Launchctl.run(["enable", "gui/\(getuid())/\(gatewayLaunchdLabel)"])
        guard result.status != 0 else { return }
        let msg = result.output.trimmingCharacters(in: .whitespacesAndNewlines)
        if msg.isEmpty {
            self.logger.warning("launchd enable failed")
        } else {
            self.logger.warning("launchd enable failed: \(msg)")
        }
    }
    private static func ensureDisabled() async {
        let result = await Launchctl.run(["disable", "gui/\(getuid())/\(gatewayLaunchdLabel)"])
        guard result.status != 0 else { return }
        let msg = result.output.trimmingCharacters(in: .whitespacesAndNewlines)
        if msg.isEmpty {
            self.logger.warning("launchd disable failed")
        } else {
            self.logger.warning("launchd disable failed: \(msg)")
        }
    }
 }
 #if DEBUG
 extension GatewayLaunchAgentManager {
    static func _testGatewayExecutablePath(bundlePath: String) -> String {
        self.gatewayExecutablePath(bundlePath: bundlePath)
    }
    static func _testRelayDir(bundlePath: String) -> String {
        self.relayDir(bundlePath: bundlePath)
    }
    static func _testPreferredGatewayBind() -> String? {
        self.preferredGatewayBind()
    }
    static func _testPreferredGatewayToken() -> String? {
        self.preferredGatewayToken()
    }
    static func _testEscapePlistValue(_ raw: String) -> String {
        self.escapePlistValue(raw)
    }
 }
 #endif
@@ -69,6 +69,7 @@ final class GatewayProcessManager {
    func ensureLaunchAgentEnabledIfNeeded() async {
        guard !CommandResolver.connectionModeIsRemote() else { return }
        guard !AppStateStore.attachExistingGatewayOnly else { return }
        let enabled = await GatewayLaunchAgentManager.isLoaded()
        guard !enabled else { return }
        let bundlePath = Bundle.main.bundleURL.path
@@ -96,6 +97,15 @@ final class GatewayProcessManager {
            if await self.attachExistingGatewayIfAvailable() {
                return
            }
            // Respect debug toggle: only attach, never spawn, when enabled.
            if AppStateStore.attachExistingGatewayOnly {
                await MainActor.run {
                    self.status = .failed("Attach-only enabled; no gateway to attach")
                    self.appendLog("[gateway] attach-only enabled; not spawning local gateway\n")
                    self.logger.warning("gateway attach-only enabled; not spawning")
                }
                return
            }
            await self.enableLaunchdGateway()
        }
    }
@@ -140,7 +150,7 @@ final class GatewayProcessManager {
    func refreshLog() {
        guard self.logRefreshTask == nil else { return }
-        let path = GatewayLaunchAgentManager.launchdGatewayLogPath()
+        let path = LogLocator.launchdGatewayLogPath
        let limit = self.logLimit
        self.logRefreshTask = Task { [weak self] in
            let log = await Task.detached(priority: .utility) {
@@ -211,21 +221,9 @@ final class GatewayProcessManager {
    private func describe(details instance: String?, port: Int, snap: HealthSnapshot?) -> String {
        let instanceText = instance ?? "pid unknown"
        if let snap {
-            let linkId = snap.channelOrder?.first(where: {
+            let linked = snap.web.linked ? "linked" : "not linked"
-                if let summary = snap.channels[$0] { return summary.linked != nil }
+            let authAge = snap.web.authAgeMs.flatMap(msToAge) ?? "unknown age"
-                return false
+            return "port \(port), \(linked), auth \(authAge), \(instanceText)"
            }) ?? snap.channels.keys.first(where: {
                if let summary = snap.channels[$0] { return summary.linked != nil }
                return false
            })
            let linked = linkId.flatMap { snap.channels[$0]?.linked } ?? false
            let authAge = linkId.flatMap { snap.channels[$0]?.authAgeMs }.flatMap(msToAge) ?? "unknown age"
            let label =
                linkId.flatMap { snap.channelLabels?[$0] } ??
                linkId?.capitalized ??
                "channel"
            let linkText = linked ? "linked" : "not linked"
            return "port \(port), \(label) \(linkText), auth \(authAge), \(instanceText)"
        }
        return "port \(port), health probe succeeded, \(instanceText)"
    }
@@ -241,7 +239,7 @@ final class GatewayProcessManager {
        let lower = message.lowercased()
        if self.isGatewayAuthFailure(error) {
            return """
-            Gateway on port \(port) rejected auth. Set gateway.auth.token (or CLAWDBOT_GATEWAY_TOKEN) \
+            Gateway on port \(port) rejected auth. Set CLAWDBOT_GATEWAY_TOKEN in the app \
            to match the running gateway (or clear it on the gateway) and retry.
            """
        }
@@ -354,7 +352,7 @@ final class GatewayProcessManager {
    func clearLog() {
        self.log = ""
-        try? FileManager.default.removeItem(atPath: GatewayLaunchAgentManager.launchdGatewayLogPath())
+        try? FileManager.default.removeItem(atPath: LogLocator.launchdGatewayLogPath)
        self.logger.debug("gateway log cleared")
    }
@@ -1,5 +1,4 @@
 import AppKit
 import ClawdbotDiscovery
 import ClawdbotIPC
 import ClawdbotKit
 import CoreLocation
@@ -13,8 +12,7 @@ struct GeneralSettings: View {
    @AppStorage(locationPreciseKey) private var locationPreciseEnabled: Bool = true
    private let healthStore = HealthStore.shared
    private let gatewayManager = GatewayProcessManager.shared
-    @State private var gatewayDiscovery = GatewayDiscoveryModel(
+    @State private var gatewayDiscovery = GatewayDiscoveryModel()
        localDisplayName: InstanceIdentity.displayName)
    @State private var isInstallingCLI = false
    @State private var cliStatus: String?
    @State private var cliInstalled = false
@@ -30,22 +28,10 @@ struct GeneralSettings: View {
        ScrollView(.vertical) {
            VStack(alignment: .leading, spacing: 18) {
                if !self.state.onboardingSeen {
-                    Button {
+                    Text("Complete onboarding to finish setup")
-                        DebugActions.restartOnboarding()
+                        .font(.callout.weight(.semibold))
-                    } label: {
+                        .foregroundColor(.accentColor)
-                        HStack(spacing: 8) {
+                        .padding(.bottom, 2)
                            Label("Complete onboarding to finish setup", systemImage: "arrow.counterclockwise")
                                .font(.callout.weight(.semibold))
                                .foregroundStyle(Color.accentColor)
                            Spacer(minLength: 0)
                            Image(systemName: "chevron.right")
                                .font(.caption.weight(.semibold))
                                .foregroundStyle(.tertiary)
                        }
                        .contentShape(Rectangle())
                    }
                    .buttonStyle(.plain)
                    .padding(.bottom, 2)
                }
                VStack(alignment: .leading, spacing: 12) {
@@ -83,25 +69,6 @@ struct GeneralSettings: View {
                        subtitle: "Allow the agent to capture a photo or short video via the built-in camera.",
                        binding: self.$cameraEnabled)
                    VStack(alignment: .leading, spacing: 6) {
                        Text("Node Run Commands")
                            .font(.body)
                        Picker("", selection: self.$state.systemRunPolicy) {
                            ForEach(SystemRunPolicy.allCases) { policy in
                                Text(policy.title).tag(policy)
                            }
                        }
                        .pickerStyle(.segmented)
                        Text("""
                        Controls remote command execution on this Mac when it is paired as a node. "Always Ask" prompts on each command; "Always Allow" runs without prompts; "Never" disables `system.run`.
                        """)
                        .font(.footnote)
                        .foregroundStyle(.tertiary)
                        .fixedSize(horizontal: false, vertical: true)
                    }
                    VStack(alignment: .leading, spacing: 6) {
                        Text("Location Access")
                            .font(.body)
@@ -183,18 +150,13 @@ struct GeneralSettings: View {
    private func requestLocationAuthorization(mode: ClawdbotLocationMode) async -> Bool {
        guard mode != .off else { return true }
        guard CLLocationManager.locationServicesEnabled() else {
            await MainActor.run { LocationPermissionHelper.openSettings() }
            return false
        }
        let status = CLLocationManager().authorizationStatus
-        let requireAlways = mode == .always
+        // Note: macOS only supports authorizedAlways, not authorizedWhenInUse (iOS only)
-        if PermissionManager.isLocationAuthorized(status: status, requireAlways: requireAlways) {
+        if status == .authorizedAlways {
            return true
        }
-        let updated = await LocationPermissionRequester.shared.request(always: requireAlways)
+        let updated = await LocationPermissionRequester.shared.request(always: mode == .always)
-        return PermissionManager.isLocationAuthorized(status: updated, requireAlways: requireAlways)
+        return updated == .authorizedAlways
    }
    private var connectionSection: some View {
@@ -368,7 +330,7 @@ struct GeneralSettings: View {
                Button {
                    Task { await self.installCLI() }
                } label: {
-                    let title = self.cliInstalled ? "Reinstall CLI" : "Install CLI"
+                    let title = self.cliInstalled ? "Reinstall CLI helper" : "Install CLI helper"
                    ZStack {
                        Text(title)
                            .opacity(self.isInstallingCLI ? 0 : 1)
@@ -407,7 +369,7 @@ struct GeneralSettings: View {
                    .foregroundStyle(.secondary)
                    .lineLimit(2)
            } else {
-                Text("Installs a user-space Node 22+ runtime and the CLI (no Homebrew).")
+                Text("Symlink \"clawdbot\" into /usr/local/bin and /opt/homebrew/bin for scripts.")
                    .font(.caption)
                    .foregroundStyle(.secondary)
                    .lineLimit(2)
@@ -475,8 +437,10 @@ struct GeneralSettings: View {
        self.isInstallingCLI = true
        defer { isInstallingCLI = false }
        await CLIInstaller.install { status in
-            self.cliStatus = status
+            await MainActor.run {
-            self.refreshCLIStatus()
+                self.cliStatus = status
                self.refreshCLIStatus()
            }
        }
    }
@@ -515,19 +479,7 @@ struct GeneralSettings: View {
            }
            if let snap = snapshot {
-                let linkId = snap.channelOrder?.first(where: {
+                Text("Linked auth age: \(healthAgeString(snap.web.authAgeMs))")
                    if let summary = snap.channels[$0] { return summary.linked != nil }
                    return false
                }) ?? snap.channels.keys.first(where: {
                    if let summary = snap.channels[$0] { return summary.linked != nil }
                    return false
                })
                let linkLabel =
                    linkId.flatMap { snap.channelLabels?[$0] } ??
                    linkId?.capitalized ??
                    "Link channel"
                let linkAge = linkId.flatMap { snap.channels[$0]?.authAgeMs }
                Text("\(linkLabel) auth age: \(healthAgeString(linkAge))")
                    .font(.caption)
                    .foregroundStyle(.secondary)
                Text("Session store: \(snap.sessions.path) (\(snap.sessions.count) entries)")
@@ -4,29 +4,35 @@ import Observation
 import SwiftUI
 struct HealthSnapshot: Codable, Sendable {
-    struct ChannelSummary: Codable, Sendable {
+    struct Telegram: Codable, Sendable {
        struct Probe: Codable, Sendable {
            struct Bot: Codable, Sendable {
                let id: Int?
                let username: String?
            }
-            struct Webhook: Codable, Sendable {
+            let ok: Bool
                let url: String?
            }
            let ok: Bool?
            let status: Int?
            let error: String?
            let elapsedMs: Double?
            let bot: Bot?
            let webhook: Webhook?
        }
-        let configured: Bool?
+        let configured: Bool
        let linked: Bool?
        let authAgeMs: Double?
        let probe: Probe?
-        let lastProbeAt: Double?
+    }
    struct Web: Codable, Sendable {
        struct Connect: Codable, Sendable {
            let ok: Bool
            let status: Int?
            let error: String?
            let elapsedMs: Double?
        }
        let linked: Bool
        let authAgeMs: Double?
        let connect: Connect?
    }
    struct SessionInfo: Codable, Sendable {
@@ -44,9 +50,8 @@ struct HealthSnapshot: Codable, Sendable {
    let ok: Bool?
    let ts: Double
    let durationMs: Double
-    let channels: [String: ChannelSummary]
+    let web: Web
-    let channelOrder: [String]?
+    let telegram: Telegram?
    let channelLabels: [String: String]?
    let heartbeatSeconds: Int?
    let sessions: Sessions
 }
@@ -89,13 +94,6 @@ final class HealthStore {
        }
    }
    // Test-only escape hatch: the HealthStore is a process-wide singleton but
    // state derivation is pure from `snapshot` + `lastError`.
    func __setSnapshotForTest(_ snapshot: HealthSnapshot?, lastError: String? = nil) {
        self.snapshot = snapshot
        self.lastError = lastError
    }
    func start() {
        guard self.loopTask == nil else { return }
        self.loopTask = Task { [weak self] in
@@ -144,49 +142,10 @@ final class HealthStore {
        }
    }
-    private static func isChannelHealthy(_ summary: HealthSnapshot.ChannelSummary) -> Bool {
+    private static func isTelegramHealthy(_ snap: HealthSnapshot) -> Bool {
-        guard summary.configured == true else { return false }
+        guard let tg = snap.telegram, tg.configured else { return false }
        // If probe is missing, treat it as "configured but unknown health" (not a hard fail).
-        return summary.probe?.ok ?? true
+        return tg.probe?.ok ?? true
    }
    private static func describeProbeFailure(_ probe: HealthSnapshot.ChannelSummary.Probe) -> String {
        let elapsed = probe.elapsedMs.map { "\(Int($0))ms" }
        if let error = probe.error, error.lowercased().contains("timeout") || probe.status == nil {
            if let elapsed { return "Health check timed out (\(elapsed))" }
            return "Health check timed out"
        }
        let code = probe.status.map { "status \($0)" } ?? "status unknown"
        let reason = probe.error?.isEmpty == false ? probe.error! : "health probe failed"
        if let elapsed { return "\(reason) (\(code), \(elapsed))" }
        return "\(reason) (\(code))"
    }
    private func resolveLinkChannel(
        _ snap: HealthSnapshot) -> (id: String, summary: HealthSnapshot.ChannelSummary)?
    {
        let order = snap.channelOrder ?? Array(snap.channels.keys)
        for id in order {
            if let summary = snap.channels[id], summary.linked != nil {
                return (id: id, summary: summary)
            }
        }
        return nil
    }
    private func resolveFallbackChannel(
        _ snap: HealthSnapshot,
        excluding id: String?) -> (id: String, summary: HealthSnapshot.ChannelSummary)?
    {
        let order = snap.channelOrder ?? Array(snap.channels.keys)
        for channelId in order {
            if channelId == id { continue }
            guard let summary = snap.channels[channelId] else { continue }
            if Self.isChannelHealthy(summary) {
                return (id: channelId, summary: summary)
            }
        }
        return nil
    }
    var state: HealthState {
@@ -194,15 +153,13 @@ final class HealthStore {
            return .degraded(error)
        }
        guard let snap = self.snapshot else { return .unknown }
-        guard let link = self.resolveLinkChannel(snap) else { return .unknown }
+        if !snap.web.linked {
-        if link.summary.linked != true {
+            // WhatsApp Web linking is optional if Telegram is healthy; don't paint the whole app red.
-            // Linking is optional if any other channel is healthy; don't paint the whole app red.
+            return Self.isTelegramHealthy(snap) ? .degraded("Not linked") : .linkingNeeded
            let fallback = self.resolveFallbackChannel(snap, excluding: link.id)
            return fallback != nil ? .degraded("Not linked") : .linkingNeeded
        }
-        // A channel can be "linked" but still unhealthy (failed probe / cannot connect).
+        if let connect = snap.web.connect, !connect.ok {
-        if let probe = link.summary.probe, probe.ok == false {
+            let reason = connect.error ?? "connect failed"
-            return .degraded(Self.describeProbeFailure(probe))
+            return .degraded(reason)
        }
        return .ok
    }
@@ -211,22 +168,19 @@ final class HealthStore {
        if self.isRefreshing { return "Health check running…" }
        if let error = self.lastError { return "Health check failed: \(error)" }
        guard let snap = self.snapshot else { return "Health check pending" }
-        guard let link = self.resolveLinkChannel(snap) else { return "Health check pending" }
+        if !snap.web.linked {
-        if link.summary.linked != true {
+            if let tg = snap.telegram, tg.configured {
-            if let fallback = self.resolveFallbackChannel(snap, excluding: link.id) {
+                let tgLabel = (tg.probe?.ok ?? true) ? "Telegram ok" : "Telegram degraded"
-                let fallbackLabel = snap.channelLabels?[fallback.id] ?? fallback.id.capitalized
+                return "\(tgLabel) · Not linked — run clawdbot login"
                let fallbackState = (fallback.summary.probe?.ok ?? true) ? "ok" : "degraded"
                return "\(fallbackLabel) \(fallbackState) · Not linked — run clawdbot login"
            }
            return "Not linked — run clawdbot login"
        }
-        let auth = link.summary.authAgeMs.map { msToAge($0) } ?? "unknown"
+        let auth = snap.web.authAgeMs.map { msToAge($0) } ?? "unknown"
-        if let probe = link.summary.probe, probe.ok == false {
+        if let connect = snap.web.connect, !connect.ok {
-            let status = probe.status.map(String.init) ?? "?"
+            let code = connect.status.map(String.init) ?? "?"
-            let suffix = probe.status == nil ? "probe degraded" : "probe degraded · status \(status)"
+            return "Link stale? status \(code)"
            return "linked · auth \(auth) · \(suffix)"
        }
-        return "linked · auth \(auth)"
+        return "linked · auth \(auth) · socket ok"
    }
    /// Short, human-friendly detail for the last failure, used in the UI.
@@ -247,11 +201,17 @@ final class HealthStore {
    }
    func describeFailure(from snap: HealthSnapshot, fallback: String?) -> String {
-        if let link = self.resolveLinkChannel(snap), link.summary.linked != true {
+        if !snap.web.linked {
            return "Not linked — run clawdbot login"
        }
-        if let link = self.resolveLinkChannel(snap), let probe = link.summary.probe, probe.ok == false {
+        if let connect = snap.web.connect, !connect.ok {
-            return Self.describeProbeFailure(probe)
+            let elapsed = connect.elapsedMs.map { "\(Int($0))ms" } ?? "unknown duration"
            if let err = connect.error, err.lowercased().contains("timeout") || connect.status == nil {
                return "Health check timed out (\(elapsed))"
            }
            let code = connect.status.map { "status \($0)" } ?? "status unknown"
            let reason = connect.error ?? "connect failed"
            return "\(reason) (\(code), \(elapsed))"
        }
        if let fallback, !fallback.isEmpty {
            return fallback